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/24 05:13:15 UTC
svn commit: r434294 - in /maven/shared/trunk/maven-user:
maven-user-controller/
maven-user-controller/src/main/java/org/apache/maven/user/controller/action/
maven-user-model/src/main/java/org/apache/maven/user/model/
maven-user-webapp/ maven-user-webap...
Author: carlos
Date: Wed Aug 23 20:13:14 2006
New Revision: 434294
URL: http://svn.apache.org/viewvc?rev=434294&view=rev
Log:
[CONTINUUM-800] Use maven-user project for user management
Submitted By: Joakim Erdfelt
Modified:
maven/shared/trunk/maven-user/maven-user-controller/pom.xml
maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/AddUserRoleAction.java
maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserAction.java
maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java
maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/Messages.java
maven/shared/trunk/maven-user/maven-user-webapp/pom.xml
maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/WEB-INF/web.xml
maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/addRole.jsp
maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/delete.jsp
maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/edit.jsp
maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/list.jsp
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=434294&r1=434293&r2=434294&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 23 20:13:14 2006
@@ -1,9 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<?xml version="1.0" ?>
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.maven.shared.user</groupId>
<artifactId>maven-user</artifactId>
@@ -11,7 +13,7 @@
</parent>
<artifactId>maven-user-controller</artifactId>
-
+
<name>Maven User Management Controller</name>
<description>User Management Controller Layer</description>
Modified: 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=434294&r1=434293&r2=434294&view=diff
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/AddUserRoleAction.java (original)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/AddUserRoleAction.java Wed Aug 23 20:13:14 2006
@@ -45,58 +45,46 @@
private Permission permission;
- private int accountId;
+ private String username;
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++ )
+ user = userManager.getUser( username );
+ permissions = userManager.getPermissions();
+ int i;
+ for ( i = 0; i < permissions.size(); i++ )
+ {
+ permission = (Permission) permissions.get( i );
+ if ( permission.getName().equalsIgnoreCase( permissionName ) )
{
- permission = (Permission) permissions.get( i );
- if ( permission.getName().equalsIgnoreCase( permissionName ) )
- {
- break;
- }
+ 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;
-// }
+ }
+ if ( i < permissions.size() )
+ {
+ user.getGroup().addPermission( permission );
+ userManager.updateUser( user );
+ }
+ else
+ {
+ addActionMessage( "Can't add user role (username=" + username + ", role=" + permissionName
+ + ") : Role does not exist." );
+ }
return SUCCESS;
}
- public int getAccountId()
+ public String getUsername()
{
- return accountId;
+ return username;
}
- public void setAccountId( int accountId )
+ public void setUsername( String username )
{
- this.accountId = accountId;
+ this.username = username;
}
public String getPermissionName()
@@ -108,5 +96,4 @@
{
this.permissionName = permissionName;
}
-
}
Modified: 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=434294&r1=434293&r2=434294&view=diff
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserAction.java (original)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserAction.java Wed Aug 23 20:13:14 2006
@@ -42,18 +42,7 @@
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;
-// }
+ userManager.removeUser( accountId );
return SUCCESS;
}
Modified: 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=434294&r1=434293&r2=434294&view=diff
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java (original)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java Wed Aug 23 20:13:14 2006
@@ -65,8 +65,6 @@
private boolean addMode = false;
- private int accountId;
-
private String username;
private String password;
@@ -95,60 +93,28 @@
}
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;
-// }
+ 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 );
}
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;
-// }
+ user = userManager.getUser( username );
+ user.setUsername( username );
+ user.setPassword( password );
+ user.setEmail( email );
+ user.getGroup().setPermissions( permissions );
+ userManager.updateUser( user );
}
request.getSession().removeAttribute( "addMode" );
- request.getSession().removeAttribute( "accountId" );
request.getSession().removeAttribute( "username" );
request.getSession().removeAttribute( "password" );
request.getSession().removeAttribute( "email" );
@@ -167,26 +133,15 @@
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;
-// }
+ addMode = false;
+ user = userManager.getUser( username );
+ // 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();
+ }
return INPUT;
}
@@ -194,46 +149,35 @@
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
+ 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++ )
{
- for ( i = 0; i < staticPermissions.size(); i++ )
+ staticPermission = (Permission) staticPermissions.get( i );
+ for ( j = 0; j < permissions.size(); j++ )
{
- 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() )
+ permission = (Permission) permissions.get( j );
+ if ( permission.getName().equalsIgnoreCase( staticPermission.getName() ) )
{
- availablePermissions.add( staticPermission );
+ 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 );
@@ -244,54 +188,43 @@
public String doAddPermission()
throws Exception
{
-// try
-// {
- staticPermissions = userManager.getPermissions();
- int i, j;
- for ( i = 0; i < staticPermissions.size(); i++ )
+ staticPermissions = userManager.getPermissions();
+ int i, j;
+ for ( i = 0; i < staticPermissions.size(); i++ )
+ {
+ permission = (Permission) staticPermissions.get( i );
+ if ( permission.getName().equalsIgnoreCase( permissionName ) )
{
- permission = (Permission) staticPermissions.get( i );
- if ( permission.getName().equalsIgnoreCase( permissionName ) )
+ permissions = (List) request.getSession().getAttribute( "permissions" );
+ if ( permissions == null )
{
- permissions = (List) request.getSession().getAttribute( "permissions" );
- if ( permissions == null )
- {
- permissions = new ArrayList();
- permissions.add( permission );
- }
- else
+ permissions = new ArrayList();
+ permissions.add( permission );
+ }
+ else
+ {
+ for ( j = 0; j < permissions.size(); j++ )
{
- for ( j = 0; j < permissions.size(); j++ )
- {
- Permission permission = (Permission) permissions.get( j );
- if ( permission.getName().equalsIgnoreCase( permissionName ) )
- {
- break;
- }
- }
- if ( j >= permissions.size() )
+ Permission permission = (Permission) permissions.get( j );
+ if ( permission.getName().equalsIgnoreCase( permissionName ) )
{
- permissions.add( permission );
+ break;
}
}
- if ( permissions.size() == 1 )
+ if ( j >= permissions.size() )
{
- permissionName = ( (Permission) permissions.get( 0 ) ).getName();
+ permissions.add( permission );
}
- break;
}
+ 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" );
@@ -346,16 +279,6 @@
this.addMode = addMode;
}
- public int getAccountId()
- {
- return accountId;
- }
-
- public void setAccountId( int accountId )
- {
- this.accountId = accountId;
- }
-
public String getUsername()
{
return username;
@@ -395,5 +318,4 @@
{
this.request = request;
}
-
}
Modified: maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/Messages.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/Messages.java?rev=434294&r1=434293&r2=434294&view=diff
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/Messages.java (original)
+++ maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/Messages.java Wed Aug 23 20:13:14 2006
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-
import java.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
Modified: maven/shared/trunk/maven-user/maven-user-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-webapp/pom.xml?rev=434294&r1=434293&r2=434294&view=diff
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-webapp/pom.xml (original)
+++ maven/shared/trunk/maven-user/maven-user-webapp/pom.xml Wed Aug 23 20:13:14 2006
@@ -1,9 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.maven.shared.user</groupId>
<artifactId>maven-user</artifactId>
@@ -12,7 +13,7 @@
<artifactId>maven-user-webapp</artifactId>
<packaging>war</packaging>
-
+
<name>Maven User Management Webapp</name>
<description>User Management Webapp Layer</description>
@@ -22,5 +23,55 @@
<artifactId>maven-user-controller</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>c</artifactId>
+ <version>1.1.2</version>
+ <type>tld</type>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.extremecomponents</groupId>
+ <artifactId>extremecomponents</artifactId>
+ <version>1.0.1</version>
+ </dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jspc-maven-plugin</artifactId>
+ <configuration>
+ <warSourceDirectory>${project.build.directory}/${project.build.finalName}/</warSourceDirectory>
+ <injectString><![CDATA[<!-- [jspc-maven-plugin:post-compiled-jsps-as-servlets] -->]]></injectString>
+ <!-- <outputWebXml>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</outputWebXml> -->
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>9090</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/WEB-INF/web.xml?rev=434294&r1=434293&r2=434294&view=diff
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/WEB-INF/web.xml Wed Aug 23 20:13:14 2006
@@ -38,6 +38,12 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
+ <listener>
+ <listener-class>org.codehaus.plexus.xwork.PlexusLifecycleListener</listener-class>
+ </listener>
+
+ <!-- [jspc-maven-plugin:post-compiled-jsps-as-servlets] -->
+
<welcome-file-list>
<welcome-file>index.action</welcome-file>
</welcome-file-list>
@@ -46,4 +52,5 @@
<taglib-uri>/tld/extremecomponents</taglib-uri>
<taglib-location>/WEB-INF/extremecomponents.tld</taglib-location>
</taglib>
+
</web-app>
Modified: maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/addRole.jsp
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/addRole.jsp?rev=434294&r1=434293&r2=434294&view=diff
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/addRole.jsp (original)
+++ maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/addRole.jsp Wed Aug 23 20:13:14 2006
@@ -2,7 +2,7 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
<html>
- <ww:i18n name="localization.Continuum">
+ <ww:i18n name="localization.MavenUser">
<head>
<title><ww:text name="role.page.title"/></title>
</head>
Modified: maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/delete.jsp
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/delete.jsp?rev=434294&r1=434293&r2=434294&view=diff
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/delete.jsp (original)
+++ maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/delete.jsp Wed Aug 23 20:13:14 2006
@@ -1,6 +1,6 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<html>
- <ww:i18n name="localization.Continuum">
+ <ww:i18n name="localization.MavenUser">
<head>
<title><ww:text name="user.delete.page.title"/></title>
</head>
Modified: maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/edit.jsp
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/edit.jsp?rev=434294&r1=434293&r2=434294&view=diff
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/edit.jsp (original)
+++ maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/edit.jsp Wed Aug 23 20:13:14 2006
@@ -22,7 +22,7 @@
}
</script>
<html>
- <ww:i18n name="localization.Continuum">
+ <ww:i18n name="localization.MavenUser">
<head>
<ww:if test="addMode == true">
<title><ww:text name="user.add.page.title"/></title>
Modified: maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/list.jsp
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/list.jsp?rev=434294&r1=434293&r2=434294&view=diff
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/list.jsp (original)
+++ maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/list.jsp Wed Aug 23 20:13:14 2006
@@ -2,7 +2,7 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
<html>
- <ww:i18n name="localization.Continuum">
+ <ww:i18n name="localization.MavenUser">
<head>
<title><ww:text name="users.page.title"/></title>
</head>