[myblog] r445 committed - refactor some code.

2 views
Skip to first unread message

myb...@googlecode.com

unread,
Jun 13, 2011, 6:37:43 PM6/13/11
to mybl...@googlegroups.com
Revision: 445
Author: Ror...@gmail.com
Date: Mon Jun 13 11:36:49 2011
Log: refactor some code.
http://code.google.com/p/myblog/source/detail?r=445

Added:
/branches/myblog-springmvc/src/main/resources/META-INF

/branches/myblog-springmvc/src/main/resources/META-INF/persistence.xml.hsqldb_mem

/branches/myblog-springmvc/src/main/resources/META-INF/persistence.xml.mysql

/branches/myblog-springmvc/src/main/resources/META-INF/persistence.xml.postgresql
/branches/myblog-springmvc/src/main/resources/spring
/branches/myblog-springmvc/src/main/resources/spring/global-context.xml
/branches/myblog-springmvc/src/main/resources/spring/security-context.xml
Deleted:

/branches/myblog-springmvc/src/main/resources/applicationContext-common-authorization.xml

/branches/myblog-springmvc/src/main/resources/applicationContext-common-business.xml
Modified:
/branches/myblog-springmvc/pom.xml
/branches/myblog-springmvc/src/main/webapp/WEB-INF/web.xml

