I have moved project dhis-service-organisationunit into dhis-service-core. Remember to delete project from eclipse/IDE. The reasons are that this code fits together, we want to reduce the number of modules if possible and we plan to phase out the source object, which requires this move.
Lasr
···
On Tue, Nov 3, 2009 at 3:26 PM, noreply@launchpad.net wrote:
revno: 968
committer: Lars Helge Oeverland larshelge@gmail.com
branch nick: trunk
timestamp: Tue 2009-11-03 15:24:13 +0100
message:
Merged project dhis-service-organisationunit with dhis-service-core.
removed:
dhis-2/dhis-services/dhis-service-organisationunit/
dhis-2/dhis-services/dhis-service-organisationunit/LICENSE.txt
dhis-2/dhis-services/dhis-service-organisationunit/pom.xml
dhis-2/dhis-services/dhis-service-organisationunit/src/
dhis-2/dhis-services/dhis-service-organisationunit/src/main/
dhis-2/dhis-services/dhis-service-organisationunit/src/main/java/
dhis-2/dhis-services/dhis-service-organisationunit/src/main/java/org/
dhis-2/dhis-services/dhis-service-organisationunit/src/main/java/org/hisp/
dhis-2/dhis-services/dhis-service-organisationunit/src/main/java/org/hisp/dhis/
dhis-2/dhis-services/dhis-service-organisationunit/src/main/java/org/hisp/dhis/organisationunit/
dhis-2/dhis-services/dhis-service-organisationunit/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitGroupService.java
dhis-2/dhis-services/dhis-service-organisationunit/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java
dhis-2/dhis-services/dhis-service-organisationunit/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupDeletionHandler.java
dhis-2/dhis-services/dhis-service-organisationunit/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSetDeletionHandler.java
dhis-2/dhis-services/dhis-service-organisationunit/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSetPopulator.java
dhis-2/dhis-services/dhis-service-organisationunit/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitHierarchyVerifier.java
dhis-2/dhis-services/dhis-service-organisationunit/src/main/java/org/hisp/dhis/organisationunit/hibernate/
dhis-2/dhis-services/dhis-service-organisationunit/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitGroupStore.java
dhis-2/dhis-services/dhis-service-organisationunit/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java
dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/
dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/META-INF/
dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/META-INF/dhis/
dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/
dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/
dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/
dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/
dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/
dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml
dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroup.hbm.xml
dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroupSet.hbm.xml
dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitHierarchy.hbm.xml
dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitLevel.hbm.xml
dhis-2/dhis-services/dhis-service-organisationunit/src/test/
dhis-2/dhis-services/dhis-service-organisationunit/src/test/java/
dhis-2/dhis-services/dhis-service-organisationunit/src/test/java/org/
dhis-2/dhis-services/dhis-service-organisationunit/src/test/java/org/hisp/
dhis-2/dhis-services/dhis-service-organisationunit/src/test/java/org/hisp/dhis/
dhis-2/dhis-services/dhis-service-organisationunit/src/test/java/org/hisp/dhis/organisationunit/
dhis-2/dhis-services/dhis-service-organisationunit/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitServiceTest.java
dhis-2/dhis-services/dhis-service-organisationunit/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitStoreTest.java
dhis-2/dhis-services/dhis-service-organisationunit/src/test/resources/
modified:
dhis-2/dhis-i18n/dhis-i18n-upgrader/pom.xml
dhis-2/dhis-services/dhis-service-administration/pom.xml
dhis-2/dhis-services/dhis-service-aggregationengine-default/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-importexport/pom.xml
dhis-2/dhis-services/dhis-service-jdbc-test/pom.xml
dhis-2/dhis-services/dhis-service-mapping/pom.xml
dhis-2/dhis-services/dhis-service-reporting/pom.xml
dhis-2/dhis-services/dhis-service-user-hibernate/pom.xml
dhis-2/dhis-services/pom.xml
dhis-2/dhis-web/dhis-web-commons/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-dataset/pom.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/pom.xml
dhis-2/dhis-web/dhis-web-mapping/pom.xml
dhis-2/dhis-web/dhis-web-reporting/pom.xml
dhis-2/dhis-web/dhis-web-validationrule/pom.xml
dhis-2/pom.xml
The size of the diff (3720 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 : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
Dear Lars,
I’ve just updated a new source but a conflicting message which is appeared as
“*Can’t delete dhis-2/dhis-services/dhis-service-organisationunit because it is not empty. Not deleting.*”
What should I do with Bazaar ?
Takk.
···
2009/11/3 Lars Helge Øverland larshelge@gmail.com
I have moved project dhis-service-organisationunit into dhis-service-core. Remember to delete project from eclipse/IDE. The reasons are that this code fits together, we want to reduce the number of modules if possible and we plan to phase out the source object, which requires this move.
Lasr <<< HOW COULD YOU WRITE A WRONG NAME WITH YOURS ^_~
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
–
Hieu.HISPVietnam
Good Health !
Hey!
That’s why I wrote “Remember to delete project from eclipse/IDE” First do that, then do a bzr revert, then remove those folders manually.
Lars
···
2009/11/3 Hieu Dang Duy hieu.hispvietnam@gmail.com
Dear Lars,
I’ve just updated a new source but a conflicting message which is appeared as
“*Can’t delete dhis-2/dhis-services/dhis-service-organisationunit because it is not empty. Not deleting.*”
What should I do with Bazaar ?