CdmApplicationRemoteConfiguration : added GeoService and @Component bean name

remotingApplicationContext : exclude CdmApplicationDefaultConfiguration from comp scan
remoting_services_security : cosmetic
httpInvokerServiceClients : added editGeoService
config.properties : corrected context path
localApplicationContext.xml : new config file to ease remoting switch
editorApplicationContext : simplified switch to remoting and back

diff --git a/.gitattributes b/.gitattributes
index 34bc39866be0339f4ca42dd755f70dcfa19eb7d8..b8ab28ceb9606d49163af7ac52160c2fae735417 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -339,6 +339,7 @@ eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/Ab
 eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/config.properties -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/httpInvokerServiceClients.xml -text
+eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/localApplicationContext.xml -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remoting_persistence_security.xml -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remoting_services_security.xml -text

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
index d52adb42b09e7643999d276a9f2ba5a9f51feecc..1c80eeb7524a907fda1ed17189beaff4fce0ce8a 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
@@ -10,16 +10,18 @@
 \r
 package eu.etaxonomy.cdm.api.application;\r
 \r
+import org.hibernate.SessionFactory;\r
+\r
 import org.apache.log4j.Logger;\r
-import org.springframework.context.ApplicationContextAware;\r
+import org.springframework.beans.factory.annotation.Autowired;\r
 import org.springframework.stereotype.Component;\r
 import org.springframework.transaction.PlatformTransactionManager;\r
 import org.springframework.transaction.TransactionStatus;\r
 \r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration;\r
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
 import eu.etaxonomy.cdm.api.conversation.ConversationHolderMock;\r
 import eu.etaxonomy.cdm.api.service.IDatabaseService;\r
+import eu.etaxonomy.cdm.ext.geo.IEditGeoService;\r
 \r
 /**\r
  * @author a.mueller\r
@@ -30,12 +32,17 @@ import eu.etaxonomy.cdm.api.service.IDatabaseService;
  * @author a.mueller\r
  * @author j.koch\r
  */\r
-@Component\r
+// FIXME:Remoting This bean naming is a hack to make remoting work, in conjunction with the\r
+// exclude filter in the application package set in the remotingApplicationContext \r
+@Component("cdmApplicationDefaultConfiguration")\r
 public class CdmApplicationRemoteConfiguration extends CdmApplicationDefaultConfiguration {\r
        \r
        @SuppressWarnings("unused")\r
        private static final Logger logger = Logger.getLogger(CdmApplicationRemoteConfiguration.class);\r
 \r
+       @Autowired\r
+       IEditGeoService editGeoService;\r
+       \r
        public CdmApplicationRemoteConfiguration() {\r
        }\r
        \r
@@ -79,4 +86,15 @@ public class CdmApplicationRemoteConfiguration extends CdmApplicationDefaultConf
                // TODO Auto-generated method stub\r
                return new ConversationHolderMock();\r
        }\r
+       \r
+       public IEditGeoService getEditGeoService() {\r
+               return this.editGeoService;\r
+       }\r
+       @Override\r
+       public void setTransactionManager(PlatformTransactionManager transactionManager) {        \r
+    }\r
+       \r
+       @Override\r
+    public void setSessionFactory(SessionFactory sessionFactory) {     \r
+    }\r
 }\r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/config.properties b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/config.properties
index 85f6c1ccaab2fb027d720ad4f80a8b17f3259e92..f706a6e3bc5727806c33e553b8c47e8cabe099f1 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/config.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/config.properties
@@ -1,2 +1,2 @@
 serverName=localhost:8080
-contextPath=
+contextPath=remoting

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/httpInvokerServiceClients.xml b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/httpInvokerServiceClients.xml
index 80c6994f82c4c539d69265d924de94ee517a6852..250a837572e9f6bfe3c3e0d5ccfe00d473360253 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/httpInvokerServiceClients.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/httpInvokerServiceClients.xml
@@ -102,6 +102,19 @@
                        <bean class="org.springframework.security.remoting.httpinvoker.AuthenticationSimpleHttpInvokerRequestExecutor" />\r
                </property>\r
        </bean>\r
