← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1871: Replaced cacheManager and dbmsManager definitions with annotations

 

------------------------------------------------------------
revno: 1871
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Tue 2010-05-18 00:14:26 +0200
message:
  Replaced cacheManager and dbmsManager definitions with annotations
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/importer/DefaultDhis14FileImportService.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/importer/DefaultDhis14XMLImportService.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DXFConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ixf/importer/DefaultIXFImportService.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/cache/DefaultHibernateCacheManager.java
  dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/cache/HibernateCacheManager.java
  dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java
  dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandlerTest.java
  dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandlerTest.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/cache/ClearCacheAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/cache/ShowCacheAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2010-05-17 21:54:30 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2010-05-17 22:14:26 +0000
@@ -445,11 +445,6 @@
 	  ref="org.hisp.dhis.validation.ValidationCriteriaStore" />
   </bean>
   
-  <!-- LocaleManager -->
-  <!--
-  <bean id="org.hisp.dhis.i18n.locale.LocaleManagerDb" class="org.hisp.dhis.i18n.locale.SessionLocaleManager"/>
-  -->
-  
   <bean id="org.hisp.dhis.i18n.locale.LocaleManagerDb" class="org.hisp.dhis.i18n.locale.DatabaseLocaleManager">
 	<property name="userSettingService" ref="org.hisp.dhis.user.UserSettingService"/>
   </bean>

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/importer/DefaultDhis14FileImportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/importer/DefaultDhis14FileImportService.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/importer/DefaultDhis14FileImportService.java	2010-05-17 22:14:26 +0000
@@ -119,6 +119,7 @@
 import org.hisp.dhis.source.Source;
 import org.hisp.dhis.system.util.AppendingHashMap;
 import org.hisp.dhis.system.util.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import com.ibatis.sqlmap.client.event.RowHandler;
 
@@ -240,13 +241,9 @@
         this.importAnalyser = importAnalyser;
     }    
 
+    @Autowired
     private HibernateCacheManager cacheManager;
 
-    public void setCacheManager( HibernateCacheManager cacheManager )
-    {
-        this.cacheManager = cacheManager;
-    }
-
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/importer/DefaultDhis14XMLImportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/importer/DefaultDhis14XMLImportService.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/importer/DefaultDhis14XMLImportService.java	2010-05-17 22:14:26 +0000
@@ -74,6 +74,7 @@
 import org.hisp.dhis.system.process.OutputHolderState;
 import org.hisp.dhis.system.util.AppendingHashMap;
 import org.hisp.dhis.system.util.StreamUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @author Lars Helge Overland
@@ -161,13 +162,9 @@
         this.importAnalyser = importAnalyser;
     }
 
+    @Autowired
     private HibernateCacheManager cacheManager;
 
-    public void setCacheManager( HibernateCacheManager cacheManager )
-    {
-        this.cacheManager = cacheManager;
-    }
-
     private ConverterInvoker converterInvoker;
 
     public void setConverterInvoker( ConverterInvoker converterInvoker )

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DXFConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DXFConverter.java	2010-04-29 17:05:22 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DXFConverter.java	2010-05-17 22:14:26 +0000
@@ -113,6 +113,7 @@
 import org.hisp.dhis.reporttable.ReportTableService;
 import org.hisp.dhis.source.Source;
 import org.hisp.dhis.validation.ValidationRuleService;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * DXFConverter class
@@ -249,13 +250,9 @@
         this.objectMappingGenerator = objectMappingGenerator;
     }
 
+    @Autowired
     private HibernateCacheManager cacheManager;
 
-    public void setCacheManager( HibernateCacheManager cacheManager )
-    {
-        this.cacheManager = cacheManager;
-    }
-
     private ConverterInvoker converterInvoker;
 
     public void setConverterInvoker( ConverterInvoker converterInvoker )

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ixf/importer/DefaultIXFImportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ixf/importer/DefaultIXFImportService.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ixf/importer/DefaultIXFImportService.java	2010-05-17 22:14:26 +0000
@@ -67,6 +67,7 @@
 import org.hisp.dhis.source.Source;
 import org.hisp.dhis.system.process.OutputHolderState;
 import org.hisp.dhis.system.util.StreamUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @author Lars Helge Overland
