You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by jo...@apache.org on 2006/06/26 14:51:11 UTC

svn commit: r417180 - in /lenya/trunk/src: modules-core/administration/config/cocoon-xconf/ modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/ modules-core/administration/usecases/ pubs/default/config/ac/ pubs/default/config/menus/

Author: josias
Date: Mon Jun 26 05:51:10 2006
New Revision: 417180

URL: http://svn.apache.org/viewvc?rev=417180&view=rev
Log:
applied patch by Jörn Nettingsmeier (with some modifications): reworked usecases to change passwords and made usecases available in the gui. fixes bug #39765.

Added:
    lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AbstractChangePassword.java   (with props)
    lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/ChangePassword.java   (with props)
    lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/ChangePasswordAdmin.java   (with props)
    lenya/trunk/src/modules-core/administration/usecases/changePasswordAdmin.jx   (with props)
    lenya/trunk/src/modules-core/administration/usecases/passwordForm.jx   (with props)
Removed:
    lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserPassword.java
    lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserPasswordWithCheck.java
Modified:
    lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-changePassword.xconf
    lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-changePasswordAdmin.xconf
    lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AddUser.java
    lenya/trunk/src/modules-core/administration/usecases/changePassword.jx
    lenya/trunk/src/modules-core/administration/usecases/user.jx
    lenya/trunk/src/pubs/default/config/ac/usecase-policies.xml
    lenya/trunk/src/pubs/default/config/menus/generic.xsp

Modified: lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-changePassword.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-changePassword.xconf?rev=417180&r1=417179&r2=417180&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-changePassword.xconf (original)
+++ lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-changePassword.xconf Mon Jun 26 05:51:10 2006
@@ -15,7 +15,6 @@
   limitations under the License.
 -->
 
-<!-- $Id: usecases-workflow-deactivate.xconf 348547 2005-11-23 20:13:01Z chestnut $ -->
 <!--
     This file defines the publication specific use-cases
 -->
@@ -23,12 +22,10 @@
   <xconf xpath="/cocoon/usecases" unless="/cocoon/usecases/component-instance[@name = 'admin.changePassword']">
 
     <component-instance name="admin.changePassword" logger="lenya.admin"
-      class="org.apache.lenya.cms.ac.usecases.UserPasswordWithCheck">
-      <view template="modules/administration/usecases/changePassword.jx" menu="true">
-        <tab group="admin" name="users"/>
+      class="org.apache.lenya.cms.ac.usecases.ChangePassword">
+      <view template="modules/administration/usecases/changePassword.jx">
         <parameter name="checkPassword" value="true"/>
       </view>
-      <exit usecase="admin.user"/>
     </component-instance>
     
   </xconf>

Modified: lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-changePasswordAdmin.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-changePasswordAdmin.xconf?rev=417180&r1=417179&r2=417180&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-changePasswordAdmin.xconf (original)
+++ lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-changePasswordAdmin.xconf Mon Jun 26 05:51:10 2006
@@ -15,15 +15,14 @@
   limitations under the License.
 -->
 
-<!-- $Id: usecases-workflow-deactivate.xconf 348547 2005-11-23 20:13:01Z chestnut $ -->
 <!--
     This file defines the publication specific use-cases
 -->
 
   <xconf xpath="/cocoon/usecases" unless="/cocoon/usecases/component-instance[@name = 'admin.changePasswordAdmin']">
 
-    <component-instance name="admin.changePasswordAdmin" logger="lenya.admin" class="org.apache.lenya.cms.ac.usecases.UserPassword">
-      <view template="modules/administration/usecases/changePassword.jx" menu="true">
+    <component-instance name="admin.changePasswordAdmin" logger="lenya.admin" class="org.apache.lenya.cms.ac.usecases.ChangePasswordAdmin">
+      <view template="modules/administration/usecases/changePasswordAdmin.jx" menu="true">
         <tab group="admin" name="users"/>
         <parameter name="checkPassword" value="false"/>
       </view>

