dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1879
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Tue 2010-05-18 16:57:16 +0200
message:
  Minor fix
modified:
  dhis-2/dhis-services/dhis-service-reporting/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


--
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-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml	2010-05-18 14:13:30 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml	2010-05-18 14:57:16 +0000
@@ -81,7 +81,7 @@
       value="reports"/>
     <property name="reportConfigFile" 
       value="reportConfiguration.xml"/>
-	<property name="jdbcConfiguration" value="jdbcConfiguration"/> 
+	<property name="jdbcConfiguration" ref="jdbcConfiguration"/> 
   </bean>
   
   <!-- Chart -->

=== 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-17 21:31:03 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/configuration/JdbcConfigurationFactoryBean.java	2010-05-18 14:57:16 +0000
@@ -61,7 +61,7 @@
     @Autowired
     private HibernateConfigurationProvider configurationProvider;
     
-    private JdbcConfiguration jdbcConfiguration;
+    private JdbcConfiguration jdbcConfig;
 
     // -------------------------------------------------------------------------
     // Initialisation
@@ -101,7 +101,7 @@
         config.setUsername( hibernateConfiguration.getProperty( KEY_USERNAME ) );
         config.setPassword( hibernateConfiguration.getProperty( KEY_PASSWORD ) );
         
-        this.jdbcConfiguration = config;
+        this.jdbcConfig = config;
     }
 
     // -------------------------------------------------------------------------
@@ -111,7 +111,7 @@
     public JdbcConfiguration getObject()
         throws Exception
     {
-        return jdbcConfiguration;
+        return jdbcConfig;
     }
 
     public Class<JdbcConfiguration> getObjectType()