From 7c57e80a10a53d4daab571037b37d395100074f3 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 9 Apr 2012 19:27:59 +0000 Subject: [PATCH] package change for redback-keys-jdo generated classes git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1311390 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva/redback/management/JdoDataManagementTool.java | 6 +++--- .../archiva/redback/integration/mail/MailGeneratorTest.java | 2 +- .../archiva/redback/rest/services/DefaultLoginService.java | 2 +- .../redback-keys-providers/redback-keys-jdo/pom.xml | 2 +- .../org/apache/archiva/redback/keys/jdo/JdoKeyManager.java | 2 -- .../redback-keys-jdo/src/main/mdo/keys.mdo | 4 ++-- .../apache/archiva/redback/keys/jdo/JdoKeyManagerTest.java | 2 +- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java b/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java index 0b9578ef..db3e5534 100644 --- a/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java +++ b/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java @@ -36,15 +36,15 @@ import javax.xml.stream.XMLStreamException; import org.apache.archiva.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.KeyManager; +import org.apache.archiva.redback.keys.jdo.AuthenticationKeyDatabase; +import org.apache.archiva.redback.keys.jdo.io.stax.RedbackKeyManagementJdoStaxReader; +import org.apache.archiva.redback.keys.jdo.io.stax.RedbackKeyManagementJdoStaxWriter; import org.apache.archiva.redback.rbac.Operation; import org.apache.archiva.redback.rbac.Permission; import org.apache.archiva.redback.rbac.RbacManagerException; import org.apache.archiva.redback.rbac.Role; import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.keys.KeyManagerException; -import org.codehaus.plexus.redback.keys.jdo.AuthenticationKeyDatabase; -import org.codehaus.plexus.redback.keys.jdo.io.stax.RedbackKeyManagementJdoStaxReader; -import org.codehaus.plexus.redback.keys.jdo.io.stax.RedbackKeyManagementJdoStaxWriter; import org.apache.archiva.redback.rbac.RBACManager; import org.apache.archiva.redback.rbac.Resource; import org.apache.archiva.redback.rbac.UserAssignment; diff --git a/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java b/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java index e8f28174..c51d6996 100644 --- a/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java +++ b/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java @@ -97,7 +97,7 @@ public class MailGeneratorTest } SchemaTool.createSchemaTables( new URL[] { getClass() - .getResource( "/org/codehaus/plexus/redback/keys/jdo/package.jdo" ) }, new URL[] {}, null, false, null ); //$NON-NLS-1$ + .getResource( "/org/apache/archiva/redback/keys/jdo/package.jdo" ) }, new URL[] {}, null, false, null ); //$NON-NLS-1$ log.info( "jdoFactory driverName {} " , jdoFactory.getDriverName() ); diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLoginService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLoginService.java index a2af18b6..ec85d712 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLoginService.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLoginService.java @@ -20,12 +20,12 @@ package org.apache.archiva.redback.rest.services; */ import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.keys.KeyManager; +import org.apache.archiva.redback.keys.jdo.JdoAuthenticationKey; import org.apache.archiva.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.MustChangePasswordException; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.apache.archiva.redback.keys.AuthenticationKey; -import org.codehaus.plexus.redback.keys.jdo.JdoAuthenticationKey; import org.apache.archiva.redback.keys.memory.MemoryAuthenticationKey; import org.apache.archiva.redback.keys.memory.MemoryKeyManager; import org.apache.archiva.redback.system.SecuritySession; diff --git a/redback-keys/redback-keys-providers/redback-keys-jdo/pom.xml b/redback-keys/redback-keys-providers/redback-keys-jdo/pom.xml index d59e692a..7db5be52 100644 --- a/redback-keys/redback-keys-providers/redback-keys-jdo/pom.xml +++ b/redback-keys/redback-keys-providers/redback-keys-jdo/pom.xml @@ -120,7 +120,7 @@ jpox-jdo-mapping - ${basedir}/target/classes/org/codehaus/plexus/redback/keys/jdo + ${basedir}/target/classes/org/apache/archiva/redback/keys/jdo diff --git a/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/apache/archiva/redback/keys/jdo/JdoKeyManager.java b/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/apache/archiva/redback/keys/jdo/JdoKeyManager.java index 577a07bf..c2b382b9 100644 --- a/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/apache/archiva/redback/keys/jdo/JdoKeyManager.java +++ b/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/apache/archiva/redback/keys/jdo/JdoKeyManager.java @@ -27,8 +27,6 @@ import org.codehaus.plexus.jdo.PlexusStoreException; import org.apache.archiva.redback.keys.AbstractKeyManager; import org.apache.archiva.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyNotFoundException; -import org.codehaus.plexus.redback.keys.jdo.JdoAuthenticationKey; -import org.codehaus.plexus.redback.keys.jdo.RedbackKeyManagementJdoModelloMetadata; import org.codehaus.plexus.util.StringUtils; import org.jpox.PersistenceManagerFactoryImpl; import org.springframework.stereotype.Service; diff --git a/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo b/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo index e0986c0f..e847ca3a 100644 --- a/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo +++ b/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo @@ -23,11 +23,11 @@ redback-keys-jdo RedbackKeyManagementJdo 1.0.1 - Plexus Redback :: Key Management JDO Store. + Archiva Redback :: Key Management JDO Store. package - org.codehaus.plexus.redback.keys.jdo + org.apache.archiva.redback.keys.jdo diff --git a/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/apache/archiva/redback/keys/jdo/JdoKeyManagerTest.java b/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/apache/archiva/redback/keys/jdo/JdoKeyManagerTest.java index 8ec912e9..f0710729 100644 --- a/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/apache/archiva/redback/keys/jdo/JdoKeyManagerTest.java +++ b/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/apache/archiva/redback/keys/jdo/JdoKeyManagerTest.java @@ -86,7 +86,7 @@ public class JdoKeyManagerTest } SchemaTool.createSchemaTables( new URL[] { getClass() - .getResource( "/org/codehaus/plexus/redback/keys/jdo/package.jdo" ) }, new URL[] {}, null, false, null ); //$NON-NLS-1$ + .getResource( "/org/apache/archiva/redback/keys/jdo/package.jdo" ) }, new URL[] {}, null, false, null ); //$NON-NLS-1$ PersistenceManagerFactory pmf = jdoFactory.getPersistenceManagerFactory();