=======================================
--- /dev/null
+++
/branches/myblog-springmvc/src/main/resources/META-INF/persistence.xml.hsqldb_mem
Mon Jun 13 11:36:49 2011
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
+ http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
version="1.0">
+
+ <!-- JPA test "unit" -->
+ <persistence-unit name="myblogUnit" transaction-type="RESOURCE_LOCAL" >
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <class>com.jdkcn.myblog.domain.Entry</class>
+ <class>com.jdkcn.myblog.domain.Category</class>
+ <class>com.jdkcn.myblog.domain.User</class>
+ <class>com.jdkcn.myblog.domain.Account</class>
+ <class>com.jdkcn.myblog.domain.Blog</class>
+ <class>com.jdkcn.myblog.domain.Tag</class>
+ <class>com.jdkcn.myblog.domain.Comment</class>
+ <exclude-unlisted-classes>true</exclude-unlisted-classes>
+ <properties>
+ <property name="hibernate.connection.driver_class"
value="org.hsqldb.jdbcDriver" />
+ <property name="hibernate.connection.url"
value="jdbc:hsqldb:mem:myblog" />
+ <property name="hibernate.connection.username" value="sa" />
+ <property name="hibernate.connection.password" value="" />
+ <property name="hibernate.connection.pool_size" value="5"/>
+ <property name="hibernate.dialect"
value="org.hibernate.dialect.HSQLDialect" />
+ <property name="hibernate.hbm2ddl.auto" value="update"/>
+ <property name="hibernate.show_sql" value="false"/>
+ <property name="hibernate.format_sql" value="true"/>
+ <property name="hibernate.cache.provider_class"
value="net.sf.ehcache.hibernate.SingletonEhCacheProvider" />
+ <property name="hibernate.cache.use_query_cache" value="true"
/>
+ <property name="hibernate.cache.use_second_level_cache"
value="true" />
+ </properties>
+ </persistence-unit>
+
+</persistence>
=======================================
--- /dev/null
+++
/branches/myblog-springmvc/src/main/resources/META-INF/persistence.xml.mysql
Mon Jun 13 11:36:49 2011
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
+ http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
version="1.0">
+
+ <!-- JPA test "unit" -->
+ <persistence-unit name="myblogUnit" transaction-type="RESOURCE_LOCAL" >
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <class>com.jdkcn.myblog.domain.Entry</class>
+ <class>com.jdkcn.myblog.domain.Category</class>
+ <class>com.jdkcn.myblog.domain.User</class>
+ <class>com.jdkcn.myblog.domain.Account</class>
+ <class>com.jdkcn.myblog.domain.Blog</class>
+ <class>com.jdkcn.myblog.domain.Tag</class>
+ <class>com.jdkcn.myblog.domain.Comment</class>
+ <exclude-unlisted-classes>true</exclude-unlisted-classes>
+ <properties>
+ <!--
+ <property name="hibernate.connection.driver_class"
value="com.p6spy.engine.spy.P6SpyDriver"/>
+ -->
+ <property name="hibernate.connection.driver_class"
value="com.mysql.jdbc.Driver" />
+ <property name="hibernate.connection.url"
value="jdbc:mysql://localhost:3306/myblog?useUnicode=true&amp;characterEncoding=UTF-8"
/>
+ <property name="hibernate.connection.username" value="root" />
+ <property name="hibernate.connection.password" value="root" />
+ <property name="hibernate.connection.pool_size" value="5"/>
+ <property name="hibernate.dialect"
value="org.hibernate.dialect.MySQLInnoDBDialect" />
+ <property name="hibernate.hbm2ddl.auto" value="update"/>
+ <property name="hibernate.show_sql" value="false"/>
+ <property name="hibernate.format_sql" value="true"/>
+ <property name="hibernate.cache.provider_class"
value="net.sf.ehcache.hibernate.SingletonEhCacheProvider" />
+ <property name="hibernate.cache.use_query_cache" value="true"
/>
+ <property name="hibernate.cache.use_second_level_cache"
value="true" />
+ </properties>
+ </persistence-unit>
+
+</persistence>
=======================================
--- /dev/null
+++
/branches/myblog-springmvc/src/main/resources/META-INF/persistence.xml.postgresql
Mon Jun 13 11:36:49 2011
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
+ http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
version="1.0">
+
+ <!-- JPA test "unit" -->
+ <persistence-unit name="myblogUnit" transaction-type="RESOURCE_LOCAL" >
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <class>com.jdkcn.myblog.domain.Entry</class>
+ <class>com.jdkcn.myblog.domain.Category</class>
+ <class>com.jdkcn.myblog.domain.User</class>
+ <class>com.jdkcn.myblog.domain.Account</class>
+ <class>com.jdkcn.myblog.domain.Blog</class>
+ <class>com.jdkcn.myblog.domain.Tag</class>
+ <class>com.jdkcn.myblog.domain.Comment</class>
+ <exclude-unlisted-classes>true</exclude-unlisted-classes>
+ <properties>
+ <property name="hibernate.connection.driver_class"
value="org.postgresql.Driver"/>
+ <!--
+ <property name="hibernate.connection.driver_class"
value="com.p6spy.engine.spy.P6SpyDriver"/>
+ -->
+ <property name="hibernate.connection.url"
value="jdbc:postgresql://localhost:5432/myblog"/>
+ <property name="hibernate.connection.username"
value="postgres"/>
+ <property name="hibernate.connection.password"
value="postgres"/>
+ <property name="hibernate.connection.pool_size" value="5"/>
+ <property name="hibernate.dialect"
value="org.hibernate.dialect.PostgreSQLDialect"/>
+ <property name="hibernate.hbm2ddl.auto" value="update"/>
+ <property name="hibernate.show_sql" value="false"/>
+ <property name="hibernate.format_sql" value="true"/>
+ <property name="hibernate.cache.provider_class"
value="net.sf.ehcache.hibernate.SingletonEhCacheProvider" />
+ <property name="hibernate.cache.use_query_cache" value="true"
/>
+ <property name="hibernate.cache.use_second_level_cache"
value="true" />
+ </properties>
+ </persistence-unit>
+
+</persistence>
+
=======================================
--- /dev/null
+++ /branches/myblog-springmvc/src/main/resources/spring/global-context.xml
Mon Jun 13 11:36:49 2011
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Application context containing business beans. Used by all artifacts.
-->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:tx="http://www.springframework.org/schema/tx"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+
+ <bean id="dataSource"
class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+ <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+ <property name="url"
value="jdbc:mysql://localhost:3306/myblog?useUnicode=true&amp;characterEncoding=utf-8"
/>
+ <property name="username" value="root" />
+ <property name="password" value="root" />
+ </bean>
+
+ <bean id="transactionManager"
class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+ <property name="dataSource" ref="dataSource"/>
+ </bean>
+
+ <tx:annotation-driven transaction-manager="transactionManager" />
+
+ <bean id="entityManagerFactory"
+ class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean">
+ <property name="persistenceUnitName" value="myblogUnit" />
+ </bean>
+
+ <!-- Uncomment the following lines when first time you run the application
+ because DataSourcePopulator class will create and populate the tables for
you in mysql under "blog" database for testing purposes -->
+ <bean id="dataSourcePopulator"
class="com.jdkcn.myblog.service.DataSourcePopulator">
+ <property name="dataSource" ref="dataSource"/>
+ <property name="mutableAclService" ref="aclService"/>
+ <property name="platformTransactionManager"
ref="transactionManager"/>
+ </bean>
+
+ <bean id="blogManager"
class="com.jdkcn.myblog.service.BlogManagerImpl">
+ <property name="blogDao">
+ <bean class="com.jdkcn.myblog.repository.BlogDaoImpl">
+ <property name="dataSource" ref="dataSource"/>
+ </bean>
+ </property>
+ <property name="mutableAclService" ref="aclService"/>
+ </bean>
+
+</beans>
=======================================
--- /dev/null
+++
/branches/myblog-springmvc/src/main/resources/spring/security-context.xml
Mon Jun 13 11:36:49 2011
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:security="http://www.springframework.org/schema/security"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security-3.0.xsd">
+
+ <!-- Application context containing the ACL beans. -->
+
+ <!-- ========= ACL SERVICE DEFINITIONS ========= -->
+
+ <bean id="aclCache"
+ class="org.springframework.security.acls.domain.EhCacheBasedAclCache">
+ <constructor-arg>
+ <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+ <property name="cacheManager">
+ <bean
class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean" />
+ </property>
+ <property name="cacheName" value="aclCache" />
+ </bean>
+ </constructor-arg>
+ </bean>
+
+ <bean id="lookupStrategy"
+ class="org.springframework.security.acls.jdbc.BasicLookupStrategy">
+ <constructor-arg ref="dataSource" />
+ <constructor-arg ref="aclCache" />
+ <constructor-arg>
+ <bean
+
class="org.springframework.security.acls.domain.AclAuthorizationStrategyImpl">
+ <constructor-arg>
+ <list>
+ <bean
+
class="org.springframework.security.core.authority.GrantedAuthorityImpl">
+ <constructor-arg value="ROLE_ADMINISTRATOR" />
+ </bean>
+ <bean
+
class="org.springframework.security.core.authority.GrantedAuthorityImpl">
+ <constructor-arg value="ROLE_ADMINISTRATOR" />
+ </bean>
+ <bean
+
class="org.springframework.security.core.authority.GrantedAuthorityImpl">
+ <constructor-arg value="ROLE_ADMINISTRATOR" />
+ </bean>
+ </list>
+ </constructor-arg>
+ </bean>
+ </constructor-arg>
+ <constructor-arg>
+ <bean
class="org.springframework.security.acls.domain.ConsoleAuditLogger" />
+ </constructor-arg>
+ </bean>
+
+ <bean id="aclService"
+ class="org.springframework.security.acls.jdbc.JdbcMutableAclService">
+ <constructor-arg ref="dataSource" />
+ <constructor-arg ref="lookupStrategy" />
+ <constructor-arg ref="aclCache" />
+ <property name="classIdentityQuery" value="SELECT @@IDENTITY" />
+ <property name="sidIdentityQuery" value="SELECT @@IDENTITY" />
+ </bean>
+
+</beans>
=======================================
---
/branches/myblog-springmvc/src/main/resources/applicationContext-common-authorization.xml
Wed Jun 1 01:04:00 2011
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:security="http://www.springframework.org/schema/security"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security-2.0.1.xsd">
-
-<!-- Application context containing the ACL beans. -->
-
- <!-- ========= ACL SERVICE DEFINITIONS ========= -->
-
- <bean id="aclCache"
class="org.springframework.security.acls.domain.EhCacheBasedAclCache">
- <constructor-arg>
- <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <property name="cacheManager">
- <bean
class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean"/>
- </property>
- <property name="cacheName" value="aclCache"/>
- </bean>
- </constructor-arg>
- </bean>
-
- <bean id="lookupStrategy"
class="org.springframework.security.acls.jdbc.BasicLookupStrategy">
- <constructor-arg ref="dataSource"/>
- <constructor-arg ref="aclCache"/>
- <constructor-arg>
- <bean
class="org.springframework.security.acls.domain.AclAuthorizationStrategyImpl">
- <constructor-arg>
- <list>
- <bean
class="org.springframework.security.core.authority.GrantedAuthorityImpl">
- <constructor-arg value="ROLE_ADMINISTRATOR"/>
- </bean>
- <bean
class="org.springframework.security.core.authority.GrantedAuthorityImpl">
- <constructor-arg value="ROLE_ADMINISTRATOR"/>
- </bean>
- <bean
class="org.springframework.security.core.authority.GrantedAuthorityImpl">
- <constructor-arg value="ROLE_ADMINISTRATOR"/>
- </bean>
- </list>
- </constructor-arg>
- </bean>
- </constructor-arg>
- <constructor-arg>
- <bean
class="org.springframework.security.acls.domain.ConsoleAuditLogger"/>
- </constructor-arg>
- </bean>
-
- <bean id="aclService"
class="org.springframework.security.acls.jdbc.JdbcMutableAclService">
- <constructor-arg ref="dataSource"/>
- <constructor-arg ref="lookupStrategy"/>
- <constructor-arg ref="aclCache"/>
- <property name="classIdentityQuery" value="SELECT @@IDENTITY"/>
- <property name="sidIdentityQuery" value="SELECT @@IDENTITY"/>
- </bean>
-
-</beans>
=======================================
---
/branches/myblog-springmvc/src/main/resources/applicationContext-common-business.xml
Wed Jun 1 01:33:04 2011
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Application context containing business beans. Used by all artifacts.
-->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:tx="http://www.springframework.org/schema/tx"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
-
- <bean id="dataSource"
class="org.springframework.jdbc.datasource.DriverManagerDataSource">
- <property name="driverClassName" value="com.mysql.jdbc.Driver" />
- <property name="url"
value="jdbc:mysql://localhost:3306/myblog?useUnicode=true&amp;characterEncoding=utf-8"
/>
- <property name="username" value="root" />
- <property name="password" value="root" />
- </bean>
-
- <bean id="transactionManager"
class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
- <property name="dataSource" ref="dataSource"/>
- </bean>
-
- <tx:annotation-driven transaction-manager="transactionManager" />
-
- <!-- Uncomment the following lines when first time you run the application
- because DataSourcePopulator class will create and populate the tables for
you in mysql under "blog" database for testing purposes -->
- <bean id="dataSourcePopulator"
class="com.jdkcn.myblog.service.DataSourcePopulator">
- <property name="dataSource" ref="dataSource"/>
- <property name="mutableAclService" ref="aclService"/>
- <property name="platformTransactionManager"
ref="transactionManager"/>
- </bean>
-
- <bean id="blogManager"
class="com.jdkcn.myblog.service.BlogManagerImpl">
- <property name="blogDao">
- <bean class="com.jdkcn.myblog.repository.BlogDaoImpl">
- <property name="dataSource" ref="dataSource"/>
- </bean>
- </property>
- <property name="mutableAclService" ref="aclService"/>
- </bean>
-
-</beans>
=======================================
--- /branches/myblog-springmvc/pom.xml Wed Jun 1 01:33:04 2011
+++ /branches/myblog-springmvc/pom.xml Mon Jun 13 11:36:49 2011
@@ -153,6 +153,11 @@
<version>3.0.5.RELEASE</version>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>3.0.5.RELEASE</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>3.0.5.RELEASE</version>
=======================================
--- /branches/myblog-springmvc/src/main/webapp/WEB-INF/web.xml Wed Jun 1
01:33:04 2011
+++ /branches/myblog-springmvc/src/main/webapp/WEB-INF/web.xml Mon Jun 13
11:36:49 2011
@@ -13,8 +13,7 @@
<param-name>contextConfigLocation</param-name>
<param-value>
/WEB-INF/applicationContext-security.xml
- classpath:applicationContext-common-business.xml
- classpath:applicationContext-common-authorization.xml
+ classpath:spring/*.xml
</param-value>
</context-param>

Reply all
Reply to author
Forward
0 new messages