Centralize server spring configs

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

diff --git a/org.argeo.slc.server/.classpath b/org.argeo.slc.server/.classpath
index 141f474b6d42e591a019a750f2bf5360010c43a5..fe6837c7e23039ca809d9ee211133f059e5b9f3e 100644 (file)
--- a/org.argeo.slc.server/.classpath
+++ b/org.argeo.slc.server/.classpath
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" path="src/main/java"/>\r
-       <classpathentry kind="src" path="src/test/java"/>\r
-       <classpathentry kind="src" path="src/test/resources"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" path="src/main/java"/>
+       <classpathentry kind="src" path="src/main/resources"/>
+       <classpathentry kind="src" path="src/test/java"/>
+       <classpathentry kind="src" path="src/test/resources"/>
+       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>

diff --git a/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-web-servlet.xml b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-web-servlet.xml
new file mode 100644 (file)
index 0000000..27a40e1
--- /dev/null
+++ b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-web-servlet.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xmlns:aop="http://www.springframework.org/schema/aop"\r
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"\r
+       default-lazy-init="true">\r
+\r
+       <bean name="/home.web"\r
+               class="org.argeo.slc.web.mvc.admin.HomeController">\r
+               <property name="viewName" value="home.jsp" />\r
+       </bean>\r
+\r
+       <bean name="/slcExecutionList.web"\r
+               class="org.argeo.slc.web.mvc.process.SlcExecutionListController">\r
+               <constructor-arg ref="slcExecutionDao" />\r
+               <property name="viewName" value="slcExecutionList" />\r
+       </bean>\r
+\r
+       <bean name="/slcExecutionView.web"\r
+               class="org.argeo.slc.web.mvc.process.SlcExecutionViewController">\r
+               <constructor-arg ref="slcExecutionDao" />\r
+               <property name="viewName" value="slcExecutionView" />\r
+       </bean>\r
+\r
+       <bean name="/resultList.web"\r
+               class="org.argeo.slc.web.mvc.result.ResultListController">\r
+               <constructor-arg ref="testResultDao" />\r
+               <property name="viewName" value="resultList" />\r
+       </bean>\r
+\r
+       <bean name="/resultView.web"\r
+               class="org.argeo.slc.web.mvc.result.ResultViewController">\r
+               <constructor-arg ref="testResultDao" />\r
+               <property name="viewName" value="resultView" />\r
+       </bean>\r
+\r
+       <bean name="/resultCollectionList.web"\r
+               class="org.argeo.slc.web.mvc.result.ResultCollectionListController">\r
+               <constructor-arg ref="testResultCollectionDao" />\r
+               <property name="viewName" value="resultCollectionList" />\r
+       </bean>\r
+\r
+       <bean name="/resultCollectionView.web"\r
+               class="org.argeo.slc.web.mvc.result.ResultCollectionViewController">\r
+               <constructor-arg ref="testResultCollectionDao" />\r
+               <property name="viewName" value="resultCollectionView" />\r
+       </bean>\r
+       \r
+       <bean name="/addResultToCollection.web"\r
+               class="org.argeo.slc.web.mvc.result.AddResultToCollectionController">\r
+               <constructor-arg ref="testManagerService" />\r
+               <property name="viewName" value="addResultToCollectionS" />\r
+       </bean>\r
+\r
+       <bean name="/removeResultFromCollection.web"\r
+               class="org.argeo.slc.web.mvc.result.RemoveResultFromCollectionController">\r
+               <constructor-arg ref="testManagerService" />\r
+               <property name="viewName" value="removeResultFromCollectionS" />\r
+       </bean>\r
+\r
+       <bean name="/testRunView.web"\r
+               class="org.argeo.slc.web.mvc.result.TestRunViewController">\r
+               <constructor-arg ref="testRunDescriptorDao" />\r
+               <property name="viewName" value="testRunView" />\r
+       </bean>\r
+\r
+       <bean id="handlerMapping"\r
+               class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">\r
+               <property name="interceptors">\r
+                       <list>\r
+                               <ref bean="resultInterceptor" />\r
+                       </list>\r
+               </property>\r
+       </bean>\r
+\r
+       <bean id="resultInterceptor"\r
+               class="org.argeo.slc.web.mvc.result.ResultInterceptor">\r
+               <constructor-arg ref="testResultCollectionDao" />\r
+       </bean>\r
+\r
+       <bean id="viewResolver"\r
+               class="org.springframework.web.servlet.view.InternalResourceViewResolver">\r
+               <property name="viewClass">\r
+                       <value>org.springframework.web.servlet.view.JstlView</value>\r
+               </property>\r
+               <property name="prefix">\r
+                       <value>WEB-INF/slc-jsp/</value>\r
+               </property>\r
+               <property name="suffix">\r
+                       <value>.jsp</value>\r
+               </property>\r
+       </bean>\r
+\r
+\r
+</beans>
\ No newline at end of file