@@ -137,13 +138,9 @@
         this.objectMappingGenerator = objectMappingGenerator;
     }
 
+    @Autowired
     private HibernateCacheManager cacheManager;
 
-    public void setCacheManager( HibernateCacheManager cacheManager )
-    {
-        this.cacheManager = cacheManager;
-    }
-
     private ConverterInvoker converterInvoker;
 
     public void setConverterInvoker( ConverterInvoker converterInvoker )

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java	2010-05-12 13:38:28 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java	2010-05-17 22:14:26 +0000
@@ -77,6 +77,7 @@
 import org.hisp.dhis.reporttable.ReportTableService;
 import org.hisp.dhis.validation.ValidationRule;
 import org.hisp.dhis.validation.ValidationRuleService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -181,12 +182,8 @@
         this.dataValueService = dataValueService;
     }
     
+    @Autowired
     private HibernateCacheManager cacheManager;
-
-    public void setCacheManager( HibernateCacheManager cacheManager )
-    {
-        this.cacheManager = cacheManager;
-    }
     
     // -------------------------------------------------------------------------
     // ImportObjectService implementation

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml	2010-05-17 21:11:03 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml	2010-05-17 22:14:26 +0000
@@ -122,7 +122,6 @@
 		<property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService" />
 		<property name="olapURLService" ref="org.hisp.dhis.olap.OlapURLService" />
 		<property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
-		<property name="cacheManager" ref="org.hisp.dhis.cache.HibernateCacheManager" />
 	</bean>
 
 	<bean id="internal-process-ImportPreview" class="org.hisp.dhis.importexport.ImportPreviewInternalProcess"
@@ -160,7 +159,6 @@
 			ref="org.hisp.dhis.importexport.mapping.ObjectMappingGenerator" />
 		<property name="importAnalyser"
 			ref="org.hisp.dhis.importexport.analysis.ImportAnalyser" />
-		<property name="cacheManager" ref="org.hisp.dhis.cache.HibernateCacheManager" />
 		<property name="converterInvoker"
 			ref="org.hisp.dhis.importexport.invoker.ConverterInvoker" />
 	</bean>
@@ -201,7 +199,6 @@
 		<property name="dataMartService" ref="org.hisp.dhis.datamart.DataMartService" />
 		<property name="importAnalyser"
 			ref="org.hisp.dhis.importexport.analysis.ImportAnalyser" />
-		<property name="cacheManager" ref="org.hisp.dhis.cache.HibernateCacheManager" />
 	</bean>
 
 	<bean
@@ -234,8 +231,8 @@
 		<property name="importService" ref="org.hisp.dhis.importexport.XMLImportService" />
 	</bean>
 
-	   <bean id="org.hisp.dhis.importexport.DXFConverter"
-          class="org.hisp.dhis.importexport.dxf.converter.DXFConverter" >
+	<bean id="org.hisp.dhis.importexport.DXFConverter"
+         class="org.hisp.dhis.importexport.dxf.converter.DXFConverter" >
         <property name="importObjectService"
                   ref="org.hisp.dhis.importexport.ImportObjectService" />
         <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
@@ -260,7 +257,6 @@
         <property name="batchHandlerFactory" ref="batchHandlerFactory" />
         <property name="objectMappingGenerator"
                   ref="org.hisp.dhis.importexport.mapping.ObjectMappingGenerator" />
-        <property name="cacheManager" ref="org.hisp.dhis.cache.HibernateCacheManager" />
         <property name="converterInvoker"
                   ref="org.hisp.dhis.importexport.invoker.ConverterInvoker" />
     </bean>
