dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4634: added mobile login/loginfailure interfaces

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Wed, 21 Sep 2011 20:15:14 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 4634
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-09-21 22:13:56 +0200
message:
  added mobile login/loginfailure interfaces
added:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginfailed_mobile.vm
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LoginAction.java
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LogoutAction.java
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.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

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm	2011-09-21 20:13:56 +0000
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+<title>DHIS 2</title>
+
+<meta name="viewport" content="width=device-width, user-scalable=no" />
+	
+<style type="text/css">
+html,body
+{
+  background-color: #1d5288;  
+  color: white;
+  font-size: 16px;
+}
+
+p {
+	width: 150px;
+}
+</style>
+</head>
+
+<body>
+
+<div id="wrapper" align="center">
+<p>
+	<img alt="" src="logo_banner.png">
+</p>
+
+<form id='loginForm' action="../../dhis-web-commons-security/login.action" method="post">
+
+<p>
+	<h3>Username</h3>
+	<input type="text" id="j_username" name="j_username"></td>
+</p>
+
+<p>
+	<h3>Password</h3>
+	<input type="password" id="j_password" name="j_password"></td>
+</p>
+
+<p>
+	<input id='submit' type="submit" value="Login" style="width: 45%;">
+	<input id='reset' type="reset" value="Clear" style="width: 45%;">
+</p>
+
+</form>
+</div>
+
+</body>
+
+</html>

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginfailed_mobile.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginfailed_mobile.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginfailed_mobile.vm	2011-09-21 20:13:56 +0000
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+<title>DHIS 2</title>
+
+<meta name="viewport" content="width=device-width, user-scalable=no" />
+
+<style type="text/css">
+html,body
+{
+  background-color: #1d5288;  
+  color: white;
+  font-size: 16px;
+}
+
+p {
+	width: 150px;
+}
+</style>
+
+</head>
+
+<body>
+
+<div id="wrapper" align="center">
+<p>
+	<img alt="" src="logo_banner.png">
+</p>
+
+<form id='loginForm' action="../../dhis-web-commons-security/login.action" method="post">
+
+<p>
+	<h3>Username</h3>
+	<input type="text" id="j_username" name="j_username"></td>
+</p>
+
+<p>
+	<h3>Password</h3>
+	<input type="password" id="j_password" name="j_password"></td>
+</p>
+
+<p>
+	<input id='submit' type="submit" value="Login" style="width: 45%;">
+	<input id='reset' type="reset" value="Clear" style="width: 45%;">
+</p>
+
+</form>
+
+<p style="color: #eee;">
+	Wrong username or password. Please try again.
+</p>
+</div>
+
+</body>
+
+</html>

=== added file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LoginAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LoginAction.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LoginAction.java	2011-09-21 20:13:56 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2004-2010, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ *   be used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.security.action;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.struts2.ServletActionContext;
+import org.springframework.mobile.device.Device;
+import org.springframework.mobile.device.DeviceResolver;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author mortenoh
+ */
+public class LoginAction
+    implements Action
+{
+    // -------------------------------------------------------------------------
+    // Dependencies
+    // -------------------------------------------------------------------------
+
+    private DeviceResolver deviceResolver;
+
+    public void setDeviceResolver( DeviceResolver deviceResolver )
+    {
+        this.deviceResolver = deviceResolver;
+    }
+
+    // -------------------------------------------------------------------------
+    // Input & Output
+    // -------------------------------------------------------------------------
+
+    // -------------------------------------------------------------------------
+    // Action implementation
+    // -------------------------------------------------------------------------
+
+    @Override
+    public String execute()
+    {
+        HttpServletRequest request = ServletActionContext.getRequest();
+        Device device = deviceResolver.resolveDevice( request );
+
+        if ( device.isMobile() )
+        {
+            return "mobile";
+        }
+
+        return "standard";
+    }
+}

=== added file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LogoutAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LogoutAction.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LogoutAction.java	2011-09-21 20:13:56 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2004-2010, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ *   be used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.security.action;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.struts2.ServletActionContext;
+import org.springframework.mobile.device.Device;
+import org.springframework.mobile.device.DeviceResolver;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author mortenoh
+ */
+public class LogoutAction
+    implements Action
+{
+    // -------------------------------------------------------------------------
+    // Dependencies
+    // -------------------------------------------------------------------------
+
+    private DeviceResolver deviceResolver;
+
+    public void setDeviceResolver( DeviceResolver deviceResolver )
+    {
+        this.deviceResolver = deviceResolver;
+    }
+
+    // -------------------------------------------------------------------------
+    // Input & Output
+    // -------------------------------------------------------------------------
+
+    // -------------------------------------------------------------------------
+    // Action implementation
+    // -------------------------------------------------------------------------
+
+    @Override
+    public String execute()
+    {
+        HttpServletRequest request = ServletActionContext.getRequest();
+        Device device = deviceResolver.resolveDevice( request );
+
+        if ( device.isMobile() )
+        {
+            return "mobile";
+        }
+
+        return "standard";
+    }
+}

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml	2011-09-08 10:38:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml	2011-09-21 20:13:56 +0000
@@ -89,6 +89,16 @@
     </property>
   </bean>
 
+  <bean id="org.springframework.mobile.device.DeviceResolver" class="org.springframework.mobile.device.LiteDeviceResolver" />
+
+  <bean id="org.hisp.dhis.security.action.LoginAction" class="org.hisp.dhis.security.action.LoginAction">
+    <property name="deviceResolver" ref="org.springframework.mobile.device.DeviceResolver" />
+  </bean>
+
+  <bean id="org.hisp.dhis.security.action.LogoutAction" class="org.hisp.dhis.security.action.LogoutAction">
+    <property name="deviceResolver" ref="org.springframework.mobile.device.DeviceResolver" />
+  </bean>
+
   <!-- Organisation Unit Web Tree -->
 
   <bean id="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" class="org.hisp.dhis.ouwt.manager.DefaultOrganisationUnitSelectionManager">

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2011-09-21 18:20:11 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2011-09-21 20:13:56 +0000
@@ -108,13 +108,15 @@
   <!-- Security -->
   <package name="dhis-web-commons-security" extends="dhis-web-commons" namespace="/dhis-web-commons/security">
 
-    <action name="login" class="org.hisp.dhis.commons.action.NoAction">
-      <result name="success" type="velocity">/dhis-web-commons/security/login.vm</result>
+    <action name="login" class="org.hisp.dhis.security.action.LoginAction">
+      <result name="standard" type="velocity">/dhis-web-commons/security/login.vm</result>
+      <result name="mobile" type="velocity">/dhis-web-commons/security/login_mobile.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
     </action>
 
-    <action name="loginfailed" class="org.hisp.dhis.commons.action.NoAction">
-      <result name="success" type="velocity">/dhis-web-commons/security/loginfailed.vm</result>
+    <action name="loginfailed" class="org.hisp.dhis.security.action.LogoutAction">
+      <result name="standard" type="velocity">/dhis-web-commons/security/loginfailed.vm</result>
+      <result name="mobile" type="velocity">/dhis-web-commons/security/loginfailed_mobile.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
     </action>