=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.java	2010-05-18 20:05:58 +0000
@@ -40,6 +40,7 @@
 import org.hisp.dhis.system.util.ConversionUtils;
 import org.hisp.dhis.system.util.DateUtils;
 import org.hisp.dhis.system.util.TextUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @author Lars Helge Overland
@@ -52,12 +53,8 @@
     // Dependencies
     // -------------------------------------------------------------------------
 
+    @Autowired
     private StatementManager statementManager;
-
-    public void setStatementManager( StatementManager statementManager )
-    {
-        this.statementManager = statementManager;
-    }
     
     // -------------------------------------------------------------------------
     // DataSetCompletenessStore

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/jdbc/JDBCReportTableManager.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/jdbc/JDBCReportTableManager.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/jdbc/JDBCReportTableManager.java	2010-05-18 20:05:58 +0000
@@ -54,6 +54,7 @@
 import org.hisp.dhis.reporttable.statement.GetReportTableStatement;
 import org.hisp.dhis.reporttable.statement.RemoveReportTableStatement;
 import org.hisp.dhis.reporttable.statement.ReportTableStatement;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @author Lars Helge Overland
@@ -68,20 +69,16 @@
     // Dependencies
     // -------------------------------------------------------------------------
 
+    @Autowired
     private StatementManager statementManager;
 
-    public void setStatementManager( StatementManager statementManager )
-    {
-        this.statementManager = statementManager;
-    }
-
     private StatementBuilder statementBuilder;
 
     public void setStatementBuilder( StatementBuilder statementBuilder )
     {
         this.statementBuilder = statementBuilder;
     }
-
+    
     // -------------------------------------------------------------------------
     // ReportTableManager implementation
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml	2010-05-18 15:18:53 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml	2010-05-18 20:05:58 +0000
@@ -32,8 +32,7 @@
     
   <bean id="org.hisp.dhis.reporttable.jdbc.ReportTableManager"
     class="org.hisp.dhis.reporttable.jdbc.JDBCReportTableManager">
-    <property name="statementManager" ref="statementManager"/>
-    <property name="statementBuilder" ref="statementBuilder"/>
+	<property name="statementBuilder" ref="statementBuilder"/>
   </bean>
 
   <bean id="org.hisp.dhis.reporttable.ReportTableStore"
@@ -160,9 +159,7 @@
   </bean>
   
   <bean id="org.hisp.dhis.completeness.DataSetCompletenessStore"
-    class="org.hisp.dhis.completeness.jdbc.JDBCDataSetCompletenessStore">   
-    <property name="statementManager" ref="statementManager"/>
-  </bean>
+    class="org.hisp.dhis.completeness.jdbc.JDBCDataSetCompletenessStore"/>
 
   <bean id="internal-process-DataSetCompleteness"
     class="org.hisp.dhis.completeness.DataSetCompletenessInternalProcess"