dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21647
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2016-01-07 17:26:11 +0100
message:
  Included new app management app
added:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-app-management.png
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties
  dhis-2/dhis-web/dhis-web-apps/pom.xml
  dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.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 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2016-01-04 16:36:24 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2016-01-07 16:26:11 +0000
@@ -49,6 +49,7 @@
 dhis-web-maintenance-appmanager=App Management
 dhis-web-caseentry=Individual Records
 dhis-web-dataentry=Data Entry
+dhis-web-sms=SMS
 dhis-web-importexport=Import-Export
 dhis-web-validationrule=Data Quality
 dhis-web-mapping=GIS
@@ -63,14 +64,14 @@
 dhis-web-dashboard-integration=Dashboard
 dhis-web-visualizer=Data Visualizer
 dhis-web-pivot=Pivot Table
+dhis-web-app-management=App Management
 dhis-web-dashboard=Data Analyser
 dhis-web-integration=NHRM Integration
 dhis-web-reports=NRHM Reports
 dhis-web-dataentry-national=Linelisting Data Entry
 dhis-web-validationrule-local-in=Validation Analysis
-dhis-web-survey=Survey - Target
+dhis-web-survey=Survey Target
 dhis-web-spreadsheet-reporting=Spreadsheet Reports
-dhis-web-sms=SMS
 dhis-web-maintenance-in=Configuration
 dhis-web-linelisting-mp=Manpower
 dhis-web-maintenance-rbf=Maintenance RBF

=== modified file 'dhis-2/dhis-web/dhis-web-apps/pom.xml'
--- dhis-2/dhis-web/dhis-web-apps/pom.xml	2015-12-23 21:34:01 +0000
+++ dhis-2/dhis-web/dhis-web-apps/pom.xml	2016-01-07 16:26:11 +0000
@@ -34,7 +34,7 @@
                 <artifactItem>
                   <groupId>org.hisp.dhis</groupId>
                   <artifactId>dhis-app-settings</artifactId>
-                  <version>2.22-SNAPSHOT</version>
+                  <version>${apps.version}</version>
                   <overWrite>true</overWrite>
                   <outputDirectory>${project.build.directory}/${project.artifactId}/dhis-web-settings</outputDirectory>
                   <includes>**/*.*</includes>
@@ -43,11 +43,20 @@
                 <artifactItem>
                   <groupId>org.hisp.dhis</groupId>
                   <artifactId>dhis-app-maintenance</artifactId>
-                  <version>2.22-SNAPSHOT</version>
+                  <version>${apps.version}</version>
                   <overWrite>true</overWrite>
                   <outputDirectory>${project.build.directory}/${project.artifactId}/dhis-web-maintenance</outputDirectory>
                   <includes>**/*.*</includes>
                 </artifactItem>
+                <!-- App management -->
+                <artifactItem>
+                  <groupId>org.hisp.dhis</groupId>
+                  <artifactId>dhis-app-app-management</artifactId>
+                  <version>${apps.version}</version>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/${project.artifactId}/dhis-web-app-management</outputDirectory>
+                  <includes>**/*.*</includes>
+                </artifactItem>
               </artifactItems>
             </configuration>
           </execution>
@@ -101,5 +110,6 @@
 
   <properties>
     <rootDir>../../</rootDir>
+    <apps.version>2.22-SNAPSHOT</apps.version>
   </properties>
 </project>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml	2015-12-24 00:21:36 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml	2016-01-07 16:26:11 +0000
@@ -82,4 +82,10 @@
 		</action>
 	</package>
     
+	<package name="dhis-web-app-management" extends="dhis-web-commons" namespace="/dhis-web-app-management">
+		<action name="index" class="org.hisp.dhis.commons.action.NoAction">
+			<result name="success" type="redirect">#</result>
+		</action>
+	</package>
+    
 </struts>

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-app-management.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-app-management.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-app-management.png	2016-01-07 16:26:11 +0000 differ