geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r490485 - in /geronimo/server: branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/ branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/ branches/1.2/a...
Date Wed, 27 Dec 2006 12:11:21 GMT
Author: vamsic007
Date: Wed Dec 27 04:11:20 2006
New Revision: 490485

URL: http://svn.apache.org/viewvc?view=rev&rev=490485
Log:
GERONIMO-2027 Mismatched passwords when editing user in web console
  o Removed the prepopulated bogus values
  o Modified the SEUsersPortlet to update on receiving non empty password only

Modified:
    geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java
    geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp
    geronimo/server/branches/1.2/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java
    geronimo/server/branches/1.2/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp

Modified: geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java?view=diff&rev=490485&r1=490484&r2=490485
==============================================================================
--- geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java
(original)
+++ geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java
Wed Dec 27 04:11:20 2006
@@ -33,6 +33,9 @@
 import org.apache.geronimo.console.util.SERealmGroupHelper;
 import org.apache.geronimo.console.util.SERealmUserHelper;
 
+/**
+ * @version $Rev$ $Date$
+ */
 public class SEUsersPortlet extends AbstractSecurityManagerPortlet {
 
     protected void doView(RenderRequest renderRequest,
@@ -129,7 +132,10 @@
                     }
                 }
             } else if ("update".equals(action)) {
-                SERealmUserHelper.updateUser(user, password);
+                if(password != null && !password.equals("")) {
+                    // Update the password only when it is not blank.
+                    SERealmUserHelper.updateUser(user, password);
+                }
             } else if ("add".equals(action)) {
                 try {
                     SERealmUserHelper.addUser(user, password);

Modified: geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp?view=diff&rev=490485&r1=490484&r2=490485
==============================================================================
--- geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp
(original)
+++ geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp
Wed Dec 27 04:11:20 2006
@@ -1,3 +1,22 @@
+<%--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+--%>
+
+<%-- $Rev$ $Date$ --%>
+
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <script language="JavaScript">
@@ -25,16 +44,12 @@
         <c:when test="${add}"> 
        		<b>ADD USER</b>
       		<c:set var="UserName" value=""/>
-      		<c:set var="Password" value=""/>      		
-      		<c:set var="Password2" value=""/>      		
       		<c:set var="Action" value="add"/>      		
       		<c:set var="Submit" value="Add"/>
        </c:when>
        <c:otherwise>
 			<b>UPDATE USER</b>
       		<c:set var="UserName" value="${userID}"/>
-      		<c:set var="Password" value="xxxxxxxx"/>
-      		<c:set var="Password2" value="yyyyyyyy"/>      		
       		<c:set var="Action" value="update"/>      		
       		<c:set var="Submit" value="Update"/>
        </c:otherwise>
@@ -59,11 +74,11 @@
     </tr>   
     <tr>
         <td width="200">Password</td>
-        <td><input type="password" name="password" value="${Password}"></td>
+        <td><input type="password" name="password" value=""></td>
     </tr>   
     <tr>
         <td width="200">Confirm Password</td>
-        <td><input type="password" name="confirmpassword" value="${Password2}"></td>
+        <td><input type="password" name="confirmpassword" value=""></td>
     </tr>
     <tr>   
        <td>&nbsp;</td> <td  align="left" class="formElement"><input
type="submit" value="${Submit}" onclick="return <portlet:namespace/>validateForm()">
<input type="submit" name="cancel"  value="Cancel"></td>

Modified: geronimo/server/branches/1.2/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java?view=diff&rev=490485&r1=490484&r2=490485
==============================================================================
--- geronimo/server/branches/1.2/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java
(original)
+++ geronimo/server/branches/1.2/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java
Wed Dec 27 04:11:20 2006
@@ -33,6 +33,9 @@
 import org.apache.geronimo.console.util.SERealmGroupHelper;
 import org.apache.geronimo.console.util.SERealmUserHelper;
 
+/**
+ * @version $Rev$ $Date$
+ */
 public class SEUsersPortlet extends AbstractSecurityManagerPortlet {
 
     protected void doView(RenderRequest renderRequest,
@@ -129,7 +132,10 @@
                     }
                 }
             } else if ("update".equals(action)) {
-                SERealmUserHelper.updateUser(user, password);
+                if(password != null && !password.equals("")) {
+                    // Update the password only when it is not blank.
+                    SERealmUserHelper.updateUser(user, password);
+                }
             } else if ("add".equals(action)) {
                 try {
                     SERealmUserHelper.addUser(user, password);

Modified: geronimo/server/branches/1.2/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp?view=diff&rev=490485&r1=490484&r2=490485
==============================================================================
--- geronimo/server/branches/1.2/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp
(original)
+++ geronimo/server/branches/1.2/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp
Wed Dec 27 04:11:20 2006
@@ -14,6 +14,9 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
+
+<%-- $Rev$ $Date$ --%>
+
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <script language="JavaScript">
@@ -41,16 +44,12 @@
         <c:when test="${add}"> 
        		<b>ADD USER</b>
       		<c:set var="UserName" value=""/>
-      		<c:set var="Password" value=""/>      		
-      		<c:set var="Password2" value=""/>      		
       		<c:set var="Action" value="add"/>      		
       		<c:set var="Submit" value="Add"/>
        </c:when>
        <c:otherwise>
 			<b>UPDATE USER</b>
       		<c:set var="UserName" value="${userID}"/>
-      		<c:set var="Password" value="xxxxxxxx"/>
-      		<c:set var="Password2" value="yyyyyyyy"/>      		
       		<c:set var="Action" value="update"/>      		
       		<c:set var="Submit" value="Update"/>
        </c:otherwise>
@@ -75,11 +74,11 @@
     </tr>   
     <tr>
         <td width="200">Password</td>
-        <td><input type="password" name="password" value="${Password}"></td>
+        <td><input type="password" name="password" value=""></td>
     </tr>   
     <tr>
         <td width="200">Confirm Password</td>
-        <td><input type="password" name="confirmpassword" value="${Password2}"></td>
+        <td><input type="password" name="confirmpassword" value=""></td>
     </tr>
     <tr>   
        <td>&nbsp;</td> <td  align="left" class="formElement"><input
type="submit" value="${Submit}" onclick="return <portlet:namespace/>validateForm()">
<input type="submit" name="cancel"  value="Cancel"></td>

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java?view=diff&rev=490485&r1=490484&r2=490485
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java
(original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java
Wed Dec 27 04:11:20 2006
@@ -33,6 +33,9 @@
 import org.apache.geronimo.console.util.SERealmGroupHelper;
 import org.apache.geronimo.console.util.SERealmUserHelper;
 
+/**
+ * @version $Rev$ $Date$
+ */
 public class SEUsersPortlet extends AbstractSecurityManagerPortlet {
 
     protected void doView(RenderRequest renderRequest,
@@ -129,7 +132,10 @@
                     }
                 }
             } else if ("update".equals(action)) {
-                SERealmUserHelper.updateUser(user, password);
+                if(password != null && !password.equals("")) {
+                    // Update the password only when it is not blank.
+                    SERealmUserHelper.updateUser(user, password);
+                }
             } else if ("add".equals(action)) {
                 try {
                     SERealmUserHelper.addUser(user, password);

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp?view=diff&rev=490485&r1=490484&r2=490485
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp
(original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp
Wed Dec 27 04:11:20 2006
@@ -14,6 +14,9 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
+
+<%-- $Rev$ $Date$ --%>
+
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <script language="JavaScript">
@@ -41,16 +44,12 @@
         <c:when test="${add}"> 
        		<b>ADD USER</b>
       		<c:set var="UserName" value=""/>
-      		<c:set var="Password" value=""/>      		
-      		<c:set var="Password2" value=""/>      		
       		<c:set var="Action" value="add"/>      		
       		<c:set var="Submit" value="Add"/>
        </c:when>
        <c:otherwise>
 			<b>UPDATE USER</b>
       		<c:set var="UserName" value="${userID}"/>
-      		<c:set var="Password" value="xxxxxxxx"/>
-      		<c:set var="Password2" value="yyyyyyyy"/>      		
       		<c:set var="Action" value="update"/>      		
       		<c:set var="Submit" value="Update"/>
        </c:otherwise>
@@ -75,11 +74,11 @@
     </tr>   
     <tr>
         <td width="200">Password</td>
-        <td><input type="password" name="password" value="${Password}"></td>
+        <td><input type="password" name="password" value=""></td>
     </tr>   
     <tr>
         <td width="200">Confirm Password</td>
-        <td><input type="password" name="confirmpassword" value="${Password2}"></td>
+        <td><input type="password" name="confirmpassword" value=""></td>
     </tr>
     <tr>   
        <td>&nbsp;</td> <td  align="left" class="formElement"><input
type="submit" value="${Submit}" onclick="return <portlet:namespace/>validateForm()">
<input type="submit" name="cancel"  value="Cancel"></td>



Mime
View raw message