diff --git a/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-ws-servlet.xml b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-ws-servlet.xml
new file mode 100644 (file)
index 0000000..3fc84ef
--- /dev/null
+++ b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-ws-servlet.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"\r
+       default-lazy-init="true">\r
+\r
+       <import\r
+               resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />\r
+       <import\r
+               resource="classpath:/org/argeo/slc/xml/spring/applicationContext.xml" />\r
+\r
+       <bean name="slcExecutionRequestEp"\r
+               class="org.argeo.slc.ws.process.SlcExecutionRequestEp">\r
+               <constructor-arg ref="slcExecutionDao" />\r
+               <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
+               <property name="unmarshaller"\r
+                       ref="slcDefault.castor.marshaller" />\r
+       </bean>\r
+\r
+       <bean name="slcExecutionStepsRequestEp"\r
+               class="org.argeo.slc.ws.process.SlcExecutionStepsRequestEp">\r
+               <constructor-arg ref="slcExecutionDao" />\r
+               <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
+               <property name="unmarshaller"\r
+                       ref="slcDefault.castor.marshaller" />\r
+       </bean>\r
+\r
+       <bean name="createTreeTestResultRequestEp"\r
+               class="org.argeo.slc.ws.test.tree.CreateTreeTestResultRequestEp">\r
+               <constructor-arg ref="testResultDao" />\r
+               <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
+               <property name="unmarshaller"\r
+                       ref="slcDefault.castor.marshaller" />\r
+       </bean>\r
+\r
+       <bean name="closeTreeTestResultRequestEp"\r
+               class="org.argeo.slc.ws.test.tree.CloseTreeTestResultRequestEp">\r
+               <constructor-arg ref="testResultDao" />\r
+               <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
+               <property name="unmarshaller"\r
+                       ref="slcDefault.castor.marshaller" />\r
+       </bean>\r
+\r
+       <bean name="resultPartRequestEp"\r
+               class="org.argeo.slc.ws.test.tree.ResultPartRequestEp">\r
+               <constructor-arg ref="testResultDao" />\r
+               <constructor-arg ref="testManagerService" />\r
+               <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
+               <property name="unmarshaller"\r
+                       ref="slcDefault.castor.marshaller" />\r
+       </bean>\r
+\r
+       <bean id="endPointMapping"\r
+               class="org.springframework.ws.server.endpoint.mapping.PayloadRootQNameEndpointMapping">\r
+               <property name="mappings">\r
+\r
+                       <props>\r
+                               <prop\r
+                                       key="{http://argeo.org/projects/slc/schemas}slc-execution-request">\r
+                                       slcExecutionRequestEp\r
+                               </prop>\r
+                               <prop\r
+                                       key="{http://argeo.org/projects/slc/schemas}slc-execution-status-request">\r
+                                       slcExecutionRequestEp\r
+                               </prop>\r
+                               <prop\r
+                                       key="{http://argeo.org/projects/slc/schemas}slc-execution-steps-request">\r
+                                       slcExecutionStepsRequestEp\r
+                               </prop>\r
+                               <prop\r
+                                       key="{http://argeo.org/projects/slc/schemas}create-tree-test-result-request">\r
+                                       createTreeTestResultRequestEp\r
+                               </prop>\r
+                               <prop\r
+                                       key="{http://argeo.org/projects/slc/schemas}close-tree-test-result-request">\r
+                                       closeTreeTestResultRequestEp\r
+                               </prop>\r
+                               <prop\r
+                                       key="{http://argeo.org/projects/slc/schemas}result-part-request">\r
+                                       resultPartRequestEp\r
+                               </prop>\r
+                       </props>\r
+               </property>\r
+\r
+               <property name="interceptors">\r
+                       <bean\r
+                               class="org.springframework.ws.server.endpoint.interceptor.PayloadLoggingInterceptor" />\r
+               </property>\r
+       </bean>\r
+\r
+       <bean id="slcDefinition"\r
+               class="org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition">\r
+               <property name="schema" ref="slcDefault.xml.xsdSchema" />\r
+               <property name="portTypeName" value="Slc" />\r
+               <property name="locationUri"\r
+                       value="http://localhost:8080/org.argeo.slc.webapp/slcService/" />\r
+               <property name="targetNamespace"\r
+                       value="http://argeo.org/projects/slc/definitions" />\r
+               <property name="requestSuffix" value="-request" />\r
+       </bean>\r
+\r
+       <bean class="org.argeo.slc.ws.CustomSoapExceptionResolver" />\r
+</beans>
\ No newline at end of file

diff --git a/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-xslt-servlet.xml b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-xslt-servlet.xml
new file mode 100644 (file)
index 0000000..f79c1ca
--- /dev/null
+++ b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-xslt-servlet.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xmlns:aop="http://www.springframework.org/schema/aop"\r
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"\r
+       default-lazy-init="true">\r
+\r
+       <import\r
+               resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />\r
+\r
+       <bean name="/resultView.xslt"\r
+               class="org.argeo.slc.web.mvc.result.ResultViewController">\r
+               <constructor-arg ref="testResultDao" />\r
+               <property name="viewName" value="resultView" />\r
+       </bean>\r
+\r
+       <bean\r
+               class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">\r
+       </bean>\r
+\r
+\r
+       <bean id="viewResolverXslt"\r
+               class="org.argeo.slc.web.mvc.XsltMarshallerViewResolver">\r
+               <property name="viewClass">\r
+                       <value>org.argeo.slc.web.mvc.XsltMarshallerView</value>\r
+               </property>\r
+               <property name="prefix">\r
+                       <value>WEB-INF/slc-xslt/</value>\r
+               </property>\r
+               <property name="suffix">\r
+                       <value>.xsl</value>\r
+               </property>\r
+               <property name="marshaller" ref="slcDefault.castor.marshaller"/>\r
+       </bean>\r
+\r
+\r
+</beans>
\ No newline at end of file