Added: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AbstractChangePassword.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AbstractChangePassword.java?rev=417180&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AbstractChangePassword.java (added)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AbstractChangePassword.java Mon Jun 26 05:51:10 2006
@@ -0,0 +1,70 @@
+/*
+ * Copyright  1999-2004 The Apache Software Foundation
+ *
+ *  Licensed 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.
+ *
+ */
+package org.apache.lenya.cms.ac.usecases;
+
+import org.apache.lenya.ac.User;
+
+
+/**
+ * Usecase to change a user's password.
+ */
+public abstract class AbstractChangePassword extends AccessControlUsecase {
+
+    protected static final String NEW_PASSWORD = "password";
+    protected static final String CONFIRM_PASSWORD = "confirmPassword";
+
+    protected abstract User getUser();
+
+    /**
+     * @see org.apache.lenya.cms.usecase.AbstractUsecase#doCheckExecutionConditions()
+     */
+    protected void doCheckExecutionConditions() throws Exception {
+        super.doCheckExecutionConditions();
+        checkNewPassword(this);
+    }
+
+    /**
+     * @see org.apache.lenya.cms.usecase.AbstractUsecase#doExecute()
+     */
+    protected void doExecute() throws Exception {
+        super.doExecute();
+        getUser().setPassword(getParameterAsString(NEW_PASSWORD));
+        getUser().save();
+    }
+
+    /**
+     * Checks a password and a confirmed password.
+     * @param usecase The usecase.
+     */
+    protected static void checkNewPassword(AccessControlUsecase usecase) {
+        String password = usecase.getParameterAsString(NEW_PASSWORD);
+        String confirmPassword = usecase.getParameterAsString(CONFIRM_PASSWORD);
+
+        if (!password.equals(confirmPassword)) {
+            usecase.addErrorMessage("Password and confirmed password are not equal.");
+        }
+
+        if (password.length() < 6) {
+            usecase.addErrorMessage("The password must be at least six characters long.");
+        }
+
+        if (!password.matches(".*\\d.*")) {
+            usecase.addErrorMessage("The password must contain at least one number.");
+        }
+    }
+
+}

Propchange: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AbstractChangePassword.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AddUser.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AddUser.java?rev=417180&r1=417179&r2=417180&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AddUser.java (original)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AddUser.java Mon Jun 26 05:51:10 2006
@@ -77,7 +77,7 @@
         }
 
         else {
-            UserPassword.checkNewPassword(this);
+            ChangePassword.checkNewPassword(this);
         }
 
     }
