CdmApplicationRemoteConfiguration : added GeoService and @Component bean name

[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / src / main / resources / eu / etaxonomy / cdm / remotingApplicationContext.xml

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml
index e9c3af1e9b0c51269d1894f72a9e083046f75131..df3383767f583445cca58a9ae87c46f1729d35fa 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml
@@ -6,41 +6,25 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">\r
+       \r
 \r
-       <context:spring-configured />\r
-    <bean id="cdmlazyLoader" class="eu.etaxonomy.cdm.api.lazyloading.CdmLazyLoader"\r
-      factory-method="aspectOf" />\r
-       <!-- <import resource="classpath:/eu/etaxonomy/cdm/services.xml"/> -->\r
-       <!--import resource="classpath:/eu/etaxonomy/cdm/defaultSecurityContext.xml"/> -->\r
-        <import resource="classpath:/eu/etaxonomy/cdm/remoting_services_security.xml"/> \r
-       <!-- <import resource="classpath:/eu/etaxonomy/cdm/spelling.xml"/> -->\r
-\r
-       <!-- includes service beans e.g. in eu/etaxonomy/cdm/api -->\r
-       <!-- Services are defined in httpInvokerServiceClients.xml, component-scan is not needed. -->\r
- <!-- \r
-       <context:component-scan base-package="eu/etaxonomy/cdm/api/service">\r
-       </context:component-scan>\r
- -->\r
+    <!--  <bean id="remoteTermInitializer" class="eu.etaxonomy.cdm.remote.service.RemoteTermInitializer"/>-->\r
+        \r
+       \r
+       <context:component-scan base-package="eu/etaxonomy/cdm/api/application">\r
+               <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.api\.application\.CdmApplicationDefaultConfiguration" /> \r
+       </context:component-scan>\r
     \r
+       <import resource="classpath:/eu/etaxonomy/cdm/remoting_services_security.xml"/> \r
+\r
        <import resource="classpath:/eu/etaxonomy/cdm/httpInvokerServiceClients.xml"/>\r
- \r
-       <context:component-scan base-package="eu/etaxonomy/cdm/api/application">\r
-               <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.api\.application\.CdmApplicationController"/>\r
-               <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.api\.application\.CdmApplicationDefaultConfiguration"/>\r
-               <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.api\.application\.CdmApplicationRemoteController"/>\r
-               <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.api\.application\.CdmApplicationRemoteDefaultConfiguration"/>\r
-       </context:component-scan>\r
-       <!--bean id="persistentTermInitializer" class="eu.etaxonomy.cdm.database.PersistentTermInitializer">\r
-       <property name="omit" value="false" />\r
-    </bean-->\r
-       <!--bean id="remoteTermInitializer" class="eu.etaxonomy.cdm.remote.service.RemoteTermInitializer">\r
-       <property name="omit" value="false" />\r
-       </bean-->\r
+\r
 \r
        <!-- EditGeoService was moved to ext. Therefore it will not be found by the default component scan.
        We added it here because the Editor needs it. However, this is only a temporary solution.
        In the future we want to pass in an application context with the editor. -->\r
 \r
+\r
        <!-- <bean id="conversationHolder" class="eu.etaxonomy.cdm.api.conversation.ConversationHolder" scope="prototype"/> -->\r
 \r
        <!-- TODO move to io -->\r