dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16449: dhis-web-apps index moved.

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Tue, 19 Aug 2014 21:21:24 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 16449 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-08-19 23:19:45 +0200
message:
  dhis-web-apps index moved.
removed:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/index.html
added:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/index.html
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-19 20:25:29 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml	2014-08-19 21:02:14 +0000
@@ -8,7 +8,7 @@
 
 	<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>
+			<result name="success" type="redirect">index.html</result>
 		</action>
     </package>
 

=== added directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps'
=== added file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/index.html	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/index.html	2014-08-19 21:02:14 +0000
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<body>
+    <ul>
+        <li><a href="../dhis-web-pivot/app/index.html">dhis-web-pivot</a></li>
+        <li><a href="../dhis-web-visualizer/app/index.html">dhis-web-visualizer</a></li>
+        <li><a href="../dhis-web-mapping/app/index.html">dhis-web-mapping</a></li>
+        <li><a href="../dhis-web-event-reports/app/index.html">dhis-web-event-reports</a></li>
+        <li><a href="../dhis-web-event-visualizer/app/index.html">dhis-web-event-visualizer</a></li>
+        <li><a href="../dhis-web-event-capture/index.html">dhis-web-event-capture</a></li>
+        <li><a href="../dhis-web-tracker-capture/index.html">dhis-web-tracker-capture</a></li>
+    </ul>
+</body>
+</html>

=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/index.html	2014-08-18 14:37:59 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/index.html	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-    <ul>
-        <li><a href="../dhis-web-pivot/app/index.html">dhis-web-pivot</a></li>
-        <li><a href="../dhis-web-visualizer/app/index.html">dhis-web-visualizer</a></li>
-        <li><a href="../dhis-web-mapping/app/index.html">dhis-web-mapping</a></li>
-        <li><a href="../dhis-web-event-reports/app/index.html">dhis-web-event-reports</a></li>
-        <li><a href="../dhis-web-event-visualizer/app/index.html">dhis-web-event-visualizer</a></li>
-        <li><a href="../dhis-web-event-capture/index.html">dhis-web-event-capture</a></li>
-        <li><a href="../dhis-web-tracker-capture/index.html">dhis-web-tracker-capture</a></li>
-    </ul>
-</body>
-</html>