dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8338
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-10-02 14:46:54 +0700
message:
  mobile: now that we have split into two servlets, we can move mobile-web from /dhis-web-mobile => /mobile.
modified:
  dhis-2/dhis-web/dhis-web-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java
  dhis-2/dhis-web/dhis-web-mobile/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/settings.vm
  dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.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-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java	2012-10-01 04:01:22 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java	2012-10-02 07:46:54 +0000
@@ -41,16 +41,16 @@
 @Controller
 public class MobileController
 {
-    @RequestMapping( value = "/dhis-web-mobile" )
+    @RequestMapping( value = "/mobile" )
     public String base()
     {
-        return "redirect:/dhis-web-mobile/index";
+        return "redirect:/mobile/index";
     }
 
     @RequestMapping( value = "/" )
     public String baseWithSlash()
     {
-        return "redirect:/dhis-web-mobile/index";
+        return "redirect:/mobile/index";
     }
 
     @RequestMapping( value = "/index" )

=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/resources/struts.xml	2012-09-12 05:58:51 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/resources/struts.xml	2012-10-02 07:46:54 +0000
@@ -6,7 +6,7 @@
   <include file="dhis-web-commons.xml" />
 
   <package name="dhis-web-mobile" extends="dhis-web-commons"
-      namespace="/dhis-web-mobile">
+      namespace="/mobile">
   </package>
 
 </struts>

=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/settings.vm'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/settings.vm	2012-10-02 07:20:25 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/settings.vm	2012-10-02 07:46:54 +0000
@@ -29,7 +29,7 @@
                 type: 'POST'
             }).complete(function() {
                 $.mobile.hidePageLoadingMsg();
-                window.location.href = '../dhis-web-mobile';
+                window.location.href = '../mobile';
             });
 
             e.preventDefault();

=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/web.xml'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/web.xml	2012-09-28 09:09:02 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/web.xml	2012-10-02 07:46:54 +0000
@@ -14,7 +14,7 @@
     <filter-class>org.hisp.dhis.servlet.filter.HttpRedirectFilter</filter-class>
     <init-param>
       <param-name>redirectPath</param-name>
-      <param-value>dhis-web-mobile/index</param-value>
+      <param-value>mobile/index</param-value>
     </init-param>
   </filter>
   <filter>
@@ -44,7 +44,7 @@
   </filter-mapping>
   <filter-mapping>
     <filter-name>OpenSessionInViewFilter</filter-name>
-    <url-pattern>/dhis-web-mobile/*</url-pattern>
+    <url-pattern>/mobile/*</url-pattern>
   </filter-mapping>
   <filter-mapping>
     <filter-name>springSecurityFilterChain</filter-name>
@@ -86,12 +86,12 @@
 
   <servlet-mapping>
     <servlet-name>mobileServlet</servlet-name>
-    <url-pattern>/dhis-web-mobile</url-pattern>
+    <url-pattern>/mobile</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
     <servlet-name>mobileServlet</servlet-name>
-    <url-pattern>/dhis-web-mobile/*</url-pattern>
+    <url-pattern>/mobile/*</url-pattern>
   </servlet-mapping>
 
   <!-- Web API -->

=== modified file 'dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml'
--- dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml	2012-09-28 09:09:02 +0000
+++ dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml	2012-10-02 07:46:54 +0000
@@ -48,7 +48,7 @@
   </filter-mapping>
   <filter-mapping>
     <filter-name>OpenSessionInViewFilter</filter-name>
-    <url-pattern>/dhis-web-mobile/*</url-pattern>
+    <url-pattern>/mobile/*</url-pattern>
   </filter-mapping>
   <filter-mapping>
     <filter-name>springSecurityFilterChain</filter-name>
@@ -90,12 +90,12 @@
 
   <servlet-mapping>
     <servlet-name>mobileServlet</servlet-name>
-    <url-pattern>/dhis-web-mobile</url-pattern>
+    <url-pattern>/mobile</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
     <servlet-name>mobileServlet</servlet-name>
-    <url-pattern>/dhis-web-mobile/*</url-pattern>
+    <url-pattern>/mobile/*</url-pattern>
   </servlet-mapping>
 
   <!-- Web API -->