You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2006/09/13 06:47:00 UTC
svn commit: r442839 - in
/maven/shared/trunk/maven-user/maven-user-controller/src/main:
java/org/apache/maven/user/controller/action/
resources/org/apache/maven/user/webapp/
Author: carlos
Date: Tue Sep 12 21:46:59 2006
New Revision: 442839
URL: http://svn.apache.org/viewvc?view=rev&rev=442839
Log:
Use camel case and singular names for actions
Added:
maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserGroupAction.java
- copied, changed from r442241, maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserGroupsAction.java
Removed:
maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserGroupsAction.java
Modified:
maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserGroupAction.java
maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserGroupAction.java
maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserAction.java
maven/shared/trunk/maven-user/maven-user-controller/src/main/resources/org/apache/maven/user/webapp/xwork.xml
Modified: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserGroupAction.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserGroupAction.java?view=diff&rev=442839&r1=442838&r2=442839
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserGroupAction.java (original)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserGroupAction.java Tue Sep 12 21:46:59 2006
@@ -25,7 +25,7 @@
*
* @plexus.component
* role="com.opensymphony.xwork.Action"
- * role-hint="deleteUsergroup"
+ * role-hint="deleteUserGroup"
*/
public class DeleteUserGroupAction
extends PlexusActionSupport
Modified: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserGroupAction.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserGroupAction.java?view=diff&rev=442839&r1=442838&r2=442839
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserGroupAction.java (original)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserGroupAction.java Tue Sep 12 21:46:59 2006
@@ -21,13 +21,9 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.maven.user.model.PasswordRuleViolationException;
-import org.apache.maven.user.model.PasswordRuleViolations;
import org.apache.maven.user.model.Permission;
-import org.apache.maven.user.model.User;
import org.apache.maven.user.model.UserGroup;
import org.apache.maven.user.model.UserManager;
-import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import com.opensymphony.webwork.interceptor.ServletRequestAware;
@@ -38,8 +34,7 @@
*
* @plexus.component
* role="com.opensymphony.xwork.Action"
- * role-hint="editUsergroup"
- * instantiation-strategy="per-lookup"
+ * role-hint="editUserGroup"
*/
public class EditUserGroupAction
extends PlexusActionSupport
Modified: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserAction.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserAction.java?view=diff&rev=442839&r1=442838&r2=442839
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserAction.java (original)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserAction.java Tue Sep 12 21:46:59 2006
@@ -27,7 +27,7 @@
*
* @plexus.component
* role="com.opensymphony.xwork.Action"
- * role-hint="listUsers"
+ * role-hint="listUser"
*/
public class ListUserAction
extends PlexusActionSupport
Copied: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserGroupAction.java (from r442241, maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserGroupsAction.java)
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserGroupAction.java?view=diff&rev=442839&p1=maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserGroupsAction.java&r1=442241&p2=maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserGroupAction.java&r2=442839
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserGroupsAction.java (original)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserGroupAction.java Tue Sep 12 21:46:59 2006
@@ -27,9 +27,9 @@
*
* @plexus.component
* role="com.opensymphony.xwork.Action"
- * role-hint="listUsergroups"
+ * role-hint="listUserGroup"
*/
-public class ListUserGroupsAction
+public class ListUserGroupAction
extends PlexusActionSupport
{
Modified: maven/shared/trunk/maven-user/maven-user-controller/src/main/resources/org/apache/maven/user/webapp/xwork.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/src/main/resources/org/apache/maven/user/webapp/xwork.xml?view=diff&rev=442839&r1=442838&r2=442839
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/main/resources/org/apache/maven/user/webapp/xwork.xml (original)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/main/resources/org/apache/maven/user/webapp/xwork.xml Tue Sep 12 21:46:59 2006
@@ -1,6 +1,7 @@
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN" "http://www.opensymphony.com/xwork/xwork-1.0.dtd">
<xwork>
+
<package name="maven-user" extends="webwork-default" namespace="/user">
<action name="edit" class="editUser">
@@ -14,7 +15,7 @@
<result name="success" type="chain">list</result>
</action>
- <action name="list" class="listUsers">
+ <action name="list" class="listUser">
<result name="success">/user/list.jsp</result>
</action>
@@ -27,21 +28,26 @@
<result name="input">/user/edit.jsp</result>
<result name="success" type="chain">list</result>
</action>
-
- <action name="editGroup" class="editUsergroup">
- <result name="input">/user/groups/edit.jsp</result>
+
+ </package>
+
+ <package name="maven-user-group" extends="webwork-default" namespace="/user/group">
+
+ <action name="editGroup" class="editUserGroup">
+ <result name="input">/user/group/edit.jsp</result>
<result name="permissions">/user/addRole.jsp</result>
<result name="success" type="chain">list</result>
</action>
- <action name="deleteGroup" class="deleteUsergroup">
- <result name="delete">/user/groups/delete.jsp</result>
+ <action name="deleteGroup" class="deleteUserGroup">
+ <result name="delete">/user/group/delete.jsp</result>
<result name="success" type="chain">list</result>
</action>
- <action name="listGroups" class="listUsergroups">
- <result name="success">/user/groups/list.jsp</result>
+ <action name="listGroups" class="listUserGroups">
+ <result name="success">/user/group/list.jsp</result>
</action>
</package>
+
</xwork>