remotingApplicationContext : added CdmCacher as bean to be initialised

META-INF/MANIFEST.MF, .classpath, lib/ehcache-core-2.4.3.jar, lib/ehcache-core-2.6.9.jar: replaced ehcache-core-2.4.3 with ehcache-core-2.6.9 for the CdmCacher.
It seems that even though hibernate-ehcache-4.1.10.Final is embedded with ehcache-core-2.4.3, it is compatible with ehcache-core-2.6.9 according to http://architects.dzone.com/articles/hibernate-4-and-ehcache-higher.

diff --git a/.gitattributes b/.gitattributes
index 9b3a9a027040b28bd56f57176b3e53d7da0aaf7a..1267314462c39b9128574565a27517b4ea724fde 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -177,7 +177,7 @@ eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/dozer-5.3.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/easymock-3.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/easymockclassextension-2.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/dozer-5.3.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/easymock-3.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/easymockclassextension-2.3.jar -text

-eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.4.3.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.9.jar -text

 eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/fop-1.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/google-api-translate-java-0.92.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/fop-1.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/google-api-translate-java-0.92.jar -text

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index eb67fba3cfe1e5a07f218b6ab2e9ccebec448ffd..fa4efb5065d057bbfdf7065dd334a7f7fd314373 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -66,7 +66,7 @@
        <classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/easymock-3.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/easymockclassextension-2.3.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/easymock-3.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/easymockclassextension-2.3.jar"/>

-       <classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.4.3.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.6.9.jar"/>

        <classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/guava-r05.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/guava-r05.jar"/>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 4a22c9a0cf43ce7fdca2be468d838ea1ca523b5d..0b36eb8471a32f48dd41b06b317ed1ec695d8bf2 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -468,7 +468,7 @@ Bundle-ClassPath: .,
  lib/dozer-5.3.0.jar,
  lib/easymock-3.1.jar,
  lib/easymockclassextension-2.3.jar,
  lib/dozer-5.3.0.jar,
  lib/easymock-3.1.jar,
  lib/easymockclassextension-2.3.jar,

- lib/ehcache-core-2.4.3.jar,
+ lib/ehcache-core-2.6.9.jar,

  lib/ezmorph-1.0.6.jar,
  lib/fop-1.1.jar,
  lib/guava-r05.jar,
  lib/ezmorph-1.0.6.jar,
  lib/fop-1.1.jar,
  lib/guava-r05.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.4.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.4.3.jar
deleted file mode 100644 (file)
index 7a26318..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.4.3.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.9.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.9.jar
new file mode 100644 (file)
index 0000000..99dd2d2
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.9.jar differ

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 2f564e9947535d3296bf76ec6fa3e5d0f49e9a57..549d4825f3aa93787a2623ae76ee054c3584ce08 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
@@ -10,18 +10,19 @@
        \r
     <!--  <bean id="remoteTermInitializer" class="eu.etaxonomy.cdm.remote.service.RemoteTermInitializer"/>-->\r
         \r
        \r
     <!--  <bean id="remoteTermInitializer" class="eu.etaxonomy.cdm.remote.service.RemoteTermInitializer"/>-->\r
         \r

-<!--   <context:annotation-config/> -->\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
+       <context:annotation-config/>\r

     \r
     \r

-    <bean id="cdmApplicationRemoteConfiguration" class="eu.etaxonomy.cdm.api.application.CdmApplicationRemoteConfiguration"/>\r
+    <import resource="classpath:/eu/etaxonomy/cdm/httpInvokerServiceClients.xml"/>\r
+    \r
+    <bean id="cdmApplicationRemoteConfiguration" class="eu.etaxonomy.cdm.api.application.CdmApplicationRemoteConfiguration"/>    \r

     \r
        <import resource="classpath:/eu/etaxonomy/cdm/remoting_services_security.xml"/> \r
     \r
        <import resource="classpath:/eu/etaxonomy/cdm/remoting_services_security.xml"/> \r

-\r
-       <import resource="classpath:/eu/etaxonomy/cdm/httpInvokerServiceClients.xml"/>\r
-\r
+       \r
+       <context:component-scan base-package="eu/etaxonomy/cdm/api/cache"/>\r
+       \r
+       <bean id="cdmCacher" class="eu.etaxonomy.cdm.api.cache.CdmCacher"/>\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
        <!-- 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