From bf3860360e940865349894380ae13b4d4150a6ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BF=8A=E6=9D=B0Jerry?= <bupt1987@gmail.com>
Date: Thu, 28 Aug 2014 17:05:01 +0800
Subject: [PATCH] up

---
 pom.xml                                       |  73 +++++----
 src/main/java/applicationContext.xml          | 149 -----------------
 src/main/resources/applicationContext.xml     | 152 ++++++++++++++++++
 src/main/{java => resources}/jdbc.properties  |   0
 .../jgframework.properties                    |   0
 src/main/{java => resources}/log4j.properties |   0
 src/main/{java => resources}/services.xml     |   0
 7 files changed, 194 insertions(+), 180 deletions(-)
 delete mode 100644 src/main/java/applicationContext.xml
 create mode 100644 src/main/resources/applicationContext.xml
 rename src/main/{java => resources}/jdbc.properties (100%)
 rename src/main/{java => resources}/jgframework.properties (100%)
 rename src/main/{java => resources}/log4j.properties (100%)
 rename src/main/{java => resources}/services.xml (100%)

diff --git a/pom.xml b/pom.xml
index 5764f0f..edca4aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,33 +1,44 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>JgWeb</groupId>
-  <artifactId>JgWeb</artifactId>
-  <packaging>war</packaging>
-  <version>0.0.1-SNAPSHOT</version>
-  <name>JgWeb</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <!-- 测试websocket -->
-    <dependency>
-    	<groupId>org.java-websocket</groupId>
-    	<artifactId>Java-WebSocket</artifactId>
-    	<version>1.3.0</version>
-    </dependency>
-    <dependency>
-    	<groupId>JgFramework</groupId>
-    	<artifactId>JgFramework</artifactId>
-    	<version>0.0.1-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <finalName>JgWeb</finalName>
-  </build>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>JgWeb</groupId>
+    <artifactId>JgWeb</artifactId>
+    <packaging>war</packaging>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>JgWeb</name>
+    <url>http://maven.apache.org</url>
+    <build>
+        <finalName>JgWeb</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+        <!-- 测试websocket -->
+        <dependency>
+            <groupId>org.java-websocket</groupId>
+            <artifactId>Java-WebSocket</artifactId>
+            <version>1.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>JgFramework</groupId>
+            <artifactId>JgFramework</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/src/main/java/applicationContext.xml b/src/main/java/applicationContext.xml
deleted file mode 100644
index b86ba47..0000000
--- a/src/main/java/applicationContext.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans 
-			http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-			http://www.springframework.org/schema/tx 
-         	http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
-          	http://www.springframework.org/schema/context 
-          	http://www.springframework.org/schema/context/spring-context-3.1.xsd 
-          	http://www.springframework.org/schema/aop 
-          	http://www.springframework.org/schema/aop/spring-aop-3.1.xsd">
-          	
-    <!-- 注解 -->
-	<context:annotation-config/>
-	<!-- 扫描包 -->
-	<context:component-scan base-package="com.zhaidaosi.game.server.sdm"/>
-	<!-- 代理 -->
-	<aop:aspectj-autoproxy/>
-	
-	<context:property-placeholder location="classpath*:jdbc.properties" />
-
-	<!-- bonecp连接池配置 -->
-	<bean id="parentDataSource" class="com.jolbox.bonecp.BoneCPDataSource" destroy-method="close"/>
-
-
-	<!-- jgframework 主数据源-->  
-    <bean id="jgframeworkMasterDataSource" parent="parentDataSource">
-        <property name="driverClass" value="${jgframework.master.jdbc.driverClassName}" />  
-        <property name="jdbcUrl" value="${jgframework.master.jdbc.url}" />  
-        <property name="username" value="${jgframework.master.jdbc.username}" />  
-        <property name="password" value="${jgframework.master.jdbc.password}" />
-        <property name="partitionCount" value="${jgframework.master.jdbc.partitionCount}"/>
-		<property name="maxConnectionsPerPartition" value="${jgframework.master.jdbc.maxConnectionsPerPartition}"/>
-		<property name="minConnectionsPerPartition" value="${jgframework.master.jdbc.minConnectionsPerPartition}"/>
-		<property name="poolName" value="jgframework-master-pool"/>
-		<property name="lazyInit" value="true"/>
-    </bean>
-    <!-- jgframework 从数据源-->  
-    <bean id="jgframeworkSlaveDataSource" parent="parentDataSource">  
-        <property name="driverClass" value="${jgframework.slave.jdbc.driverClassName}" />  
-        <property name="jdbcUrl" value="${jgframework.slave.jdbc.url}" />  
-        <property name="username" value="${jgframework.slave.jdbc.username}" />  
-        <property name="password" value="${jgframework.slave.jdbc.password}"/>
-        <property name="partitionCount" value="${jgframework.slave.jdbc.partitionCount}"/>
-		<property name="maxConnectionsPerPartition" value="${jgframework.slave.jdbc.maxConnectionsPerPartition}"/>
-		<property name="minConnectionsPerPartition" value="${jgframework.slave.jdbc.minConnectionsPerPartition}"/> 
-		<property name="poolName" value="jgframework-slave-pool"/>
-    </bean>	
-    
-    <!-- cronweb 主数据源
-    <bean id="cronwebMasterDataSource" parent="parentDataSource">
-        <property name="driverClass" value="${cronweb.master.jdbc.driverClassName}" />  
-        <property name="jdbcUrl" value="${cronweb.master.jdbc.url}" />  
-        <property name="username" value="${cronweb.master.jdbc.username}" />  
-        <property name="password" value="${cronweb.master.jdbc.password}" />
-        <property name="partitionCount" value="${cronweb.master.jdbc.partitionCount}"/>
-		<property name="maxConnectionsPerPartition" value="${cronweb.master.jdbc.maxConnectionsPerPartition}"/>
-		<property name="minConnectionsPerPartition" value="${cronweb.master.jdbc.minConnectionsPerPartition}"/>
-		<property name="poolName" value="cronweb-master-pool"/>
-		<property name="lazyInit" value="true"/>
-    </bean>-->   
-    <!-- cronweb 从数据源
-    <bean id="cronwebSlaveDataSource" parent="parentDataSource">  
-        <property name="driverClass" value="${cronweb.slave.jdbc.driverClassName}" />  
-        <property name="jdbcUrl" value="${cronweb.slave.jdbc.url}" />  
-        <property name="username" value="${cronweb.slave.jdbc.username}" />  
-        <property name="password" value="${cronweb.slave.jdbc.password}"/>
-        <property name="partitionCount" value="${cronweb.slave.jdbc.partitionCount}"/>
-		<property name="maxConnectionsPerPartition" value="${cronweb.slave.jdbc.maxConnectionsPerPartition}"/>
-		<property name="minConnectionsPerPartition" value="${cronweb.slave.jdbc.minConnectionsPerPartition}"/> 
-		<property name="poolName" value="cronweb-slave-pool"/>
-    </bean>-->  
-
-	<bean id="dataSource" class="com.zhaidaosi.game.jgframework.common.spring.DynamicDataSource">  
-        <property name="targetDataSources">  
-            <map key-type="java.lang.String">  
-                <!-- <entry key="cronweb-master" value-ref="cronwebMasterDataSource" />
-                <entry key="cronweb-slave" value-ref="cronwebSlaveDataSource" />  -->
-                <entry key="jgframework-master" value-ref="jgframeworkMasterDataSource" />
-                <entry key="jgframework-slave" value-ref="jgframeworkSlaveDataSource" /> 
-            </map>  
-        </property>  
-        <property name="defaultTargetDataSource" ref="jgframeworkSlaveDataSource" />  
-        <property name="defaultDatabase" value="jgframework"/>
-    </bean> 
-    
-	
-	<!-- 自己定义的扫描模型类 -->
-	<bean id="sessionFactory" class="com.zhaidaosi.game.jgframework.common.spring.AnnotationSessionFactoryBeanEx">
-		<property name="dataSource" ref="dataSource"/>
-		<property name="hibernateProperties">
-			<props>
-				<prop key="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</prop>
-				<prop key="hibernate.show_sql">false</prop>
-    			<prop key="hibernate.hbm2ddl.auto">none</prop><!-- update,none -->
-			</props>
-		</property>
-		<property name="annotatedClassesLocations">  
-            <list>  
-                <value>classpath*:com/zhaidaosi/game/server/sdm/model/*.class</value>  
-            </list>  
-        </property>
-	</bean>
-
-	<bean id="hibernateTemplate" class="org.springframework.orm.hibernate3.HibernateTemplate">
-		<property name="sessionFactory">
-			<ref bean="sessionFactory" />
-		</property>
-	</bean>
-
-	<!-- 定义事务管理器 -->
-	<bean id="txManager"
-		class="org.springframework.orm.hibernate3.HibernateTransactionManager">
-		<property name="sessionFactory" ref="sessionFactory" />
-	</bean>
-
-	<!-- 加载事务驱动 -->
-	<tx:annotation-driven transaction-manager="txManager"/>
-	<tx:advice id="txAdvice" transaction-manager="txManager">
-		<tx:attributes>
-			<tx:method name="total*" read-only="true" propagation="SUPPORTS"/>
-			<tx:method name="find*" read-only="true" propagation="SUPPORTS"/>
-			<tx:method name="save*" propagation="REQUIRED" />
-			<tx:method name="add*" propagation="REQUIRED" />
-			<tx:method name="delete*" propagation="REQUIRED" />
-			<tx:method name="update*" propagation="REQUIRED" />
-		</tx:attributes>
-	</tx:advice>
-	
-	<!-- 切换数据库 -->
-	<bean id="dataSourceAdvice" class="com.zhaidaosi.game.jgframework.common.spring.DataSourceAdvice" />
-	<aop:config>
-		<aop:pointcut id="bussinessService" expression="execution(public * com.zhaidaosi.game.server.sdm.service..*.*(..))" />
-		<aop:advisor pointcut-ref="bussinessService" advice-ref="dataSourceAdvice" />
-		<aop:advisor pointcut-ref="bussinessService" advice-ref="txAdvice" />
-	</aop:config>
-	
-	<aop:config>
-		<aop:pointcut id="frameworkbussinessService" expression="execution(public * com.zhaidaosi.game.jgframework.common.sdm.BaseService.*(..))" />
-		<aop:advisor pointcut-ref="frameworkbussinessService" advice-ref="dataSourceAdvice" />
-		<aop:advisor pointcut-ref="frameworkbussinessService" advice-ref="txAdvice" />
-	</aop:config>
-	
-	<!-- service beans -->
-	<import resource="classpath*:services.xml"/>
-	
-</beans>
\ No newline at end of file
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
new file mode 100644
index 0000000..faef883
--- /dev/null
+++ b/src/main/resources/applicationContext.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+			http://www.springframework.org/schema/tx 
+         	http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
+          	http://www.springframework.org/schema/context 
+          	http://www.springframework.org/schema/context/spring-context-3.1.xsd 
+          	http://www.springframework.org/schema/aop 
+          	http://www.springframework.org/schema/aop/spring-aop-3.1.xsd">
+
+    <!-- 注解 -->
+    <context:annotation-config/>
+    <!-- 扫描包 -->
+    <context:component-scan base-package="com.zhaidaosi.game.server.sdm"/>
+    <!-- 代理 -->
+    <aop:aspectj-autoproxy/>
+
+    <context:property-placeholder location="classpath*:jdbc.properties"/>
+
+    <!-- bonecp连接池配置 -->
+    <bean id="parentDataSource" class="com.jolbox.bonecp.BoneCPDataSource" destroy-method="close"/>
+
+
+    <!-- jgframework 主数据源-->
+    <bean id="jgframeworkMasterDataSource" parent="parentDataSource">
+        <property name="driverClass" value="${jgframework.master.jdbc.driverClassName}"/>
+        <property name="jdbcUrl" value="${jgframework.master.jdbc.url}"/>
+        <property name="username" value="${jgframework.master.jdbc.username}"/>
+        <property name="password" value="${jgframework.master.jdbc.password}"/>
+        <property name="partitionCount" value="${jgframework.master.jdbc.partitionCount}"/>
+        <property name="maxConnectionsPerPartition" value="${jgframework.master.jdbc.maxConnectionsPerPartition}"/>
+        <property name="minConnectionsPerPartition" value="${jgframework.master.jdbc.minConnectionsPerPartition}"/>
+        <property name="poolName" value="jgframework-master-pool"/>
+        <property name="lazyInit" value="true"/>
+    </bean>
+    <!-- jgframework 从数据源-->
+    <bean id="jgframeworkSlaveDataSource" parent="parentDataSource">
+        <property name="driverClass" value="${jgframework.slave.jdbc.driverClassName}"/>
+        <property name="jdbcUrl" value="${jgframework.slave.jdbc.url}"/>
+        <property name="username" value="${jgframework.slave.jdbc.username}"/>
+        <property name="password" value="${jgframework.slave.jdbc.password}"/>
+        <property name="partitionCount" value="${jgframework.slave.jdbc.partitionCount}"/>
+        <property name="maxConnectionsPerPartition" value="${jgframework.slave.jdbc.maxConnectionsPerPartition}"/>
+        <property name="minConnectionsPerPartition" value="${jgframework.slave.jdbc.minConnectionsPerPartition}"/>
+        <property name="poolName" value="jgframework-slave-pool"/>
+    </bean>
+
+    <!-- cronweb 主数据源
+    <bean id="cronwebMasterDataSource" parent="parentDataSource">
+        <property name="driverClass" value="${cronweb.master.jdbc.driverClassName}" />  
+        <property name="jdbcUrl" value="${cronweb.master.jdbc.url}" />  
+        <property name="username" value="${cronweb.master.jdbc.username}" />  
+        <property name="password" value="${cronweb.master.jdbc.password}" />
+        <property name="partitionCount" value="${cronweb.master.jdbc.partitionCount}"/>
+		<property name="maxConnectionsPerPartition" value="${cronweb.master.jdbc.maxConnectionsPerPartition}"/>
+		<property name="minConnectionsPerPartition" value="${cronweb.master.jdbc.minConnectionsPerPartition}"/>
+		<property name="poolName" value="cronweb-master-pool"/>
+		<property name="lazyInit" value="true"/>
+    </bean>-->
+    <!-- cronweb 从数据源
+    <bean id="cronwebSlaveDataSource" parent="parentDataSource">  
+        <property name="driverClass" value="${cronweb.slave.jdbc.driverClassName}" />  
+        <property name="jdbcUrl" value="${cronweb.slave.jdbc.url}" />  
+        <property name="username" value="${cronweb.slave.jdbc.username}" />  
+        <property name="password" value="${cronweb.slave.jdbc.password}"/>
+        <property name="partitionCount" value="${cronweb.slave.jdbc.partitionCount}"/>
+		<property name="maxConnectionsPerPartition" value="${cronweb.slave.jdbc.maxConnectionsPerPartition}"/>
+		<property name="minConnectionsPerPartition" value="${cronweb.slave.jdbc.minConnectionsPerPartition}"/> 
+		<property name="poolName" value="cronweb-slave-pool"/>
+    </bean>-->
+
+    <bean id="dataSource" class="com.zhaidaosi.game.jgframework.common.spring.DynamicDataSource">
+        <property name="targetDataSources">
+            <map key-type="java.lang.String">
+                <!-- <entry key="cronweb-master" value-ref="cronwebMasterDataSource" />
+                <entry key="cronweb-slave" value-ref="cronwebSlaveDataSource" />  -->
+                <entry key="jgframework-master" value-ref="jgframeworkMasterDataSource"/>
+                <entry key="jgframework-slave" value-ref="jgframeworkSlaveDataSource"/>
+            </map>
+        </property>
+        <property name="defaultTargetDataSource" ref="jgframeworkSlaveDataSource"/>
+        <property name="defaultDatabase" value="jgframework"/>
+    </bean>
+
+
+    <!-- 自己定义的扫描模型类 -->
+    <bean id="sessionFactory" class="com.zhaidaosi.game.jgframework.common.spring.AnnotationSessionFactoryBeanEx">
+        <property name="dataSource" ref="dataSource"/>
+        <property name="hibernateProperties">
+            <props>
+                <prop key="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</prop>
+                <prop key="hibernate.show_sql">false</prop>
+                <prop key="hibernate.hbm2ddl.auto">none</prop>
+                <!-- update,none -->
+            </props>
+        </property>
+        <property name="annotatedClassesLocations">
+            <list>
+                <value>classpath*:com/zhaidaosi/game/server/sdm/model/*.class</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="hibernateTemplate" class="org.springframework.orm.hibernate3.HibernateTemplate">
+        <property name="sessionFactory">
+            <ref bean="sessionFactory"/>
+        </property>
+    </bean>
+
+    <!-- 定义事务管理器 -->
+    <bean id="txManager"
+          class="org.springframework.orm.hibernate3.HibernateTransactionManager">
+        <property name="sessionFactory" ref="sessionFactory"/>
+    </bean>
+
+    <!-- 加载事务驱动 -->
+    <tx:annotation-driven transaction-manager="txManager"/>
+    <tx:advice id="txAdvice" transaction-manager="txManager">
+        <tx:attributes>
+            <tx:method name="total*" read-only="true" propagation="SUPPORTS"/>
+            <tx:method name="find*" read-only="true" propagation="SUPPORTS"/>
+            <tx:method name="save*" propagation="REQUIRED"/>
+            <tx:method name="add*" propagation="REQUIRED"/>
+            <tx:method name="delete*" propagation="REQUIRED"/>
+            <tx:method name="update*" propagation="REQUIRED"/>
+        </tx:attributes>
+    </tx:advice>
+
+    <!-- 切换数据库 -->
+    <bean id="dataSourceAdvice" class="com.zhaidaosi.game.jgframework.common.spring.DataSourceAdvice"/>
+    <aop:config>
+        <aop:pointcut id="bussinessService"
+                      expression="execution(public * com.zhaidaosi.game.server.sdm.service..*.*(..))"/>
+        <aop:advisor pointcut-ref="bussinessService" advice-ref="dataSourceAdvice"/>
+        <aop:advisor pointcut-ref="bussinessService" advice-ref="txAdvice"/>
+    </aop:config>
+
+    <aop:config>
+        <aop:pointcut id="frameworkbussinessService"
+                      expression="execution(public * com.zhaidaosi.game.jgframework.common.sdm.BaseService.*(..))"/>
+        <aop:advisor pointcut-ref="frameworkbussinessService" advice-ref="dataSourceAdvice"/>
+        <aop:advisor pointcut-ref="frameworkbussinessService" advice-ref="txAdvice"/>
+    </aop:config>
+
+    <!-- service beans -->
+    <import resource="classpath*:services.xml"/>
+
+</beans>
\ No newline at end of file
diff --git a/src/main/java/jdbc.properties b/src/main/resources/jdbc.properties
similarity index 100%
rename from src/main/java/jdbc.properties
rename to src/main/resources/jdbc.properties
diff --git a/src/main/java/jgframework.properties b/src/main/resources/jgframework.properties
similarity index 100%
rename from src/main/java/jgframework.properties
rename to src/main/resources/jgframework.properties
diff --git a/src/main/java/log4j.properties b/src/main/resources/log4j.properties
similarity index 100%
rename from src/main/java/log4j.properties
rename to src/main/resources/log4j.properties
diff --git a/src/main/java/services.xml b/src/main/resources/services.xml
similarity index 100%
rename from src/main/java/services.xml
rename to src/main/resources/services.xml