Repository: archiva-redback-core Updated Branches: refs/heads/master 2dd5b2b9e -> c04779a7e
remove jdo reference Signed-off-by: olivier lamy <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/commit/c04779a7 Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/c04779a7 Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/c04779a7 Branch: refs/heads/master Commit: c04779a7e025344f87e6b9b93a9c14b3cadfcc10 Parents: 2dd5b2b Author: olivier lamy <[email protected]> Authored: Fri May 26 11:30:58 2017 +1000 Committer: olivier lamy <[email protected]> Committed: Fri May 26 11:30:58 2017 +1000 ---------------------------------------------------------------------- .../src/test/resources/spring-context.xml | 2 +- .../src/test/resources/spring-context.xml | 2 +- .../redback/keys/jpa/model/JpaAuthenticationKey.java | 2 +- .../apache/archiva/redback/keys/jpa/JpaKeyManagerTest.java | 2 +- .../apache/archiva/redback/rbac/jpa/JpaRbacManagerTest.java | 2 +- .../apache/archiva/redback/rbac/ldap/LdapRbacManager.java | 2 +- .../users/provider/test/AbstractUserManagerTestCase.java | 9 +-------- 7 files changed, 7 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/c04779a7/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml b/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml index f429aa7..2f0c4e8 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml +++ b/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml @@ -35,7 +35,7 @@ <property name="securityPolicy" ref="userSecurityPolicy"/> </bean> - <alias name="userManager#memory" alias="userManager#jdo"/> + <alias name="userManager#memory" alias="userManager#jpa"/> <alias name="userConfiguration#redback" alias="userConfiguration#default"/> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/c04779a7/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml index 0f14790..e6921a6 100644 --- a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml +++ b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml @@ -35,7 +35,7 @@ <property name="usersCache" ref="cache#users"/> </bean> - <alias name="userManager#memory" alias="userManager#jdo"/> + <alias name="userManager#memory" alias="userManager#jpa"/> <bean name="cache#users" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache" init-method="initialize"> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/c04779a7/redback-keys/redback-keys-providers/redback-keys-jpa/src/main/java/org/apache/archiva/redback/keys/jpa/model/JpaAuthenticationKey.java ---------------------------------------------------------------------- diff --git a/redback-keys/redback-keys-providers/redback-keys-jpa/src/main/java/org/apache/archiva/redback/keys/jpa/model/JpaAuthenticationKey.java b/redback-keys/redback-keys-providers/redback-keys-jpa/src/main/java/org/apache/archiva/redback/keys/jpa/model/JpaAuthenticationKey.java index f747d02..5c80364 100644 --- a/redback-keys/redback-keys-providers/redback-keys-jpa/src/main/java/org/apache/archiva/redback/keys/jpa/model/JpaAuthenticationKey.java +++ b/redback-keys/redback-keys-providers/redback-keys-jpa/src/main/java/org/apache/archiva/redback/keys/jpa/model/JpaAuthenticationKey.java @@ -26,7 +26,7 @@ import java.util.Date; /** * Authentication Key implementation for JPA. * - * The table names are set to match the JDO tables. + * The table names are set to match the legacy JDO tables. * * @author <a href="mailto:[email protected]";>Martin Stockhammer</a> */ http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/c04779a7/redback-keys/redback-keys-providers/redback-keys-jpa/src/test/java/org/apache/archiva/redback/keys/jpa/JpaKeyManagerTest.java ---------------------------------------------------------------------- diff --git a/redback-keys/redback-keys-providers/redback-keys-jpa/src/test/java/org/apache/archiva/redback/keys/jpa/JpaKeyManagerTest.java b/redback-keys/redback-keys-providers/redback-keys-jpa/src/test/java/org/apache/archiva/redback/keys/jpa/JpaKeyManagerTest.java index 0c34fbf..0ae1215 100644 --- a/redback-keys/redback-keys-providers/redback-keys-jpa/src/test/java/org/apache/archiva/redback/keys/jpa/JpaKeyManagerTest.java +++ b/redback-keys/redback-keys-providers/redback-keys-jpa/src/test/java/org/apache/archiva/redback/keys/jpa/JpaKeyManagerTest.java @@ -30,7 +30,7 @@ import javax.inject.Named; import javax.persistence.EntityManagerFactory; /** - * JdoKeyManagerTest + * JpaKeyManagerTest * * @author <a href="mailto:[email protected]";>Martin Stockhammer</a> * http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/c04779a7/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManagerTest.java ---------------------------------------------------------------------- diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManagerTest.java b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManagerTest.java index 082d1ea..89bcf1b 100644 --- a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManagerTest.java +++ b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManagerTest.java @@ -34,7 +34,7 @@ import java.io.InputStream; import java.util.Properties; /** - * JdoRbacManagerTest: + * JpaRbacManagerTest: * * @author Jesse McConnell * @author <a href="mailto:[email protected]";>Joakim Erdfelt</a> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/c04779a7/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java ---------------------------------------------------------------------- diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java index aefb829..6ecfdf9 100644 --- a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java +++ b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java @@ -393,7 +393,7 @@ public class LdapRbacManager } catch ( RbacObjectNotFoundException e ) { - // if it's mapped role to a group it doesn't exist in jdo + // if it's mapped role to a group it doesn't exist in jpa } role = ( role == null ) ? new RoleImpl( group ) : role; if ( role != null ) http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/c04779a7/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java ---------------------------------------------------------------------- diff --git a/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java b/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java index d293bda..702507f 100644 --- a/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java +++ b/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java @@ -170,9 +170,6 @@ public class AbstractUserManagerTestCase User smcqueen = getUserManager().createUser( "smcqueen", "Steve McQueen", "the cooler king" ); - /* Keep a reference to the object that was added. - * Since it has the actual principal that was managed by jpox/jdo. - */ User added = userManager.addUser( smcqueen ); assertEquals( 1, userManager.getUsers().size() ); @@ -202,11 +199,7 @@ public class AbstractUserManagerTestCase smcqueen.setLocked( true ); - /* - * Keep a reference to the object that was added. Since it has the - * actual principal that was managed by jpox/jdo. - */ - User added = userManager.addUser( smcqueen ); + User added = userManager.addUser( smcqueen ); assertTrue( added.isLocked() );
