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/12/04 19:20:21 UTC
svn commit: r1417087 - in /archiva/redback/redback-core/trunk: ./
redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/apache/archiva/redback/keys/jdo/
redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/a...
Author: olamy
Date: Tue Dec 4 18:20:19 2012
New Revision: 1417087
URL: http://svn.apache.org/viewvc?rev=1417087&view=rev
Log:
adapt to last changes in spring-jdo2 component
Modified:
archiva/redback/redback-core/trunk/pom.xml
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/apache/archiva/redback/keys/jdo/JdoKeyManager.java
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
Modified: archiva/redback/redback-core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/pom.xml?rev=1417087&r1=1417086&r2=1417087&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/pom.xml (original)
+++ archiva/redback/redback-core/trunk/pom.xml Tue Dec 4 18:20:19 2012
@@ -392,7 +392,7 @@
<dependency>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>spring-jdo2</artifactId>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
Modified: archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/apache/archiva/redback/keys/jdo/JdoKeyManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/apache/archiva/redback/keys/jdo/JdoKeyManager.java?rev=1417087&r1=1417086&r2=1417087&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/apache/archiva/redback/keys/jdo/JdoKeyManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/apache/archiva/redback/keys/jdo/JdoKeyManager.java Tue Dec 4 18:20:19 2012
@@ -20,9 +20,9 @@ package org.apache.archiva.redback.keys.
*/
import org.apache.archiva.redback.components.jdo.JdoFactory;
-import org.apache.archiva.redback.components.jdo.PlexusJdoUtils;
-import org.apache.archiva.redback.components.jdo.PlexusObjectNotFoundException;
-import org.apache.archiva.redback.components.jdo.PlexusStoreException;
+import org.apache.archiva.redback.components.jdo.RedbackJdoUtils;
+import org.apache.archiva.redback.components.jdo.RedbackObjectNotFoundException;
+import org.apache.archiva.redback.components.jdo.RedbackStoreException;
import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.keys.AbstractKeyManager;
import org.apache.archiva.redback.keys.KeyManagerException;
@@ -78,13 +78,13 @@ public class JdoKeyManager
public AuthenticationKey addKey( AuthenticationKey key )
{
- return (AuthenticationKey) PlexusJdoUtils.addObject( getPersistenceManager(), key );
+ return (AuthenticationKey) RedbackJdoUtils.addObject( getPersistenceManager(), key );
}
public void eraseDatabase()
{
- PlexusJdoUtils.removeAll( getPersistenceManager(), JdoAuthenticationKey.class );
- PlexusJdoUtils.removeAll( getPersistenceManager(), RedbackKeyManagementJdoModelloMetadata.class );
+ RedbackJdoUtils.removeAll( getPersistenceManager(), JdoAuthenticationKey.class );
+ RedbackJdoUtils.removeAll( getPersistenceManager(), RedbackKeyManagementJdoModelloMetadata.class );
}
public AuthenticationKey findKey( String key )
@@ -97,9 +97,8 @@ public class JdoKeyManager
try
{
- JdoAuthenticationKey authkey = (JdoAuthenticationKey) PlexusJdoUtils.getObjectById( getPersistenceManager(),
- JdoAuthenticationKey.class,
- key );
+ JdoAuthenticationKey authkey = (JdoAuthenticationKey) RedbackJdoUtils.getObjectById(
+ getPersistenceManager(), JdoAuthenticationKey.class, key );
if ( authkey == null )
{
@@ -109,11 +108,11 @@ public class JdoKeyManager
return authkey;
}
- catch ( PlexusObjectNotFoundException e )
+ catch ( RedbackObjectNotFoundException e )
{
throw new KeyNotFoundException( e.getMessage() );
}
- catch ( PlexusStoreException e )
+ catch ( RedbackStoreException e )
{
throw new KeyManagerException(
"Unable to get " + JdoAuthenticationKey.class.getName() + "', key '" + key + "' from jdo store." );
@@ -123,7 +122,7 @@ public class JdoKeyManager
public void deleteKey( AuthenticationKey authkey )
throws KeyManagerException
{
- PlexusJdoUtils.removeObject( getPersistenceManager(), authkey );
+ RedbackJdoUtils.removeObject( getPersistenceManager(), authkey );
}
public void deleteKey( String key )
@@ -132,7 +131,7 @@ public class JdoKeyManager
try
{
AuthenticationKey authkey = findKey( key );
- PlexusJdoUtils.removeObject( getPersistenceManager(), authkey );
+ RedbackJdoUtils.removeObject( getPersistenceManager(), authkey );
}
catch ( KeyNotFoundException e )
{
@@ -143,7 +142,7 @@ public class JdoKeyManager
@SuppressWarnings( "unchecked" )
public List<AuthenticationKey> getAllKeys()
{
- return PlexusJdoUtils.getAllObjectsDetached( getPersistenceManager(), JdoAuthenticationKey.class );
+ return RedbackJdoUtils.getAllObjectsDetached( getPersistenceManager(), JdoAuthenticationKey.class );
}
@PostConstruct
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=1417087&r1=1417086&r2=1417087&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 Tue Dec 4 18:20:19 2012
@@ -20,9 +20,9 @@ package org.apache.archiva.redback.users
*/
import org.apache.archiva.redback.components.jdo.JdoFactory;
-import org.apache.archiva.redback.components.jdo.PlexusJdoUtils;
-import org.apache.archiva.redback.components.jdo.PlexusObjectNotFoundException;
-import org.apache.archiva.redback.components.jdo.PlexusStoreException;
+import org.apache.archiva.redback.components.jdo.RedbackJdoUtils;
+import org.apache.archiva.redback.components.jdo.RedbackObjectNotFoundException;
+import org.apache.archiva.redback.components.jdo.RedbackStoreException;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.AbstractUserManager;
import org.apache.archiva.redback.users.PermanentUserException;
@@ -107,7 +107,7 @@ public class JdoUserManager
@SuppressWarnings ("unchecked")
private List<User> getAllObjectsDetached( String ordering )
{
- return PlexusJdoUtils.getAllObjectsDetached( getPersistenceManager(), JdoUser.class, ordering, (String) null );
+ return RedbackJdoUtils.getAllObjectsDetached( getPersistenceManager(), JdoUser.class, ordering, (String) null );
}
public List<User> findUsersByUsernameKey( String usernameKey, boolean orderAscending )
@@ -276,7 +276,7 @@ public class JdoUserManager
fireUserManagerUserRemoved( user );
- PlexusJdoUtils.removeObject( getPersistenceManager(), user );
+ RedbackJdoUtils.removeObject( getPersistenceManager(), user );
}
catch ( UserNotFoundException e )
{
@@ -303,8 +303,8 @@ public class JdoUserManager
public void eraseDatabase()
{
- PlexusJdoUtils.removeAll( getPersistenceManager(), JdoUser.class );
- PlexusJdoUtils.removeAll( getPersistenceManager(), UsersManagementModelloMetadata.class );
+ RedbackJdoUtils.removeAll( getPersistenceManager(), JdoUser.class );
+ RedbackJdoUtils.removeAll( getPersistenceManager(), UsersManagementModelloMetadata.class );
}
public User findUser( Object principal )
@@ -317,14 +317,14 @@ public class JdoUserManager
try
{
- return (User) PlexusJdoUtils.getObjectById( getPersistenceManager(), JdoUser.class, principal.toString(),
- null );
+ return (User) RedbackJdoUtils.getObjectById( getPersistenceManager(), JdoUser.class, principal.toString(),
+ null );
}
- catch ( PlexusObjectNotFoundException e )
+ catch ( RedbackObjectNotFoundException e )
{
throw new UserNotFoundException( "Unable to find user: " + e.getMessage(), e );
}
- catch ( PlexusStoreException e )
+ catch ( RedbackStoreException e )
{
throw new UserNotFoundException( "Unable to find user: " + e.getMessage(), e );
}
@@ -407,7 +407,7 @@ public class JdoUserManager
private Object addObject( Object object )
{
- return PlexusJdoUtils.addObject( getPersistenceManager(), object );
+ return RedbackJdoUtils.addObject( getPersistenceManager(), object );
}
private Object getObjectById( String id, String fetchGroup )
@@ -415,13 +415,13 @@ public class JdoUserManager
{
try
{
- return PlexusJdoUtils.getObjectById( getPersistenceManager(), JdoUser.class, id, fetchGroup );
+ return RedbackJdoUtils.getObjectById( getPersistenceManager(), JdoUser.class, id, fetchGroup );
}
- catch ( PlexusObjectNotFoundException e )
+ catch ( RedbackObjectNotFoundException e )
{
throw new UserNotFoundException( e.getMessage() );
}
- catch ( PlexusStoreException e )
+ catch ( RedbackStoreException e )
{
throw new UserManagerException( "Unable to get object '" + JdoUser.class.getName() + "', id '" + id +
"', fetch-group '" + fetchGroup + "' from jdo store.", e );
@@ -435,7 +435,7 @@ public class JdoUserManager
throw new UserManagerException( "Unable to remove null object" );
}
- PlexusJdoUtils.removeObject( getPersistenceManager(), o );
+ RedbackJdoUtils.removeObject( getPersistenceManager(), o );
return o;
}
@@ -444,9 +444,9 @@ public class JdoUserManager
{
try
{
- return PlexusJdoUtils.updateObject( getPersistenceManager(), object );
+ return RedbackJdoUtils.updateObject( getPersistenceManager(), object );
}
- catch ( PlexusStoreException e )
+ catch ( RedbackStoreException e )
{
throw new UserManagerException(
"Unable to update the '" + object.getClass().getName() + "' object in the jdo database.", e );
@@ -455,7 +455,7 @@ public class JdoUserManager
private void rollback( Transaction tx )
{
- PlexusJdoUtils.rollbackIfActive( tx );
+ RedbackJdoUtils.rollbackIfActive( tx );
}
private boolean hasTriggeredInit = false;