← Back to branch summary

~registry/dhis2-academy/group11

~registry/dhis2-academy/group11

Viewing all changes in revision 5221.

Committer: Vangelis Tasoulas
Date: 2011-11-30 17:23:05 UTC
Revision ID: evanget@ifi.uio.no-20111130172305-ta98p1iz49gqc0r0

Branched the trunk again.
Made all of the needed changed for our project.
Code beautifying using Netbeans auto formatter with the DHIS Code style.
Fixed a DHIS API Hibernate bug.

files added:
dhis-2/dhis-web/dhis-web-openrosa

dhis-2/dhis-web/dhis-web-openrosa/pom.xml

dhis-2/dhis-web/dhis-web-openrosa/src

dhis-2/dhis-web/dhis-web-openrosa/src/main

dhis-2/dhis-web/dhis-web-openrosa/src/main/java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/controller

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/controller/dataSetController.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/BasicConsts.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/DataSetLinks.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/FormElementlinks.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/HtmlConsts.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/Link.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/Nodebind.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/ParserConsts.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/XFormConsts.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/XFormControl.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/XFormHead.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/XFormInputControl.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/XFormListQuestion.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/XFormMain.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/XFormQuestionElements.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/XFormSelectControl.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/XFormSelectControlSelectItem.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/package-info.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/services

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/services/GenericMapAdapter.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/services/LinkBuilderImpl.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/services/ParserService.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/services/XformParser.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/resources

dhis-2/dhis-web/dhis-web-openrosa/src/main/webapp

dhis-2/dhis-web/dhis-web-openrosa/src/main/webapp/WEB-INF

dhis-2/dhis-web/dhis-web-openrosa/src/main/webapp/WEB-INF/applicationContext.xml

dhis-2/dhis-web/dhis-web-openrosa/src/main/webapp/WEB-INF/dispatcher-servlet.xml

dhis-2/dhis-web/dhis-web-openrosa/src/main/webapp/WEB-INF/glassfish-web.xml

dhis-2/dhis-web/dhis-web-openrosa/src/main/webapp/WEB-INF/jsp

dhis-2/dhis-web/dhis-web-openrosa/src/main/webapp/WEB-INF/jsp/index.jsp

dhis-2/dhis-web/dhis-web-openrosa/src/main/webapp/WEB-INF/web.xml

dhis-2/dhis-web/dhis-web-openrosa/src/test

dhis-2/dhis-web/dhis-web-openrosa/src/test/java

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/hisp

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/hisp/dhis

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/hisp/dhis/dhisopenrosa

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/hisp/dhis/dhisopenrosa/services

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/hisp/dhis/dhisopenrosa/services/XformParserTest.java

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/hsip

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/hsip/dhis

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/hsip/dhis/dhisopenrosa

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/hsip/dhis/dhisopenrosa/services

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/hsip/dhis/dhisopenrosa/services/GenericMapAdapterTest.java

dhis-2/dhis-web/dhis-web-openrosa/src/test/resources

dhis-2/dhis-web/dhis-web-openrosa/src/test/resources/population_submission.xml

files modified:
.bzrignore

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java

dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml

dhis-2/dhis-web/dhis-web-portal/pom.xml

dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml

dhis-2/dhis-web/pom.xml

Show diffs side-by-side

added added

removed removed

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java

dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml

dhis-2/dhis-web/dhis-web-openrosa/

dhis-2/dhis-web/dhis-web-openrosa/pom.xml

dhis-2/dhis-web/dhis-web-openrosa/src/

dhis-2/dhis-web/dhis-web-openrosa/src/main/

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/controller/

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/controller/dataSetController.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/BasicConsts.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/DataSetLinks.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/FormElementlinks.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/HtmlConsts.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/Link.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/Nodebind.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/ParserConsts.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/XFormConsts.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/XFormControl.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/XFormHead.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/XFormInputControl.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/XFormListQuestion.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/XFormMain.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/XFormQuestionElements.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/XFormSelectControl.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/XFormSelectControlSelectItem.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/model/package-info.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/services/

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/services/GenericMapAdapter.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/services/LinkBuilderImpl.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/services/ParserService.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/java/org/hisp/dhis/dhisopenrosa/services/XformParser.java

dhis-2/dhis-web/dhis-web-openrosa/src/main/resources/

dhis-2/dhis-web/dhis-web-openrosa/src/main/webapp/

dhis-2/dhis-web/dhis-web-openrosa/src/main/webapp/WEB-INF/

dhis-2/dhis-web/dhis-web-openrosa/src/main/webapp/WEB-INF/applicationContext.xml

dhis-2/dhis-web/dhis-web-openrosa/src/main/webapp/WEB-INF/dispatcher-servlet.xml

dhis-2/dhis-web/dhis-web-openrosa/src/main/webapp/WEB-INF/glassfish-web.xml

dhis-2/dhis-web/dhis-web-openrosa/src/main/webapp/WEB-INF/jsp/

dhis-2/dhis-web/dhis-web-openrosa/src/main/webapp/WEB-INF/jsp/index.jsp

dhis-2/dhis-web/dhis-web-openrosa/src/main/webapp/WEB-INF/web.xml

dhis-2/dhis-web/dhis-web-openrosa/src/test/

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/hisp/

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/hisp/dhis/

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/hisp/dhis/dhisopenrosa/

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/hisp/dhis/dhisopenrosa/services/

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/hisp/dhis/dhisopenrosa/services/XformParserTest.java

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/hsip/

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/hsip/dhis/

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/hsip/dhis/dhisopenrosa/

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/hsip/dhis/dhisopenrosa/services/

dhis-2/dhis-web/dhis-web-openrosa/src/test/java/org/hsip/dhis/dhisopenrosa/services/GenericMapAdapterTest.java

dhis-2/dhis-web/dhis-web-openrosa/src/test/resources/

dhis-2/dhis-web/dhis-web-openrosa/src/test/resources/population_submission.xml

dhis-2/dhis-web/dhis-web-portal/pom.xml

dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml

dhis-2/dhis-web/pom.xml

Older »