------------------------------------------------------------ revno: 1837 committer: Lars <larsh...@larshelg-laptop> branch nick: trunk timestamp: Tue 2010-05-11 16:20:51 +0200 message: Merged dhis-support-i18n into dhis-service-core. The reason is that i18n-db must depend on UserSettingService. Added a MockLocaleManager since there is no user during tests. removed: dhis-2/dhis-support/dhis-support-i18n/ dhis-2/dhis-support/dhis-support-i18n/pom.xml dhis-2/dhis-support/dhis-support-i18n/src/ dhis-2/dhis-support/dhis-support-i18n/src/main/ dhis-2/dhis-support/dhis-support-i18n/src/main/java/ dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/ dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/ dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/ dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/i18n/ dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/i18n/DefaultI18nService.java dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/i18n/I18nObject.java dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/i18n/I18nService.java dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/i18n/I18nUtils.java dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/i18n/interceptor/ dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/i18n/interceptor/I18nObjectInterceptor.java dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/i18n/interceptor/I18nTranslationInterceptor.java dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/i18n/locale/ dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/i18n/locale/DatabaseLocaleManager.java dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/i18n/locale/SessionLocaleManager.java dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/i18n/util/ dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/i18n/util/LocaleUtils.java dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/translation/ dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/translation/hibernate/ dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/translation/hibernate/HibernateTranslationStore.java dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/translation/impl/ dhis-2/dhis-support/dhis-support-i18n/src/main/java/org/hisp/dhis/translation/impl/DefaultTranslationService.java dhis-2/dhis-support/dhis-support-i18n/src/main/resources/ dhis-2/dhis-support/dhis-support-i18n/src/main/resources/META-INF/ dhis-2/dhis-support/dhis-support-i18n/src/main/resources/META-INF/dhis/ dhis-2/dhis-support/dhis-support-i18n/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-support/dhis-support-i18n/src/main/resources/org/ dhis-2/dhis-support/dhis-support-i18n/src/main/resources/org/hisp/ dhis-2/dhis-support/dhis-support-i18n/src/main/resources/org/hisp/dhis/ dhis-2/dhis-support/dhis-support-i18n/src/main/resources/org/hisp/dhis/translation/ dhis-2/dhis-support/dhis-support-i18n/src/main/resources/org/hisp/dhis/translation/hibernate/ dhis-2/dhis-support/dhis-support-i18n/src/main/resources/org/hisp/dhis/translation/hibernate/Translation.hbm.xml dhis-2/dhis-support/dhis-support-i18n/src/test/ dhis-2/dhis-support/dhis-support-i18n/src/test/java/ dhis-2/dhis-support/dhis-support-i18n/src/test/java/org/ dhis-2/dhis-support/dhis-support-i18n/src/test/java/org/hisp/ dhis-2/dhis-support/dhis-support-i18n/src/test/java/org/hisp/dhis/ dhis-2/dhis-support/dhis-support-i18n/src/test/java/org/hisp/dhis/i18n/ dhis-2/dhis-support/dhis-support-i18n/src/test/java/org/hisp/dhis/i18n/I18nServiceTest.java dhis-2/dhis-support/dhis-support-i18n/src/test/java/org/hisp/dhis/i18n/I18nServiceTranslationTest.java dhis-2/dhis-support/dhis-support-i18n/src/test/java/org/hisp/dhis/translation/ dhis-2/dhis-support/dhis-support-i18n/src/test/java/org/hisp/dhis/translation/TranslationServiceTest.java dhis-2/dhis-support/dhis-support-i18n/src/test/java/org/hisp/dhis/translation/TranslationStoreTest.java dhis-2/dhis-support/dhis-support-i18n/src/test/resources/ added: dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/DefaultI18nService.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/I18nObject.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/I18nService.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/I18nUtils.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/interceptor/ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/interceptor/I18nObjectInterceptor.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/interceptor/I18nTranslationInterceptor.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/locale/ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/locale/DatabaseLocaleManager.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/translation/ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/translation/DefaultTranslationService.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/translation/hibernate/ 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/resources/org/hisp/dhis/translation/ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/translation/hibernate/ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/translation/hibernate/Translation.hbm.xml dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/i18n/ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/i18n/I18nServiceTest.java dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/i18n/I18nServiceTranslationTest.java dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/mock/ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/mock/MockLocaleManager.java dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/translation/ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/translation/TranslationServiceTest.java dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/translation/TranslationStoreTest.java dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/LocaleUtils.java modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/locale/LocaleManager.java dhis-2/dhis-services/dhis-service-core/pom.xml dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java dhis-2/dhis-support/pom.xml dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/GetTranslationsAction.java dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/TranslateAction.java dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/ValidateAddDuplicatedTranslationAction.java dhis-2/pom.xml The size of the diff (5553 lines) is larger than your specified limit of 1000 lines
-- 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 _______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
