changed package name to be consistent with cdmlib

remotingApplicationContext.xml : cleaning up component scan

diff --git a/.gitattributes b/.gitattributes
index ab8a127d1fe98183266c50adab642188201c2c61..c296a7b01d4adf68d222e57531977bd910dd36c6 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -333,12 +333,13 @@ eu.etaxonomy.taxeditor.cdmlib/lib/xpp3_min-1.1.4c.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/yjp-controller-api-redist-9.0.8.jar -text
 eu.etaxonomy.taxeditor.cdmlib/pom.xml -text
+eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java -text
+eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteController.java -text
+eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/ICdmApplicationRemoteConfiguration.java -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/lazyloading/CdmLazyLoader.java -text
-eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/CdmApplicationRemoteConfiguration.java -text
-eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/CdmApplicationRemoteController.java -text
-eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/ICdmApplicationRemoteConfiguration.java -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java -text
 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/remotingApplicationContext.xml -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remoting_persistence_security.xml -text

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index 766a24b441ccf14aec065195ad69188cd7a7b28b..029e764d05650ba49bd513dd1f0635617f07815a 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src/main/java"/>
        <classpathentry kind="src" path="src/test/java"/>
        <classpathentry kind="src" path="src/main/resources"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.project b/eu.etaxonomy.taxeditor.cdmlib/.project
index 2d7facc3c922276015e7219b03d9f68072cf8c62..63767411ddaf24a18eacea11c8a1db29f1c2c621 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.project
+++ b/eu.etaxonomy.taxeditor.cdmlib/.project
@@ -6,7 +6,7 @@
        </projects>
        <buildSpec>
                <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
+                       <name>org.eclipse.ajdt.core.ajbuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
@@ -22,6 +22,7 @@
                </buildCommand>
        </buildSpec>
        <natures>
+               <nature>org.eclipse.ajdt.ui.ajnature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
                <nature>org.eclipse.pde.PluginNature</nature>
        </natures>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 8ff9d9558b3f06d9598f09973eb69e57da1fd1e9..7b5109bdd9a2db1820f8f4a0d173efc52f14755a 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -124,7 +124,6 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.print.out.pdf,
  eu.etaxonomy.cdm.print.out.taxpub,
  eu.etaxonomy.cdm.print.out.xml,
- eu.etaxonomy.cdm.remote.api.application,
  eu.etaxonomy.cdm.remote.config,
  eu.etaxonomy.cdm.remote.controller,
  eu.etaxonomy.cdm.remote.controller.csv,
@@ -398,7 +397,8 @@ Export-Package: com.google.api,
 Bundle-Vendor: EDIT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.osgi,
- org.eclipse.equinox.common
+ org.eclipse.equinox.common,
+ org.aspectj.runtime
 Bundle-ClassPath: .,
  lib/activation-1.1.1.jar,
  lib/antlr-2.7.7.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/CdmApplicationRemoteConfiguration.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
similarity index 88%
rename from eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/CdmApplicationRemoteConfiguration.java
rename to eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
index bbd3286bbe3c9986284e25b5dc1fe6899e8c5085..02ee655b76a9c68cb12826a07b7997ec37f65dbe 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/CdmApplicationRemoteConfiguration.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
@@ -8,13 +8,12 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.cdm.remote.api.application;\r
+package eu.etaxonomy.cdm.api.application;\r
 \r
 import org.apache.log4j.Logger;\r
 import org.springframework.context.ApplicationContextAware;\r
 import org.springframework.stereotype.Component;\r
 \r
-import eu.etaxonomy.cdm.api.application.CdmApplicationConfiguration;\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

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/CdmApplicationRemoteController.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteController.java
similarity index 93%
rename from eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/CdmApplicationRemoteController.java
rename to eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteController.java
index 0e71ca72fa3a702520f1af9f9978d890cff9eb75..dd6b6509f4057aac2a58e1d3d86b15e5bdd0c9da 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/CdmApplicationRemoteController.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteController.java
@@ -9,7 +9,7 @@
  */\r
 \r
 \r
-package eu.etaxonomy.cdm.remote.api.application;\r
+package eu.etaxonomy.cdm.api.application;\r
 \r
 import java.util.UUID;\r
 \r
@@ -182,16 +182,20 @@ public class CdmApplicationRemoteController  implements ICdmApplicationRemoteCon
        \r
        private void init(){\r
                logger.info("Init " +  this.getClass().getName() + " ... ");\r
-               if (logger.isInfoEnabled()){for (String beanName : applicationContext.getBeanDefinitionNames()){ logger.debug(beanName);}}\r
+               //if (logger.isInfoEnabled()){\r
+                       for (String beanName : applicationContext.getBeanDefinitionNames()){ \r
+                               logger.debug(beanName);}\r
+               //}\r
                //TODO delete next row (was just for testing)\r
-               if (logger.isInfoEnabled()){\r
+               //if (logger.isInfoEnabled()){\r
                        logger.info("Registered Beans: ");\r
                        String[] beanNames = applicationContext.getBeanDefinitionNames();\r
                        for (String beanName : beanNames){\r
                                logger.info(beanName);\r
                        }\r
-               }\r
-               configuration = new CdmApplicationRemoteConfiguration();\r
+               //}\r
+               //configuration = new CdmApplicationRemoteConfiguration();\r
+               configuration = (ICdmApplicationRemoteConfiguration) applicationContext.getBean("cdmApplicationRemoteConfiguration");\r
        }\r
        \r
     \r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/ICdmApplicationRemoteConfiguration.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/ICdmApplicationRemoteConfiguration.java
similarity index 77%
rename from eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/ICdmApplicationRemoteConfiguration.java
rename to eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/ICdmApplicationRemoteConfiguration.java
index 57b520089363eba177158ae6e4d321afa301e429..576156f34dc27189945963225446213ac1673223 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/ICdmApplicationRemoteConfiguration.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/ICdmApplicationRemoteConfiguration.java
@@ -1,4 +1,4 @@
-package eu.etaxonomy.cdm.remote.api.application;
+package eu.etaxonomy.cdm.api.application;
 
 import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
 

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
new file mode 100644 (file)
index 0000000..85f6c1c
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/config.properties
@@ -0,0 +1,2 @@
+serverName=localhost:8080
+contextPath=

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 9e3d1ec65ca784c82629338102e546b865d0c1e0..3d3aa428c1511847add4f4d04899dab0000326f9 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,27 +7,15 @@
     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
-       <!-- Remoting Aspect -->\r
-       <!--context:spring-configured />\r
-    <bean id="cdmlazyLoader" class="eu.etaxonomy.cdm.api.lazyloading.CdmLazyLoader"\r
-      factory-method="aspectOf" /--> \r
-\r
-        <import resource="classpath:/eu/etaxonomy/cdm/remoting_services_security.xml"/> \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:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.api\.application\.CdmApplicationDefaultController"/>
+               <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.api\.application\.CdmApplicationDefaultConfiguration"/>
        </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.

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/remoting/CdmApplicationRemoteControllerTest.java b/eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/remoting/CdmApplicationRemoteControllerTest.java
index ccb5dc74a0cc177025dbfc396f2c20f0eae61114..e8c04f431d2f395f0927ad6d601d872d6e927639 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/remoting/CdmApplicationRemoteControllerTest.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/remoting/CdmApplicationRemoteControllerTest.java
@@ -2,7 +2,7 @@ package eu.etaxonomy.taxeditor.remoting;
 
 import org.junit.Test;
 
-import eu.etaxonomy.cdm.remote.api.application.CdmApplicationRemoteController;
+import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteController;
 
 public class CdmApplicationRemoteControllerTest {