Centralize server spring configs

git-svn-id: https://svn.argeo.org/slc/trunk@1208 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml
index bc17798e13ef5f996d5f17350548e91ebc0ac617..a733e9603c881793a9e7e13f7aade9f97b33c553 100644 (file)
--- a/org.argeo.slc.webapp/pom.xml
+++ b/org.argeo.slc.webapp/pom.xml
@@ -18,10 +18,6 @@
                        <plugin>\r
                                <groupId>org.apache.maven.plugins</groupId>\r
                                <artifactId>maven-compiler-plugin</artifactId>\r
-                               <configuration>\r
-                                       <source>1.5</source>\r
-                                       <target>1.5</target>\r
-                               </configuration>\r
                        </plugin>\r
                </plugins>\r
        </build>\r
@@ -32,15 +28,4 @@
                        <version>${project.version}</version>\r
                </dependency>\r
        </dependencies>\r
-       <repositories>\r
-               <repository>\r
-                       <id>central</id>\r
-                       <url>http://www.argeo.org/maven/proxy</url>\r
-                       <releases>\r
-                               <enabled>true</enabled>\r
-                               <updatePolicy>daily</updatePolicy>\r
-                               <checksumPolicy>warn</checksumPolicy>\r
-                       </releases>\r
-               </repository>\r
-       </repositories>\r
 </project>
\ No newline at end of file

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
index b4be84fa99a7c4ea8e784b2495a30d9b5fe3a537..7214eed9c35ad96dbab88a014e924c49b92ff66b 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -5,7 +5,7 @@
        default-lazy-init="true">\r
 \r
        <import\r
-               resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />\r
+               resource="classpath:/org/argeo/slc/server/spring/servletContext.xml" />\r
 \r
        <bean\r
                class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">\r
@@ -41,33 +41,4 @@
                <property name="password" value="" />\r
                <property name="suppressClose" value="true" />\r
        </bean>\r
-\r
-       <!-- Services -->\r
-       <bean id="testManagerService"\r
-               class="org.argeo.slc.services.test.impl.TestManagerServiceImpl">\r
-               <constructor-arg ref="testResultDao" />\r
-               <constructor-arg ref="testRunDescriptorDao" />\r
-               <constructor-arg ref="slcExecutionDao" />\r
-               <constructor-arg ref="testResultCollectionDao" />\r
-       </bean>\r
-\r
-       <!-- DAOs -->\r
-       <bean id="testResultDao" parent="slcTemplates.dao.testResultDao">\r
-               <property name="sessionFactory" ref="sessionFactory" />\r
-       </bean>\r
-\r
-       <bean id="testResultCollectionDao"\r
-               parent="slcTemplates.dao.testResultCollectionDao">\r
-               <property name="sessionFactory" ref="sessionFactory" />\r
-       </bean>\r
-\r
-       <bean id="testRunDescriptorDao"\r
-               parent="slcTemplates.dao.testRunDescriptorDao">\r
-               <property name="sessionFactory" ref="sessionFactory" />\r
-       </bean>\r
-\r
-       <bean id="slcExecutionDao"\r
-               parent="slcTemplates.dao.slcExecutionDao">\r
-               <property name="sessionFactory" ref="sessionFactory" />\r
-       </bean>\r
 </beans>
\ No newline at end of file