dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1636
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Fri 2010-03-12 10:56:06 +0100
message:
  Temporary disabled LocaleManagerDb bean. Caused build failures because user module isn't included as a dependency. But including it leads to cyclic dependency errors. Refactor to come.
modified:
  dhis-2/dhis-i18n/dhis-i18n-db/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-i18n/dhis-i18n-db/src/test/java/org/hisp/dhis/i18n/I18nServiceTest.java
  dhis-2/dhis-i18n/dhis-i18n-db/src/test/java/org/hisp/dhis/i18n/I18nServiceTranslationTest.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-i18n/dhis-i18n-db/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-i18n/dhis-i18n-db/src/main/resources/META-INF/dhis/beans.xml	2010-03-11 06:27:12 +0000
+++ dhis-2/dhis-i18n/dhis-i18n-db/src/main/resources/META-INF/dhis/beans.xml	2010-03-12 09:56:06 +0000
@@ -7,7 +7,7 @@
 	<bean id="org.hisp.dhis.i18n.locale.LocaleManagerSession" class="org.hisp.dhis.i18n.locale.SessionLocaleManager">
 		<property name="systemLocale" value="en_GB" />
 	</bean>
-
+<!--
 	<bean id="org.hisp.dhis.i18n.locale.LocaleManagerDb" class="org.hisp.dhis.i18n.locale.DatabaseLocaleManager">
 		<property name="userSettingService">
 			<ref bean="org.hisp.dhis.user.UserSettingService" />
@@ -19,7 +19,7 @@
 			<value>en_GB</value>
 		</property>
 	</bean>
-
+-->
 	<!-- I18n object definitions -->
 
 	<bean id="I18nDataElement" class="org.hisp.dhis.i18n.I18nObject">
@@ -218,7 +218,7 @@
 
 	<bean id="org.hisp.dhis.i18n.I18nService" class="org.hisp.dhis.i18n.DefaultI18nService">
 		<property name="localeManager">
-			<ref bean="org.hisp.dhis.i18n.locale.LocaleManagerDb" />
+			<ref bean="org.hisp.dhis.i18n.locale.LocaleManagerSession" />
 		</property>
 		<property name="translationService">
 			<ref bean="org.hisp.dhis.translation.TranslationService" />

=== modified file 'dhis-2/dhis-i18n/dhis-i18n-db/src/test/java/org/hisp/dhis/i18n/I18nServiceTest.java'
--- dhis-2/dhis-i18n/dhis-i18n-db/src/test/java/org/hisp/dhis/i18n/I18nServiceTest.java	2009-11-10 01:44:26 +0000
+++ dhis-2/dhis-i18n/dhis-i18n-db/src/test/java/org/hisp/dhis/i18n/I18nServiceTest.java	2010-03-12 09:56:06 +0000
@@ -64,7 +64,7 @@
     {
         i18nService = (I18nService) getBean( I18nService.ID );
 
-        localeManager = (LocaleManager) getBean( "org.hisp.dhis.i18n.locale.LocaleManagerDb" );
+        localeManager = (LocaleManager) getBean( "org.hisp.dhis.i18n.locale.LocaleManagerSession" );
     }
 
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-i18n/dhis-i18n-db/src/test/java/org/hisp/dhis/i18n/I18nServiceTranslationTest.java'
--- dhis-2/dhis-i18n/dhis-i18n-db/src/test/java/org/hisp/dhis/i18n/I18nServiceTranslationTest.java	2009-11-10 01:44:26 +0000
+++ dhis-2/dhis-i18n/dhis-i18n-db/src/test/java/org/hisp/dhis/i18n/I18nServiceTranslationTest.java	2010-03-12 09:56:06 +0000
@@ -78,7 +78,7 @@
     {
         i18nService = (I18nService) getBean( I18nService.ID );
 
-        localeManager = (LocaleManager) getBean( "org.hisp.dhis.i18n.locale.LocaleManagerDb" );
+        localeManager = (LocaleManager) getBean( "org.hisp.dhis.i18n.locale.LocaleManagerSession" );
         
         translationService = (TranslationService) getBean( TranslationService.ID );