**I have made a change to the source code projects / modules. Those of you who have the source code in an IDE (eclipse, netbeans) should remove the **
1) dhis-useradminandsecurity
2) dhis-service-user-hibernate
3) dhis-service-jdbc
4) dhis-service-jdbc-test
5) dhis-options
projects before updating the source code! (or just remove all)
If you don’t do this you will get problems ala “Directory could not be deleted, not empty” from bazaar. If you get those the best solution is to delete the whole working copy and check out again.
I have removed 1) and 2) and merged them into the dhis-service-core. This had to be done because we need the user-functionality in trunk (Viet’s work on audit logging).
I have also reamed and moved 3) and 4) (dhis-service-jdbc → dhis-support-jdbc and dhis-service-jdbc-test → dhis-support-jdbc-test) to dhis-support directory.
I have renamed and moved 5) (dhis-options → dhis-service-options) to dhis-services.
All this to improve the dependency structure in the system. Now we have a layered structure with 5 levels:
This implies that modules cannot have dependencies to modules at a higher level, only at the same or a lower level. This will reduce the chances of getting cyclic dependency issues in the future. All unit tests now run successfully. Will include this in the technical docs. I am sorry for the inconvenience this might mean for merging development branches.
**I have made a change to the source code projects / modules. Those of you who have the source code in an IDE (eclipse, netbeans) should remove the **
1) dhis-useradminandsecurity
2) dhis-service-user-hibernate
3) dhis-service-jdbc
4) dhis-service-jdbc-test
5) dhis-options
projects before updating the source code! (or just remove all)
If you don’t do this you will get problems ala “Directory could not be deleted, not empty” from bazaar. If you get those the best solution is to delete the whole working copy and check out again.
I have removed 1) and 2) and merged them into the dhis-service-core. This had to be done because we need the user-functionality in trunk (Viet’s work on audit logging).
I have also reamed and moved 3) and 4) (dhis-service-jdbc → dhis-support-jdbc and dhis-service-jdbc-test → dhis-support-jdbc-test) to dhis-support directory.
I have renamed and moved 5) (dhis-options → dhis-service-options) to dhis-services.
All this to improve the dependency structure in the system. Now we have a layered structure with 5 levels:
This implies that modules cannot have dependencies to modules at a higher level, only at the same or a lower level. This will reduce the chances of getting cyclic dependency issues in the future. All unit tests now run successfully. Will include this in the technical docs. I am sorry for the inconvenience this might mean for merging development branches.
**I have made a change to the source code projects / modules. Those of you who have the source code in an IDE (eclipse, netbeans) should remove the **
1) dhis-useradminandsecurity
2) dhis-service-user-hibernate
3) dhis-service-jdbc
4) dhis-service-jdbc-test
5) dhis-options
projects before updating the source code! (or just remove all)
If you don’t do this you will get problems ala “Directory could not be deleted, not empty” from bazaar. If you get those the best solution is to delete the whole working copy and check out again.
I have removed 1) and 2) and merged them into the dhis-service-core. This had to be done because we need the user-functionality in trunk (Viet’s work on audit logging).
I have also reamed and moved 3) and 4) (dhis-service-jdbc → dhis-support-jdbc and dhis-service-jdbc-test → dhis-support-jdbc-test) to dhis-support directory.
I have renamed and moved 5) (dhis-options → dhis-service-options) to dhis-services.
All this to improve the dependency structure in the system. Now we have a layered structure with 5 levels:
This implies that modules cannot have dependencies to modules at a higher level, only at the same or a lower level. This will reduce the chances of getting cyclic dependency issues in the future. All unit tests now run successfully. Will include this in the technical docs. I am sorry for the inconvenience this might mean for merging development branches.
I removed also the projects as recommended and then do bzr merge lp:dhis2 at the working folder but meet a trouble in merging code from i18n-uniqueness branch to dhis branch. PLS take a look.
What’s wrong in my done? D:\dhis2-global-bis\i18n-uniqueness\dhis-2>bzr merge lp:dhis2
Connected (version 2.0, client Twisted)
Authentication (publickey) successful!
Secsh channel 1 opened.
bzr: ERROR: Working tree “D:/dhis2-global-bis/i18n-uniqueness/” has uncommitted changes.
I removed also the projects as recommended and then do bzr merge lp:dhis2 at the working folder but meet a trouble in merging code from i18n-uniqueness branch to dhis branch. PLS take a look.
What’s wrong in my done? D:\dhis2-global-bis\i18n-uniqueness\dhis-2>bzr merge lp:dhis2
Connected (version 2.0, client Twisted)
Authentication (publickey) successful!
Secsh channel 1 opened.
bzr: ERROR: Working tree “D:/dhis2-global-bis/i18n-uniqueness/” has uncommitted changes.
You cannot have uncommitted changes in your local repo when merging. Just commit your changes to your branch first.
The picture is now complete, modules are either web-, service- or support-modules in separate layers.
Again please remove these modules from eclipse before updating source code (or just remove all). You might have to remove un-versioned files/folders from those directories too. Then do a mvn eclipse:eclipse and a new import to get in the renamed ones.
**I have made a change to the source code projects / modules. Those of you who have the source code in an IDE (eclipse, netbeans) should remove the **
1) dhis-useradminandsecurity
2) dhis-service-user-hibernate
3) dhis-service-jdbc
4) dhis-service-jdbc-test
5) dhis-options
projects before updating the source code! (or just remove all)
If you don’t do this you will get problems ala “Directory could not be deleted, not empty” from bazaar. If you get those the best solution is to delete the whole working copy and check out again.
I have removed 1) and 2) and merged them into the dhis-service-core. This had to be done because we need the user-functionality in trunk (Viet’s work on audit logging).
I have also reamed and moved 3) and 4) (dhis-service-jdbc → dhis-support-jdbc and dhis-service-jdbc-test → dhis-support-jdbc-test) to dhis-support directory.
I have renamed and moved 5) (dhis-options → dhis-service-options) to dhis-services.
All this to improve the dependency structure in the system. Now we have a layered structure with 5 levels:
This implies that modules cannot have dependencies to modules at a higher level, only at the same or a lower level. This will reduce the chances of getting cyclic dependency issues in the future. All unit tests now run successfully. Will include this in the technical docs. I am sorry for the inconvenience this might mean for merging development branches.
