Various changes (currently broken, apparently Castor is hanging)

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

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 0177380d39e2465bae432eff390685bef4695615..9ef1c433eea4cfe18b7fb1bde4a05c60701474bb 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
@@ -3,7 +3,8 @@
        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.0.xsd">\r
 \r
-       <import resource="classpath:/org/argeo/slc/spring/templates.xml" />\r
+       <import\r
+               resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />\r
 \r
        <bean\r
                class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">\r
@@ -40,13 +41,12 @@
                <property name="suppressClose" value="true" />\r
        </bean>\r
 \r
-       <bean id="testResultDao"\r
-               class="org.argeo.slc.hibernate.test.tree.TestResultDaoHibernate">\r
+       <bean id="testResultDao" parent="slcTemplates.dao.testResultDao">\r
                <property name="sessionFactory" ref="sessionFactory" />\r
        </bean>\r
 \r
        <bean id="slcExecutionDao"\r
-               class="org.argeo.slc.hibernate.process.SlcExecutionDaoHibernate">\r
+               parent="slcTemplates.dao.slcExecutionDao">\r
                <property name="sessionFactory" ref="sessionFactory" />\r
        </bean>\r
 </beans>
\ No newline at end of file

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
index 8c3977ccdcfdc2538435e69c30c110f8252b3e42..1277f5e5e85e169a524a67e87b1ee005aad649cb 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
@@ -3,39 +3,33 @@
        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.0.xsd">\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="marshaller" />\r
-               <property name="unmarshaller" ref="marshaller" />\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="marshaller" />\r
-               <property name="unmarshaller" ref="marshaller" />\r
+               <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
+               <property name="unmarshaller"\r
+                       ref="slcDefault.castor.marshaller" />\r
        </bean>\r
 \r
-       <bean name="treeTestResultRequestEp"\r
-               class="org.argeo.slc.ws.test.tree.TreeTestResultRequestEp">\r
+       <bean name="createTreeTestResultRequestEp"\r
+               class="org.argeo.slc.ws.test.tree.CreateTreeTestResultRequestEp">\r
                <constructor-arg ref="testResultDao" />\r
-               <property name="marshaller" ref="marshaller" />\r
-               <property name="unmarshaller" ref="marshaller" />\r
-       </bean>\r
-\r
-       <bean id="marshaller"\r
-               class="org.springframework.oxm.castor.CastorMarshaller">\r
-               <property name="mappingLocations">\r
-                       <list>\r
-                               <value>\r
-                                       classpath:org/argeo/slc/castor/process/mapping.xml\r
-                               </value>\r
-                               <value>\r
-                                       classpath:org/argeo/slc/castor/test/tree/mapping.xml\r
-                               </value>\r
-                       </list>\r
-               </property>\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
@@ -52,8 +46,8 @@
                                        slcExecutionStepsRequestEp\r
                                </prop>\r
                                <prop\r
-                                       key="{http://argeo.org/projects/slc/schemas}tree-test-result-request">\r
-                                       treeTestResultRequestEp\r
+                                       key="{http://argeo.org/projects/slc/schemas}create-tree-test-result-request">\r
+                                       createTreeTestResultRequestEp\r
                                </prop>\r
                        </props>\r
                </property>\r
@@ -66,20 +60,14 @@
 \r
        <bean id="slcDefinition"\r
                class="org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition">\r
-               <property name="schema" ref="schema" />\r
+               <property name="schema" ref="slcDefault.xml.xsdSchema" />\r
                <property name="portTypeName" value="Slc" />\r
                <property name="locationUri"\r
-                       value="http://localhost:8080/argeo-slc-ws/slcService/" />\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 id="schema"\r
-               class="org.springframework.xml.xsd.SimpleXsdSchema">\r
-               <property name="xsd"\r
-                       value="classpath:/org/argeo/slc/xml/slc.xsd" />\r
-       </bean>\r
-\r
        <bean class="org.argeo.slc.ws.CustomSoapExceptionResolver" />\r
 </beans>
\ No newline at end of file