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/08/02 22:56:58 UTC
svn commit: r428145 - in
/maven/shared/trunk/maven-user/maven-user-controller: ./
src/main/java/org/apache/maven/user/controller/action/
Author: carlos
Date: Wed Aug 2 13:56:58 2006
New Revision: 428145
URL: http://svn.apache.org/viewvc?rev=428145&view=rev
Log:
Added actions from Continuum
Added:
maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/
maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/AddUserRoleAction.java (with props)
maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserAction.java (with props)
maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java (with props)
maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/UsersAction.java (with props)
Modified:
maven/shared/trunk/maven-user/maven-user-controller/pom.xml
Modified: maven/shared/trunk/maven-user/maven-user-controller/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/pom.xml?rev=428145&r1=428144&r2=428145&view=diff
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/pom.xml (original)
+++ maven/shared/trunk/maven-user/maven-user-controller/pom.xml Wed Aug 2 13:56:58 2006
@@ -21,5 +21,17 @@
<artifactId>maven-user-model</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-xwork-integration</artifactId>
+ <version>1.0-alpha-2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
+
</project>
Added: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/AddUserRoleAction.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/AddUserRoleAction.java?rev=428145&view=auto
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/AddUserRoleAction.java (added)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/AddUserRoleAction.java Wed Aug 2 13:56:58 2006
@@ -0,0 +1,112 @@
+package org.apache.maven.user.controller.action;
+
+/*
+ * Copyright 2006 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.
+ */
+
+import java.util.List;
+
+import org.apache.maven.user.model.Permission;
+import org.apache.maven.user.model.User;
+import org.apache.maven.user.model.UserManager;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+
+/**
+ * @author Teody Cue
+ * @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="addUserRole"
+ */
+public class AddUserRoleAction
+ extends PlexusActionSupport
+{
+
+ private static final long serialVersionUID = 6977844294060864622L;
+
+ private UserManager userManager;
+
+ private User user;
+
+ private List permissions;
+
+ private Permission permission;
+
+ private int accountId;
+
+ private String permissionName;
+
+ public String execute()
+ throws Exception
+ {
+// try
+// {
+ user = userManager.getUser( accountId );
+ permissions = userManager.getPermissions();
+ int i;
+ for ( i = 0; i < permissions.size(); i++ )
+ {
+ permission = (Permission) permissions.get( i );
+ if ( permission.getName().equalsIgnoreCase( permissionName ) )
+ {
+ break;
+ }
+ }
+ if ( i < permissions.size() )
+ {
+ user.getGroup().addPermission( permission );
+ userManager.updateUser( user );
+ }
+ else
+ {
+ addActionMessage( "Can't add user role (id=" + accountId + ", role=" + permissionName
+ + ") : Role does not exist." );
+ }
+// }
+// catch ( ContinuumException e )
+// {
+// addActionMessage( "Can't add user role (id=" + accountId + ", role=" + permissionName + ") : "
+// + e.getMessage() );
+//
+// e.printStackTrace();
+//
+// return ERROR;
+// }
+
+ return SUCCESS;
+ }
+
+ public int getAccountId()
+ {
+ return accountId;
+ }
+
+ public void setAccountId( int accountId )
+ {
+ this.accountId = accountId;
+ }
+
+ public String getPermissionName()
+ {
+ return permissionName;
+ }
+
+ public void setPermissionName( String permissionName )
+ {
+ this.permissionName = permissionName;
+ }
+
+}
Propchange: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/AddUserRoleAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/AddUserRoleAction.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserAction.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserAction.java?rev=428145&view=auto
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserAction.java (added)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserAction.java Wed Aug 2 13:56:58 2006
@@ -0,0 +1,85 @@
+package org.apache.maven.user.controller.action;
+
+/*
+ * Copyright 2006 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.
+ */
+
+import org.apache.maven.user.model.UserManager;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+
+/**
+ * @author Henry Isidro
+ * @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="deleteUser"
+ */
+public class DeleteUserAction
+ extends PlexusActionSupport
+{
+ /**
+ * @plexus.requirement
+ */
+ private UserManager userManager;
+
+ private int accountId;
+
+ private String username;
+
+ public String execute()
+ throws Exception
+ {
+// try
+// {
+ userManager.removeUser( accountId );
+// }
+// catch ( ContinuumException e )
+// {
+// addActionMessage( "Can't delete user (id=" + accountId + ") : " + e.getMessage() );
+//
+// e.printStackTrace();
+//
+// return ERROR;
+// }
+
+ return SUCCESS;
+ }
+
+ public String doDelete()
+ {
+ return "delete";
+ }
+
+ public int getAccountId()
+ {
+ return accountId;
+ }
+
+ public void setAccountId( int accountId )
+ {
+ this.accountId = accountId;
+ }
+
+ public String getUsername()
+ {
+ return username;
+ }
+ public void setUsername( String username )
+ {
+ this.username = username;
+ }
+
+}
Propchange: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserAction.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java?rev=428145&view=auto
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java (added)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java Wed Aug 2 13:56:58 2006
@@ -0,0 +1,391 @@
+package org.apache.maven.user.controller.action;
+
+/*
+ * Copyright 2006 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.
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+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.xwork.action.PlexusActionSupport;
+
+import com.opensymphony.webwork.interceptor.ServletRequestAware;
+
+/**
+ * @author Henry Isidro
+ * @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="editUser"
+ */
+public class EditUserAction
+ extends PlexusActionSupport
+ implements ServletRequestAware
+{
+
+ private static final long serialVersionUID = 8143169847676423348L;
+
+ /**
+ * @plexus.requirement
+ */
+ private UserManager userManager;
+
+ private User user;
+
+ private UserGroup userGroup;
+
+ private List staticPermissions;
+
+ private List availablePermissions;
+
+ private Permission staticPermission;
+
+ private Permission permission;
+
+ private String permissionName;
+
+ private boolean addMode = false;
+
+ private int accountId;
+
+ private String username;
+
+ private String password;
+
+ private String email;
+
+ private List permissions;
+
+ private HttpServletRequest request;
+
+ public String execute()
+ throws Exception
+ {
+ permissions = (List) request.getSession().getAttribute( "permissions" );
+ username = username.substring( 0, username.indexOf( "," ) );
+ password = password.substring( 0, password.indexOf( "," ) );
+ email = email.substring( 0, email.indexOf( "," ) );
+
+ if ( addMode )
+ {
+// try
+// {
+ userGroup = new UserGroup();
+ userGroup.setName( username );
+ userGroup.setPermissions( permissions );
+
+ user = new User();
+ user.setUsername( username );
+ user.setPassword( password );
+ user.setEmail( email );
+ user.setGroup( userGroup );
+ userManager.addUser( user );
+// }
+// catch ( ContinuumException e )
+// {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+//
+// return ERROR;
+// }
+ }
+ else
+ {
+// try
+// {
+ user = userManager.getUser( accountId );
+ user.setUsername( username );
+ user.setPassword( password );
+ user.setEmail( email );
+ user.getGroup().setPermissions( permissions );
+// }
+// catch ( ContinuumException e )
+// {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+//
+// return ERROR;
+// }
+
+// try
+// {
+ userManager.updateUser( user );
+// }
+// catch ( ContinuumException e )
+// {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+//
+// return ERROR;
+// }
+ }
+
+ request.getSession().removeAttribute( "addMode" );
+ request.getSession().removeAttribute( "accountId" );
+ request.getSession().removeAttribute( "username" );
+ request.getSession().removeAttribute( "password" );
+ request.getSession().removeAttribute( "email" );
+ request.getSession().removeAttribute( "permissions" );
+
+ return SUCCESS;
+ }
+
+ public String doAdd()
+ throws Exception
+ {
+ addMode = true;
+ return INPUT;
+ }
+
+ public String doEdit()
+ throws Exception
+ {
+// try
+// {
+ addMode = false;
+ user = userManager.getUser( accountId );
+ username = user.getUsername();
+ //password = user.getPassword(); don't access the password
+ email = user.getEmail();
+ permissions = user.getGroup().getPermissions();
+ if ( permissions.size() == 1 )
+ {
+ permissionName = ( (Permission) permissions.get( 0 ) ).getName();
+ }
+// }
+// catch ( ContinuumException e )
+// {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+//
+// return ERROR;
+// }
+
+ return INPUT;
+ }
+
+ public String doGetAvailablePermissions()
+ throws Exception
+ {
+// try
+// {
+ int i, j;
+ availablePermissions = new ArrayList();
+ staticPermissions = userManager.getPermissions();
+ permissions = (List) request.getSession().getAttribute( "permissions" );
+ if ( permissions == null || permissions.size() == 0 )
+ {
+ availablePermissions.addAll( staticPermissions );
+ }
+ else
+ {
+ for ( i = 0; i < staticPermissions.size(); i++ )
+ {
+ staticPermission = (Permission) staticPermissions.get( i );
+ for ( j = 0; j < permissions.size(); j++ )
+ {
+ permission = (Permission) permissions.get( j );
+ if ( permission.getName().equalsIgnoreCase( staticPermission.getName() ) )
+ {
+ break;
+ }
+ }
+ if ( j >= permissions.size() )
+ {
+ availablePermissions.add( staticPermission );
+ }
+ }
+ }
+// }
+// catch ( ContinuumStoreException e )
+// {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+//
+// return ERROR;
+// }
+
+ request.getSession().setAttribute( "addMode", Boolean.valueOf( addMode ) );
+ request.getSession().setAttribute( "accountId", new Integer( accountId ) );
+ request.getSession().setAttribute( "username", username );
+ request.getSession().setAttribute( "password", password );
+ request.getSession().setAttribute( "email", email );
+
+ return "permissions";
+ }
+
+ public String doAddPermission()
+ throws Exception
+ {
+// try
+// {
+ staticPermissions = userManager.getPermissions();
+ int i, j;
+ for ( i = 0; i < staticPermissions.size(); i++ )
+ {
+ permission = (Permission) staticPermissions.get( i );
+ if ( permission.getName().equalsIgnoreCase( permissionName ) )
+ {
+ permissions = (List) request.getSession().getAttribute( "permissions" );
+ if ( permissions == null )
+ {
+ permissions = new ArrayList();
+ permissions.add( permission );
+ }
+ else
+ {
+ for ( j = 0; j < permissions.size(); j++ )
+ {
+ Permission permission = (Permission) permissions.get( j );
+ if ( permission.getName().equalsIgnoreCase( permissionName ) )
+ {
+ break;
+ }
+ }
+ if ( j >= permissions.size() )
+ {
+ permissions.add( permission );
+ }
+ }
+ if ( permissions.size() == 1 )
+ {
+ permissionName = ( (Permission) permissions.get( 0 ) ).getName();
+ }
+ break;
+ }
+ }
+// }
+// catch ( ContinuumStoreException e )
+// {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+//
+// return ERROR;
+// }
+
+ addMode = ( (Boolean) request.getSession().getAttribute( "addMode" ) ).booleanValue();
+ accountId = ( (Integer) request.getSession().getAttribute( "accountId" ) ).intValue();
+ username = (String) request.getSession().getAttribute( "username" );
+ password = (String) request.getSession().getAttribute( "password" );
+ email = (String) request.getSession().getAttribute( "email" );
+
+ return INPUT;
+ }
+
+ public String doDeletePermission()
+ throws Exception
+ {
+ int i = 0;
+ permissions = (List) request.getSession().getAttribute( "permissions" );
+ for ( ; i < permissions.size(); i++ )
+ {
+ permission = (Permission) permissions.get( i );
+ if ( permission.getName().equalsIgnoreCase( permissionName ) )
+ {
+ permissions.remove( i );
+ break;
+ }
+ if ( permissions.size() == 1 )
+ {
+ permissionName = ( (Permission) permissions.get( 0 ) ).getName();
+ }
+ }
+
+ return INPUT;
+ }
+
+ public List getAvailablePermissions()
+ {
+ return availablePermissions;
+ }
+
+ public String getPermissionName()
+ {
+ return permissionName;
+ }
+
+ public void setPermissionName( String permissionName )
+ {
+ this.permissionName = permissionName;
+ }
+
+ public boolean isAddMode()
+ {
+ return addMode;
+ }
+
+ public void setAddMode( boolean addMode )
+ {
+ this.addMode = addMode;
+ }
+
+ public int getAccountId()
+ {
+ return accountId;
+ }
+
+ public void setAccountId( int accountId )
+ {
+ this.accountId = accountId;
+ }
+
+ public String getUsername()
+ {
+ return username;
+ }
+
+ public void setUsername( String username )
+ {
+ this.username = username;
+ }
+
+ public String getPassword()
+ {
+ return password;
+ }
+
+ public void setPassword( String password )
+ {
+ this.password = password;
+ }
+
+ public String getEmail()
+ {
+ return email;
+ }
+
+ public void setEmail( String email )
+ {
+ this.email = email;
+ }
+
+ public List getPermissions()
+ {
+ return this.permissions;
+ }
+
+ public void setServletRequest( HttpServletRequest request )
+ {
+ this.request = request;
+ }
+
+}
Propchange: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/UsersAction.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/UsersAction.java?rev=428145&view=auto
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/UsersAction.java (added)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/UsersAction.java Wed Aug 2 13:56:58 2006
@@ -0,0 +1,68 @@
+package org.apache.maven.user.controller.action;
+
+/*
+ * Copyright 2006 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.
+ */
+
+import java.util.Collection;
+
+import org.apache.maven.user.model.UserManager;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+
+/**
+ * @author Henry Isidro
+ * @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="users"
+ */
+public class UsersAction
+ extends PlexusActionSupport
+{
+
+ private static final long serialVersionUID = 5279820976671267899L;
+
+ /**
+ * @plexus.requirement
+ */
+ private UserManager userManager;
+
+ private Collection users;
+
+ public String execute()
+ {
+// try
+// {
+ users = userManager.getUsers();
+// }
+// catch ( ContinuumException ce )
+// {
+// addActionError( "Can't get continuum users: " + ce.getMessage() );
+//
+// ce.printStackTrace();
+//
+// return ERROR;
+// }
+
+ return SUCCESS;
+ }
+
+ public Collection getUsers()
+ {
+ return users;
+ }
+
+}
Propchange: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/UsersAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/UsersAction.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"