Project

General

Profile

« Previous | Next » 

Revision 3eed28dc

Added by Andreas Müller over 2 years ago

Revert "rename getMediainHierarchy to getMediaInHierarchy"

This reverts commit 10a9a8cd7811b77de3d877298448c650a3e117e4.

View differences:

cdmlib-remote/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml
10 10
    http://www.springframework.org/schema/tx 
11 11
    http://www.springframework.org/schema/tx/spring-tx-4.3.xsd">
12 12

  
13
  <!-- 
14
    NOTE: 
15
    For a detailed overview on the spring MVC and application context configuration and 
16
    bootstrapping of this web application see: 
17
    http://dev.e-taxonomy.eu/trac/wiki/cdmlib-remote-webappConfigurationAndBootstrapping
18
  -->
19
  
20
  <context:annotation-config />
21

  
22
  <!-- include default application context and customization -->
23
  <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml" />
24
  <bean id="persistentTermInitializer" class="eu.etaxonomy.cdm.database.PersistentTermInitializer">
25
    <property name="omit" value="false" />
26
  </bean>
27
  <context:component-scan base-package="eu/etaxonomy/cdm/ext" />
28

  
29
  <import resource="classpath:/eu/etaxonomy/cdm/remote.xml"/>
30
  <context:component-scan base-package="eu/etaxonomy/cdm/io"/>
31

  
32
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
33
    <property name="properties">
34
      <props>
35
        <prop key="eu.etaxonomy.cdm.base.path">${user.home}/.cdmLibrary/</prop>
36
        <prop key="eu.etaxonomy.cdm.search.index.path">${user.home}/.cdmLibrary/index/</prop>
37
      </props>
38
    </property>
39
  </bean>
40

  
41
  <!-- enable the configuration of transactional behavior based on annotations -->
42
  <tx:annotation-driven transaction-manager="transactionManager" />
43

  
44
  <!-- import additional beans into the root context -->
45
<!--   <import resource="applicationContext.views.xml" /> -->
46

  
47
  <!-- import configuration of the datasource bean -->
48
<!--   <import resource="datasources/configurable.xml" /> -->
49
  
50
  <!-- bootstrap the Web Configuration -->
51
  <bean class="eu.etaxonomy.cdm.remote.config.MultiWebSecurityConfiguration" />
52
  
53
<!--   <bean class="eu.etaxonomy.cdm.opt.config.LoggingConfigurer" /> -->
54
  
55
<!--   <bean class="eu.etaxonomy.cdm.opt.config.EhCacheDiskStoreConfiguration" /> -->
56

  
57
  <!-- OAI-PMH TODO externalize? -->
58
  <bean name="taxonOaiPmhController"
59
    class="eu.etaxonomy.cdm.remote.controller.oaipmh.TaxonOaiPmhController">
60
    <property name="cachingModel" ref="taxonOaiPmhCacheMapping" />
61
  </bean>
62

  
63
  <bean name="taxonOaiPmhCacheMapping"
64
    class="org.springmodules.cache.provider.ehcache.EhCacheCachingModel">
65
    <property name="cacheName"
66
      value="eu.etaxonomy.cdm.remote.controller.TaxonOaiPmhController.resumptionToken" />
67
  </bean>
68

  
69
  <bean id="serializableFactory" class="org.springmodules.cache.serializable.XStreamSerializableFactory" />
70

  
71
  <bean id="cacheProviderFacade" class="org.springmodules.cache.provider.ehcache.EhCacheFacade">
72
    <!-- 
73
        the cacheManager is provided by the eu.etaxonomy.cdm.api.config.EhCacheConfiguration
74
        in cdmlib-services
75
     -->
76
    <property name="cacheManager" ref="cacheManager" />
77
    <property name="serializableFactory" ref="serializableFactory" />
78
  </bean>
79
  
80
  
81

  
82
<!--     <context:property-override location="classpath:eu/etaxonomy/cdm/override.properties"/> -->
13
    <context:property-override location="classpath:eu/etaxonomy/cdm/override.properties"/>
83 14
   
84 15
    <!-- 
85 16
        This applicationContext is not a full cdm application context. It only covers the remote components 
......
87 18
        eu/etaxonomy/cdm/service/api/conf which cannot be used in this context. Therefore we are 
88 19
        using the EhCacheManagerFactoryBean here to initialize the cacheManager bean.
89 20
     -->
90
<!--     <bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean"> -->
91
<!--       <property name="configLocation" value="classpath:/eu/etaxonomy/cdm/remote/ehcache.xml"/> -->
92
<!--       <property name="shared" value="true"/> -->
93
<!--     </bean>  -->
94

  
95
    <context:component-scan base-package="eu/etaxonomy/cdm/remote/controller"/> 
21
    <bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
22
      <property name="configLocation" value="classpath:/eu/etaxonomy/cdm/remote/ehcache.xml"/>
23
      <property name="shared" value="true"/>
24
    </bean> 
25

  
26
    <import resource="classpath:/eu/etaxonomy/cdm/remote.xml"/>    
96 27
</beans>

Also available in: Unified diff