=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultProgramService.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultProgramService.java 2011-11-04 11:27:33 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultProgramService.java 2012-03-16 06:36:41 +0000
@@ -113,7 +113,7 @@
org.hisp.dhis.program.Program program = programService.getProgram( programId );
- program = i18n( i18nService, locale, program );
+ //program = i18n( i18nService, locale, program );
Program pr = new Program();
@@ -125,7 +125,7 @@
for ( org.hisp.dhis.program.ProgramStage programStage : program.getProgramStages() )
{
- programStage = i18n( i18nService, locale, programStage );
+ //programStage = i18n( i18nService, locale, programStage );
ProgramStage prStg = new ProgramStage();
@@ -139,7 +139,7 @@
for ( ProgramStageDataElement programStagedataElement : programStageDataElements )
{
- programStagedataElement = i18n( i18nService, locale, programStagedataElement );
+ //programStagedataElement = i18n( i18nService, locale, programStagedataElement );
org.hisp.dhis.dataelement.DataElement dataElement = programStagedataElement.getDataElement();
=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/pom.xml'
--- dhis-2/dhis-web/dhis-web-api-mobile/pom.xml 2012-02-20 12:01:56 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/pom.xml 2012-03-16 06:36:41 +0000
@@ -10,7 +10,7 @@
dhis-web-api-mobile
- war
+ jar
DHIS Mobile API
=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileClientController.java'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileClientController.java 2012-01-20 10:38:11 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileClientController.java 2012-03-16 06:36:41 +0000
@@ -70,7 +70,7 @@
private static String getUrl( HttpServletRequest request, int id, String path )
{
String url = UrlUtils.buildFullRequestUrl( request );
- url = url + "orgUnits/" + id + "/" + path;
+ url = url + "/orgUnits/" + id + "/" + path;
return url;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/servlet.xml'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/servlet.xml 2012-01-06 12:12:16 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/servlet.xml 2012-03-16 06:36:41 +0000
@@ -1,21 +1,23 @@
-
+
-
-
-
-
-
+
+
+
+
+
-
+
=== modified file 'dhis-2/dhis-web/dhis-web-api/pom.xml'
--- dhis-2/dhis-web/dhis-web-api/pom.xml 2012-02-20 12:01:56 +0000
+++ dhis-2/dhis-web/dhis-web-api/pom.xml 2012-03-16 06:36:41 +0000
@@ -53,6 +53,11 @@
org.hisp.dhis
dhis-service-sms
+
+ org.hisp.dhis
+ dhis-web-api-mobile
+ ${project.version}
+
javax.servlet
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml 2012-03-05 14:43:22 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml 2012-03-16 06:36:41 +0000
@@ -11,7 +11,11 @@
-
+
+
+
+
+
=== modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml'
--- dhis-2/dhis-web/dhis-web-portal/pom.xml 2012-02-20 12:01:56 +0000
+++ dhis-2/dhis-web/dhis-web-portal/pom.xml 2012-03-16 06:36:41 +0000
@@ -131,7 +131,7 @@
org.hisp.dhis
dhis-web-api-mobile
${project.version}
- war
+ jar
org.hisp.dhis