Author: carlos
Date: Tue Aug 22 18:07:11 2006
New Revision: 433821
URL: http://svn.apache.org/viewvc?rev=433821&view=rev
Log:
Remove dependency in persistence-api due to license and JDK requirement
constraints
Removed:
maven/shared/trunk/maven-user/persistence-api-exceptions/
Modified:
maven/shared/trunk/maven-user/maven-user-model/pom.xml
maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/UserManager.java
maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java
maven/shared/trunk/maven-user/maven-user-model/src/test/java/org/apache/maven/user/model/impl/DefaultUserManagerTest.java
maven/shared/trunk/maven-user/pom.xml
Modified: maven/shared/trunk/maven-user/maven-user-model/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-model/pom.xml?rev=433821&r1=433820&r2=433821&view=diff
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-model/pom.xml (original)
+++ maven/shared/trunk/maven-user/maven-user-model/pom.xml Tue Aug 22 18:07:11
2006
@@ -20,11 +20,6 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>persistence-api-exceptions</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-jdo2</artifactId>
</dependency>
Modified:
maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/UserManager.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/UserManager.java?rev=433821&r1=433820&r2=433821&view=diff
==============================================================================
---
maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/UserManager.java
(original)
+++
maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/UserManager.java
Tue Aug 22 18:07:11 2006
@@ -18,9 +18,6 @@
import java.util.List;
-import javax.persistence.EntityExistsException;
-import javax.persistence.EntityNotFoundException;
-
/**
* Facade for user related operations.
*
@@ -43,20 +40,18 @@
* before storing it.
*
* @param user
- * @throws EntityExistsException if the user already exists
*/
User addUser( User user )
- throws EntityExistsException, PasswordRuleViolationException;
+ throws PasswordRuleViolationException;
/**
* Update user data. User password will be encoded using the [EMAIL
PROTECTED] #getPasswordEncoder()}
* before storing it.
*
* @param user
- * @throws EntityNotFoundException if the user does not exist
*/
void updateUser( User user )
- throws EntityNotFoundException, PasswordRuleViolationException;
+ throws PasswordRuleViolationException;
/**
* Get all users. Users password won't be returned for security reasons.
@@ -111,19 +106,15 @@
* </p>
*
* @param accountId
- * @throws EntityNotFoundException if the user does not exist
*/
- void removeUser( int accountId )
- throws EntityNotFoundException;
+ void removeUser( int accountId );
/**
* Delete a user
*
* @param username
- * @throws EntityNotFoundException if the user does not exist
*/
- void removeUser( String username )
- throws EntityNotFoundException;
+ void removeUser( String username );
// ----------------------------------------------------------------------
// Login
@@ -185,19 +176,15 @@
* Add a new user group
*
* @param userGroup
- * @throws EntityExistsException if the user group already exists
*/
- UserGroup addUserGroup( UserGroup userGroup )
- throws EntityExistsException;
+ UserGroup addUserGroup( UserGroup userGroup );
/**
* Update an existing UserGroup.
*
* @param userGroup
- * @throws EntityNotFoundException if the user group does not exist
*/
- void updateUserGroup( UserGroup userGroup )
- throws EntityNotFoundException;
+ void updateUserGroup( UserGroup userGroup );
/**
* Get all UserGroup's.
@@ -236,19 +223,15 @@
* </p>
*
* @param userGroupId
- * @throws EntityNotFoundException if the user does not exist
*/
- void removeUserGroup( int userGroupId )
- throws EntityNotFoundException;
+ void removeUserGroup( int userGroupId );
/**
* Remove the named UserGroup
*
* @param name the user group name to remove
- * @throws EntityNotFoundException if the user group name does not exist.
*/
- void removeUserGroup( String name )
- throws EntityNotFoundException;
+ void removeUserGroup( String name );
// ----------------------------------------------------------------------
// Permissions
@@ -266,8 +249,7 @@
*
* @return user's permission
*/
- Permission getPermission( String name )
- throws EntityNotFoundException;
+ Permission getPermission( String name );
/**
* Add a permission
Modified:
maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java?rev=433821&r1=433820&r2=433821&view=diff
==============================================================================
---
maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java
(original)
+++
maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java
Tue Aug 22 18:07:11 2006
@@ -16,6 +16,18 @@
* limitations under the License.
*/
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.jdo.Extent;
+import javax.jdo.PersistenceManager;
+import javax.jdo.PersistenceManagerFactory;
+import javax.jdo.Query;
+import javax.jdo.Transaction;
+
import org.apache.maven.user.model.Messages;
import org.apache.maven.user.model.PasswordEncoder;
import org.apache.maven.user.model.PasswordRule;
@@ -33,20 +45,6 @@
import
org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.util.StringUtils;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.jdo.Extent;
-import javax.jdo.PersistenceManager;
-import javax.jdo.PersistenceManagerFactory;
-import javax.jdo.Query;
-import javax.jdo.Transaction;
-import javax.persistence.EntityExistsException;
-import javax.persistence.EntityNotFoundException;
-
/**
* Default implementation of the [EMAIL PROTECTED] UserManager} interface.
*
@@ -108,7 +106,7 @@
public User addUser( User user )
- throws EntityExistsException, PasswordRuleViolationException
+ throws PasswordRuleViolationException
{
if(user.getAccountId() > 0)
{
@@ -152,7 +150,6 @@
}
public UserGroup addUserGroup( UserGroup userGroup )
- throws EntityExistsException
{
if(userGroup.getId() > 0)
{
@@ -177,11 +174,7 @@
}
catch ( PlexusStoreException pse )
{
- //log exception
- }
- catch ( EntityNotFoundException eee )
- {
- return null;
+ // TODO log exception
}
return user;
@@ -287,11 +280,7 @@
}
catch ( PlexusStoreException pse )
{
- //log exception
- }
- catch ( EntityNotFoundException eee )
- {
- return null;
+ //TODO log exception
}
return userGroup;
}
@@ -348,7 +337,6 @@
}
public void removeUser( int userId )
- throws EntityNotFoundException
{
User user = getUser( userId );
@@ -356,7 +344,6 @@
}
public void removeUser( String username )
- throws EntityNotFoundException
{
User user = getUser( username );
@@ -364,7 +351,6 @@
}
public void removeUserGroup( int userGroupId )
- throws EntityNotFoundException
{
UserGroup userGroup = getUserGroup( userGroupId );
@@ -372,7 +358,6 @@
}
public void removeUserGroup( String userGroupName )
- throws EntityNotFoundException
{
UserGroup userGroup = getUserGroup( userGroupName );
@@ -402,7 +387,7 @@
}
public void updateUser( User user )
- throws EntityNotFoundException, PasswordRuleViolationException
+ throws PasswordRuleViolationException
{
try
{
@@ -421,7 +406,6 @@
}
public void updateUserGroup( UserGroup userGroup )
- throws EntityNotFoundException
{
try
{
@@ -439,7 +423,6 @@
}
public Permission getPermission( String name )
- throws EntityNotFoundException
{
PersistenceManager pm = getPersistenceManager();
@@ -496,13 +479,13 @@
}
private Object getObjectById( Class clazz, int id )
- throws PlexusStoreException, EntityNotFoundException
+ throws PlexusStoreException
{
return getObjectById( clazz, id, null );
}
private Object getObjectById( Class clazz, int id, String fetchGroup )
- throws PlexusStoreException, EntityNotFoundException
+ throws PlexusStoreException
{
try
{
@@ -510,7 +493,8 @@
}
catch ( PlexusObjectNotFoundException e )
{
- throw new EntityNotFoundException( e.getMessage() );
+ // TODO make PlexusObjectNotFoundException runtime or change
plexus not to wrap jdo exceptions
+ throw new RuntimeException( e.getMessage() );
}
catch ( PlexusStoreException e )
{
Modified:
maven/shared/trunk/maven-user/maven-user-model/src/test/java/org/apache/maven/user/model/impl/DefaultUserManagerTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-model/src/test/java/org/apache/maven/user/model/impl/DefaultUserManagerTest.java?rev=433821&r1=433820&r2=433821&view=diff
==============================================================================
---
maven/shared/trunk/maven-user/maven-user-model/src/test/java/org/apache/maven/user/model/impl/DefaultUserManagerTest.java
(original)
+++
maven/shared/trunk/maven-user/maven-user-model/src/test/java/org/apache/maven/user/model/impl/DefaultUserManagerTest.java
Tue Aug 22 18:07:11 2006
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import org.apache.maven.user.model.PasswordRuleViolationException;
import org.apache.maven.user.model.Permission;
import org.apache.maven.user.model.User;
import org.apache.maven.user.model.UserGroup;
@@ -35,7 +34,6 @@
import javax.jdo.PersistenceManager;
import javax.jdo.PersistenceManagerFactory;
-import javax.persistence.EntityExistsException;
/**
* Test Cases for the Default User Manager.
@@ -142,7 +140,7 @@
assertEquals( smcqueen, actual );
}
- public void testUpdateUser() throws EntityExistsException,
PasswordRuleViolationException
+ public void testUpdateUser() throws Exception
{
assertNotNull( usermanager );
@@ -165,7 +163,7 @@
assertEquals( "Flight Lt. Hendley", actual.getFullName() );
//$NON-NLS-1$
}
- public void testRemoveUser() throws EntityExistsException,
PasswordRuleViolationException
+ public void testRemoveUser() throws Exception
{
assertNotNull( usermanager );
@@ -352,7 +350,7 @@
assertEquals( "removed user should not affect existing user ids.",
american, actual2 ); //$NON-NLS-1$
}
- public void testGetSetUserGroupInUserLoose() throws EntityExistsException,
PasswordRuleViolationException
+ public void testGetSetUserGroupInUserLoose() throws Exception
{
assertNotNull( usermanager );
@@ -384,7 +382,7 @@
assertEquals( added.getGroup(), actual.getGroup() );
}
- public void testGetSetUserGroupInUserPreloaded() throws
EntityExistsException, PasswordRuleViolationException
+ public void testGetSetUserGroupInUserPreloaded() throws Exception
{
assertNotNull( usermanager );
Modified: maven/shared/trunk/maven-user/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/pom.xml?rev=433821&r1=433820&r2=433821&view=diff
==============================================================================
--- maven/shared/trunk/maven-user/pom.xml (original)
+++ maven/shared/trunk/maven-user/pom.xml Tue Aug 22 18:07:11 2006
@@ -19,7 +19,6 @@
<description>User management code shared for different apps like Continuum
or MRM</description>
<modules>
- <module>persistence-api-exceptions</module>
<module>maven-user-model</module>
<module>maven-user-controller</module>
<module>maven-user-webapp</module>
