refactoring http invoker section to a separate config file to make it easy to test...

diff --git a/.gitattributes b/.gitattributes
index 35c612526d1b0c84141cb51b8136eea9ba5136e4..7c8cca55291c50ffb592287c898fd0b01af7604d 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -2249,6 +2249,7 @@ cdmlib-services/src/main/java/eu/etaxonomy/cdm/validation/constraint/NoDuplicate
 cdmlib-services/src/main/java/org/apache/lucene/search/MultiCollector.java -text
 cdmlib-services/src/main/resources/eu/etaxonomy/cdm/defaultApplicationContext.xml -text
 cdmlib-services/src/main/resources/eu/etaxonomy/cdm/httpInvokerServices.xml -text
+cdmlib-services/src/main/resources/eu/etaxonomy/cdm/remoting-services.xml -text
 cdmlib-services/src/main/resources/eu/etaxonomy/cdm/services.xml -text
 cdmlib-services/src/main/resources/eu/etaxonomy/cdm/services_security.xml -text
 cdmlib-services/src/main/resources/eu/etaxonomy/cdm/validation/name/TaxonNameBase-Constraints.xml -text

diff --git a/cdmlib-remote-webapp/src/main/webapp/WEB-INF/cdmlib-remote-servlet.xml b/cdmlib-remote-webapp/src/main/webapp/WEB-INF/cdmlib-remote-servlet.xml
index 33effee5a105270c0ea94d17a7e61725ef6bedc0..495c1c2dfb52dbc2e5417cf42d1dd6dc2fc66d6a 100644 (file)
--- a/cdmlib-remote-webapp/src/main/webapp/WEB-INF/cdmlib-remote-servlet.xml
+++ b/cdmlib-remote-webapp/src/main/webapp/WEB-INF/cdmlib-remote-servlet.xml
@@ -64,53 +64,7 @@
        ======= Remoting =======
        -->
        
-<!--   <import resource="classpath:/eu/etaxonomy/cdm/httpInvokerServices.xml"/>-->
-<!---->
-<!--   <bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">-->
-<!--           <property name="order" value="0" />-->
-<!--           <property name="mappings">-->
-<!--    -->
-               <!-- Needed for spring remoting with the http invoker -->
-<!--           <!-- The configuration of the services is imported from httpInvokerServices.xml -->-->
-<!--                   <props>-->
-<!--                           <prop key="/remoting/agent.service">httpAgentService</prop>-->
-<!--                           <prop key="/remoting/annotation.service">httpAnnotationService</prop>-->
-<!--                           <prop key="/remoting/auditevent.service">httpAuditEventService</prop>-->
-<!--                           <prop key="/remoting/classification.service">httpClassificationService</prop>-->
-<!--                           <prop key="/remoting/collection.service">httpCollectionService</prop>-->
-<!--                           <prop key="/remoting/common.service">httpCommonService</prop>-->
-<!--                           <prop key="/remoting/database.service">httpDatabaseService</prop>-->
-<!--                           <prop key="/remoting/description.service">httpDescriptionService</prop>-->
-<!--                           <prop key="/remoting/featurenode.service">httpFeatureNodeService</prop>-->
-<!--                           <prop key="/remoting/featuretree.service">httpFeatureTreeService</prop>-->
-<!--                           <prop key="/remoting/grantedauthority.service">httpGrantedAuthorityService</prop>-->
-<!--                           <prop key="/remoting/group.service">httpGroupService</prop>-->
-<!--                           <prop key="/remoting/identificationkey.service">httpIdentificationKeyService</prop>-->
-<!--                           <prop key="/remoting/location.service">httpLocationService</prop>-->
-<!--                           <prop key="/remoting/lsidauthority.service">httpLsidAuthorityService</prop>             -->
-<!--                           <prop key="/remoting/lsiddata.service">httpLsidDataService</prop>       -->
-<!--                           <prop key="/remoting/lsidmetadata.service">httpLsidMetadataService</prop>                       -->
-<!--                           <prop key="/remoting/marker.service">httpMarkerService</prop>-->
-<!--                           <prop key="/remoting/media.service">httpMediaService</prop>-->
-<!--                           <prop key="/remoting/name.service">httpNameService</prop>-->
-<!--                           <prop key="/remoting/occurrence.service">httpOccurrenceService</prop>-->
-<!--                           <prop key="/remoting/polytomouskeynode.service">httpPolytomousKeyNodeService</prop>-->
-<!--                           <prop key="/remoting/polytomouskey.service">httpPolytomousKeyService</prop>-->
-<!--                           <prop key="/remoting/reference.service">httpReferenceService</prop>-->
-<!--                           <prop key="/remoting/service.service">httpServiceService</prop>-->
-<!--                           <prop key="/remoting/taxonnode.service">httpTaxonNodeService</prop>-->
-<!--                           <prop key="/remoting/taxon.service">httpTaxonService</prop>-->
-<!--                           <prop key="/remoting/term.service">httpTermService</prop>-->
-<!--                           <prop key="/remoting/user.service">httpUserService</prop>-->
-<!--                           <prop key="/remoting/vocabulary.service">httpVocabularyService</prop>-->
-<!--                           <prop key="/remoting/authenticationManager.service">httpAuthenticationManager</prop>-->
-<!--                   </props>-->
-<!--           </property>-->
-<!--   </bean>-->
-<!---->
-<!--    -->
-<!--    <!-- needed for HTTPInvoker  -->       -->
-<!--   <bean class="org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter" />-->
+       <!-- <import resource="classpath:/eu/etaxonomy/cdm/remoting-services.xml"/>-->
        
        
   <!--

