test

apollo-biz/pom.xml

@@ -18,10 +18,6 @@
 			<groupId>com.ctrip.framework.apollo</groupId>
 			<artifactId>apollo-common</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>
 		<!-- eureka -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>

apollo-biz/src/main/resources/application.properties

@@ -1,12 +0,0 @@
-# DataSource
-spring.datasource.testWhileIdle=true
-spring.datasource.testOnBorrow=true
-spring.datasource.validationQuery=SELECT 1
-
-# Naming strategy
-spring.jpa.hibernate.naming_strategy=org.hibernate.cfg.EJB3NamingStrategy
-spring.jpa.hibernate.globally_quoted_identifiers=true
-spring.jpa.properties.hibernate.globally_quoted_identifiers=true
-
-# Tomcat configuration
-server.tomcat.accept-count=1024

apollo-common/pom.xml

@@ -36,7 +36,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-aop</artifactId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.data</groupId>

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/datasource/TitanCondition.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/TitanCondition.java

@@ -1,4 +1,4 @@
-package com.ctrip.framework.apollo.biz.datasource;
+package com.ctrip.framework.apollo.common.datasource;
 
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/datasource/TitanEntityManager.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/TitanEntityManager.java

@@ -1,4 +1,4 @@
-package com.ctrip.framework.apollo.biz.datasource;
+package com.ctrip.framework.apollo.common.datasource;
 
 import java.lang.reflect.Method;
 

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/datasource/TitanSettings.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/TitanSettings.java

@@ -1,4 +1,4 @@
-package com.ctrip.framework.apollo.biz.datasource;
+package com.ctrip.framework.apollo.common.datasource;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

apollo-common/src/main/resources/application.properties

@@ -1 +1,14 @@
-spring.http.converters.preferred-json-mapper=gson
+spring.http.converters.preferred-json-mapper=gson
+
+# DataSource
+spring.datasource.testWhileIdle=true
+spring.datasource.testOnBorrow=true
+spring.datasource.validationQuery=SELECT 1
+
+# Naming strategy
+spring.jpa.hibernate.naming_strategy=org.hibernate.cfg.EJB3NamingStrategy
+spring.jpa.hibernate.globally_quoted_identifiers=true
+spring.jpa.properties.hibernate.globally_quoted_identifiers=true
+
+# Tomcat configuration
+server.tomcat.accept-count=1024