dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #08266
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1959: Removed annotations
------------------------------------------------------------
revno: 1959
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2010-10-29 14:19:15 +0200
message:
Removed annotations
removed:
dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/META-INF/
dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/META-INF/MANIFEST.MF
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/startup/OpenHealthDataSourceWriter.java
modified:
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataarchive/ArchivedDataValueDeletionHandler.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataarchive/jdbc/JdbcDataArchiveStore.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/databrowser/jdbc/StatementManagerDataBrowserStore.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datalock/hibernate/HibernateDataSetLockStore.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datamerge/jdbc/JdbcDataMergeStore.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/jdbc/JdbcDataPruneStore.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/maintenance/jdbc/JdbcMaintenanceStore.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/hibernate/HibernateResourceTableStore.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/jdbc/JdbcSqlViewExpandStore.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/useraudit/hibernate/HibernateUserAuditStore.java
dhis-2/dhis-services/dhis-service-administration/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/concept/DefaultConceptService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataanalysis/jdbc/JdbcDataAnalysisStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDefaultDimensionPopulator.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/hibernate/HibernateDataEntryFormStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateCompleteDataSetRegistrationStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateSectionStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueAuditStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/hibernate/HibernateIndicatorStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/period/hibernate/HibernatePeriodStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/hibernate/HibernateUserDetailsService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/source/hibernate/HibernateSourceStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/translation/hibernate/HibernateTranslationStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserStore.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleServiceTest.java
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/calculateddataelement/DefaultCalculatedDataElementDataMart.java
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/DefaultCrossTabService.java
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/jdbc/JDBCCrossTabStore.java
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/indicator/DefaultIndicatorDataMart.java
dhis-2/dhis-services/dhis-service-datamart-default/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/hibernate/HibernateExcelItemStore.java
dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/hibernate/HibernateReportExcelStore.java
dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/DefaultImportService.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/configuration/DefaultIbatisConfigurationManager.java
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/exporter/DefaultDhis14XMLExportService.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/dxf/converter/DataElementCategoryConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/hibernate/HibernateImportDataValueStore.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryImporter.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/java/org/hisp/dhis/importexport/xml/XMLPreConverter.java
dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMappingStore.java
dhis-2/dhis-services/dhis-service-mapping/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationMappingStore.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/TableAlteror.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/DefaultPatientDataValueAggregationEngine.java
dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/AbstractDataSetCompletenessService.java
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/report/manager/DefaultReportManager.java
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/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceTest.java
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/report/ReportManagerTest.java
dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/location/DefaultLocationManagerResolver.java
dhis-2/dhis-support/dhis-support-external/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/dbms/HibernateDbmsManager.java
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/ConnectionPropertyFactoryBean.java
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/DefaultHibernateConfigurationProvider.java
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingDirectoryLocationsFactoryBean.java
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingJarLocationsFactoryBean.java
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernatePropertiesFactoryBean.java
dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/configuration/JdbcConfigurationFactoryBean.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/HibernateDatabaseInfoProvider.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionInterceptor.java
dhis-2/dhis-support/dhis-support-system/src/main/resources/META-INF/dhis/beans.xml
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/deletion/DeletionManagerTest.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/DataSet.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateReportAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml
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/interceptor/ContextInterceptor.java
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/order/store/FileDataElementOrderStore.java
dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportLocationManager.java
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportSupport.java
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/jchart/action/AddJChartAction.java
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml
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
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ValidateIndicatorGroupSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ExportDataEntryFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.java
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/document/action/RemoveDocumentAction.java
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/document/action/SaveDocumentAction.java
dhis-2/dhis-web/dhis-web-reporting/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-administration/src/main/java/org/hisp/dhis/dataarchive/ArchivedDataValueDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataarchive/ArchivedDataValueDeletionHandler.java 2010-05-18 18:37:07 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataarchive/ArchivedDataValueDeletionHandler.java 2010-10-29 12:19:15 +0000
@@ -32,7 +32,6 @@
import org.hisp.dhis.period.Period;
import org.hisp.dhis.source.Source;
import org.hisp.dhis.system.deletion.DeletionHandler;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
/**
@@ -45,9 +44,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private JdbcTemplate jdbcTemplate;
-
+
+ public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
+ {
+ this.jdbcTemplate = jdbcTemplate;
+ }
+
// -------------------------------------------------------------------------
// DeletionHandler implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataarchive/jdbc/JdbcDataArchiveStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataarchive/jdbc/JdbcDataArchiveStore.java 2010-10-24 15:41:13 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataarchive/jdbc/JdbcDataArchiveStore.java 2010-10-29 12:19:15 +0000
@@ -35,7 +35,6 @@
import org.apache.commons.logging.LogFactory;
import org.hisp.dhis.dataarchive.DataArchiveStore;
import org.hisp.dhis.jdbc.StatementBuilder;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
/**
@@ -50,12 +49,20 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private JdbcTemplate jdbcTemplate;
- @Autowired
+ public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
+ {
+ this.jdbcTemplate = jdbcTemplate;
+ }
+
private StatementBuilder statementBuilder;
+ public void setStatementBuilder( StatementBuilder statementBuilder )
+ {
+ this.statementBuilder = statementBuilder;
+ }
+
// -------------------------------------------------------------------------
// Implementation methods for Data values
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/databrowser/jdbc/StatementManagerDataBrowserStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/databrowser/jdbc/StatementManagerDataBrowserStore.java 2010-09-17 03:44:03 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/databrowser/jdbc/StatementManagerDataBrowserStore.java 2010-10-29 12:19:15 +0000
@@ -13,7 +13,6 @@
import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.sqlview.SqlViewService;
import org.hisp.dhis.system.util.TimeUtils;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author joakibj, martinwa, briane, eivinhb
@@ -27,11 +26,20 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private StatementManager statementManager;
+ public void setStatementManager( StatementManager statementManager )
+ {
+ this.statementManager = statementManager;
+ }
+
private OrganisationUnitService organisationUnitService;
+ public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
+ {
+ this.organisationUnitService = organisationUnitService;
+ }
+
private SqlViewService sqlViewService;
public void setSqlViewService( SqlViewService sqlViewService )
@@ -39,11 +47,6 @@
this.sqlViewService = sqlViewService;
}
- public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
- {
- this.organisationUnitService = organisationUnitService;
- }
-
// -------------------------------------------------------------------------
// DataBrowserStore implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datalock/hibernate/HibernateDataSetLockStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datalock/hibernate/HibernateDataSetLockStore.java 2010-05-18 18:37:07 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datalock/hibernate/HibernateDataSetLockStore.java 2010-10-29 12:19:15 +0000
@@ -38,7 +38,6 @@
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.source.Source;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Brajesh Murari
@@ -51,9 +50,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private SessionFactory sessionFactory;
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
private PeriodService periodService;
public void setPeriodService( PeriodService periodService )
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datamerge/jdbc/JdbcDataMergeStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datamerge/jdbc/JdbcDataMergeStore.java 2010-09-06 15:22:49 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datamerge/jdbc/JdbcDataMergeStore.java 2010-10-29 12:19:15 +0000
@@ -34,7 +34,6 @@
import org.hisp.dhis.datamerge.DataMergeStore;
import org.hisp.dhis.jdbc.StatementBuilder;
import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
/**
@@ -49,12 +48,20 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private JdbcTemplate jdbcTemplate;
- @Autowired
+ public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
+ {
+ this.jdbcTemplate = jdbcTemplate;
+ }
+
private StatementBuilder statementBuilder;
-
+
+ public void setStatementBuilder( StatementBuilder statementBuilder )
+ {
+ this.statementBuilder = statementBuilder;
+ }
+
// -------------------------------------------------------------------------
// DataMergeStore implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/jdbc/JdbcDataPruneStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/jdbc/JdbcDataPruneStore.java 2010-09-17 12:11:18 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/jdbc/JdbcDataPruneStore.java 2010-10-29 12:19:15 +0000
@@ -35,14 +35,14 @@
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.system.util.ConversionUtils;
import org.hisp.dhis.system.util.TextUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
/**
* @author Quang Nguyen
* @version Apr 6, 2010 5:48:15 PM
*/
-public class JdbcDataPruneStore implements DataPruneStore
+public class JdbcDataPruneStore
+ implements DataPruneStore
{
private static final Log log = LogFactory.getLog( JdbcDataPruneStore.class );
@@ -50,9 +50,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private JdbcTemplate jdbcTemplate;
-
+
+ public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
+ {
+ this.jdbcTemplate = jdbcTemplate;
+ }
+
// -------------------------------------------------------------------------
// DataPruneService implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/maintenance/jdbc/JdbcMaintenanceStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/maintenance/jdbc/JdbcMaintenanceStore.java 2010-05-18 18:37:07 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/maintenance/jdbc/JdbcMaintenanceStore.java 2010-10-29 12:19:15 +0000
@@ -29,7 +29,6 @@
import org.hisp.dhis.jdbc.StatementBuilder;
import org.hisp.dhis.maintenance.MaintenanceStore;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
/**
@@ -43,12 +42,20 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private JdbcTemplate jdbcTemplate;
- @Autowired
+ public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
+ {
+ this.jdbcTemplate = jdbcTemplate;
+ }
+
private StatementBuilder statementBuilder;
-
+
+ public void setStatementBuilder( StatementBuilder statementBuilder )
+ {
+ this.statementBuilder = statementBuilder;
+ }
+
// -------------------------------------------------------------------------
// MaintenanceStore implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/hibernate/HibernateResourceTableStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/hibernate/HibernateResourceTableStore.java 2010-09-16 08:49:51 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/hibernate/HibernateResourceTableStore.java 2010-10-29 12:19:15 +0000
@@ -41,7 +41,6 @@
import org.hisp.dhis.resourcetable.statement.CreateDataElementGroupSetTableStatement;
import org.hisp.dhis.resourcetable.statement.CreateIndicatorGroupSetTableStatement;
import org.hisp.dhis.resourcetable.statement.CreateOrganisationUnitGroupSetTableStatement;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.BadSqlGrammarException;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -58,9 +57,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private JdbcTemplate jdbcTemplate;
+ public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
+ {
+ this.jdbcTemplate = jdbcTemplate;
+ }
+
// -------------------------------------------------------------------------
// OrganisationUnitStructure
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/jdbc/JdbcSqlViewExpandStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/jdbc/JdbcSqlViewExpandStore.java 2010-09-16 19:01:55 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/jdbc/JdbcSqlViewExpandStore.java 2010-10-29 12:19:15 +0000
@@ -45,7 +45,6 @@
import org.hisp.dhis.sqlview.SqlViewExpandStore;
import org.hisp.dhis.sqlview.SqlViewJoinLib;
import org.hisp.dhis.sqlview.SqlViewTable;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.BadSqlGrammarException;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -74,12 +73,20 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private StatementManager statementManager;
- @Autowired
+ public void setStatementManager( StatementManager statementManager )
+ {
+ this.statementManager = statementManager;
+ }
+
private JdbcTemplate jdbcTemplate;
+ public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
+ {
+ this.jdbcTemplate = jdbcTemplate;
+ }
+
// -------------------------------------------------------------------------
// Implementing methods
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java 2010-08-31 05:47:11 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java 2010-10-29 12:19:15 +0000
@@ -32,7 +32,6 @@
import org.hisp.dhis.common.Objects;
import org.hisp.dhis.statistics.StatisticsProvider;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.BadSqlGrammarException;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -47,9 +46,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private JdbcTemplate jdbcTemplate;
+ public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
+ {
+ this.jdbcTemplate = jdbcTemplate;
+ }
+
// -------------------------------------------------------------------------
// StatisticsProvider implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/useraudit/hibernate/HibernateUserAuditStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/useraudit/hibernate/HibernateUserAuditStore.java 2010-05-18 18:37:07 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/useraudit/hibernate/HibernateUserAuditStore.java 2010-10-29 12:19:15 +0000
@@ -29,13 +29,12 @@
import java.util.Collection;
import java.util.Date;
+
import org.hibernate.Query;
-
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hisp.dhis.useraudit.LoginFailure;
import org.hisp.dhis.useraudit.UserAuditStore;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -43,9 +42,13 @@
public class HibernateUserAuditStore
implements UserAuditStore
{
- @Autowired
private SessionFactory sessionFactory;
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
@Override
public void saveLoginFailure( LoginFailure login )
{
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-administration/src/main/resources/META-INF/dhis/beans.xml 2010-10-21 05:41:06 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/resources/META-INF/dhis/beans.xml 2010-10-29 12:19:15 +0000
@@ -10,6 +10,7 @@
<bean id="org.hisp.dhis.datalock.DataSetLockStore"
class="org.hisp.dhis.datalock.hibernate.HibernateDataSetLockStore">
+ <property name="sessionFactory" ref="sessionFactory"/>
<property name="periodService"
ref="org.hisp.dhis.period.PeriodService"/>
</bean>
@@ -23,7 +24,9 @@
<!-- ResourceTable -->
<bean id="org.hisp.dhis.resourcetable.ResourceTableStore"
- class="org.hisp.dhis.resourcetable.hibernate.HibernateResourceTableStore"/>
+ class="org.hisp.dhis.resourcetable.hibernate.HibernateResourceTableStore">
+ <property name="jdbcTemplate" ref="jdbcTemplate"/>
+ </bean>
<bean id="org.hisp.dhis.resourcetable.ResourceTableService"
class="org.hisp.dhis.resourcetable.DefaultResourceTableService">
@@ -65,7 +68,10 @@
<!-- Maintenance -->
<bean id="org.hisp.dhis.maintenance.MaintenanceStore"
- class="org.hisp.dhis.maintenance.jdbc.JdbcMaintenanceStore"/>
+ class="org.hisp.dhis.maintenance.jdbc.JdbcMaintenanceStore">
+ <property name="jdbcTemplate" ref="jdbcTemplate"/>
+ <property name="statementBuilder" ref="statementBuilder"/>
+ </bean>
<bean id="org.hisp.dhis.maintenance.MaintenanceService"
class="org.hisp.dhis.maintenance.DefaultMaintenanceService">
@@ -76,12 +82,15 @@
<!-- Statistics -->
<bean id="org.hisp.dhis.statistics.StatisticsProvider"
- class="org.hisp.dhis.statistics.jdbc.JdbcStatisticsProvider"/>
+ class="org.hisp.dhis.statistics.jdbc.JdbcStatisticsProvider">
+ <property name="jdbcTemplate" ref="jdbcTemplate"/>
+ </bean>
<!-- Databrowser -->
<bean id="org.hisp.dhis.databrowser.DataBrowserStore"
class="org.hisp.dhis.databrowser.jdbc.StatementManagerDataBrowserStore">
+ <property name="statementManager" ref="statementManager"/>
<property name="organisationUnitService"
ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
<property name="sqlViewService"
@@ -102,7 +111,10 @@
<!-- Data merge -->
<bean id="org.hisp.dhis.datamerge.DataMergeStore"
- class="org.hisp.dhis.datamerge.jdbc.JdbcDataMergeStore"/>
+ class="org.hisp.dhis.datamerge.jdbc.JdbcDataMergeStore">
+ <property name="jdbcTemplate" ref="jdbcTemplate"/>
+ <property name="statementBuilder" ref="statementBuilder"/>
+ </bean>
<bean id="org.hisp.dhis.datamerge.DataMergeService"
class="org.hisp.dhis.datamerge.DefaultDataMergeService">
@@ -126,12 +138,16 @@
<bean id="org.hisp.dhis.dataprune.DataPruneStore"
class="org.hisp.dhis.dataprune.jdbc.JdbcDataPruneStore">
+ <property name="jdbcTemplate" ref="jdbcTemplate"/>
</bean>
<!-- Data archive -->
<bean id="org.hisp.dhis.dataarchive.DataArchiveStore"
- class="org.hisp.dhis.dataarchive.jdbc.JdbcDataArchiveStore"/>
+ class="org.hisp.dhis.dataarchive.jdbc.JdbcDataArchiveStore">
+ <property name="jdbcTemplate" ref="jdbcTemplate"/>
+ <property name="statementBuilder" ref="statementBuilder"/>
+ </bean>
<bean id="org.hisp.dhis.dataarchive.DataArchiveService"
class="org.hisp.dhis.dataarchive.DefaultDataArchiveService">
@@ -148,12 +164,16 @@
</bean>
<bean id="org.hisp.dhis.useraudit.UserAuditStore"
- class="org.hisp.dhis.useraudit.hibernate.HibernateUserAuditStore"/>
+ class="org.hisp.dhis.useraudit.hibernate.HibernateUserAuditStore">
+ <property name="sessionFactory" ref="sessionFactory"/>
+ </bean>
<!--DeletionHandler -->
<bean id="org.hisp.dhis.dataarchive.ArchivedDataValueDeletionHandler"
- class="org.hisp.dhis.dataarchive.ArchivedDataValueDeletionHandler"/>
+ class="org.hisp.dhis.dataarchive.ArchivedDataValueDeletionHandler">
+ <property name="jdbcTemplate" ref="jdbcTemplate"/>
+ </bean>
<bean id="org.hisp.dhis.datalock.DataSetLockDeletionHandler"
class="org.hisp.dhis.datalock.DataSetLockDeletionHandler">
@@ -185,6 +205,8 @@
<bean id="org.hisp.dhis.sqlview.SqlViewExpandStore"
class="org.hisp.dhis.sqlview.jdbc.JdbcSqlViewExpandStore">
+ <property name="statementManager" ref="statementManager"/>
+ <property name="jdbcTemplate" ref="jdbcTemplate"/>
</bean>
<bean id="org.hisp.dhis.sqlview.SqlViewService"
@@ -195,14 +217,6 @@
ref="org.hisp.dhis.sqlview.SqlViewExpandStore" />
</bean>
- <!--bean id="internal-process-SqlView"
- class="org.hisp.dhis.sqlview.SqlViewInternalProcess"
- scope="prototype">
- <property name="statementManager" ref="statementManager"/>
- <property name="sqlViewService"
- ref="org.hisp.dhis.sqlview.SqlViewService"/>
- </bean-->
-
<!-- AOP definitions -->
<aop:config>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java 2010-08-31 07:06:55 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java 2010-10-29 12:19:15 +0000
@@ -31,7 +31,6 @@
import org.hisp.dhis.system.objectmapper.AggregatedIndicatorValueRowMapper;
import org.hisp.dhis.system.objectmapper.DataValueRowMapper;
import org.hisp.dhis.system.objectmapper.DeflatedDataValueRowMapper;
-import org.springframework.beans.factory.annotation.Autowired;
public class JdbcAggregatedDataValueStore
implements AggregatedDataValueStore
@@ -40,9 +39,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private StatementManager statementManager;
+ public void setStatementManager( StatementManager statementManager )
+ {
+ this.statementManager = statementManager;
+ }
+
// -------------------------------------------------------------------------
// AggregatedDataValue
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/concept/DefaultConceptService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/concept/DefaultConceptService.java 2010-09-17 21:30:59 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/concept/DefaultConceptService.java 2010-10-29 12:19:15 +0000
@@ -46,7 +46,7 @@
// Dependencies
// -------------------------------------------------------------------------
- GenericIdentifiableObjectStore<Concept> conceptStore;
+ private GenericIdentifiableObjectStore<Concept> conceptStore;
public void setConceptStore( GenericIdentifiableObjectStore<Concept> conceptStore )
{
@@ -99,5 +99,4 @@
Concept defaultConcept = new Concept("default");
conceptStore.save( defaultConcept );
}
-
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataanalysis/jdbc/JdbcDataAnalysisStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataanalysis/jdbc/JdbcDataAnalysisStore.java 2010-09-23 06:55:57 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataanalysis/jdbc/JdbcDataAnalysisStore.java 2010-10-29 12:19:15 +0000
@@ -44,7 +44,6 @@
import org.hisp.dhis.system.objectmapper.DeflatedDataValueNameMinMaxRowMapper;
import org.hisp.dhis.system.util.ConversionUtils;
import org.hisp.dhis.system.util.TextUtils;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -56,13 +55,20 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private StatementManager statementManager;
- @Autowired
+ public void setStatementManager( StatementManager statementManager )
+ {
+ this.statementManager = statementManager;
+ }
+
private StatementBuilder statementBuilder;
-
-
+
+ public void setStatementBuilder( StatementBuilder statementBuilder )
+ {
+ this.statementBuilder = statementBuilder;
+ }
+
// -------------------------------------------------------------------------
// OutlierAnalysisStore implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDefaultDimensionPopulator.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDefaultDimensionPopulator.java 2010-09-17 21:30:59 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDefaultDimensionPopulator.java 2010-10-29 12:19:15 +0000
@@ -34,7 +34,6 @@
import org.hisp.dhis.concept.Concept;
import org.hisp.dhis.concept.ConceptService;
import org.hisp.dhis.system.startup.AbstractStartupRoutine;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
/**
@@ -60,14 +59,18 @@
private DataElementService dataElementService;
- @Autowired
- private ConceptService conceptService;
-
public void setDataElementService( DataElementService dataElementService )
{
this.dataElementService = dataElementService;
}
+ private ConceptService conceptService;
+
+ public void setConceptService( ConceptService conceptService )
+ {
+ this.conceptService = conceptService;
+ }
+
private DataElementCategoryService categoryService;
public void setCategoryService( DataElementCategoryService categoryService )
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java 2010-10-22 16:27:16 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java 2010-10-29 12:19:15 +0000
@@ -52,7 +52,6 @@
import org.hisp.dhis.system.objectmapper.DataElementOperandMapper;
import org.hisp.dhis.system.util.ConversionUtils;
import org.hisp.dhis.system.util.TextUtils;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Torgeir Lorange Ostby
@@ -66,12 +65,20 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private SessionFactory sessionFactory;
- @Autowired
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
private StatementManager statementManager;
+ public void setStatementManager( StatementManager statementManager )
+ {
+ this.statementManager = statementManager;
+ }
+
// -------------------------------------------------------------------------
// DataElement
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/hibernate/HibernateDataEntryFormStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/hibernate/HibernateDataEntryFormStore.java 2010-10-14 08:14:12 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/hibernate/HibernateDataEntryFormStore.java 2010-10-29 12:19:15 +0000
@@ -39,7 +39,6 @@
import org.hisp.dhis.dataentryform.DataEntryFormStore;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.program.ProgramStage;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Bharath Kumar
@@ -52,9 +51,13 @@
// Dependencies
// ------------------------------------------------------------------------
- @Autowired
private SessionFactory sessionFactory;
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
// ------------------------------------------------------------------------
// DataEntryFormStore implementation
// ------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateCompleteDataSetRegistrationStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateCompleteDataSetRegistrationStore.java 2010-05-18 15:42:54 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateCompleteDataSetRegistrationStore.java 2010-10-29 12:19:15 +0000
@@ -36,7 +36,6 @@
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.source.Source;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -49,9 +48,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private SessionFactory sessionFactory;
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
private PeriodService periodService;
public void setPeriodService( PeriodService periodService )
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java 2010-10-22 06:50:26 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java 2010-10-29 12:19:15 +0000
@@ -41,7 +41,6 @@
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.source.Source;
import org.hisp.dhis.system.util.ConversionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Kristian Nordal
@@ -54,9 +53,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private SessionFactory sessionFactory;
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
private PeriodStore periodStore;
public void setPeriodStore( PeriodStore periodStore )
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateSectionStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateSectionStore.java 2010-08-25 09:31:57 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateSectionStore.java 2010-10-29 12:19:15 +0000
@@ -32,7 +32,6 @@
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.dataset.Section;
import org.hisp.dhis.dataset.SectionStore;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Tri
@@ -45,9 +44,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private SessionFactory sessionFactory;
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
// -------------------------------------------------------------------------
// SectionStore implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueAuditStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueAuditStore.java 2010-06-14 15:51:12 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueAuditStore.java 2010-10-29 12:19:15 +0000
@@ -41,7 +41,6 @@
import org.hisp.dhis.datavalue.DataValueAuditStore;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.source.Source;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Quang Nguyen
@@ -54,9 +53,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private SessionFactory sessionFactory;
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
// -------------------------------------------------------------------------
// DataValueAuditStore implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueStore.java 2010-06-21 21:21:07 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueStore.java 2010-10-29 12:19:15 +0000
@@ -47,7 +47,6 @@
import org.hisp.dhis.period.PeriodStore;
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.source.Source;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Torgeir Lorange Ostby
@@ -61,12 +60,20 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private SessionFactory sessionFactory;
- @Autowired
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
private StatementManager statementManager;
+ public void setStatementManager( StatementManager statementManager )
+ {
+ this.statementManager = statementManager;
+ }
+
private PeriodStore periodStore;
public void setPeriodStore( PeriodStore periodStore )
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/hibernate/HibernateIndicatorStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/hibernate/HibernateIndicatorStore.java 2010-05-18 15:42:54 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/hibernate/HibernateIndicatorStore.java 2010-10-29 12:19:15 +0000
@@ -37,7 +37,6 @@
import org.hisp.dhis.hibernate.HibernateGenericStore;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.indicator.IndicatorStore;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -50,9 +49,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private SessionFactory sessionFactory;
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
// -------------------------------------------------------------------------
// Indicator
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java 2010-08-27 10:58:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java 2010-10-29 12:19:15 +0000
@@ -41,7 +41,6 @@
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitStore;
import org.hisp.dhis.system.objectmapper.OrganisationUnitRelationshipRowMapper;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
/**
@@ -55,15 +54,27 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private SessionFactory sessionFactory;
- @Autowired
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
private StatementManager statementManager;
- @Autowired
+ public void setStatementManager( StatementManager statementManager )
+ {
+ this.statementManager = statementManager;
+ }
+
private JdbcTemplate jdbcTemplate;
+ public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
+ {
+ this.jdbcTemplate = jdbcTemplate;
+ }
+
// -------------------------------------------------------------------------
// OrganisationUnit
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/period/hibernate/HibernatePeriodStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/period/hibernate/HibernatePeriodStore.java 2010-07-04 10:31:31 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/period/hibernate/HibernatePeriodStore.java 2010-10-29 12:19:15 +0000
@@ -42,7 +42,6 @@
import org.hisp.dhis.period.PeriodStore;
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.source.Source;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* Implements the PeriodStore interface.
@@ -57,9 +56,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private SessionFactory sessionFactory;
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
// -------------------------------------------------------------------------
// Period
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/hibernate/HibernateUserDetailsService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/hibernate/HibernateUserDetailsService.java 2010-05-27 08:42:06 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/hibernate/HibernateUserDetailsService.java 2010-10-29 12:19:15 +0000
@@ -37,7 +37,6 @@
import org.hibernate.criterion.Restrictions;
import org.hisp.dhis.user.UserAuthorityGroup;
import org.hisp.dhis.user.UserCredentials;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.GrantedAuthorityImpl;
@@ -64,9 +63,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private SessionFactory sessionFactory;
-
+
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
// -------------------------------------------------------------------------
// UserDetailsService implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/source/hibernate/HibernateSourceStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/source/hibernate/HibernateSourceStore.java 2010-05-18 15:42:54 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/source/hibernate/HibernateSourceStore.java 2010-10-29 12:19:15 +0000
@@ -33,7 +33,6 @@
import org.hibernate.SessionFactory;
import org.hisp.dhis.source.Source;
import org.hisp.dhis.source.SourceStore;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Torgeir Lorange Ostby
@@ -46,9 +45,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private SessionFactory sessionFactory;
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
// -------------------------------------------------------------------------
// SourceStore implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/translation/hibernate/HibernateTranslationStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/translation/hibernate/HibernateTranslationStore.java 2010-05-18 15:42:54 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/translation/hibernate/HibernateTranslationStore.java 2010-10-29 12:19:15 +0000
@@ -40,7 +40,6 @@
import org.hisp.dhis.system.util.LocaleUtils;
import org.hisp.dhis.translation.Translation;
import org.hisp.dhis.translation.TranslationStore;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Oyvind Brucker
@@ -52,9 +51,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private SessionFactory sessionFactory;
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
// -------------------------------------------------------------------------
// Translation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserStore.java 2010-10-22 16:27:16 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserStore.java 2010-10-29 12:19:15 +0000
@@ -46,7 +46,6 @@
import org.hisp.dhis.user.UserCredentials;
import org.hisp.dhis.user.UserSetting;
import org.hisp.dhis.user.UserStore;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
/**
@@ -63,9 +62,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private SessionFactory sessionFactory;
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
private CurrentUserService currentUserService;
public void setCurrentUserService( CurrentUserService currentUserService )
=== 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-10-22 07:47:18 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2010-10-29 12:19:15 +0000
@@ -14,7 +14,9 @@
</bean>
<bean id="org.hisp.dhis.dataentryform.DataEntryFormStore"
- class="org.hisp.dhis.dataentryform.hibernate.HibernateDataEntryFormStore" />
+ class="org.hisp.dhis.dataentryform.hibernate.HibernateDataEntryFormStore">
+ <property name="sessionFactory" ref="sessionFactory"/>
+ </bean>
<bean id="org.hisp.dhis.customvalue.CustomValueStore"
class="org.hisp.dhis.customvalue.hibernate.HibernateCustomValueStore">
@@ -23,7 +25,10 @@
</bean>
<bean id="org.hisp.dhis.dataelement.DataElementStore"
- class="org.hisp.dhis.dataelement.hibernate.HibernateDataElementStore" />
+ class="org.hisp.dhis.dataelement.hibernate.HibernateDataElementStore">
+ <property name="sessionFactory" ref="sessionFactory"/>
+ <property name="statementManager" ref="statementManager"/>
+ </bean>
<bean id="org.hisp.dhis.dataelement.DataElementGroupStore" class="org.hisp.dhis.hibernate.HibernateGenericStore">
<property name="clazz" value="org.hisp.dhis.dataelement.DataElementGroup" />
@@ -44,11 +49,15 @@
<bean id="org.hisp.dhis.datavalue.DataValueStore"
class="org.hisp.dhis.datavalue.hibernate.HibernateDataValueStore">
+ <property name="sessionFactory" ref="sessionFactory"/>
+ <property name="statementManager" ref="statementManager"/>
<property name="periodStore" ref="org.hisp.dhis.period.PeriodStore" />
</bean>
<bean id="org.hisp.dhis.indicator.IndicatorStore"
- class="org.hisp.dhis.indicator.hibernate.HibernateIndicatorStore" />
+ class="org.hisp.dhis.indicator.hibernate.HibernateIndicatorStore">
+ <property name="sessionFactory" ref="sessionFactory"/>
+ </bean>
<bean id="org.hisp.dhis.indicator.IndicatorTypeStore" class="org.hisp.dhis.hibernate.HibernateGenericStore">
<property name="clazz" value="org.hisp.dhis.indicator.IndicatorType" />
@@ -65,16 +74,22 @@
<property name="sessionFactory" ref="sessionFactory" />
</bean>
- <bean id="org.hisp.dhis.period.PeriodStore" class="org.hisp.dhis.period.hibernate.HibernatePeriodStore" />
+ <bean id="org.hisp.dhis.period.PeriodStore" class="org.hisp.dhis.period.hibernate.HibernatePeriodStore">
+ <property name="sessionFactory" ref="sessionFactory"/>
+ </bean>
- <bean id="org.hisp.dhis.source.SourceStore" class="org.hisp.dhis.source.hibernate.HibernateSourceStore" />
+ <bean id="org.hisp.dhis.source.SourceStore" class="org.hisp.dhis.source.hibernate.HibernateSourceStore">
+ <property name="sessionFactory" ref="sessionFactory"/>
+ </bean>
<bean id="org.hisp.dhis.dataset.DataSetStore" class="org.hisp.dhis.dataset.hibernate.HibernateDataSetStore">
+ <property name="sessionFactory" ref="sessionFactory"/>
<property name="periodStore" ref="org.hisp.dhis.period.PeriodStore" />
</bean>
<bean id="org.hisp.dhis.dataset.CompleteDataSetRegistrationStore"
class="org.hisp.dhis.dataset.hibernate.HibernateCompleteDataSetRegistrationStore">
+ <property name="sessionFactory" ref="sessionFactory"/>
<property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
</bean>
@@ -130,11 +145,17 @@
<property name="sessionFactory" ref="sessionFactory" />
</bean>
- <bean id="org.hisp.dhis.dataset.SectionStore" class="org.hisp.dhis.dataset.hibernate.HibernateSectionStore" />
+ <bean id="org.hisp.dhis.dataset.SectionStore" class="org.hisp.dhis.dataset.hibernate.HibernateSectionStore">
+ <property name="sessionFactory" ref="sessionFactory"/>
+ </bean>
<bean id="org.hisp.dhis.organisationunit.OrganisationUnitStore"
- class="org.hisp.dhis.organisationunit.hibernate.HibernateOrganisationUnitStore" />
-
+ class="org.hisp.dhis.organisationunit.hibernate.HibernateOrganisationUnitStore">
+ <property name="sessionFactory" ref="sessionFactory"/>
+ <property name="statementManager" ref="statementManager"/>
+ <property name="jdbcTemplate" ref="jdbcTemplate"/>
+ </bean>
+
<bean id="org.hisp.dhis.organisationunit.OrganisationUnitGroupStore"
class="org.hisp.dhis.hibernate.HibernateGenericStore">
<property name="clazz"
@@ -150,13 +171,18 @@
</bean>
<bean id="org.hisp.dhis.dataanalysis.jdbc.DataAnalysisStore"
- class="org.hisp.dhis.dataanalysis.jdbc.JdbcDataAnalysisStore" >
+ class="org.hisp.dhis.dataanalysis.jdbc.JdbcDataAnalysisStore">
+ <property name="statementManager" ref="statementManager"/>
+ <property name="statementBuilder" ref="statementBuilder"/>
</bean>
<bean id="org.hisp.dhis.datavalue.DataValueAuditStore"
- class="org.hisp.dhis.datavalue.hibernate.HibernateDataValueAuditStore" />
+ class="org.hisp.dhis.datavalue.hibernate.HibernateDataValueAuditStore">
+ <property name="sessionFactory" ref="sessionFactory"/>
+ </bean>
<bean id="org.hisp.dhis.user.UserStore" class="org.hisp.dhis.user.hibernate.HibernateUserStore">
+ <property name="sessionFactory" ref="sessionFactory"/>
<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
</bean>
@@ -166,10 +192,14 @@
</bean>
<bean id="org.hisp.dhis.translation.TranslationStore"
- class="org.hisp.dhis.translation.hibernate.HibernateTranslationStore" />
+ class="org.hisp.dhis.translation.hibernate.HibernateTranslationStore">
+ <property name="sessionFactory" ref="sessionFactory"/>
+ </bean>
<bean id="org.hisp.dhis.aggregation.AggregatedDataValueStore"
- class="org.hisp.dhis.aggregation.jdbc.JdbcAggregatedDataValueStore"/>
+ class="org.hisp.dhis.aggregation.jdbc.JdbcAggregatedDataValueStore">
+ <property name="statementManager" ref="statementManager"/>
+ </bean>
<!-- Service definitions -->
@@ -1108,8 +1138,8 @@
<bean id="org.hisp.dhis.dataelement.DataElementDefaultDimensionPopulator"
class="org.hisp.dhis.dataelement.DataElementDefaultDimensionPopulator">
<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="categoryService"
- ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+ <property name="conceptService" ref="org.hisp.dhis.concept.ConceptService"/>
+ <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
<property name="name" value="DataElementDefaultDimensionPopulator" />
<property name="runlevel" value="3" />
</bean>
@@ -1378,7 +1408,9 @@
</bean>
<bean id="userDetailsService"
- class="org.hisp.dhis.security.hibernate.HibernateUserDetailsService" />
+ class="org.hisp.dhis.security.hibernate.HibernateUserDetailsService">
+ <property name="sessionFactory" ref="sessionFactory"/>
+ </bean>
<bean id="passwordEncoder"
class="org.springframework.security.authentication.encoding.Md5PasswordEncoder" />
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleServiceTest.java 2010-09-04 06:30:08 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleServiceTest.java 2010-10-29 12:19:15 +0000
@@ -65,7 +65,6 @@
import org.hisp.dhis.source.SourceStore;
import org.hisp.dhis.system.util.MathUtils;
import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -74,7 +73,6 @@
public class ValidationRuleServiceTest
extends DhisTest
{
- @Autowired
private BatchHandlerFactory batchHandlerFactory;
private DataElement dataElementA;
@@ -141,6 +139,8 @@
public void setUpTest()
throws Exception
{
+ batchHandlerFactory = (BatchHandlerFactory) getBean( "batchHandlerFactory" );
+
validationRuleService = (ValidationRuleService) getBean( ValidationRuleService.ID );
dataElementService = (DataElementService) getBean( DataElementService.ID );
=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/calculateddataelement/DefaultCalculatedDataElementDataMart.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/calculateddataelement/DefaultCalculatedDataElementDataMart.java 2010-06-26 19:48:18 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/calculateddataelement/DefaultCalculatedDataElementDataMart.java 2010-10-29 12:19:15 +0000
@@ -54,7 +54,6 @@
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -132,9 +131,13 @@
this.aggregationCache = aggregationCache;
}
- @Autowired
private BatchHandlerFactory batchHandlerFactory;
+ public void setBatchHandlerFactory( BatchHandlerFactory batchHandlerFactory )
+ {
+ this.batchHandlerFactory = batchHandlerFactory;
+ }
+
// -------------------------------------------------------------------------
// CalculatedDataElementDataMart implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/DefaultCrossTabService.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/DefaultCrossTabService.java 2010-10-22 12:37:35 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/DefaultCrossTabService.java 2010-10-29 12:19:15 +0000
@@ -45,7 +45,6 @@
import org.hisp.dhis.datamart.CrossTabDataValue;
import org.hisp.dhis.datamart.crosstab.jdbc.CrossTabStore;
import org.hisp.dhis.jdbc.batchhandler.GenericBatchHandler;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -63,9 +62,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private BatchHandlerFactory batchHandlerFactory;
+ public void setBatchHandlerFactory( BatchHandlerFactory batchHandlerFactory )
+ {
+ this.batchHandlerFactory = batchHandlerFactory;
+ }
+
private CrossTabStore crossTabStore;
public void setCrossTabStore( CrossTabStore crossTabTableManager )
=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/jdbc/JDBCCrossTabStore.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/jdbc/JDBCCrossTabStore.java 2010-06-26 19:48:18 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/jdbc/JDBCCrossTabStore.java 2010-10-29 12:19:15 +0000
@@ -43,7 +43,6 @@
import org.hisp.dhis.dataelement.DataElementOperand;
import org.hisp.dhis.datamart.CrossTabDataValue;
import org.hisp.dhis.jdbc.StatementBuilder;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -56,12 +55,20 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private StatementManager statementManager;
- @Autowired
+ public void setStatementManager( StatementManager statementManager )
+ {
+ this.statementManager = statementManager;
+ }
+
private StatementBuilder statementBuilder;
+ public void setStatementBuilder( StatementBuilder statementBuilder )
+ {
+ this.statementBuilder = statementBuilder;
+ }
+
// -------------------------------------------------------------------------
// CrossTabStore implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/indicator/DefaultIndicatorDataMart.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/indicator/DefaultIndicatorDataMart.java 2010-06-26 19:48:18 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/indicator/DefaultIndicatorDataMart.java 2010-10-29 12:19:15 +0000
@@ -55,7 +55,6 @@
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.system.util.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -136,9 +135,13 @@
this.systemSettingManager = systemSettingManager;
}
- @Autowired
private BatchHandlerFactory batchHandlerFactory;
+ public void setBatchHandlerFactory( BatchHandlerFactory batchHandlerFactory )
+ {
+ this.batchHandlerFactory = batchHandlerFactory;
+ }
+
// -------------------------------------------------------------------------
// IndicatorDataMart implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/resources/META-INF/dhis/beans.xml 2010-09-04 06:30:08 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/resources/META-INF/dhis/beans.xml 2010-10-29 12:19:15 +0000
@@ -77,10 +77,14 @@
<!-- Crosstab -->
<bean id="org.hisp.dhis.datamart.crosstab.jdbc.CrossTabStore"
- class="org.hisp.dhis.datamart.crosstab.jdbc.JDBCCrossTabStore"/>
+ class="org.hisp.dhis.datamart.crosstab.jdbc.JDBCCrossTabStore">
+ <property name="statementManager" ref="statementManager"/>
+ <property name="statementBuilder" ref="statementBuilder"/>
+ </bean>
<bean id="org.hisp.dhis.datamart.crosstab.CrossTabService"
class="org.hisp.dhis.datamart.crosstab.DefaultCrossTabService">
+ <property name="batchHandlerFactory" ref="batchHandlerFactory"/>
<property name="crossTabStore"
ref="org.hisp.dhis.datamart.crosstab.jdbc.CrossTabStore"/>
<property name="aggregatedDataValueService"
@@ -176,6 +180,7 @@
ref="org.hisp.dhis.datamart.aggregation.cache.AggregationCache"/>
<property name="systemSettingManager"
ref="org.hisp.dhis.options.SystemSettingManager"/>
+ <property name="batchHandlerFactory" ref="batchHandlerFactory"/>
</bean>
<!-- CalculatedDataElementDataMart -->
@@ -200,6 +205,7 @@
ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
<property name="aggregationCache"
ref="org.hisp.dhis.datamart.aggregation.cache.AggregationCache"/>
+ <property name="batchHandlerFactory" ref="batchHandlerFactory"/>
</bean>
<!-- DeletionHandler -->
=== removed directory 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/META-INF'
=== removed file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/META-INF/MANIFEST.MF'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/META-INF/MANIFEST.MF 2009-09-14 03:19:36 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/META-INF/MANIFEST.MF 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/hibernate/HibernateExcelItemStore.java'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/hibernate/HibernateExcelItemStore.java 2010-09-30 09:37:41 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/hibernate/HibernateExcelItemStore.java 2010-10-29 12:19:15 +0000
@@ -13,7 +13,6 @@
import org.hisp.dhis.reportexcel.excelitem.ExcelItem;
import org.hisp.dhis.reportexcel.excelitem.ExcelItemGroup;
import org.hisp.dhis.reportexcel.excelitem.ExcelItemStore;
-import org.springframework.beans.factory.annotation.Autowired;
/*
* Copyright (c) 2004-2010, University of Oslo
@@ -54,9 +53,13 @@
// Dependencies
// ----------------------------------------------------------------------
- @Autowired
private SessionFactory sessionFactory;
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
private PeriodStore periodStore;
public void setPeriodStore( PeriodStore periodStore )
=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/hibernate/HibernateReportExcelStore.java'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/hibernate/HibernateReportExcelStore.java 2010-07-02 10:12:52 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/hibernate/HibernateReportExcelStore.java 2010-10-29 12:19:15 +0000
@@ -47,7 +47,6 @@
import org.hisp.dhis.reportexcel.ReportExcelStore;
import org.hisp.dhis.reportexcel.status.DataEntryStatus;
import org.hisp.dhis.user.CurrentUserService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
/**
@@ -61,9 +60,13 @@
// Dependency
// -------------------------------------------------
- @Autowired
private SessionFactory sessionFactory;
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
private CurrentUserService currentUserService;
public void setCurrentUserService( CurrentUserService currentUserService )
=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2010-09-30 09:37:41 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2010-10-29 12:19:15 +0000
@@ -7,7 +7,8 @@
<!-- ReportExcel -->
<bean id="org.hisp.dhis.reportexcel.ReportExcelStore"
class="org.hisp.dhis.reportexcel.hibernate.HibernateReportExcelStore">
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
+ <property name="sessionFactory" ref="sessionFactory"/>
+ <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService"/>
</bean>
<bean id="org.hisp.dhis.reportexcel.ReportExcelService" class="org.hisp.dhis.reportexcel.DefaultReportExcelService">
@@ -20,6 +21,7 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<bean id="org.hisp.dhis.reportexcel.excelitem.ExcelItemStore"
class="org.hisp.dhis.reportexcel.excelitem.hibernate.HibernateExcelItemStore">
+ <property name="sessionFactory" ref="sessionFactory"/>
<property name="periodStore" ref="org.hisp.dhis.period.PeriodStore" />
</bean>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/DefaultImportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/DefaultImportService.java 2010-10-29 08:56:13 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/DefaultImportService.java 2010-10-29 12:19:15 +0000
@@ -52,7 +52,6 @@
import org.hisp.dhis.importexport.zip.ZipAnalyzer;
import org.hisp.dhis.system.process.OutputHolderState;
import org.hisp.dhis.system.util.StreamUtils;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author bobj
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/configuration/DefaultIbatisConfigurationManager.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/configuration/DefaultIbatisConfigurationManager.java 2010-10-29 08:56:13 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/configuration/DefaultIbatisConfigurationManager.java 2010-10-29 12:19:15 +0000
@@ -38,7 +38,6 @@
import org.hisp.dhis.external.location.LocationManagerException;
import org.hisp.dhis.importexport.IbatisConfiguration;
import org.hisp.dhis.importexport.IbatisConfigurationManager;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
=== 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-10-29 08:56:13 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/importer/DefaultDhis14FileImportService.java 2010-10-29 12:19:15 +0000
@@ -119,7 +119,6 @@
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.source.Source;
import org.hisp.dhis.system.util.AppendingHashMap;
-import org.springframework.beans.factory.annotation.Autowired;
import com.ibatis.sqlmap.client.event.RowHandler;
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/exporter/DefaultDhis14XMLExportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/exporter/DefaultDhis14XMLExportService.java 2010-10-29 08:56:13 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/exporter/DefaultDhis14XMLExportService.java 2010-10-29 12:19:15 +0000
@@ -64,7 +64,6 @@
import org.hisp.dhis.importexport.dhis14.xml.converter.xsd.UserXSDConverter;
import org.hisp.dhis.indicator.IndicatorService;
import org.hisp.dhis.period.PeriodService;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
=== 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-10-29 08:56:13 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/importer/DefaultDhis14XMLImportService.java 2010-10-29 12:19:15 +0000
@@ -75,7 +75,6 @@
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
=== 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-10-29 08:56:13 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DXFConverter.java 2010-10-29 12:19:15 +0000
@@ -121,7 +121,6 @@
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
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementCategoryConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementCategoryConverter.java 2010-09-30 11:21:51 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementCategoryConverter.java 2010-10-29 12:19:15 +0000
@@ -27,6 +27,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import static org.hisp.dhis.importexport.dxf.converter.DXFConverter.MINOR_VERSION_11;
+import static org.hisp.dhis.importexport.dxf.converter.DXFConverter.MINOR_VERSION_12;
+
import java.util.Collection;
import java.util.Map;
@@ -44,9 +47,6 @@
import org.hisp.dhis.importexport.importer.DataElementCategoryImporter;
import org.hisp.dhis.importexport.mapping.NameMappingUtil;
-import static org.hisp.dhis.importexport.dxf.converter.DXFConverter. MINOR_VERSION_11;
-import static org.hisp.dhis.importexport.dxf.converter.DXFConverter. MINOR_VERSION_12;
-
/**
* @author Lars Helge Overland
* @version $Id$
@@ -60,7 +60,6 @@
private static final String FIELD_ID = "id";
private static final String FIELD_NAME = "name";
private static final String FIELD_CONCEPT_ID = "conceptid";
- private static final String FIELD_CONCEPT_NAME = "conceptname"; //deprecated 1.2
private ConceptService conceptService;
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java 2010-10-29 08:56:13 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java 2010-10-29 12:19:15 +0000
@@ -61,9 +61,9 @@
import org.hisp.dhis.importexport.dxf.converter.CalculatedDataElementConverter;
import org.hisp.dhis.importexport.dxf.converter.CategoryCategoryOptionAssociationConverter;
import org.hisp.dhis.importexport.dxf.converter.CategoryComboCategoryAssociationConverter;
-import org.hisp.dhis.importexport.dxf.converter.ConceptConverter;
import org.hisp.dhis.importexport.dxf.converter.ChartConverter;
import org.hisp.dhis.importexport.dxf.converter.CompleteDataSetRegistrationConverter;
+import org.hisp.dhis.importexport.dxf.converter.ConceptConverter;
import org.hisp.dhis.importexport.dxf.converter.DataDictionaryConverter;
import org.hisp.dhis.importexport.dxf.converter.DataDictionaryDataElementConverter;
import org.hisp.dhis.importexport.dxf.converter.DataDictionaryIndicatorConverter;
@@ -109,7 +109,6 @@
import org.hisp.dhis.reporttable.ReportTableService;
import org.hisp.dhis.system.util.DateUtils;
import org.hisp.dhis.validation.ValidationRuleService;
-import org.springframework.beans.factory.annotation.Autowired;
/**
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/hibernate/HibernateImportDataValueStore.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/hibernate/HibernateImportDataValueStore.java 2010-10-29 08:56:13 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/hibernate/HibernateImportDataValueStore.java 2010-10-29 12:19:15 +0000
@@ -37,7 +37,6 @@
import org.hisp.dhis.importexport.ImportDataValue;
import org.hisp.dhis.importexport.ImportDataValueStore;
import org.hisp.dhis.importexport.ImportObjectStatus;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
/**
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryImporter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryImporter.java 2010-09-17 21:30:59 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryImporter.java 2010-10-29 12:19:15 +0000
@@ -28,7 +28,6 @@
*/
import org.amplecode.quick.BatchHandler;
-import org.hisp.dhis.concept.ConceptService;
import org.hisp.dhis.dataelement.DataElementCategory;
import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.importexport.GroupMemberType;
=== 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-10-29 08:56:13 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java 2010-10-29 12:19:15 +0000
@@ -81,7 +81,6 @@
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;
/**
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/XMLPreConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/XMLPreConverter.java 2010-10-29 08:56:13 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/XMLPreConverter.java 2010-10-29 12:19:15 +0000
@@ -48,7 +48,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hisp.dhis.importexport.ImportException;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* GenericXMLConvertor transforms imported foreign XML to dxf.
@@ -66,13 +65,16 @@
// -------------------------------------------------------------------------
// Named XSLT parameters available to xslt stylesheets
// -------------------------------------------------------------------------
-
+
// Current timestamp
public static final String TIMESTAMP = "timestamp";
+
// url base where dxf metadata snapshots are found
public static final String METADATA_URL_BASE = "metadata_url_base";
+
// current dhis2 user
public static final String DHIS_USER = "username";
+
// url of zip file containing stream (may be null)
public static final String ZIP_URL = "zip_url";
@@ -96,7 +98,8 @@
this.dhisResolver = dhisResolver;
}
- public QName getDocumentRoot(BufferedInputStream xmlDataStream) throws ImportException
+ public QName getDocumentRoot( BufferedInputStream xmlDataStream )
+ throws ImportException
{
QName rootName = null;
@@ -111,8 +114,10 @@
rootName = reader.getElementQName();
xmlDataStream.reset();
- } catch (Exception ex) {
- throw new ImportException("Couldn't locate document root element", ex);
+ }
+ catch ( Exception ex )
+ {
+ throw new ImportException( "Couldn't locate document root element", ex );
}
return rootName;
@@ -120,7 +125,7 @@
/**
* Performs transform on stream
- *
+ *
* @param source the input
* @param result the result
* @param xsltTag identifier used to look up xslt stylesheet
@@ -134,20 +139,24 @@
InputStream sheetStream = xsltLocator.getTransformerByTag( xsltTag );
Source sheet = new StreamSource( sheetStream );
- log.debug("Populating xslt parameters");
+ log.debug( "Populating xslt parameters" );
Map<String, String> xsltParams = new HashMap<String, String>();
- if (userName != null) {
- xsltParams.put( DHIS_USER, userName);
- }
- if (zipFile != null) {
- xsltParams.put( ZIP_URL, zipFile.getAbsolutePath());
- }
- xsltParams.put( METADATA_URL_BASE, defaultMetadataBase);
+
+ if ( userName != null )
+ {
+ xsltParams.put( DHIS_USER, userName );
+ }
+ if ( zipFile != null )
+ {
+ xsltParams.put( ZIP_URL, zipFile.getAbsolutePath() );
+ }
+
+ xsltParams.put( METADATA_URL_BASE, defaultMetadataBase );
Date now = new Date();
- DateFormat dfm = new SimpleDateFormat("yyyy-MM-dd'T'hh-mm"); //iso8601 timestamp
- xsltParams.put( TIMESTAMP, dfm.format( now ));
+ DateFormat dfm = new SimpleDateFormat( "yyyy-MM-dd'T'hh-mm" ); // iso8601 timestamp
+ xsltParams.put( TIMESTAMP, dfm.format( now ) );
- log.debug("Applying stylesheet");
+ log.debug( "Applying stylesheet" );
try
{
@@ -155,8 +164,8 @@
tt.transform( source, result, dhisResolver );
log.debug( "Transform successful" );
-
- } catch ( Exception ex )
+ }
+ catch ( Exception ex )
{
throw new ImportException( "Failed to transform stream", ex );
}
=== modified file 'dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMappingStore.java'
--- dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMappingStore.java 2010-05-25 16:45:28 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMappingStore.java 2010-10-29 12:19:15 +0000
@@ -43,7 +43,6 @@
import org.hisp.dhis.mapping.MappingStore;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Jan Henrik Overland
@@ -56,9 +55,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private SessionFactory sessionFactory;
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
// -------------------------------------------------------------------------
// Map
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-mapping/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-mapping/src/main/resources/META-INF/dhis/beans.xml 2010-08-31 05:47:11 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/src/main/resources/META-INF/dhis/beans.xml 2010-10-29 12:19:15 +0000
@@ -31,7 +31,9 @@
<!-- Store definitions -->
<bean id="org.hisp.dhis.mapping.MappingStore"
- class="org.hisp.dhis.mapping.hibernate.HibernateMappingStore"/>
+ class="org.hisp.dhis.mapping.hibernate.HibernateMappingStore">
+ <property name="sessionFactory" ref="sessionFactory"/>
+ </bean>
<!-- DeletionHandlers -->
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationMappingStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationMappingStore.java 2010-05-18 19:22:26 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationMappingStore.java 2010-10-29 12:19:15 +0000
@@ -41,7 +41,6 @@
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
import org.hisp.dhis.patientdatavalue.PatientDataValue;
-import org.springframework.beans.factory.annotation.Autowired;
public class HibernateCaseAggregationMappingStore
implements CaseAggregationMappingStore
@@ -50,9 +49,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private SessionFactory sessionFactory;
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
// -------------------------------------------------------------------------
// CaseAggregationMapping
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/TableAlteror.java 2010-10-28 09:17:13 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/TableAlteror.java 2010-10-29 12:19:15 +0000
@@ -77,8 +77,6 @@
try
{
- Statement statement = holder.getStatement();
-
executeSql( "UPDATE patient SET dobType='A' WHERE birthdateestimated=true");
executeSql("ALTER TABLE patient drop column birthdateestimated");
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/DefaultPatientDataValueAggregationEngine.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/DefaultPatientDataValueAggregationEngine.java 2010-05-18 19:22:26 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/DefaultPatientDataValueAggregationEngine.java 2010-10-29 12:19:15 +0000
@@ -39,9 +39,13 @@
this.periodService = periodService;
}
- @Autowired
private StatementManager statementManager;
+ public void setStatementManager( StatementManager statementManager )
+ {
+ this.statementManager = statementManager;
+ }
+
/*
* interface: startDate, endDate, organisationUnit
*
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml 2010-10-25 07:05:55 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml 2010-10-29 12:19:15 +0000
@@ -231,6 +231,7 @@
<bean
id="org.hisp.dhis.patientdatavalue.aggregation.PatientDataValueAggregationEngine"
class="org.hisp.dhis.patientdatavalue.aggregation.DefaultPatientDataValueAggregationEngine">
+ <property name="statementManager" ref="statementManager"/>
<property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
<property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
</bean>
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/AbstractDataSetCompletenessService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/AbstractDataSetCompletenessService.java 2010-08-27 07:07:57 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/AbstractDataSetCompletenessService.java 2010-10-29 12:19:15 +0000
@@ -53,7 +53,6 @@
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.source.Source;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
/**
@@ -130,12 +129,20 @@
this.completenessStore = completenessStore;
}
- @Autowired
protected LocationManager locationManager;
- @Autowired
+ public void setLocationManager( LocationManager locationManager )
+ {
+ this.locationManager = locationManager;
+ }
+
protected ConfigurationManager<DataSetCompletenessConfiguration> configurationManager;
-
+
+ public void setConfigurationManager( ConfigurationManager<DataSetCompletenessConfiguration> configurationManager )
+ {
+ this.configurationManager = configurationManager;
+ }
+
// -------------------------------------------------------------------------
// DataSetCompletenessService implementation
// -------------------------------------------------------------------------
=== 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-08-27 07:07:57 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.java 2010-10-29 12:19:15 +0000
@@ -40,7 +40,6 @@
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
@@ -53,9 +52,13 @@
// 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/report/manager/DefaultReportManager.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/manager/DefaultReportManager.java 2010-05-18 15:18:53 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/manager/DefaultReportManager.java 2010-10-29 12:19:15 +0000
@@ -39,7 +39,6 @@
import org.hisp.dhis.external.location.LocationManagerException;
import org.hisp.dhis.report.ReportManager;
import org.hisp.dhis.system.util.CodecUtils;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -78,19 +77,31 @@
this.reportConfigFile = reportConfigFile;
}
- @Autowired
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
private JdbcConfiguration jdbcConfiguration;
-
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- @Autowired
+
+ public void setJdbcConfiguration( JdbcConfiguration jdbcConfiguration )
+ {
+ this.jdbcConfiguration = jdbcConfiguration;
+ }
+
private LocationManager locationManager;
- @Autowired
+ public void setLocationManager( LocationManager locationManager )
+ {
+ this.locationManager = locationManager;
+ }
+
private ConfigurationManager<ReportConfiguration> configurationManager;
-
+
+ public void setConfigurationManager( ConfigurationManager<ReportConfiguration> configurationManager )
+ {
+ this.configurationManager = configurationManager;
+ }
+
// -------------------------------------------------------------------------
// ReportManager implementation
// -------------------------------------------------------------------------
=== 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-05-18 20:05:58 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/jdbc/JDBCReportTableManager.java 2010-10-29 12:19:15 +0000
@@ -54,7 +54,6 @@
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
@@ -69,9 +68,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private StatementManager statementManager;
+ public void setStatementManager( StatementManager statementManager )
+ {
+ this.statementManager = statementManager;
+ }
+
private StatementBuilder statementBuilder;
public void setStatementBuilder( StatementBuilder statementBuilder )
=== removed 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-05-18 13:42:38 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/startup/OpenHealthDataSourceWriter.java 1970-01-01 00:00:00 +0000
@@ -1,137 +0,0 @@
-package org.hisp.dhis.startup;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.hisp.dhis.system.database.DatabaseInfo;
-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
- * @version $Id$
- */
-public class OpenHealthDataSourceWriter
- extends AbstractStartupRoutine
-{
- private static final Log log = LogFactory.getLog( OpenHealthDataSourceWriter.class );
-
- private static final String START_TAG = "<DataSourceInfo>";
- private static final String END_TAG = "</DataSourceInfo>";
- private static final String DATASOURCE_FOLDER = File.separator + "WEB-INF" + File.separator + "classes";
-
- // -------------------------------------------------------------------------
- // Properties
- // -------------------------------------------------------------------------
-
- private String environmentVariable;
-
- public void setEnvironmentVariable( String environmentVariable )
- {
- this.environmentVariable = environmentVariable;
- }
-
- private String dataSourceFile;
-
- public void setDataSourceFile( String dataSourceFile )
- {
- this.dataSourceFile = dataSourceFile;
- }
-
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- @Autowired
- private DatabaseInfoProvider databaseInfoProvider;
-
- // -------------------------------------------------------------------------
- // AbstractStartupRoutine implementation
- // -------------------------------------------------------------------------
-
- public void execute()
- throws Exception
- {
- String path = System.getenv( environmentVariable );
-
- if ( path == null )
- {
- log.info( "Environment variable " + environmentVariable + " not set" );
- }
- else
- {
- File file = new File( path + File.separator + DATASOURCE_FOLDER, dataSourceFile );
-
- if ( !file.exists() )
- {
- log.info( "File " + file.getAbsolutePath() + " does not exist" );
- }
- else
- {
- DatabaseInfo info = databaseInfoProvider.getDatabaseInfo();
-
- Map<String[], String> replaceMap = new HashMap<String[], String>();
-
- String value = START_TAG +
- "Provider=mondrian; " +
- "Jdbc=" + xmlEncode( info.getUrl() ) + "; " +
- "JdbcDrivers=" + info.getDriverClass() + "; " +
- "JdbcUser=" + info.getUser() + "; " +
- "JdbcPassword=" + info.getPassword() + "; " +
- "PoolNeeded=true" + END_TAG;
-
- replaceMap.put( new String[] { START_TAG, END_TAG }, value );
-
- StringBuffer in = StreamUtils.readContent( file, replaceMap );
-
- StreamUtils.writeContent( file, in );
-
- log.info( "Wrote OpenHealth datasource configuration file" );
- }
- }
- }
-
- // -------------------------------------------------------------------------
- // Supportive methods
- // -------------------------------------------------------------------------
-
- private String xmlEncode( String string )
- {
- string = string.replaceAll( "&", "&" );
- string = string.replaceAll( "[<>{}]", "" );
-
- return string;
- }
-}
=== 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-09-01 07:30:48 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2010-10-29 12:19:15 +0000
@@ -32,6 +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"/>
</bean>
@@ -82,6 +83,9 @@
value="reports"/>
<property name="reportConfigFile"
value="reportConfiguration.xml"/>
+ <property name="jdbcConfiguration" ref="jdbcConfiguration"/>
+ <property name="locationManager" ref="locationManager"/>
+ <property name="configurationManager" ref="configurationManager"/>
</bean>
<!-- Chart -->
@@ -157,6 +161,8 @@
ref="org.hisp.dhis.period.PeriodService"/>
<property name="completenessStore"
ref="org.hisp.dhis.completeness.DataSetCompletenessStore"/>
+ <property name="locationManager" ref="locationManager"/>
+ <property name="configurationManager" ref="configurationManager"/>
</bean>
<bean id="ratioDataCompletenessService"
@@ -171,7 +177,9 @@
</bean>
<bean id="org.hisp.dhis.completeness.DataSetCompletenessStore"
- class="org.hisp.dhis.completeness.jdbc.JDBCDataSetCompletenessStore"/>
+ class="org.hisp.dhis.completeness.jdbc.JDBCDataSetCompletenessStore">
+ <property name="statementManager" ref="statementManager"/>
+ </bean>
<bean id="internal-process-DataSetCompleteness"
class="org.hisp.dhis.completeness.DataSetCompletenessInternalProcess"
@@ -255,28 +263,6 @@
<bean id="org.hisp.dhis.tallysheet.TallySheetPdfService"
class="org.hisp.dhis.tallysheet.DefaultTallySheetPdfService"/>
- <!-- Startup routine definitions -->
-
- <bean id="org.hisp.dhis.startup.OpenHealthDataSourceWriter"
- class="org.hisp.dhis.startup.OpenHealthDataSourceWriter">
- <property name="environmentVariable" value="OPENHEALTH_HOME"/>
- <property name="dataSourceFile" value="datasources.xml"/>
- <property name="name" value="OpenHealthDataSourceWriter"/>
- <property name="runlevel" value="6"/>
- <property name="skipInTests" value="true"/>
- </bean>
-
- <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
- <property name="targetObject"
- ref="org.hisp.dhis.system.startup.StartupRoutineExecutor"/>
- <property name="targetMethod" value="addStartupRoutines"/>
- <property name="arguments">
- <list>
- <ref local="org.hisp.dhis.startup.OpenHealthDataSourceWriter"/>
- </list>
- </property>
- </bean>
-
<!-- DeletionHandler -->
<bean id="org.hisp.dhis.report.ReportDeletionHandler"
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceTest.java 2010-08-27 07:07:57 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceTest.java 2010-10-29 12:19:15 +0000
@@ -49,7 +49,6 @@
import org.hisp.dhis.period.PeriodType;
import org.junit.Ignore;
import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -58,7 +57,6 @@
public class DataSetCompletenessServiceTest
extends DhisTest
{
- @Autowired
private LocationManager locationManager;
private CompleteDataSetRegistrationService registrationService;
@@ -102,6 +100,8 @@
@Override
public void setUpTest()
{
+ locationManager = (LocationManager) getBean( "locationManager" );
+
setExternalTestDir( locationManager );
periodService = (PeriodService) getBean( PeriodService.ID );
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/report/ReportManagerTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/report/ReportManagerTest.java 2010-05-17 21:05:26 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/report/ReportManagerTest.java 2010-10-29 12:19:15 +0000
@@ -35,7 +35,6 @@
import org.hisp.dhis.external.location.LocationManager;
import org.hisp.dhis.report.manager.ReportConfiguration;
import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -44,7 +43,6 @@
public class ReportManagerTest
extends DhisSpringTest
{
- @Autowired
private LocationManager locationManager;
private ReportManager reportManager;
@@ -56,6 +54,8 @@
@Override
public void setUpTest()
{
+ locationManager = (LocationManager) getBean( "locationManager" );
+
reportManager = (ReportManager) getBean( ReportManager.ID );
setDependency( reportManager, "reportConfigDir", "test", String.class );
=== modified file 'dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/location/DefaultLocationManagerResolver.java'
--- dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/location/DefaultLocationManagerResolver.java 2010-09-17 12:11:18 +0000
+++ dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/location/DefaultLocationManagerResolver.java 2010-10-29 12:19:15 +0000
@@ -36,7 +36,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author bobj
@@ -51,9 +50,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private LocationManager locationManager;
+ public void setLocationManager( LocationManager locationManager )
+ {
+ this.locationManager = locationManager;
+ }
+
// -------------------------------------------------------------------------
// URIResolver implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-external/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-support/dhis-support-external/src/main/resources/META-INF/dhis/beans.xml 2010-09-17 12:11:18 +0000
+++ dhis-2/dhis-support/dhis-support-external/src/main/resources/META-INF/dhis/beans.xml 2010-10-29 12:19:15 +0000
@@ -12,7 +12,9 @@
<bean id="configurationManager" class="org.hisp.dhis.external.configuration.DefaultConfigurationManager"/>
- <bean id="dhisResolver" class="org.hisp.dhis.external.location.DefaultLocationManagerResolver"/>
+ <bean id="dhisResolver" class="org.hisp.dhis.external.location.DefaultLocationManagerResolver">
+ <property name="locationManager" ref="locationManager"/>
+ </bean>
<bean id="locationManager" class="org.hisp.dhis.external.location.DefaultLocationManager" init-method="init">
<property name="environmentVariable" value="DHIS2_HOME"/> <!-- Change environment variable -->
=== 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-09-17 12:11:18 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/cache/DefaultHibernateCacheManager.java 2010-10-29 12:19:15 +0000
@@ -29,7 +29,6 @@
import org.hibernate.SessionFactory;
import org.hibernate.stat.Statistics;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -42,9 +41,13 @@
// 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/dbms/HibernateDbmsManager.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java 2010-10-22 16:27:16 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java 2010-10-29 12:19:15 +0000
@@ -31,7 +31,6 @@
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;
@@ -48,15 +47,27 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private JdbcTemplate jdbcTemplate;
- @Autowired
+ public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
+ {
+ this.jdbcTemplate = jdbcTemplate;
+ }
+
private SessionFactory sessionFactory;
- @Autowired
+ public void setSessionFactory( SessionFactory sessionFactory )
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
private HibernateCacheManager cacheManager;
+ public void setCacheManager( HibernateCacheManager cacheManager )
+ {
+ this.cacheManager = cacheManager;
+ }
+
// -------------------------------------------------------------------------
// DbmsManager implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/ConnectionPropertyFactoryBean.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/ConnectionPropertyFactoryBean.java 2010-05-17 21:31:03 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/ConnectionPropertyFactoryBean.java 2010-10-29 12:19:15 +0000
@@ -28,7 +28,6 @@
*/
import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -41,9 +40,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private HibernateConfigurationProvider hibernateConfigurationProvider;
+ public void setHibernateConfigurationProvider( HibernateConfigurationProvider hibernateConfigurationProvider )
+ {
+ this.hibernateConfigurationProvider = hibernateConfigurationProvider;
+ }
+
private String hibernateProperty;
public void setHibernateProperty( String hibernateProperty )
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/DefaultHibernateConfigurationProvider.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/DefaultHibernateConfigurationProvider.java 2010-09-17 12:11:18 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/DefaultHibernateConfigurationProvider.java 2010-10-29 12:19:15 +0000
@@ -44,7 +44,6 @@
import org.hibernate.cfg.Configuration;
import org.hisp.dhis.external.location.LocationManager;
import org.hisp.dhis.external.location.LocationManagerException;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
@@ -77,9 +76,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private LocationManager locationManager;
-
+
+ public void setLocationManager( LocationManager locationManager )
+ {
+ this.locationManager = locationManager;
+ }
+
// -------------------------------------------------------------------------
// Initialise
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingDirectoryLocationsFactoryBean.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingDirectoryLocationsFactoryBean.java 2010-09-17 12:11:18 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingDirectoryLocationsFactoryBean.java 2010-10-29 12:19:15 +0000
@@ -28,7 +28,6 @@
*/
import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.Resource;
/**
@@ -42,9 +41,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private HibernateConfigurationProvider hibernateConfigurationProvider;
+ public void setHibernateConfigurationProvider( HibernateConfigurationProvider hibernateConfigurationProvider )
+ {
+ this.hibernateConfigurationProvider = hibernateConfigurationProvider;
+ }
+
// -------------------------------------------------------------------------
// FactoryBean implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingJarLocationsFactoryBean.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingJarLocationsFactoryBean.java 2010-09-17 12:11:18 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingJarLocationsFactoryBean.java 2010-10-29 12:19:15 +0000
@@ -28,7 +28,6 @@
*/
import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.Resource;
/**
@@ -42,9 +41,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private HibernateConfigurationProvider hibernateConfigurationProvider;
+ public void setHibernateConfigurationProvider( HibernateConfigurationProvider hibernateConfigurationProvider )
+ {
+ this.hibernateConfigurationProvider = hibernateConfigurationProvider;
+ }
+
// -------------------------------------------------------------------------
// FactoryBean implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernatePropertiesFactoryBean.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernatePropertiesFactoryBean.java 2010-09-17 12:11:18 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernatePropertiesFactoryBean.java 2010-10-29 12:19:15 +0000
@@ -30,7 +30,6 @@
import java.util.Properties;
import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -43,9 +42,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private HibernateConfigurationProvider hibernateConfigurationProvider;
+ public void setHibernateConfigurationProvider( HibernateConfigurationProvider hibernateConfigurationProvider )
+ {
+ this.hibernateConfigurationProvider = hibernateConfigurationProvider;
+ }
+
// -------------------------------------------------------------------------
// FactoryBean 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-09-17 12:11:18 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml 2010-10-29 12:19:15 +0000
@@ -19,17 +19,31 @@
<!-- Configuration -->
- <bean id="cacheManager" class="org.hisp.dhis.cache.DefaultHibernateCacheManager"/>
-
- <bean id="dbmsManager" class="org.hisp.dhis.dbms.HibernateDbmsManager"/>
-
- <bean id="hibernateConfigurationProvider" class="org.hisp.dhis.hibernate.DefaultHibernateConfigurationProvider"/>
-
- <bean id="hibernateMappingDirectoryLocations" class="org.hisp.dhis.hibernate.HibernateMappingDirectoryLocationsFactoryBean"/>
-
- <bean id="hibernateMappingJarLocations" class="org.hisp.dhis.hibernate.HibernateMappingJarLocationsFactoryBean"/>
-
- <bean id="hibernateProperties" class="org.hisp.dhis.hibernate.HibernatePropertiesFactoryBean"/>
+ <bean id="cacheManager" class="org.hisp.dhis.cache.DefaultHibernateCacheManager">
+ <property name="sessionFactory" ref="sessionFactory"/>
+ </bean>
+
+ <bean id="dbmsManager" class="org.hisp.dhis.dbms.HibernateDbmsManager">
+ <property name="jdbcTemplate" ref="jdbcTemplate"/>
+ <property name="sessionFactory" ref="sessionFactory"/>
+ <property name="cacheManager" ref="cacheManager"/>
+ </bean>
+
+ <bean id="hibernateConfigurationProvider" class="org.hisp.dhis.hibernate.DefaultHibernateConfigurationProvider">
+ <property name="locationManager" ref="locationManager"/>
+ </bean>
+
+ <bean id="hibernateMappingDirectoryLocations" class="org.hisp.dhis.hibernate.HibernateMappingDirectoryLocationsFactoryBean">
+ <property name="hibernateConfigurationProvider" ref="hibernateConfigurationProvider"/>
+ </bean>
+
+ <bean id="hibernateMappingJarLocations" class="org.hisp.dhis.hibernate.HibernateMappingJarLocationsFactoryBean">
+ <property name="hibernateConfigurationProvider" ref="hibernateConfigurationProvider"/>
+ </bean>
+
+ <bean id="hibernateProperties" class="org.hisp.dhis.hibernate.HibernatePropertiesFactoryBean">
+ <property name="hibernateConfigurationProvider" ref="hibernateConfigurationProvider"/>
+ </bean>
<bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
<property name="dataSource" ref="dataSource"/>
@@ -50,18 +64,22 @@
</bean>
<bean id="driverClassName" class="org.hisp.dhis.hibernate.ConnectionPropertyFactoryBean">
+ <property name="hibernateConfigurationProvider" ref="hibernateConfigurationProvider"/>
<property name="hibernateProperty" value="hibernate.connection.driver_class"/>
</bean>
<bean id="url" class="org.hisp.dhis.hibernate.ConnectionPropertyFactoryBean">
+ <property name="hibernateConfigurationProvider" ref="hibernateConfigurationProvider"/>
<property name="hibernateProperty" value="hibernate.connection.url"/>
</bean>
<bean id="username" class="org.hisp.dhis.hibernate.ConnectionPropertyFactoryBean">
+ <property name="hibernateConfigurationProvider" ref="hibernateConfigurationProvider"/>
<property name="hibernateProperty" value="hibernate.connection.username"/>
</bean>
<bean id="password" class="org.hisp.dhis.hibernate.ConnectionPropertyFactoryBean">
+ <property name="hibernateConfigurationProvider" ref="hibernateConfigurationProvider"/>
<property name="hibernateProperty" value="hibernate.connection.password"/>
</bean>
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/configuration/JdbcConfigurationFactoryBean.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/configuration/JdbcConfigurationFactoryBean.java 2010-05-18 14:57:16 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/configuration/JdbcConfigurationFactoryBean.java 2010-10-29 12:19:15 +0000
@@ -32,7 +32,6 @@
import org.hibernate.cfg.Configuration;
import org.hisp.dhis.hibernate.HibernateConfigurationProvider;
import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -58,9 +57,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
- private HibernateConfigurationProvider configurationProvider;
+ private HibernateConfigurationProvider hibernateConfigurationProvider;
+ public void setHibernateConfigurationProvider( HibernateConfigurationProvider hibernateConfigurationProvider )
+ {
+ this.hibernateConfigurationProvider = hibernateConfigurationProvider;
+ }
+
private JdbcConfiguration jdbcConfig;
// -------------------------------------------------------------------------
@@ -69,7 +72,7 @@
public void init()
{
- Configuration hibernateConfiguration = configurationProvider.getConfiguration();
+ Configuration hibernateConfiguration = hibernateConfigurationProvider.getConfiguration();
JdbcConfiguration config = new JdbcConfiguration();
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/resources/META-INF/dhis/beans.xml 2010-05-17 21:31:03 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/resources/META-INF/dhis/beans.xml 2010-10-29 12:19:15 +0000
@@ -24,7 +24,9 @@
<!-- JdbcConfiguration -->
- <bean id="jdbcConfiguration" class="org.hisp.dhis.jdbc.configuration.JdbcConfigurationFactoryBean" init-method="init"/>
+ <bean id="jdbcConfiguration" class="org.hisp.dhis.jdbc.configuration.JdbcConfigurationFactoryBean" init-method="init">
+ <property name="hibernateConfigurationProvider" ref="hibernateConfigurationProvider"/>
+ </bean>
<!-- StatementBuilder -->
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/HibernateDatabaseInfoProvider.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/HibernateDatabaseInfoProvider.java 2010-10-22 16:27:16 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/HibernateDatabaseInfoProvider.java 2010-10-29 12:19:15 +0000
@@ -27,11 +27,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.annotation.PostConstruct;
-
import org.hibernate.cfg.Configuration;
import org.hisp.dhis.hibernate.HibernateConfigurationProvider;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -59,13 +56,16 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
- private HibernateConfigurationProvider configurationProvider;
+ private HibernateConfigurationProvider hibernateConfigurationProvider;
- @PostConstruct
+ public void setHibernateConfigurationProvider( HibernateConfigurationProvider hibernateConfigurationProvider )
+ {
+ this.hibernateConfigurationProvider = hibernateConfigurationProvider;
+ }
+
public void init()
{
- Configuration config = configurationProvider.getConfiguration();
+ Configuration config = hibernateConfigurationProvider.getConfiguration();
String dialect = config.getProperty( KEY_DIALECT );
String driverClass = config.getProperty( KEY_DRIVER_CLASS );
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionInterceptor.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionInterceptor.java 2010-05-17 22:56:52 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionInterceptor.java 2010-10-29 12:19:15 +0000
@@ -28,7 +28,6 @@
*/
import org.aspectj.lang.JoinPoint;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -40,9 +39,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private DeletionManager deletionManager;
+ public void setDeletionManager( DeletionManager deletionManager )
+ {
+ this.deletionManager = deletionManager;
+ }
+
public void intercept( JoinPoint joinPoint )
{
if ( joinPoint.getArgs() != null && joinPoint.getArgs().length > 0 )
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-support/dhis-support-system/src/main/resources/META-INF/dhis/beans.xml 2010-10-12 07:36:49 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/resources/META-INF/dhis/beans.xml 2010-10-29 12:19:15 +0000
@@ -8,12 +8,14 @@
<bean id="processCoordinator" class="org.amplecode.cave.process.SpringProcessCoordinator" destroy-method="close"/>
- <bean id="deletionInterceptor" class="org.hisp.dhis.system.deletion.DeletionInterceptor"/>
+ <bean id="deletionInterceptor" class="org.hisp.dhis.system.deletion.DeletionInterceptor">
+ <property name="deletionManager" ref="deletionManager"/>
+ </bean>
<bean id="deletionManager" class="org.hisp.dhis.system.deletion.DefaultDeletionManager"/>
- <bean id="databaseInfoProvider" class="org.hisp.dhis.system.database.HibernateDatabaseInfoProvider"/>
-
-
+ <bean id="databaseInfoProvider" class="org.hisp.dhis.system.database.HibernateDatabaseInfoProvider" init-method="init">
+ <property name="hibernateConfigurationProvider" ref="hibernateConfigurationProvider"/>
+ </bean>
</beans>
=== 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-18 13:42:38 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/database/DatabaseInfoProviderTest.java 2010-10-29 12:19:15 +0000
@@ -31,7 +31,6 @@
import org.hisp.dhis.DhisSpringTest;
import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -40,9 +39,14 @@
public class DatabaseInfoProviderTest
extends DhisSpringTest
{
- @Autowired
private DatabaseInfoProvider databaseInfoProvider;
+ @Override
+ public void setUpTest()
+ {
+ databaseInfoProvider = (DatabaseInfoProvider) getBean( "databaseInfoProvider" );
+ }
+
// -------------------------------------------------------------------------
// Tests
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/deletion/DeletionManagerTest.java'
--- dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/deletion/DeletionManagerTest.java 2010-05-17 22:56:52 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/deletion/DeletionManagerTest.java 2010-10-29 12:19:15 +0000
@@ -30,7 +30,6 @@
import org.hisp.dhis.DhisSpringTest;
import org.hisp.dhis.dataelement.DataElement;
import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -39,7 +38,6 @@
public class DeletionManagerTest
extends DhisSpringTest
{
- @Autowired
private DeletionManager deletionManager;
private DataElement dataElement;
@@ -47,6 +45,8 @@
@Override
public void setUpTest()
{
+ deletionManager = (DeletionManager) getBean( "deletionManager" );
+
dataElement = createDataElement( 'A' );
}
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/DataSet.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/DataSet.java 2010-10-28 09:17:13 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/DataSet.java 2010-10-29 12:19:15 +0000
@@ -1,19 +1,15 @@
package org.hisp.dhis.web.api.model;
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlAccessType;
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateReportAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateReportAction.java 2010-10-28 09:17:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateReportAction.java 2010-10-29 12:19:15 +0000
@@ -35,7 +35,6 @@
import org.hisp.dhis.caseentry.state.SelectedStateManager;
import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.patient.PatientService;
import org.hisp.dhis.program.Program;
import org.hisp.dhis.program.ProgramInstance;
import org.hisp.dhis.program.ProgramInstanceService;
@@ -67,13 +66,6 @@
this.selectedStateManager = selectedStateManager;
}
- private PatientService patientService;
-
- public void setPatientService( PatientService patientService )
- {
- this.patientService = patientService;
- }
-
private ProgramService programService;
public void setProgramService( ProgramService programService )
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml 2010-10-28 09:17:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml 2010-10-29 12:19:15 +0000
@@ -324,9 +324,7 @@
<property name="programInstanceService"
ref="org.hisp.dhis.program.ProgramInstanceService"/>
<property name="programStageInstanceService"
- ref="org.hisp.dhis.program.ProgramStageInstanceService"/>
- <property name="patientService"
- ref="org.hisp.dhis.patient.PatientService"/>
+ ref="org.hisp.dhis.program.ProgramStageInstanceService"/>
</bean>
<bean id="org.hisp.dhis.caseentry.action.report.ViewRecordsAction"
=== 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-06-19 17:11:55 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java 2010-10-29 12:19:15 +0000
@@ -36,15 +36,14 @@
import javax.servlet.http.HttpServletRequest;
+import org.apache.struts2.ServletActionContext;
import org.hisp.dhis.external.location.LocationManager;
import org.hisp.dhis.external.location.LocationManagerException;
import org.hisp.dhis.i18n.I18n;
import org.hisp.dhis.system.database.DatabaseInfo;
import org.hisp.dhis.system.database.DatabaseInfoProvider;
import org.hisp.dhis.user.CurrentUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.apache.struts2.ServletActionContext;
import com.opensymphony.xwork2.Action;
/**
@@ -60,12 +59,20 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private LocationManager locationManager;
- @Autowired
+ public void setLocationManager( LocationManager locationManager )
+ {
+ this.locationManager = locationManager;
+ }
+
private DatabaseInfoProvider databaseInfoProvider;
-
+
+ public void setDatabaseInfoProvider( DatabaseInfoProvider databaseInfoProvider )
+ {
+ this.databaseInfoProvider = databaseInfoProvider;
+ }
+
private CurrentUserService currentUserService;
public void setCurrentUserService( CurrentUserService currentUserService )
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ContextInterceptor.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ContextInterceptor.java 2010-08-26 05:33:47 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ContextInterceptor.java 2010-10-29 12:19:15 +0000
@@ -31,7 +31,6 @@
import java.util.Map;
import org.hisp.dhis.system.database.DatabaseInfoProvider;
-import org.springframework.beans.factory.annotation.Autowired;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.Interceptor;
@@ -44,9 +43,13 @@
{
private static final String KEY_IN_MEMORY_DATABASE = "inMemoryDatabase";
- @Autowired
private DatabaseInfoProvider databaseInfoProvider;
+ public void setDatabaseInfoProvider( DatabaseInfoProvider databaseInfoProvider )
+ {
+ this.databaseInfoProvider = databaseInfoProvider;
+ }
+
@Override
public void destroy()
{
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/order/store/FileDataElementOrderStore.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/order/store/FileDataElementOrderStore.java 2010-05-17 21:05:26 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/order/store/FileDataElementOrderStore.java 2010-10-29 12:19:15 +0000
@@ -43,7 +43,6 @@
import org.hisp.dhis.external.location.LocationManager;
import org.hisp.dhis.external.location.LocationManagerException;
import org.hisp.dhis.order.DataElementOrder;
-import org.springframework.beans.factory.annotation.Autowired;
import com.thoughtworks.xstream.XStream;
@@ -63,9 +62,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private LocationManager locationManager;
+ public void setLocationManager( LocationManager locationManager )
+ {
+ this.locationManager = locationManager;
+ }
+
// -------------------------------------------------------------------------
// DataElementOrderStore implementation
// -------------------------------------------------------------------------
=== 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-10-28 09:17:13 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2010-10-29 12:19:15 +0000
@@ -571,7 +571,9 @@
<!-- DataElement Order -->
- <bean id="org.hisp.dhis.order.store.DataElementOrderStore" class="org.hisp.dhis.order.store.FileDataElementOrderStore"/>
+ <bean id="org.hisp.dhis.order.store.DataElementOrderStore" class="org.hisp.dhis.order.store.FileDataElementOrderStore">
+ <property name="locationManager" ref="locationManager"/>
+ </bean>
<bean id="org.hisp.dhis.order.manager.DataElementOrderManager"
class="org.hisp.dhis.order.manager.DefaultDataElementOrderManager">
@@ -595,6 +597,8 @@
<!-- About -->
<bean id="org.hisp.dhis.about.action.AboutAction" class="org.hisp.dhis.about.action.AboutAction" scope="prototype">
+ <property name="locationManager" ref="locationManager"/>
+ <property name="databaseInfoProvider" ref="databaseInfoProvider"/>
<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService"/>
</bean>
@@ -797,7 +801,9 @@
</bean>
<bean id="org.hisp.dhis.interceptor.ContextInterceptor"
- class="org.hisp.dhis.interceptor.ContextInterceptor"/>
+ class="org.hisp.dhis.interceptor.ContextInterceptor">
+ <property name="databaseInfoProvider" ref="databaseInfoProvider"/>
+ </bean>
<bean id="org.hisp.dhis.useraccount.action.GetCurrentUserAction"
class="org.hisp.dhis.useraccount.action.GetCurrentUserAction" scope="prototype">
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportLocationManager.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportLocationManager.java 2010-05-17 21:05:26 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportLocationManager.java 2010-10-29 12:19:15 +0000
@@ -33,13 +33,11 @@
import org.hisp.dhis.external.location.LocationManagerException;
import org.hisp.dhis.options.SystemSettingManager;
import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Tran Thanh Tri
* @version $Id$
*/
-
public class DefaultReportLocationManager
implements ReportLocationManager
{
@@ -51,21 +49,25 @@
// Dependency
// -------------------------------------------
- @Autowired
private LocationManager locationManager;
+ public void setLocationManager( LocationManager locationManager )
+ {
+ this.locationManager = locationManager;
+ }
+
private SystemSettingManager systemSettingManager;
- // -------------------------------------------
- // Setter
- // -------------------------------------------
-
public void setSystemSettingManager( SystemSettingManager systemSettingManager )
{
this.systemSettingManager = systemSettingManager;
}
// -------------------------------------------
+ // Setter
+ // -------------------------------------------
+
+ // -------------------------------------------
// Init
// -------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportSupport.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportSupport.java 2010-09-16 07:33:22 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportSupport.java 2010-10-29 12:19:15 +0000
@@ -73,7 +73,6 @@
import org.hisp.dhis.reportexcel.ReportExcelItem;
import org.hisp.dhis.reportexcel.ReportExcelService;
import org.hisp.dhis.reportexcel.ReportLocationManager;
-import org.hisp.dhis.reportexcel.period.db.PeriodDatabaseService;
import org.hisp.dhis.reportexcel.period.generic.PeriodGenericManager;
import org.hisp.dhis.reportexcel.preview.manager.InitializePOIStylesManager;
import org.hisp.dhis.reportexcel.state.SelectionManager;
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/jchart/action/AddJChartAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/jchart/action/AddJChartAction.java 2010-10-07 07:10:30 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/jchart/action/AddJChartAction.java 2010-10-29 12:19:15 +0000
@@ -36,7 +36,6 @@
import org.hisp.dhis.jchart.JChartSevice;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.user.CurrentUserService;
-import org.hisp.dhis.user.UserStore;
import com.opensymphony.xwork2.Action;
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2010-10-07 07:10:30 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2010-10-29 12:19:15 +0000
@@ -12,6 +12,7 @@
<bean id="org.hisp.dhis.reportexcel.ReportLocationManager" class="org.hisp.dhis.reportexcel.DefaultReportLocationManager"
init-method="init">
+ <property name="locationManager" ref="locationManager"/>
<property name="systemSettingManager" ref="org.hisp.dhis.options.SystemSettingManager" />
</bean>
=== 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-05-17 22:14:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/cache/ClearCacheAction.java 2010-10-29 12:19:15 +0000
@@ -28,7 +28,6 @@
*/
import org.hisp.dhis.cache.HibernateCacheManager;
-import org.springframework.beans.factory.annotation.Autowired;
import com.opensymphony.xwork2.Action;
@@ -43,9 +42,13 @@
// 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-05-17 22:14:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/cache/ShowCacheAction.java 2010-10-29 12:19:15 +0000
@@ -29,7 +29,6 @@
import org.hibernate.stat.Statistics;
import org.hisp.dhis.cache.HibernateCacheManager;
-import org.springframework.beans.factory.annotation.Autowired;
import com.opensymphony.xwork2.Action;
@@ -46,9 +45,13 @@
// 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-10-24 15:41:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml 2010-10-29 12:19:15 +0000
@@ -87,10 +87,14 @@
<!-- Cache -->
<bean id="org.hisp.dhis.dataadmin.action.cache.ShowCacheAction"
- class="org.hisp.dhis.dataadmin.action.cache.ShowCacheAction" scope="prototype"/>
+ class="org.hisp.dhis.dataadmin.action.cache.ShowCacheAction" scope="prototype">
+ <property name="cacheManager" ref="cacheManager"/>
+ </bean>
<bean id="org.hisp.dhis.dataadmin.action.cache.ClearCacheAction"
- class="org.hisp.dhis.dataadmin.action.cache.ClearCacheAction" scope="prototype"/>
+ class="org.hisp.dhis.dataadmin.action.cache.ClearCacheAction" scope="prototype">
+ <property name="cacheManager" ref="cacheManager"/>
+ </bean>
<!-- Data integrity -->
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ValidateIndicatorGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ValidateIndicatorGroupSetAction.java 2010-09-08 10:40:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ValidateIndicatorGroupSetAction.java 2010-10-29 12:19:15 +0000
@@ -30,7 +30,6 @@
import org.hisp.dhis.i18n.I18n;
import org.hisp.dhis.indicator.IndicatorGroupSet;
import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.indicator.IndicatorType;
import com.opensymphony.xwork2.Action;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ExportDataEntryFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ExportDataEntryFormAction.java 2010-10-12 07:36:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ExportDataEntryFormAction.java 2010-10-29 12:19:15 +0000
@@ -32,13 +32,10 @@
import java.io.InputStream;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
import org.hisp.dhis.dataentryform.DataEntryForm;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.dataset.DataSetService;
-import org.hisp.dhis.system.util.StreamUtils;
import com.opensymphony.xwork2.Action;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserListAction.java 2010-10-29 05:24:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserListAction.java 2010-10-29 12:19:15 +0000
@@ -44,7 +44,7 @@
* @version $Id: GetUserListAction.java 2869 2007-02-20 14:26:09Z andegje $
*/
public class GetUserListAction
- extends ActionPagingSupport
+ extends ActionPagingSupport<User>
{
// -------------------------------------------------------------------------
// Dependencies
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.java 2010-09-14 09:03:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.java 2010-10-29 12:19:15 +0000
@@ -29,16 +29,11 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
-import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitGroupNameComparator;
import org.hisp.dhis.oust.manager.SelectionTreeManager;
import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager;
-import org.hisp.dhis.user.CurrentUserService;
import org.hisp.dhis.user.User;
import org.hisp.dhis.user.UserAuthorityGroup;
import org.hisp.dhis.user.UserCredentials;
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/document/action/RemoveDocumentAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/document/action/RemoveDocumentAction.java 2010-05-17 21:05:26 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/document/action/RemoveDocumentAction.java 2010-10-29 12:19:15 +0000
@@ -35,7 +35,6 @@
import org.hisp.dhis.document.DocumentService;
import org.hisp.dhis.external.location.LocationManager;
import org.hisp.dhis.external.location.LocationManagerException;
-import org.springframework.beans.factory.annotation.Autowired;
import com.opensymphony.xwork2.Action;
@@ -52,9 +51,13 @@
// Dependencies
// -------------------------------------------------------------------------
- @Autowired
private LocationManager locationManager;
+ public void setLocationManager( LocationManager locationManager )
+ {
+ this.locationManager = locationManager;
+ }
+
private DocumentService documentService;
public void setDocumentService( DocumentService documentService )
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/document/action/SaveDocumentAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/document/action/SaveDocumentAction.java 2010-09-20 08:49:55 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/document/action/SaveDocumentAction.java 2010-10-29 12:19:15 +0000
@@ -34,7 +34,6 @@
import org.hisp.dhis.document.Document;
import org.hisp.dhis.document.DocumentService;
import org.hisp.dhis.external.location.LocationManager;
-import org.springframework.beans.factory.annotation.Autowired;
import com.opensymphony.xwork2.Action;
@@ -55,6 +54,13 @@
// Dependencies
// -------------------------------------------------------------------------
+ private LocationManager locationManager;
+
+ public void setLocationManager( LocationManager locationManager )
+ {
+ this.locationManager = locationManager;
+ }
+
private DocumentService documentService;
public void setDocumentService( DocumentService documentService )
@@ -62,9 +68,6 @@
this.documentService = documentService;
}
- @Autowired
- private LocationManager locationManager;
-
// -------------------------------------------------------------------------
// Input
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml 2010-10-15 08:07:52 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml 2010-10-29 12:19:15 +0000
@@ -12,6 +12,7 @@
<bean id="org.hisp.dhis.reporting.document.action.SaveDocumentAction"
class="org.hisp.dhis.reporting.document.action.SaveDocumentAction"
scope="prototype">
+ <property name="locationManager" ref="locationManager"/>
<property name="documentService"
ref="org.hisp.dhis.document.DocumentService"/>
</bean>
@@ -33,6 +34,7 @@
<bean id="org.hisp.dhis.reporting.document.action.RemoveDocumentAction"
class="org.hisp.dhis.reporting.document.action.RemoveDocumentAction"
scope="prototype">
+ <property name="locationManager" ref="locationManager"/>
<property name="documentService"
ref="org.hisp.dhis.document.DocumentService"/>
</bean>
