dhis2-devs team mailing list archive

Thread
Date
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3400: Merging Code from 2.1 - work in progress

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Fri, 15 Apr 2011 11:44:32 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx
------------------------------------------------------------
revno: 3400
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-04-15 17:11:30 +0530
message:
  Merging Code from 2.1 - work in progress
added:
  local/in/dhis-mobile/
  local/in/dhis-mobile/dhis-service-mobile/
  local/in/dhis-mobile/dhis-service-mobile/pom.xml
  local/in/dhis-mobile/dhis-service-mobile/src/
  local/in/dhis-mobile/dhis-service-mobile/src/main/
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/messaging/
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/messaging/api/
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/messaging/api/MessageService.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/Compressor.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/SMSImportJob.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/SMSImportSchedule.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/SendSMSJob.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/SmsService.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/XMLFilter.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/DefaultMobileImportService.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/MobileImportParameters.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/MobileImportService.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/ReceiveSMS.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/ReceiveSMSService.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/ReceiveSMSStore.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/SendSMS.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/SendSMSService.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/SendSMSStore.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/XmlCreatorService.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/impl/
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/impl/DefaultReceiveSMSService.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/impl/DefaultSendSMSService.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/impl/HibernateReceiveSMSStore.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/impl/HibernateSendSMSStore.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/scheduler/
  local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/scheduler/CheckDataStatusJob.java
  local/in/dhis-mobile/dhis-service-mobile/src/main/resources/
  local/in/dhis-mobile/dhis-service-mobile/src/main/resources/META-INF/
  local/in/dhis-mobile/dhis-service-mobile/src/main/resources/META-INF/dhis/
  local/in/dhis-mobile/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml
  local/in/dhis-mobile/dhis-service-mobile/src/main/resources/org/
  local/in/dhis-mobile/dhis-service-mobile/src/main/resources/org/hisp/
  local/in/dhis-mobile/dhis-service-mobile/src/main/resources/org/hisp/dhis/
  local/in/dhis-mobile/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/
  local/in/dhis-mobile/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/hibernate/
  local/in/dhis-mobile/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/hibernate/ReceiveSMS.hbm.xml
  local/in/dhis-mobile/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/hibernate/SendSMS.hbm.xml
  local/in/dhis-mobile/dhis-service-mobile/src/test/
  local/in/dhis-mobile/dhis-service-mobile/src/test/java/
  local/in/dhis-mobile/dhis-service-mobile/src/test/resources/
  local/in/dhis-mobile/dhis-web-mobile/
  local/in/dhis-mobile/dhis-web-mobile/pom.xml
  local/in/dhis-mobile/dhis-web-mobile/src/
  local/in/dhis-mobile/dhis-web-mobile/src/main/
  local/in/dhis-mobile/dhis-web-mobile/src/main/java/
  local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/
  local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/
  local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/
  local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/
  local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/
  local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/DraftPageAction.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/MobileHomePageAction.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/MobileSettingsAction.java
  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/ReceiveMessagesPageAction.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/SendOtaAction.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/SendSMSAction.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/app/
  local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/app/action/
  local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/app/action/CreateMobileAppAction.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/app/action/GetDataElementsAction.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/app/action/JarGeneratorAction.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/app/action/SplashUploadAction.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/resources/
  local/in/dhis-mobile/dhis-web-mobile/src/main/resources/META-INF/
  local/in/dhis-mobile/dhis-web-mobile/src/main/resources/META-INF/dhis/
  local/in/dhis-mobile/dhis-web-mobile/src/main/resources/META-INF/dhis/beans.xml
  local/in/dhis-mobile/dhis-web-mobile/src/main/resources/org/
  local/in/dhis-mobile/dhis-web-mobile/src/main/resources/org/hisp/
  local/in/dhis-mobile/dhis-web-mobile/src/main/resources/org/hisp/dhis/
  local/in/dhis-mobile/dhis-web-mobile/src/main/resources/org/hisp/dhis/mobile/
  local/in/dhis-mobile/dhis-web-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties
  local/in/dhis-mobile/dhis-web-mobile/src/main/resources/struts.xml
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/META-INF/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/META-INF/context.xml
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/WEB-INF/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/WEB-INF/web.xml
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/createMobileAppPage.vm
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/css/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/css/StylesForTags.css
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/css/receiveImportPage.css
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/css/stylesForReports.css
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/dataElementsResponse.vm
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/draft.vm
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/images/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/images/intro.png
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/inbox.vm
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/pom.xml
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/README
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/org/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/org/hisp/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/org/hisp/dhis/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/org/hisp/dhis/mobile/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/org/hisp/dhis/mobile/DHISMobile.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/org/hisp/dhis/mobile/DatasetPage.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/org/hisp/dhis/mobile/FormRunner.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/org/hisp/dhis/mobile/FormsListPage.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/org/hisp/dhis/mobile/PeriodPage.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/org/hisp/dhis/mobile/SendPage.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/org/hisp/dhis/mobile/SettingsPage.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/org/hisp/dhis/mobile/SplashScreen.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/uk/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/uk/co/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/uk/co/bluetrail/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/uk/co/bluetrail/lwuit/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/uk/co/bluetrail/lwuit/DateForm.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/uk/co/bluetrail/lwuit/MobrizDateField.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/uk/co/bluetrail/lwuit/MobrizImplementationFactory.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/uk/co/bluetrail/lwuit/MobrizMidpImplementation.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/java/uk/co/bluetrail/lwuit/MobrizTextArea.java
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/resources/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/resources/dhismobile-icon.png
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/resources/dhismobile.res
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/resources/splash/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/main/resources/splash/dhislogo.png
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/site/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javame_src/src/site/apt/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javascript/
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javascript/createMobileApp.js
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javascript/jquery-form.js
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javascript/user.js
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/menu.vm
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/mobileImportingResult.vm
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/mobileSettingsPage.vm
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/receiveImportPage.vm
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/sendOtaPage.vm
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/sendSMSPage.vm
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/splashUploadResponse.vm
  local/in/dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/welcome.vm
  local/in/dhis-mobile/pom.xml
The size of the diff (9165 lines) is larger than your specified limit of 5000 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