dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 16448 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-08-19 22:27:05 +0200
message:
  dhis-web-apps package added.
removed:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.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-web/dhis-web-apps/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml	2014-08-19 11:58:26 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml	2014-08-19 20:25:29 +0000
@@ -6,6 +6,12 @@
 
 	<include file="dhis-web-commons.xml" />
 
+	<package name="dhis-web-apps" extends="dhis-web-commons" namespace="/dhis-web-apps">
+		<action name="index" class="org.hisp.dhis.commons.action.NoAction">
+			<result name="success" type="redirect">../index.html</result>
+		</action>
+    </package>
+
 	<package name="dhis-web-pivot" extends="dhis-web-commons" namespace="/dhis-web-pivot">
 		<action name="index" class="org.hisp.dhis.commons.action.NoAction">
 			<result name="success" type="redirect">app/index.html</result>

=== removed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps'
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml	2014-08-08 13:04:42 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml	2014-08-19 20:25:29 +0000
@@ -275,6 +275,7 @@
         <value>dhis-web-commons-help</value>
         <value>dhis-web-commons-about</value>
         <value>dhis-web-api-mobile</value>
+		<value>dhis-web-apps</value>
         <value>dhis-web-portal</value>
       </set>
     </property>