dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #08711
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2155: Upgraded to quick 1.3
------------------------------------------------------------
revno: 2155
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2010-11-23 17:12:57 +0100
message:
Upgraded to quick 1.3
modified:
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/batchhandler/AggregatedDataValueBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedIndicatorValueBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryCategoryOptionAssociationBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryComboCategoryAssociationBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CompleteDataSetRegistrationBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ConceptBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryDataElementBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryIndicatorBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryComboBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryOptionBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupMemberBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetMemberBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetCompletenessResultBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetMemberBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetSourceAssociationBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GenericBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetMemberBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ImportDataValueBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupMemberBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetMemberBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorTypeBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupMemberBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/PeriodBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ReportTableBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/SourceBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/dialect/StatementDialectFactoryBean.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/resources/META-INF/dhis/beans.xml
dhis-2/pom.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-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-10-29 12:19:15 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml 2010-11-23 16:12:57 +0000
@@ -53,7 +53,7 @@
</bean>
<bean id="dataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close">
- <property name="driverClass" ref="driverClassName"/>
+ <property name="driverClass" ref="driverClass"/>
<property name="jdbcUrl" ref="url"/>
<property name="user" ref="username"/>
<property name="password" ref="password"/>
@@ -63,7 +63,7 @@
<property name="dataSource" ref="dataSource"/>
</bean>
- <bean id="driverClassName" class="org.hisp.dhis.hibernate.ConnectionPropertyFactoryBean">
+ <bean id="driverClass" class="org.hisp.dhis.hibernate.ConnectionPropertyFactoryBean">
<property name="hibernateConfigurationProvider" ref="hibernateConfigurationProvider"/>
<property name="hibernateProperty" value="hibernate.connection.driver_class"/>
</bean>
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedDataValueBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedDataValueBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedDataValueBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.aggregation.AggregatedDataValue;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public AggregatedDataValueBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public AggregatedDataValueBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, true, true );
+ super( config, true, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedIndicatorValueBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedIndicatorValueBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedIndicatorValueBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.aggregation.AggregatedIndicatorValue;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public AggregatedIndicatorValueBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public AggregatedIndicatorValueBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, true, true );
+ super( config, true, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryCategoryOptionAssociationBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryCategoryOptionAssociationBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryCategoryOptionAssociationBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.importexport.GroupMemberAssociation;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public CategoryCategoryOptionAssociationBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public CategoryCategoryOptionAssociationBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, true, true );
+ super( config, true, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryComboCategoryAssociationBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryComboCategoryAssociationBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryComboCategoryAssociationBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.importexport.GroupMemberAssociation;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public CategoryComboCategoryAssociationBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public CategoryComboCategoryAssociationBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, true, true );
+ super( config, true, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CompleteDataSetRegistrationBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CompleteDataSetRegistrationBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CompleteDataSetRegistrationBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.dataset.CompleteDataSetRegistration;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public CompleteDataSetRegistrationBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public CompleteDataSetRegistrationBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, true, true );
+ super( config, true, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ConceptBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ConceptBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ConceptBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.concept.Concept;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public ConceptBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public ConceptBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, false, false );
+ super( config, false, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.datadictionary.DataDictionary;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public DataDictionaryBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public DataDictionaryBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, false, false );
+ super( config, false, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryDataElementBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryDataElementBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryDataElementBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.importexport.GroupMemberAssociation;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public DataDictionaryDataElementBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public DataDictionaryDataElementBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, true, true );
+ super( config, true, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryIndicatorBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryIndicatorBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryIndicatorBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.importexport.GroupMemberAssociation;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public DataDictionaryIndicatorBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public DataDictionaryIndicatorBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, true, true );
+ super( config, true, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.dataelement.DataElement;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public DataElementBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public DataElementBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, false, false );
+ super( config, false, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.dataelement.DataElementCategory;
@@ -40,15 +38,13 @@
public class DataElementCategoryBatchHandler
extends AbstractBatchHandler<DataElementCategory>
{
-
-
// -------------------------------------------------------------------------
// Constructor
// -------------------------------------------------------------------------
- public DataElementCategoryBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public DataElementCategoryBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, false, false );
+ super( config, false, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryComboBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryComboBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryComboBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public DataElementCategoryComboBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public DataElementCategoryComboBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, false, false );
+ super( config, false, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryOptionBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryOptionBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryOptionBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.dataelement.DataElementCategoryOption;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public DataElementCategoryOptionBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public DataElementCategoryOptionBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, false, false );
+ super( config, false, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.dataelement.DataElementGroup;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public DataElementGroupBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public DataElementGroupBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, false, false );
+ super( config, false, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupMemberBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupMemberBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.importexport.GroupMemberAssociation;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public DataElementGroupMemberBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public DataElementGroupMemberBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, true, true );
+ super( config, true, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.dataelement.DataElementGroupSet;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public DataElementGroupSetBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public DataElementGroupSetBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, false, false );
+ super( config, false, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetMemberBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetMemberBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.importexport.GroupMemberAssociation;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public DataElementGroupSetMemberBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public DataElementGroupSetMemberBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, true, true );
+ super( config, true, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.dataset.DataSet;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public DataSetBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public DataSetBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, false, false );
+ super( config, false, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetCompletenessResultBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetCompletenessResultBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetCompletenessResultBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.completeness.DataSetCompletenessResult;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public DataSetCompletenessResultBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public DataSetCompletenessResultBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, true, true );
+ super( config, true, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetMemberBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetMemberBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.importexport.GroupMemberAssociation;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public DataSetMemberBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public DataSetMemberBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, true, true );
+ super( config, true, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetSourceAssociationBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetSourceAssociationBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetSourceAssociationBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -1,8 +1,6 @@
package org.hisp.dhis.jdbc.batchhandler;
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.importexport.GroupMemberAssociation;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public DataSetSourceAssociationBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public DataSetSourceAssociationBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, true, true );
+ super( config, true, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.datavalue.DataValue;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public DataValueBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public DataValueBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, true, true );
+ super( config, true, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GenericBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GenericBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GenericBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -29,9 +29,7 @@
import java.util.List;
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
/**
@@ -45,9 +43,9 @@
// Constructor
// -------------------------------------------------------------------------
- public GenericBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public GenericBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, true, true );
+ super( config, true, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public GroupSetBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public GroupSetBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, false, false );
+ super( config, false, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetMemberBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetMemberBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.importexport.GroupMemberAssociation;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public GroupSetMemberBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public GroupSetMemberBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, true, true );
+ super( config, true, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ImportDataValueBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ImportDataValueBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ImportDataValueBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.importexport.ImportDataValue;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public ImportDataValueBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public ImportDataValueBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, true, true );
+ super( config, true, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.indicator.Indicator;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public IndicatorBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public IndicatorBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, false, false );
+ super( config, false, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.indicator.IndicatorGroup;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public IndicatorGroupBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public IndicatorGroupBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, false, false );
+ super( config, false, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupMemberBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupMemberBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.importexport.GroupMemberAssociation;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public IndicatorGroupMemberBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public IndicatorGroupMemberBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, true, true );
+ super( config, true, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.indicator.IndicatorGroupSet;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public IndicatorGroupSetBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public IndicatorGroupSetBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, false, false );
+ super( config, false, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetMemberBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetMemberBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.importexport.GroupMemberAssociation;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public IndicatorGroupSetMemberBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public IndicatorGroupSetMemberBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, true, true );
+ super( config, true, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorTypeBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorTypeBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorTypeBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.indicator.IndicatorType;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public IndicatorTypeBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public IndicatorTypeBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, false, false );
+ super( config, false, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.organisationunit.OrganisationUnit;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public OrganisationUnitBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public OrganisationUnitBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, true, false );
+ super( config, true, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public OrganisationUnitGroupBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public OrganisationUnitGroupBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, false, false );
+ super( config, false, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupMemberBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupMemberBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.importexport.GroupMemberAssociation;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public OrganisationUnitGroupMemberBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public OrganisationUnitGroupMemberBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, true, true );
+ super( config, true, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/PeriodBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/PeriodBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/PeriodBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.period.Period;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public PeriodBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public PeriodBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, false, true );
+ super( config, false, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ReportTableBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ReportTableBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ReportTableBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.reporttable.ReportTable;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public ReportTableBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public ReportTableBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, false, false );
+ super( config, false, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/SourceBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/SourceBatchHandler.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/SourceBatchHandler.java 2010-11-23 16:12:57 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import javax.sql.DataSource;
-
-import org.amplecode.quick.StatementDialect;
+import org.amplecode.quick.JdbcConfiguration;
import org.amplecode.quick.batchhandler.AbstractBatchHandler;
import org.hisp.dhis.source.Source;
@@ -44,9 +42,9 @@
// Constructor
// -------------------------------------------------------------------------
- public SourceBatchHandler( DataSource dataSource, StatementDialect dialect )
+ public SourceBatchHandler( JdbcConfiguration config )
{
- super( dataSource, dialect, false, false );
+ super( config, false, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/dialect/StatementDialectFactoryBean.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/dialect/StatementDialectFactoryBean.java 2010-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/dialect/StatementDialectFactoryBean.java 2010-11-23 16:12:57 +0000
@@ -79,9 +79,9 @@
String dialect = hibernateConfiguration.getProperty( KEY_DIALECT );
- this.statementDialect = dialectMap.get( dialect );
+ statementDialect = dialectMap.get( dialect );
- if ( this.statementDialect == null )
+ if ( statementDialect == null )
{
throw new RuntimeException( "Unsupported dialect: " + dialect );
}
@@ -95,11 +95,11 @@
public StatementDialect getObject()
throws Exception
{
- return this.statementDialect;
+ return statementDialect;
}
@Override
- public Class<?> getObjectType()
+ public Class<StatementDialect> getObjectType()
{
return StatementDialect.class;
}
=== 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-11-10 13:45:42 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/resources/META-INF/dhis/beans.xml 2010-11-23 16:12:57 +0000
@@ -7,32 +7,41 @@
<!-- StatementManager -->
<bean id="statementManager" class="org.amplecode.quick.statement.JdbcStatementManager">
- <property name="dataSource" ref="dataSource"/>
+ <property name="jdbcConfiguration" ref="jdbcConfiguration"/>
</bean>
<!-- BatchHandlerFactory -->
<bean id="batchHandlerFactory" class="org.amplecode.quick.factory.DefaultBatchHandlerFactory">
- <property name="dataSource" ref="dataSource"/>
- <property name="statementDialect" ref="statementDialect"/>
+ <property name="jdbcConfiguration" ref="jdbcConfiguration"/>
</bean>
-
+
<!-- Interceptor -->
<bean id="statementInterceptor" class="org.hisp.dhis.jdbc.StatementInterceptor">
<property name="statementManager" ref="statementManager"/>
</bean>
-
+
<!-- StatementDialect -->
<bean id="statementDialect" class="org.hisp.dhis.jdbc.dialect.StatementDialectFactoryBean" init-method="init">
<property name="hibernateConfigurationProvider" ref="hibernateConfigurationProvider"/>
</bean>
-
+
<!-- StatementBuilder -->
<bean id="statementBuilder" class="org.hisp.dhis.jdbc.statementbuilder.StatementBuilderFactoryBean" init-method="init">
<property name="statementDialect" ref="statementDialect"/>
</bean>
-
+
+ <!-- JdbcConfiguration -->
+
+ <bean id="jdbcConfiguration" class="org.amplecode.quick.configuration.JdbcConfigurationFactoryBean" init-method="init">
+ <property name="dialect" ref="statementDialect"/>
+ <property name="driverClass" ref="driverClass"/>
+ <property name="connectionUrl" ref="url"/>
+ <property name="username" ref="username"/>
+ <property name="password" ref="password"/>
+ </bean>
+
</beans>
\ No newline at end of file
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2010-11-10 13:45:42 +0000
+++ dhis-2/pom.xml 2010-11-23 16:12:57 +0000
@@ -375,7 +375,7 @@
<dependency>
<groupId>org.amplecode</groupId>
<artifactId>quick</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>com.lowagie</groupId>
