dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 16443 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-08-19 13:44:18 +0200
message:
  Apps packages added to dhis-web-apps struts.
modified:
  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-web/dhis-web-apps/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml	2014-08-18 14:37:59 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml	2014-08-19 11:43:34 +0000
@@ -6,11 +6,48 @@
 
 	<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>
+		</action>
+    </package>
+    
+	<package name="dhis-web-visualizer" extends="dhis-web-commons" namespace="/dhis-web-visualizer">
+		<action name="index" class="org.hisp.dhis.commons.action.NoAction">
+			<result name="success" type="redirect">app/index.html</result>
+		</action>
+    </package>
+    
+	<package name="dhis-web-mapping" extends="dhis-web-commons" namespace="/dhis-web-mapping">
+		<action name="index" class="org.hisp.dhis.commons.action.NoAction">
+			<result name="success" type="redirect">app/index.html</result>
+		</action>
+    </package>
+    
+	<package name="dhis-web-event-reports" extends="dhis-web-commons" namespace="/dhis-web-event-reports">
+		<action name="index" class="org.hisp.dhis.commons.action.NoAction">
+			<result name="success" type="redirect">app/index.html</result>
+		</action>
+    </package>
+    
+	<package name="dhis-web-event-visualizer" extends="dhis-web-commons" namespace="/dhis-event-visualizer">
+		<action name="index" class="org.hisp.dhis.commons.action.NoAction">
+			<result name="success" type="redirect">app/index.html</result>
+		</action>
+    </package>
+    
+<!--
+	<package name="dhis-web-event-capture" extends="dhis-web-commons" namespace="/dhis-web-event-capture">
+		<action name="index" class="org.hisp.dhis.commons.action.NoAction">
+			<result name="success" type="redirect">index.html</result>
+		</action>
+    </package>
+    
+	<package name="dhis-web-tracker-capture" extends="dhis-web-commons" namespace="/dhis-web-tracker-capture">
+		<action name="index" class="org.hisp.dhis.commons.action.NoAction">
+			<result name="success" type="redirect">index.html</result>
+		</action>
+    </package>
+-->
+    
 </struts>