test pom

manage.iml

@@ -19,7 +19,6 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

src/main/resources/applicationContext.xml

@@ -64,24 +64,24 @@
 		<property name="password" value="${default.dataSource.password}"/>
 	</bean>
 	<bean id="officeDataSource" parent="parentDataSource">
-		<property name="url" value="${office.url}"/>
-		<property name="username" value="${office.username}"/>
-		<property name="password" value="${office.password}"/>
+		<property name="url" value="${office.dataSource.url}"/>
+		<property name="username" value="${office.dataSource.username}"/>
+		<property name="password" value="${office.dataSource.password}"/>
 	</bean>
 	<bean id="tkioDataSource" parent="parentDataSource">
-		<property name="url" value="${tkio.url}"/>
-		<property name="username" value="${tkio.username}"/>
-		<property name="password" value="${tkio.password}"/>
+		<property name="url" value="${tkio.dataSource.url}"/>
+		<property name="username" value="${tkio.dataSource.username}"/>
+		<property name="password" value="${tkio.dataSource.password}"/>
 	</bean>
 	<bean id="trackDataSource" parent="parentDataSource">
-		<property name="url" value="${track.url}"/>
-		<property name="username" value="${track.username}"/>
-		<property name="password" value="${track.password}"/>
+		<property name="url" value="${track.dataSource.url}"/>
+		<property name="username" value="${track.dataSource.username}"/>
+		<property name="password" value="${track.dataSource.password}"/>
 	</bean>
 	<bean id="dmpDataSource" parent="parentDataSource">
-		<property name="url" value="${dmp.url}"/>
-		<property name="username" value="${dmp.username}"/>
-		<property name="password" value="${dmp.password}"/>
+		<property name="url" value="${dmp.dataSource.url}"/>
+		<property name="username" value="${dmp.dataSource.username}"/>
+		<property name="password" value="${dmp.dataSource.password}"/>
 	</bean>
 
 	<!-- JPA实体管理工厂的配置 -->

src/main/resources/persistence.properties

@@ -5,18 +5,18 @@ default.dataSource.username=${default.datasource.username}
 default.dataSource.password=${default.datasource.password}
 
 
-office.url=${office.url}
-office.username=${office.username}
-office.password=${office.password}
+office.dataSource.url=${office.url}
+office.dataSource.username=${office.username}
+office.dataSource.password=${office.password}
 
-tkio.url=${tkio.url}
-tkio.username=${tkio.username}
-tkio.password=${tkio.password}
+tkio.dataSource.url=${tkio.url}
+tkio.dataSource.username=${tkio.username}
+tkio.dataSource.password=${tkio.password}
 
-track.url=${track.url}
-track.username=${track.username}
-track.password=${track.password}
+track.dataSource.url=${track.url}
+track.dataSource.username=${track.username}
+track.dataSource.password=${track.password}
 
-dmp.url=${dmp.url}
-dmp.username=${dmp.username}
-dmp.password=${dmp.password}
\ No newline at end of file
+dmp.dataSource.url=${dmp.url}
+dmp.dataSource.username=${dmp.username}
+dmp.dataSource.password=${dmp.password}
\ No newline at end of file