From 227599208152ac30d7754aa3d1a5422c284af308 Mon Sep 17 00:00:00 2001 From: Cherian Mathew Date: Fri, 14 Feb 2014 16:53:58 +0000 Subject: [PATCH] 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 --- .gitattributes | 1 + .../CdmApplicationRemoteConfiguration.java | 24 ++++++++++++-- .../eu/etaxonomy/cdm/config.properties | 2 +- .../cdm/httpInvokerServiceClients.xml | 13 ++++++++ .../etaxonomy/cdm/localApplicationContext.xml | 31 +++++++++++++++++++ .../cdm/remotingApplicationContext.xml | 12 +++++-- .../cdm/remoting_services_security.xml | 3 +- .../cdm/editorApplicationContext.xml | 25 ++------------- 8 files changed, 81 insertions(+), 30 deletions(-) create mode 100644 eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/localApplicationContext.xml diff --git a/.gitattributes b/.gitattributes index 34bc39866..b8ab28ceb 100644 --- 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 d52adb42b..1c80eeb75 100644 --- 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 @@ package eu.etaxonomy.cdm.api.application; +import org.hibernate.SessionFactory; + import org.apache.log4j.Logger; -import org.springframework.context.ApplicationContextAware; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionStatus; -import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.conversation.ConversationHolderMock; import eu.etaxonomy.cdm.api.service.IDatabaseService; +import eu.etaxonomy.cdm.ext.geo.IEditGeoService; /** * @author a.mueller @@ -30,12 +32,17 @@ import eu.etaxonomy.cdm.api.service.IDatabaseService; * @author a.mueller * @author j.koch */ -@Component +// FIXME:Remoting This bean naming is a hack to make remoting work, in conjunction with the +// exclude filter in the application package set in the remotingApplicationContext +@Component("cdmApplicationDefaultConfiguration") public class CdmApplicationRemoteConfiguration extends CdmApplicationDefaultConfiguration { @SuppressWarnings("unused") private static final Logger logger = Logger.getLogger(CdmApplicationRemoteConfiguration.class); + @Autowired + IEditGeoService editGeoService; + public CdmApplicationRemoteConfiguration() { } @@ -79,4 +86,15 @@ public class CdmApplicationRemoteConfiguration extends CdmApplicationDefaultConf // TODO Auto-generated method stub return new ConversationHolderMock(); } + + public IEditGeoService getEditGeoService() { + return this.editGeoService; + } + @Override + public void setTransactionManager(PlatformTransactionManager transactionManager) { + } + + @Override + public void setSessionFactory(SessionFactory sessionFactory) { + } } 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 85f6c1cca..f706a6e3b 100644 --- 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 80c6994f8..250a83757 100644 --- 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 @@ + + + + http://${serverName}/${contextPath}/editgeo.service + + + eu.etaxonomy.cdm.ext.geo.IEditGeoService + + + + + 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 index 000000000..f90ee4017 --- /dev/null +++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/localApplicationContext.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 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 2793ca621..df3383767 100644 --- 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"> + + + + + + + + - - + + 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 fcadad411..4b5a565b9 100644 --- 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" xmlns:context="http://www.springframework.org/schema/context" xmlns:security="http://www.springframework.org/schema/security" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd" 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 2a879672f..1344e38b5 100644 --- 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"> - - - - - + + - - - - - - - - - - - - - - - - - + -- 2.34.1