You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ca...@apache.org on 2006/08/24 04:08:07 UTC
svn commit: r434288 - in
/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main:
resources/localization/Continuum.properties resources/xwork.xml
webapp/navigations/Menu.jsp webapp/users.jsp
Author: carlos
Date: Wed Aug 23 19:08:06 2006
New Revision: 434288
URL: http://svn.apache.org/viewvc?rev=434288&view=rev
Log:
Make more use of maven-user, import xwork config, remove localization
Removed:
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/users.jsp
Modified:
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/Menu.jsp
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=434288&r1=434287&r2=434288&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties Wed Aug 23 19:08:06 2006
@@ -345,27 +345,6 @@
schedule.enabled.label = Enabled
schedule.enabled.message = Enable/Disable the schedule
-// ----------------------------------------------------------------------
-// Page: Add/Edit/DeleteUsers
-// ----------------------------------------------------------------------
-
-user.username = User Name
-user.password = Password
-user.email = Email Address
-users.page.title = Continuum - Users List
-users.section.title = Users List
-addUser.page.title = Continuum - Add User
-addUser.section.title = Add User
-editUser.page.title = Continuum - Edit User
-editUser.section.title = Edit User
-deleteUser.page.title = Continuum - Delete User
-deleteUser.section.title = Delete User
-deleteUser.confirmation.message = Are you sure you want to delete the user "{0}"?
-role.page.title = Continuum - Roles List
-role.section.title = Roles List
-role.rolename = Roles
-
-
# ----------------------------------------------------------------------
# Errors
# ----------------------------------------------------------------------
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml?rev=434288&r1=434287&r2=434288&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml Wed Aug 23 19:08:06 2006
@@ -2,6 +2,8 @@
<xwork>
<include file="webwork-default.xml"/>
+ <include file="org/apache/maven/user/webapp/xwork.xml"/>
+
<package name="default" extends="webwork-default">
<interceptors>
@@ -234,22 +236,6 @@
<action name="saveSchedule" class="schedule" method="save">
<result name="success" type="chain">schedules</result>
</action>
-
- <action name="users" class="users">
- <result name="success">/user/users.jsp</result>
- </action>
-
- <action name="editUser" class="editUser">
- <result name="input">/user/editUser.jsp</result>
- <result name="permissions">/user/addUserRole.jsp</result>
- <result name="success" type="chain">users</result>
- </action>
-
- <action name="deleteUser" class="deleteUser">
- <result name="delete">/user/deleteUser.jsp</result>
- <result name="success" type="chain">users</result>
- </action>
-
</package>
<package name="component" extends="default">
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/Menu.jsp?rev=434288&r1=434287&r2=434288&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/Menu.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/Menu.jsp Wed Aug 23 19:08:06 2006
@@ -51,7 +51,7 @@
</authz:authorize>
<authz:authorize ifAnyGranted="ROLE_admin,ROLE_manageUsers">
<div class="body">
- <a href="<ww:url value="users.action"/>"><ww:text name="menu.administration.users"/></a>
+ <a href="<ww:url value="/user/list.action"/>"><ww:text name="menu.administration.users"/></a>
</div>
</authz:authorize>
</div>