You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/04/09 22:17:12 UTC
svn commit: r1311412 - in /archiva/redback/redback-core/trunk:
redback-data-management/src/main/java/org/apache/archiva/redback/management/
redback-users/redback-users-providers/redback-users-jdo/
redback-users/redback-users-providers/redback-users-jdo...
Author: olamy
Date: Mon Apr 9 20:17:11 2012
New Revision: 1311412
URL: http://svn.apache.org/viewvc?rev=1311412&view=rev
Log:
package change for redback-users-jdo generated classes
Modified:
archiva/redback/redback-core/trunk/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/pom.xml
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.mdo
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java
Modified: archiva/redback/redback-core/trunk/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java?rev=1311412&r1=1311411&r2=1311412&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java (original)
+++ archiva/redback/redback-core/trunk/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java Mon Apr 9 20:17:11 2012
@@ -52,9 +52,9 @@ import org.apache.archiva.redback.rbac.R
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.users.User;
-import org.codehaus.plexus.redback.users.jdo.UserDatabase;
-import org.codehaus.plexus.redback.users.jdo.io.stax.UsersManagementStaxReader;
-import org.codehaus.plexus.redback.users.jdo.io.stax.UsersManagementStaxWriter;
+import org.apache.archiva.redback.users.jdo.UserDatabase;
+import org.apache.archiva.redback.users.jdo.io.stax.UsersManagementStaxReader;
+import org.apache.archiva.redback.users.jdo.io.stax.UsersManagementStaxWriter;
import org.codehaus.plexus.util.IOUtil;
import org.springframework.stereotype.Service;
Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/pom.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/pom.xml?rev=1311412&r1=1311411&r2=1311412&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/pom.xml (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/pom.xml Mon Apr 9 20:17:11 2012
@@ -125,7 +125,7 @@
<goal>jpox-jdo-mapping</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}/target/classes/org/codehaus/plexus/redback/users/jdo</outputDirectory>
+ <outputDirectory>${basedir}/target/classes/org/apache/archiva/redback/users/jdo</outputDirectory>
</configuration>
</execution>
</executions>
Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java?rev=1311412&r1=1311411&r2=1311412&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java Mon Apr 9 20:17:11 2012
@@ -21,17 +21,15 @@ package org.apache.archiva.redback.users
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.AbstractUserManager;
+import org.apache.archiva.redback.users.PermanentUserException;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManagerException;
import org.apache.archiva.redback.users.UserNotFoundException;
+import org.apache.archiva.redback.users.UserQuery;
import org.codehaus.plexus.jdo.JdoFactory;
import org.codehaus.plexus.jdo.PlexusJdoUtils;
import org.codehaus.plexus.jdo.PlexusObjectNotFoundException;
import org.codehaus.plexus.jdo.PlexusStoreException;
-import org.apache.archiva.redback.users.PermanentUserException;
-import org.apache.archiva.redback.users.UserQuery;
-import org.codehaus.plexus.redback.users.jdo.JdoUser;
-import org.codehaus.plexus.redback.users.jdo.UsersManagementModelloMetadata;
import org.codehaus.plexus.util.StringUtils;
import org.jpox.JDOClassLoaderResolver;
import org.springframework.stereotype.Service;
@@ -44,7 +42,6 @@ import javax.jdo.PersistenceManager;
import javax.jdo.PersistenceManagerFactory;
import javax.jdo.Query;
import javax.jdo.Transaction;
-
import java.util.Date;
import java.util.List;
@@ -54,11 +51,12 @@ import java.util.List;
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*/
-@Service("userManager#jdo")
+@Service( "userManager#jdo" )
public class JdoUserManager
extends AbstractUserManager
{
- @Inject @Named(value="jdoFactory#users")
+ @Inject
+ @Named( value = "jdoFactory#users" )
private JdoFactory jdoFactory;
@Inject
@@ -107,7 +105,7 @@ public class JdoUserManager
return getAllObjectsDetached( ordering );
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings( "unchecked" )
private List<User> getAllObjectsDetached( String ordering )
{
return PlexusJdoUtils.getAllObjectsDetached( getPersistenceManager(), JdoUser.class, ordering, (String) null );
@@ -128,7 +126,7 @@ public class JdoUserManager
return findUsers( "email", emailKey, orderAscending );
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings( "unchecked" )
public List<User> findUsersByQuery( UserQuery userQuery )
{
JdoUserQuery uq = (JdoUserQuery) userQuery;
@@ -172,7 +170,7 @@ public class JdoUserManager
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings( "unchecked" )
private List<User> findUsers( String searchField, String searchKey, boolean ascendingUsername )
{
PersistenceManager pm = getPersistenceManager();
@@ -216,7 +214,7 @@ public class JdoUserManager
if ( !( user instanceof JdoUser ) )
{
throw new UserManagerException( "Unable to Add User. User object " + user.getClass().getName() +
- " is not an instance of " + JdoUser.class.getName() );
+ " is not an instance of " + JdoUser.class.getName() );
}
if ( StringUtils.isEmpty( user.getUsername() ) )
@@ -292,7 +290,7 @@ public class JdoUserManager
if ( !( user instanceof JdoUser ) )
{
throw new UserManagerException( "Unable to Add User. User object " + user.getClass().getName() +
- " is not an instance of " + JdoUser.class.getName() );
+ " is not an instance of " + JdoUser.class.getName() );
}
if ( StringUtils.isEmpty( user.getUsername() ) )
@@ -369,7 +367,7 @@ public class JdoUserManager
if ( !( user instanceof JdoUser ) )
{
throw new UserManagerException( "Unable to Update User. User object " + user.getClass().getName() +
- " is not an instance of " + JdoUser.class.getName() );
+ " is not an instance of " + JdoUser.class.getName() );
}
// If password is supplied, assume changing of password.
@@ -427,7 +425,7 @@ public class JdoUserManager
catch ( PlexusStoreException e )
{
throw new UserManagerException( "Unable to get object '" + JdoUser.class.getName() + "', id '" + id +
- "', fetch-group '" + fetchGroup + "' from jdo store." );
+ "', fetch-group '" + fetchGroup + "' from jdo store." );
}
}
Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.mdo
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.mdo?rev=1311412&r1=1311411&r2=1311412&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.mdo (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.mdo Mon Apr 9 20:17:11 2012
@@ -22,11 +22,11 @@
<id>redback-users-jdo</id>
<name>UsersManagement</name>
<version>1.0.1</version>
- <description>Plexus Redback Users object model.</description>
+ <description>Archiva Redback Users object model.</description>
<defaults>
<default>
<key>package</key>
- <value>org.codehaus.plexus.redback.users.jdo</value>
+ <value>org.apache.archiva.redback.users.jdo</value>
</default>
</defaults>
Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java?rev=1311412&r1=1311411&r2=1311412&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java Mon Apr 9 20:17:11 2012
@@ -90,7 +90,7 @@ public class JdoUserManagerTest
StoreManagerDebug.setup( (AbstractPersistenceManagerFactory) pmf );
SchemaTool.createSchemaTables(
- new URL[]{ getClass().getResource( "/org/codehaus/plexus/redback/users/jdo/package.jdo" ) }, new URL[]{ },
+ new URL[]{ getClass().getResource( "/org/apache/archiva/redback/users/jdo/package.jdo" ) }, new URL[]{ },
null, false, null ); //$NON-NLS-1$
PersistenceManager pm = pmf.getPersistenceManager();