+       \r
+   <bean id="editGeoService"\r
+               class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
+               <property name="serviceUrl">\r
+                       <value>http://${serverName}/${contextPath}/editgeo.service</value>\r
+               </property>\r
+               <property name="serviceInterface">\r
+                       <value>eu.etaxonomy.cdm.ext.geo.IEditGeoService</value>\r
+               </property>\r
+               <property name="httpInvokerRequestExecutor">\r
+                       <bean class="org.springframework.security.remoting.httpinvoker.AuthenticationSimpleHttpInvokerRequestExecutor" />\r
+               </property>\r
+       </bean>\r
 \r
    <bean id="featureNodeService"\r
                class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/localApplicationContext.xml b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/localApplicationContext.xml
new file mode 100644 (file)
index 0000000..f90ee40
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/localApplicationContext.xml
@@ -0,0 +1,31 @@
+<?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/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">
+       
+
+    <!-- Default application context and term initializer -->
+  <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/>
+  <bean id="persistentTermInitializer" class="eu.etaxonomy.cdm.database.PersistentTermInitializer">
+    <property name="omit" value="false" />
+  </bean>
+    
+  <import resource="classpath:/eu/etaxonomy/cdm/remote.xml"/>
+  <import resource="classpath:eu/etaxonomy/cdm/remote/json/jsonConfigurations.xml"/>
+  
+  <context:component-scan base-package="eu/etaxonomy/cdm/ext"/>
+  
+  <context:component-scan base-package="eu/etaxonomy/cdm/remote">
+    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.config\.DataSourceConfigurer" />
+    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.config\.LoggingConfigurer" />
+    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.view\.PatternViewResolver" />
+    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.vaadin\..*" />
+    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.controller\..*Portal.*" /> 
+  </context:component-scan>
+  
+
+</beans>

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 2793ca621a65f4888089fe21ee93e5d0080dac79..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
@@ -7,16 +7,24 @@
     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
+    <!--  <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
-    <bean name="cdmApplicationDefaultConfiguration" class="eu.etaxonomy.cdm.api.application.CdmApplicationRemoteConfiguration"/>\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

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remoting_services_security.xml b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remoting_services_security.xml
index fcadad4118602d0dd90d6eb97779f34bc7c88921..4b5a565b90a2e57acaf402671e74cf8fc772733b 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remoting_services_security.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remoting_services_security.xml
@@ -3,8 +3,7 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
   xmlns:context="http://www.springframework.org/schema/context"\r
   xmlns:security="http://www.springframework.org/schema/security"\r
-  xsi:schemaLocation="\r
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd\r
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd\r
     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd\r
     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd\r
     http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd"\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml b/eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml
index 2a879672fd11d97b76afc4ff25b2566dfedd147c..1344e38b5d355b7ddaf20a126ae08d06b3669aa1 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml
+++ b/eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml
@@ -7,29 +7,10 @@
     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
-  <!-- Default application context and term initializer -->\r
-  <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/>
-  <bean id="persistentTermInitializer" class="eu.etaxonomy.cdm.database.PersistentTermInitializer">
-    <property name="omit" value="false" />
-  </bean>
+  <!-- Local application context and term initializer -->\r
+  <import resource="classpath:/eu/etaxonomy/cdm/localApplicationContext.xml"/>
   \r
   <!-- Remote application context and term initializer -->\r
-  <!-- <import resource="classpath:/eu/etaxonomy/cdm/remotingApplicationContext.xml"/> -->
-<!--  <bean id="remoteTermInitializer" class="eu.etaxonomy.cdm.remote.service.RemoteTermInitializer"/>-->
-  \r
-    \r
-  <import resource="classpath:/eu/etaxonomy/cdm/remote.xml"/>\r
-  <import resource="classpath:eu/etaxonomy/cdm/remote/json/jsonConfigurations.xml"/>\r
-  \r
-  <context:component-scan base-package="eu/etaxonomy/cdm/ext"/>\r
-  \r
-  <context:component-scan base-package="eu/etaxonomy/cdm/remote">\r
-    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.config\.DataSourceConfigurer" />\r
-    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.config\.LoggingConfigurer" />\r
-    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.view\.PatternViewResolver" />\r
-    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.vaadin\..*" />\r
-    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.controller\..*Portal.*" /> \r
-  </context:component-scan>\r
-  \r
+<!--  <import resource="classpath:/eu/etaxonomy/cdm/remotingApplicationContext.xml"/> -->
   \r
 </beans>\r