@@ -109,7 +109,7 @@
             String ldapId = getParameterAsString(LDAP_ID);
             user = new LDAPUser(configDir, userId, email, ldapId, getLogger());
         } else {
-            String password = getParameterAsString(UserPassword.NEW_PASSWORD);
+            String password = getParameterAsString(AbstractChangePassword.NEW_PASSWORD);
             user = new FileUser(configDir, userId, fullName, email, "");
             user.setName(fullName);
             user.setPassword(password);

Added: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/ChangePassword.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/ChangePassword.java?rev=417180&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/ChangePassword.java (added)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/ChangePassword.java Mon Jun 26 05:51:10 2006
@@ -0,0 +1,53 @@
+/*
+ * Copyright  1999-2004 The Apache Software Foundation
+ *
+ *  Licensed 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.
+ *
+ */
+package org.apache.lenya.cms.ac.usecases;
+
+import org.apache.lenya.ac.User;
+
+/**
+ * Usecase to change a user's password. The old password is checked.
+ */
+public class ChangePassword extends AbstractChangePassword {
+
+    protected static final String OLD_PASSWORD = "oldPassword";
+
+    /**
+     * @return Always returns the currently logged in user.
+     */
+    protected User getUser() {
+        return getSession().getIdentity().getUser();
+    }
+
+    /**
+     * @see org.apache.lenya.cms.usecase.AbstractUsecase#doCheckExecutionConditions()
+     */
+    protected void doCheckExecutionConditions() throws Exception {
+        super.doCheckExecutionConditions();
+        checkOldPassword();
+    }
+
+    /**
+     * verifies that the user knows the current password before s/he is allowed to change it.
+     */
+    private void checkOldPassword() {
+        String oldPassword = getParameterAsString(OLD_PASSWORD);
+        boolean authenticated = getUser().authenticate(oldPassword);
+        if (!authenticated) {
+            addErrorMessage("The old password is not correct.");
+        }
+    }
+}

Propchange: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/ChangePassword.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/ChangePasswordAdmin.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/ChangePasswordAdmin.java?rev=417180&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/ChangePasswordAdmin.java (added)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/ChangePasswordAdmin.java Mon Jun 26 05:51:10 2006
@@ -0,0 +1,47 @@
+/*
+ * Copyright  1999-2004 The Apache Software Foundation
+ *
+ *  Licensed 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.
+ *
+ */
+package org.apache.lenya.cms.ac.usecases;
+
+import org.apache.lenya.ac.User;
+
+/**
+ * Usecase to change a user's password.
+ */
+public class ChangePasswordAdmin extends AbstractChangePassword {
+
+    private User user;
+
+    protected User getUser() {
+        if (this.user == null) {
+            String userId = getParameterAsString(UserProfile.USER_ID);
+            this.user = getUserManager().getUser(userId);
+        }
+        return this.user;
+    }
+
+    /**
+     * @see org.apache.lenya.cms.usecase.AbstractUsecase#doCheckExecutionConditions()
+     */
+    protected void doCheckExecutionConditions() throws Exception {
+        super.doCheckExecutionConditions();
+        if (getUser() == null) {
+            addErrorMessage("The " + UserProfile.USER_ID 
+                + " parameter has to be provided when executing this usecase.");
+            return;
+        }
+    }
+}
\ No newline at end of file

Propchange: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/ChangePasswordAdmin.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: lenya/trunk/src/modules-core/administration/usecases/changePassword.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/changePassword.jx?rev=417180&r1=417179&r2=417180&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/changePassword.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/changePassword.jx Mon Jun 26 05:51:10 2006
@@ -23,46 +23,18 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"    
   >
   
+  <page:title>
+    <i18n:text>Change Password</i18n:text>
+  </page:title>
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
-    <div id="contentblock1" class="lenya-tab">
-    
-    <h1><i18n:text>Change Password</i18n:text></h1>
-    
-    <form id="form-change_password">
-      <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
-      <input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
+    <div class="lenya-box">
+      <div class="lenya-box-title">
+      <i18n:text>Change Password for</i18n:text> Current User
+      </div>
+    </div>
 
-      <table class="lenya-table-noborder">
-        <tr>
-          <td colspan="2">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
-          </td>
-        </tr>
-        <jx:if test="${usecase.getView().getParameter('checkPassword').equals('true')}">
-          <tr>
-            <td class="lenya-entry-caption"><label for="oldPassword"><i18n:text>Old Password</i18n:text> *</label></td>
-            <td><input type="password" name="oldPassword" class="lenya-form-element" value="${usecase.getParameter('oldPassword')}"/></td>
-          </tr>
-        </jx:if>
-        <tr>
-          <td class="lenya-entry-caption"><label for="password"><i18n:text>New Password</i18n:text> *</label></td>
-          <td><input type="password" name="password" class="lenya-form-element" value="${usecase.getParameter('password')}"/></td>
-        </tr>
-        <tr>
-          <td class="lenya-entry-caption"><label for="confirmPassword"><i18n:text>Confirm Password</i18n:text> *</label></td>
-          <td><input type="password" name="confirmPassword" class="lenya-form-element" value="${usecase.getParameter('confirmPassword')}"/></td>
-        </tr>
-        
-        <tr>
-          <td/>
-          <td>
-            <input i18n:attr="value" type="submit" name="submit" value="Save"/>
-            <input i18n:attr="value" type="submit" name="cancel" value="Cancel"/>
-          </td>
-        </tr>
-      </table>
-    </form>
+    <div class="lenya-box-body">
+      <jx:import uri="fallback://lenya/modules/administration/usecases/passwordForm.jx"/>
     </div>
   </page:body>
 </page:page>

Added: lenya/trunk/src/modules-core/administration/usecases/changePasswordAdmin.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/changePasswordAdmin.jx?rev=417180&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/changePasswordAdmin.jx (added)
+++ lenya/trunk/src/modules-core/administration/usecases/changePasswordAdmin.jx Mon Jun 26 05:51:10 2006
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 1999-2005 The Apache Software Foundation
+
+  Licensed 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.
+-->
+
+<page:page
+  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
+  xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0"
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"    
+  >
+  
+  <page:body>
+    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <div id="contentblock1" class="lenya-tab">
+    
+      <h1>
+        <i18n:text>Change Password for</i18n:text>
+        <jx:choose>
+          <jx:when test="${usecase.getParameter('userId')}">
+             User "<jx:out value="${usecase.getParameter('userId')}"/>".
+          </jx:when>
+          <jx:otherwise>
+             Current User.
+          </jx:otherwise>
+        </jx:choose>
+      </h1>
+      
+      <jx:import uri="fallback://lenya/modules/administration/usecases/passwordForm.jx"/>
+
+    </div>
+  </page:body>
+</page:page>
\ No newline at end of file

Propchange: lenya/trunk/src/modules-core/administration/usecases/changePasswordAdmin.jx
------------------------------------------------------------------------------
    svn:eol-style = native

Added: lenya/trunk/src/modules-core/administration/usecases/passwordForm.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/passwordForm.jx?rev=417180&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/passwordForm.jx (added)
+++ lenya/trunk/src/modules-core/administration/usecases/passwordForm.jx Mon Jun 26 05:51:10 2006
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 1999-2005 The Apache Software Foundation
+
+  Licensed 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.
+-->
+
+<jx:template
+  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
+  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+  xmlns="http://www.w3.org/1999/xhtml"
+  name="">
+
+  <form id="form-change_password">
+    <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
+    <input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
+
+    <table class="lenya-table-noborder">
+      <tr>
+        <td colspan="2">
+          <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+        </td>
+      </tr>
+      <jx:if test="${usecase.getView().getParameter('checkPassword').equals('true')}">
+        <tr>
+          <td class="lenya-entry-caption"><label for="oldPassword"><i18n:text>Old Password</i18n:text> *</label></td>
+          <td><input type="password" name="oldPassword" class="lenya-form-element" value="${usecase.getParameter('oldPassword')}"/></td>
+        </tr>
+      </jx:if>
+      <tr>
+        <td class="lenya-entry-caption"><label for="password"><i18n:text>New Password</i18n:text> *</label></td>
+        <td><input type="password" name="password" class="lenya-form-element" value="${usecase.getParameter('password')}"/></td>
+      </tr>
+      <tr>
+        <td class="lenya-entry-caption"><label for="confirmPassword"><i18n:text>Confirm Password</i18n:text> *</label></td>
+        <td><input type="password" name="confirmPassword" class="lenya-form-element" value="${usecase.getParameter('confirmPassword')}"/></td>
+      </tr>
+      
+      <tr>
+        <td/>
+        <td>
+          <input i18n:attr="value" type="submit" name="submit" value="Save"/>
+          <input i18n:attr="value" type="submit" name="cancel" value="Cancel"/>
+        </td>
+      </tr>
+    </table>
+  </form>
+</jx:template>
\ No newline at end of file

Propchange: lenya/trunk/src/modules-core/administration/usecases/passwordForm.jx
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: lenya/trunk/src/modules-core/administration/usecases/user.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/user.jx?rev=417180&r1=417179&r2=417180&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/user.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/user.jx Mon Jun 26 05:51:10 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright 1999-2005 The Apache Software Foundation
 
@@ -74,6 +75,17 @@
               <input type="hidden" name="lenya.usecase" value="admin.userProfile"/>
               <input type="hidden" name="userId" value="${user.getId()}"/>
               <input i18n:attr="value" type="submit" value="Edit Profile" name="input-edit_user_profile"/>
+            </form>
+          </td>
+        </tr>
+       
+        <tr>
+          <td/>
+          <td>
+            <form id="form-change_user_password">
+              <input type="hidden" name="lenya.usecase" value="admin.changePasswordAdmin"/>
+              <input type="hidden" name="userId" value="${user.getId()}"/>
+              <input i18n:attr="value" type="submit" value="Change Password" name="input-change_user_password"/>
             </form>
           </td>
         </tr>

Modified: lenya/trunk/src/pubs/default/config/ac/usecase-policies.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/config/ac/usecase-policies.xml?rev=417180&r1=417179&r2=417180&view=diff
==============================================================================
--- lenya/trunk/src/pubs/default/config/ac/usecase-policies.xml (original)
+++ lenya/trunk/src/pubs/default/config/ac/usecase-policies.xml Mon Jun 26 05:51:10 2006
@@ -197,6 +197,8 @@
   </usecase>
   <usecase id="admin.changePassword">
     <role id="admin"/>
+    <role id="edit"/>
+    <role id="review"/>
   </usecase>
   <usecase id="admin.changePasswordAdmin">
     <role id="admin"/>

Modified: lenya/trunk/src/pubs/default/config/menus/generic.xsp
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/config/menus/generic.xsp?rev=417180&r1=417179&r2=417180&view=diff
==============================================================================
--- lenya/trunk/src/pubs/default/config/menus/generic.xsp (original)
+++ lenya/trunk/src/pubs/default/config/menus/generic.xsp Mon Jun 26 05:51:10 2006
@@ -68,6 +68,7 @@
           <item uc:usecase="site.deleteLanguage" href="?"><i18n:text>Remove Language Version</i18n:text></item>
         </block>
         <block>
+          <item uc:usecase="admin.changePassword" href="?"><i18n:text>Change Password</i18n:text></item>
           <item uc:usecase="ac.logout" href="?"><i18n:text>Logout</i18n:text></item>
         </block>
       </menu>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org