dhis2-devs team mailing list archive

Thread
Date
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1799: Merged dhis-useradminandsecurity and dhis-service-user into dhis-service-core. Renamed and moved ...

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Wed, 21 Apr 2010 19:46:33 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx
------------------------------------------------------------
revno: 1799
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-04-21 21:45:12 +0200
message:
  Merged dhis-useradminandsecurity and dhis-service-user into dhis-service-core. Renamed and moved dhis-options to dhis-service/dhis-service-options. Renamed and moved dhis-service-jdbc to dhis-support/dhis-support-jdbc. Renamed and moved dhis-service-jdbc-test to dhis-support/dhis-support-jdbc-test.
removed:
  dhis-2/dhis-services/dhis-service-user-hibernate/
  dhis-2/dhis-services/dhis-service-user-hibernate/pom.xml
  dhis-2/dhis-services/dhis-service-user-hibernate/src/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/java/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/java/org/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/java/org/hisp/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/java/org/hisp/dhis/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/java/org/hisp/dhis/user/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/java/org/hisp/dhis/user/DefaultCurrentUserService.java
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/java/org/hisp/dhis/user/DefaultUserService.java
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/java/org/hisp/dhis/user/UserAuthorityGroupDeletionHandler.java
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/java/org/hisp/dhis/user/UserCredentialsDeletionHandler.java
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/java/org/hisp/dhis/user/UserDeletionHandler.java
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/java/org/hisp/dhis/user/UserSettingDeletionHandler.java
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/java/org/hisp/dhis/user/hibernate/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserStore.java
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/META-INF/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/META-INF/dhis/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/org/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/org/hisp/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/org/hisp/dhis/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/org/hisp/dhis/user/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/org/hisp/dhis/user/hibernate/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/org/hisp/dhis/user/hibernate/User.hbm.xml
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/org/hisp/dhis/user/hibernate/UserAuthorityGroup.hbm.xml
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/org/hisp/dhis/user/hibernate/UserCredentials.hbm.xml
  dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/org/hisp/dhis/user/hibernate/UserSetting.hbm.xml
  dhis-2/dhis-services/dhis-service-user-hibernate/src/test/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/test/java/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/test/java/org/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/test/java/org/hisp/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/test/java/org/hisp/dhis/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/test/java/org/hisp/dhis/user/
  dhis-2/dhis-services/dhis-service-user-hibernate/src/test/java/org/hisp/dhis/user/UserStoreTest.java
  dhis-2/dhis-services/dhis-service-user-hibernate/src/test/resources/
  dhis-2/dhis-useradminandsecurity/
  dhis-2/dhis-useradminandsecurity/pom.xml
  dhis-2/dhis-useradminandsecurity/src/
  dhis-2/dhis-useradminandsecurity/src/main/
  dhis-2/dhis-useradminandsecurity/src/main/java/
  dhis-2/dhis-useradminandsecurity/src/main/java/org/
  dhis-2/dhis-useradminandsecurity/src/main/java/org/hisp/
  dhis-2/dhis-useradminandsecurity/src/main/java/org/hisp/dhis/
  dhis-2/dhis-useradminandsecurity/src/main/java/org/hisp/dhis/security/
  dhis-2/dhis-useradminandsecurity/src/main/java/org/hisp/dhis/security/DefaultUsernameSaltSource.java
  dhis-2/dhis-useradminandsecurity/src/main/java/org/hisp/dhis/security/PasswordManager.java
  dhis-2/dhis-useradminandsecurity/src/main/java/org/hisp/dhis/security/UsernameSaltSource.java
  dhis-2/dhis-useradminandsecurity/src/main/java/org/hisp/dhis/security/hibernate/
  dhis-2/dhis-useradminandsecurity/src/main/java/org/hisp/dhis/security/hibernate/HibernateUserDetailsService.java
  dhis-2/dhis-useradminandsecurity/src/main/java/org/hisp/dhis/security/spring/
  dhis-2/dhis-useradminandsecurity/src/main/java/org/hisp/dhis/security/spring/AbstractSpringSecurityCurrentUserService.java
  dhis-2/dhis-useradminandsecurity/src/main/java/org/hisp/dhis/security/spring/SpringSecurityPasswordManager.java
  dhis-2/dhis-useradminandsecurity/src/main/java/org/hisp/dhis/security/vote/
  dhis-2/dhis-useradminandsecurity/src/main/java/org/hisp/dhis/security/vote/AllRequiredRoleVoter.java
  dhis-2/dhis-useradminandsecurity/src/main/resources/
  dhis-2/dhis-useradminandsecurity/src/main/resources/META-INF/
  dhis-2/dhis-useradminandsecurity/src/main/resources/META-INF/dhis/
  dhis-2/dhis-useradminandsecurity/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-useradminandsecurity/src/test/
  dhis-2/dhis-useradminandsecurity/src/test/java/
  dhis-2/dhis-useradminandsecurity/src/test/resources/
added:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultUsernameSaltSource.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/PasswordManager.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/UsernameSaltSource.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/hibernate/
  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/spring/
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/AbstractSpringSecurityCurrentUserService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/SpringSecurityPasswordManager.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/vote/
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/vote/AllRequiredRoleVoter.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultCurrentUserService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserAuthorityGroupDeletionHandler.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserCredentialsDeletionHandler.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserDeletionHandler.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserSettingDeletionHandler.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/
  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/org/hisp/dhis/user/
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/User.hbm.xml
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserAuthorityGroup.hbm.xml
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserCredentials.hbm.xml
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserSetting.hbm.xml
  dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/user/
  dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/user/UserStoreTest.java
renamed:
  dhis-2/dhis-options/ => dhis-2/dhis-services/dhis-service-options/
  dhis-2/dhis-services/dhis-service-jdbc/ => dhis-2/dhis-support/dhis-support-jdbc/
  dhis-2/dhis-services/dhis-service-jdbc-test/ => dhis-2/dhis-support/dhis-support-jdbc-test/
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java
  dhis-2/dhis-i18n/dhis-i18n-static/pom.xml
  dhis-2/dhis-i18n/dhis-i18n-upgrader/pom.xml
  dhis-2/dhis-services/dhis-service-administration/pom.xml
  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-services/dhis-service-datamart-default/pom.xml
  dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportExcelService.java
  dhis-2/dhis-services/dhis-service-mapping/pom.xml
  dhis-2/dhis-services/dhis-service-options/pom.xml
  dhis-2/dhis-services/dhis-service-patient/pom.xml
  dhis-2/dhis-services/dhis-service-reporting/pom.xml
  dhis-2/dhis-services/dhis-service-xml/pom.xml
  dhis-2/dhis-services/pom.xml
  dhis-2/dhis-support/dhis-support-jdbc-test/pom.xml
  dhis-2/dhis-support/dhis-support-jdbc/pom.xml
  dhis-2/dhis-support/pom.xml
  dhis-2/dhis-web/dhis-web-caseentry/pom.xml
  dhis-2/dhis-web/dhis-web-commons/pom.xml
  dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml
  dhis-2/dhis-web/dhis-web-dataentry/pom.xml
  dhis-2/dhis-web/dhis-web-datamart/pom.xml
  dhis-2/dhis-web/dhis-web-excel-reporting/pom.xml
  dhis-2/dhis-web/dhis-web-importexport/pom.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/pom.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/pom.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/pom.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddRoleAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupRoleAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm
  dhis-2/dhis-web/dhis-web-mapping/pom.xml
  dhis-2/dhis-web/dhis-web-reporting/pom.xml
  dhis-2/pom.xml
The size of the diff (5524 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