dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5938
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-02-13 18:21:47 +0530
message:
  Fixed india mobile module to run with 2.7 snapshot
modified:
  local/in/dhis-mobile/dhis-service-mobile/pom.xml
  local/in/dhis-mobile/dhis-web-mobile/pom.xml
  local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/ReceiveImportPageAction.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/SendBulkSMSAction.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/SendBulkSMSThirdPartyAction.java
  local/in/dhis-mobile/pom.xml
  local/in/pom.xml


--
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

=== modified file 'local/in/dhis-mobile/dhis-service-mobile/pom.xml'
--- local/in/dhis-mobile/dhis-service-mobile/pom.xml	2012-01-10 10:35:10 +0000
+++ local/in/dhis-mobile/dhis-service-mobile/pom.xml	2012-02-13 12:51:47 +0000
@@ -9,7 +9,7 @@
         <version>2.7-SNAPSHOT</version>
     </parent>
 
-    <artifactId>dhis-service-mobile</artifactId>
+    <artifactId>dhis-in-service-mobile</artifactId>
     <packaging>jar</packaging>
     <name>DHIS Mobile Service</name>
 

=== modified file 'local/in/dhis-mobile/dhis-web-mobile/pom.xml'
--- local/in/dhis-mobile/dhis-web-mobile/pom.xml	2012-01-10 10:35:10 +0000
+++ local/in/dhis-mobile/dhis-web-mobile/pom.xml	2012-02-13 12:51:47 +0000
@@ -9,7 +9,7 @@
     <version>2.7-SNAPSHOT</version>
   </parent>
 
-  <artifactId>dhis-web-mobile</artifactId>
+  <artifactId>dhis-in-web-mobile</artifactId>
   <packaging>war</packaging>
   <name>DHIS Mobile</name>
 
@@ -31,7 +31,7 @@
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-mobile</artifactId>
+      <artifactId>dhis-in-service-mobile</artifactId>
       <version>${project.version}</version>
       <type>jar</type>
     </dependency>

=== modified file 'local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/ReceiveImportPageAction.java'
--- local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/ReceiveImportPageAction.java	2012-02-02 09:56:51 +0000
+++ local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/ReceiveImportPageAction.java	2012-02-13 12:51:47 +0000
@@ -30,6 +30,7 @@
 import java.io.File;
 import java.util.List;
 
+import org.apache.commons.io.FileUtils;
 import org.hisp.dhis.mobile.SmsService;
 import org.hisp.dhis.mobile.api.MobileImportService;
 

=== modified file 'local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/SendBulkSMSAction.java'
--- local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/SendBulkSMSAction.java	2011-12-05 05:56:00 +0000
+++ local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/SendBulkSMSAction.java	2012-02-13 12:51:47 +0000
@@ -32,7 +32,7 @@
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitGroupNameComparator;
+//import org.hisp.dhis.organisationunit.comparator.OrganisationUnitGroupNameComparator;
 import org.smslib.http.BulkSmsHTTPGateway;
 import org.w3c.dom.NodeList;
 
@@ -167,7 +167,7 @@
 
         availableOrganisationUnitGroups = new ArrayList<OrganisationUnitGroup>( orgUnitGrpService.getAllOrganisationUnitGroups() );
         System.out.println( "size(bulksmsmaction)==" + availableOrganisationUnitGroups.size() );   
-        Collections.sort( availableOrganisationUnitGroups, new OrganisationUnitGroupNameComparator() );
+        //Collections.sort( availableOrganisationUnitGroups, new OrganisationUnitGroupNameComparator() );
         Iterator<OrganisationUnitGroup> it=orgUnitGrpService.getAllOrganisationUnitGroups().iterator();
         while(it.hasNext())
         {

=== modified file 'local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/SendBulkSMSThirdPartyAction.java'
--- local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/SendBulkSMSThirdPartyAction.java	2011-12-05 05:56:00 +0000
+++ local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/SendBulkSMSThirdPartyAction.java	2012-02-13 12:51:47 +0000
@@ -25,7 +25,7 @@
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitGroupNameComparator;
+//import org.hisp.dhis.organisationunit.comparator.OrganisationUnitGroupNameComparator;
 import org.smslib.http.BulkSmsHTTPGateway;
 
 /**
@@ -157,7 +157,7 @@
 
         availableOrganisationUnitGroups = new ArrayList<OrganisationUnitGroup>( orgUnitGrpService.getAllOrganisationUnitGroups() );
         System.out.println( "size(bulksmsmaction)==" + availableOrganisationUnitGroups.size() );   
-        Collections.sort( availableOrganisationUnitGroups, new OrganisationUnitGroupNameComparator() );
+        //Collections.sort( availableOrganisationUnitGroups, new OrganisationUnitGroupNameComparator() );
         Iterator<OrganisationUnitGroup> it=orgUnitGrpService.getAllOrganisationUnitGroups().iterator();
         while(it.hasNext())
         {

=== modified file 'local/in/dhis-mobile/pom.xml'
--- local/in/dhis-mobile/pom.xml	2011-12-26 07:15:40 +0000
+++ local/in/dhis-mobile/pom.xml	2012-02-13 12:51:47 +0000
@@ -5,7 +5,7 @@
   
   <groupId>org.hisp.dhis</groupId>
   <artifactId>dhis-sms</artifactId>
-  <version>2.6</version>
+  <version>2.7-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Mobile SMS Modules</name>
 
@@ -24,8 +24,8 @@
   </organization>
   
   <modules>
-    <module>dhis-service-mobile</module>
-    <module>dhis-web-mobile</module>
+    <module>dhis-in-service-mobile</module>
+    <module>dhis-in-web-mobile</module>
   </modules>
       
 </project>

=== modified file 'local/in/pom.xml'
--- local/in/pom.xml	2012-01-10 10:35:10 +0000
+++ local/in/pom.xml	2012-02-13 12:51:47 +0000
@@ -23,6 +23,7 @@
 	<module>dhis-web-reports-in</module>-->
     <module>dhis-web-reports-national</module>
 	<module>dhis-web-survey</module> 
+	<module>dhis-web-alert</module> 
 <!--<module>dhis-web-validationrule-in</module>-->
   </modules>