diff --git a/cdmlib-services/src/main/resources/eu/etaxonomy/cdm/remoting-services.xml b/cdmlib-services/src/main/resources/eu/etaxonomy/cdm/remoting-services.xml
new file mode 100644 (file)
index 0000000..253a655
--- /dev/null
+++ b/cdmlib-services/src/main/resources/eu/etaxonomy/cdm/remoting-services.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+  xmlns:tx="http://www.springframework.org/schema/tx"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans
+    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+    ">
+
+       <import resource="classpath:/eu/etaxonomy/cdm/httpInvokerServices.xml"/>
+
+       <bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
+               <property name="order" value="0" />
+               <property name="mappings">
+        
+                <!-- Needed for spring remoting with the http invoker -->
+                <!-- The configuration of the services is imported from httpInvokerServices.xml --> 
+                       <props>
+                               <prop key="/remoting/agent.service">httpAgentService</prop>
+                               <prop key="/remoting/annotation.service">httpAnnotationService</prop>
+                               <prop key="/remoting/auditevent.service">httpAuditEventService</prop>
+                               <prop key="/remoting/classification.service">httpClassificationService</prop>
+                               <prop key="/remoting/collection.service">httpCollectionService</prop>
+                               <prop key="/remoting/common.service">httpCommonService</prop>
+                               <prop key="/remoting/database.service">httpDatabaseService</prop>
+                               <prop key="/remoting/description.service">httpDescriptionService</prop>
+                               <prop key="/remoting/featurenode.service">httpFeatureNodeService</prop>
+                               <prop key="/remoting/featuretree.service">httpFeatureTreeService</prop>
+                               <prop key="/remoting/grantedauthority.service">httpGrantedAuthorityService</prop>
+                               <prop key="/remoting/group.service">httpGroupService</prop>
+                               <prop key="/remoting/identificationkey.service">httpIdentificationKeyService</prop>
+                               <prop key="/remoting/location.service">httpLocationService</prop>
+                               <prop key="/remoting/lsidauthority.service">httpLsidAuthorityService</prop>             
+                               <prop key="/remoting/lsiddata.service">httpLsidDataService</prop>       
+                               <prop key="/remoting/lsidmetadata.service">httpLsidMetadataService</prop>                       
+                               <prop key="/remoting/marker.service">httpMarkerService</prop>
+                               <prop key="/remoting/media.service">httpMediaService</prop>
+                               <prop key="/remoting/name.service">httpNameService</prop>
+                               <prop key="/remoting/occurrence.service">httpOccurrenceService</prop>
+                               <prop key="/remoting/polytomouskeynode.service">httpPolytomousKeyNodeService</prop>
+                               <prop key="/remoting/polytomouskey.service">httpPolytomousKeyService</prop>
+                               <prop key="/remoting/reference.service">httpReferenceService</prop>
+                               <prop key="/remoting/service.service">httpServiceService</prop>
+                               <prop key="/remoting/taxonnode.service">httpTaxonNodeService</prop>
+                               <prop key="/remoting/taxon.service">httpTaxonService</prop>
+                               <prop key="/remoting/term.service">httpTermService</prop>
+                               <prop key="/remoting/user.service">httpUserService</prop>
+                               <prop key="/remoting/vocabulary.service">httpVocabularyService</prop>
+                               <prop key="/remoting/authenticationManager.service">httpAuthenticationManager</prop>
+                       </props>
+               </property>
+       </bean>
+
+    
+     <!-- needed for HTTPInvoker -->   
+       <bean class="org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter" />
+
+</beans>
\ No newline at end of file