=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/startup/OpenHealthDataSourceWriter.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/startup/OpenHealthDataSourceWriter.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/startup/OpenHealthDataSourceWriter.java 2010-05-18 13:42:38 +0000
@@ -37,6 +37,7 @@
import org.hisp.dhis.system.database.DatabaseInfoProvider;
import org.hisp.dhis.system.startup.AbstractStartupRoutine;
import org.hisp.dhis.system.util.StreamUtils;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -73,13 +74,9 @@
// Dependencies
// -------------------------------------------------------------------------
+ @Autowired
private DatabaseInfoProvider databaseInfoProvider;
-
- public void setDatabaseInfoProvider( DatabaseInfoProvider databaseInfoProvider )
- {
- this.databaseInfoProvider = databaseInfoProvider;
- }
-
+
// -------------------------------------------------------------------------
// AbstractStartupRoutine 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-17 22:56:52 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2010-05-18 13:42:38 +0000
@@ -81,7 +81,6 @@
value="reports"/>
-
@@ -241,8 +240,6 @@
class="org.hisp.dhis.startup.OpenHealthDataSourceWriter">
-
-
-
-
-
+
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/database/DatabaseInfoProviderTest.java'
--- dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/database/DatabaseInfoProviderTest.java 2010-05-10 17:50:39 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/database/DatabaseInfoProviderTest.java 2010-05-18 13:42:38 +0000
@@ -31,6 +31,7 @@
import org.hisp.dhis.DhisSpringTest;
import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -39,17 +40,8 @@
public class DatabaseInfoProviderTest
extends DhisSpringTest
{
- private DatabaseInfoProvider provider;
-
- // -------------------------------------------------------------------------
- // Fixture
- // -------------------------------------------------------------------------
-
- @Override
- public void setUpTest()
- {
- provider = (DatabaseInfoProvider) getBean( DatabaseInfoProvider.ID );
- }
+ @Autowired
+ private DatabaseInfoProvider databaseInfoProvider;
// -------------------------------------------------------------------------
// Tests
@@ -58,7 +50,7 @@
@Test
public void testGetDatabaseInfo()
{
- DatabaseInfo info = provider.getDatabaseInfo();
+ DatabaseInfo info = databaseInfoProvider.getDatabaseInfo();
assertNotNull( info );
assertNotNull( info.getType() );
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java 2010-05-17 21:05:26 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java 2010-05-18 13:42:38 +0000
@@ -62,12 +62,8 @@
@Autowired
private LocationManager locationManager;
- private DatabaseInfoProvider provider;
-
- public void setProvider( DatabaseInfoProvider provider )
- {
- this.provider = provider;
- }
+ @Autowired
+ private DatabaseInfoProvider databaseInfoProvider;
private I18n i18n;
@@ -211,7 +207,7 @@
// Database
// ---------------------------------------------------------------------
- info = provider.getDatabaseInfo();
+ info = databaseInfoProvider.getDatabaseInfo();
try
{
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2010-05-17 21:05:26 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2010-05-18 13:42:38 +0000
@@ -558,11 +558,7 @@
-
-
-
+