@@ -299,7 +295,6 @@
 		<property name="batchHandlerFactory" ref="batchHandlerFactory" />
 		<property name="objectMappingGenerator"
 			ref="org.hisp.dhis.importexport.mapping.ObjectMappingGenerator" />
-		<property name="cacheManager" ref="org.hisp.dhis.cache.HibernateCacheManager" />
 		<property name="converterInvoker"
 			ref="org.hisp.dhis.importexport.invoker.ConverterInvoker" />
 	</bean>

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/cache/DefaultHibernateCacheManager.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/cache/DefaultHibernateCacheManager.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/cache/DefaultHibernateCacheManager.java	2010-05-17 22:14:26 +0000
@@ -32,11 +32,14 @@
 import org.hibernate.SessionFactory;
 import org.hibernate.metadata.ClassMetadata;
 import org.hibernate.stat.Statistics;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 /**
  * @author Lars Helge Overland
  * @version $Id: CrossTabDataValue.java 5514 2008-08-04 10:48:07Z larshelg $
  */
+@Component("cacheManager")
 public class DefaultHibernateCacheManager
     implements HibernateCacheManager
 {
@@ -44,13 +47,9 @@
     // Dependencies
     // -------------------------------------------------------------------------
 
+    @Autowired
     private SessionFactory sessionFactory;
 
-    public void setSessionFactory( SessionFactory sessionFactory )
-    {
-        this.sessionFactory = sessionFactory;
-    }
-
     // -------------------------------------------------------------------------
     // HibernateCacheManager implementation
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/cache/HibernateCacheManager.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/cache/HibernateCacheManager.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/cache/HibernateCacheManager.java	2010-05-17 22:14:26 +0000
@@ -35,8 +35,6 @@
  */
 public interface HibernateCacheManager
 {
-    String ID = HibernateCacheManager.class.getName();
-    
     void clearObjectCache();
     
     void clearQueryCache();

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java	2010-05-11 14:20:51 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java	2010-05-17 22:14:26 +0000
@@ -31,13 +31,16 @@
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.SessionFactory;
 import org.hisp.dhis.cache.HibernateCacheManager;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.BadSqlGrammarException;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
 
 /**
  * @author Lars Helge Overland
  * @version $Id$
  */
+@Component("dbmsManager")
 public class HibernateDbmsManager
     implements DbmsManager
 {
@@ -47,27 +50,15 @@
     // Dependencies
     // -------------------------------------------------------------------------
 
+    @Autowired
     private JdbcTemplate jdbcTemplate;
 
-    public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
-    {
-        this.jdbcTemplate = jdbcTemplate;
-    }
-    
+    @Autowired
     private SessionFactory sessionFactory;
 
-    public void setSessionFactory( SessionFactory sessionFactory )
-    {
-        this.sessionFactory = sessionFactory;
-    }
-    
+    @Autowired
     private HibernateCacheManager cacheManager;
 
-    public void setCacheManager( HibernateCacheManager cacheManager )
-    {
-        this.cacheManager = cacheManager;
-    }
-
     // -------------------------------------------------------------------------
     // DbmsManager implementation
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml	2010-05-17 21:54:30 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml	2010-05-17 22:14:26 +0000
@@ -57,21 +57,5 @@
     class="org.hisp.dhis.hibernate.ConnectionPropertyFactoryBean">
     <property name="hibernateProperty" value="hibernate.connection.password"/>
   </bean>
-  
-  <!-- Cache -->
-  
-  <bean id="org.hisp.dhis.cache.HibernateCacheManager" 
-    class="org.hisp.dhis.cache.DefaultHibernateCacheManager">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-      
-  <!-- Dbms -->
-  
-  <bean id="dbmsManager"
-    class="org.hisp.dhis.dbms.HibernateDbmsManager">
-    <property name="jdbcTemplate" ref="jdbcTemplate"/>
-    <property name="sessionFactory" ref="sessionFactory"/>
-    <property name="cacheManager" ref="org.hisp.dhis.cache.HibernateCacheManager"/>
-  </bean>
-  
+    
 </beans>

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandlerTest.java'
--- dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandlerTest.java	2010-05-17 19:31:07 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandlerTest.java	2010-05-17 22:14:26 +0000
@@ -55,6 +55,7 @@
     @Autowired
     private BatchHandlerFactory batchHandlerFactory;
     
+    @Autowired
     private HibernateCacheManager cacheManager;
 	
     private BatchHandler<DataElement> batchHandler;
@@ -72,8 +73,6 @@
     @Override
     public void setUpTest()
     {
-    	cacheManager = (HibernateCacheManager) getBean( HibernateCacheManager.ID );
-    	
         dataElementService = (DataElementService) getBean( DataElementService.ID );
         
         batchHandler = batchHandlerFactory.createBatchHandler( DataElementBatchHandler.class );

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandlerTest.java'
--- dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandlerTest.java	2010-05-17 19:31:07 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandlerTest.java	2010-05-17 22:14:26 +0000
@@ -54,6 +54,7 @@
     @Autowired
     private BatchHandlerFactory batchHandlerFactory;
     
+    @Autowired
     private HibernateCacheManager cacheManager;
 
     private BatchHandler<Indicator> batchHandler;
@@ -69,8 +70,6 @@
     @Override
     public void setUpTest()
     {
-    	cacheManager = (HibernateCacheManager) getBean( HibernateCacheManager.ID );
-    	
         indicatorService = (IndicatorService) getBean( IndicatorService.ID );
         
         batchHandler = batchHandlerFactory.createBatchHandler( IndicatorBatchHandler.class );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/cache/ClearCacheAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/cache/ClearCacheAction.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/cache/ClearCacheAction.java	2010-05-17 22:14:26 +0000
@@ -28,6 +28,7 @@
  */
 
 import org.hisp.dhis.cache.HibernateCacheManager;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import com.opensymphony.xwork2.Action;
 
@@ -42,13 +43,9 @@
     // Dependencies
     // -------------------------------------------------------------------------
     
+    @Autowired
     private HibernateCacheManager cacheManager;
 
-    public void setCacheManager( HibernateCacheManager cacheManager )
-    {
-        this.cacheManager = cacheManager;
-    }
-
     // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/cache/ShowCacheAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/cache/ShowCacheAction.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/cache/ShowCacheAction.java	2010-05-17 22:14:26 +0000
@@ -29,6 +29,7 @@
 
 import org.hibernate.stat.Statistics;
 import org.hisp.dhis.cache.HibernateCacheManager;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import com.opensymphony.xwork2.Action;
 
@@ -45,13 +46,9 @@
     // Dependencies
     // -------------------------------------------------------------------------
     
+    @Autowired
     private HibernateCacheManager cacheManager;
 
-    public void setCacheManager( HibernateCacheManager cacheManager )
-    {
-        this.cacheManager = cacheManager;
-    }
-
     // -------------------------------------------------------------------------
     // Output
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml	2010-05-17 14:19:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml	2010-05-17 22:14:26 +0000
@@ -195,14 +195,10 @@
 	<!-- Cache -->
 
 	<bean id="org.hisp.dhis.dataadmin.action.cache.ShowCacheAction"
-		class="org.hisp.dhis.dataadmin.action.cache.ShowCacheAction" scope="prototype">
-		<property name="cacheManager" ref="org.hisp.dhis.cache.HibernateCacheManager" />
-	</bean>
+		class="org.hisp.dhis.dataadmin.action.cache.ShowCacheAction" scope="prototype"/>
 
 	<bean id="org.hisp.dhis.dataadmin.action.cache.ClearCacheAction"
-		class="org.hisp.dhis.dataadmin.action.cache.ClearCacheAction" scope="prototype">
-		<property name="cacheManager" ref="org.hisp.dhis.cache.HibernateCacheManager" />
-	</bean>
+		class="org.hisp.dhis.dataadmin.action.cache.ClearCacheAction" scope="prototype"/>
 
 	<!-- Data integrity -->