Project

General

Profile

« Previous | Next » 

Revision 20ed1f92

Added by Cherian Mathew almost 10 years ago

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.

View differences:

.gitattributes
177 177
eu.etaxonomy.taxeditor.cdmlib/lib/dozer-5.3.0.jar -text
178 178
eu.etaxonomy.taxeditor.cdmlib/lib/easymock-3.1.jar -text
179 179
eu.etaxonomy.taxeditor.cdmlib/lib/easymockclassextension-2.3.jar -text
180
eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.4.3.jar -text
180
eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.9.jar -text
181 181
eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6.jar -text
182 182
eu.etaxonomy.taxeditor.cdmlib/lib/fop-1.1.jar -text
183 183
eu.etaxonomy.taxeditor.cdmlib/lib/google-api-translate-java-0.92.jar -text
eu.etaxonomy.taxeditor.cdmlib/.classpath
66 66
	<classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>
67 67
	<classpathentry exported="true" kind="lib" path="lib/easymock-3.1.jar"/>
68 68
	<classpathentry exported="true" kind="lib" path="lib/easymockclassextension-2.3.jar"/>
69
	<classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.4.3.jar"/>
69
	<classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.6.9.jar"/>
70 70
	<classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>
71 71
	<classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>
72 72
	<classpathentry exported="true" kind="lib" path="lib/guava-r05.jar"/>
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
468 468
 lib/dozer-5.3.0.jar,
469 469
 lib/easymock-3.1.jar,
470 470
 lib/easymockclassextension-2.3.jar,
471
 lib/ehcache-core-2.4.3.jar,
471
 lib/ehcache-core-2.6.9.jar,
472 472
 lib/ezmorph-1.0.6.jar,
473 473
 lib/fop-1.1.jar,
474 474
 lib/guava-r05.jar,
eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml
10 10
	
11 11
    <!--  <bean id="remoteTermInitializer" class="eu.etaxonomy.cdm.remote.service.RemoteTermInitializer"/>-->
12 12
        
13
<!-- 	<context:annotation-config/> -->
14
  	
15
<!-- 	<context:component-scan base-package="eu/etaxonomy/cdm/api/application"> -->
16
<!--   		<context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.api\.application\.CdmApplicationDefaultConfiguration" />  -->
17
<!--   	</context:component-scan> -->
13
	<context:annotation-config/>
18 14
    
19
    <bean id="cdmApplicationRemoteConfiguration" class="eu.etaxonomy.cdm.api.application.CdmApplicationRemoteConfiguration"/>
15
    <import resource="classpath:/eu/etaxonomy/cdm/httpInvokerServiceClients.xml"/>
16
    
17
    <bean id="cdmApplicationRemoteConfiguration" class="eu.etaxonomy.cdm.api.application.CdmApplicationRemoteConfiguration"/>    
20 18
    
21 19
	<import resource="classpath:/eu/etaxonomy/cdm/remoting_services_security.xml"/> 
22

  
23
	<import resource="classpath:/eu/etaxonomy/cdm/httpInvokerServiceClients.xml"/>
24

  
20
	
21
	<context:component-scan base-package="eu/etaxonomy/cdm/api/cache"/>
22
	
23
	<bean id="cdmCacher" class="eu.etaxonomy.cdm.api.cache.CdmCacher"/>
24
	
25
	
25 26
	<!-- EditGeoService was moved to ext. Therefore it will not be found by the default component scan.
26 27
	We added it here because the Editor needs it. However, this is only a temporary solution.
27 28
	In the future we want to pass in an application context with the editor. -->

Also available in: Unified diff