Author: olamy
Date: Mon Apr 9 19:27:59 2012
New Revision: 1311390
URL: http://svn.apache.org/viewvc?rev=1311390&view=rev
Log:
package change for redback-keys-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-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLoginService.java
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/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-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/apache/archiva/redback/keys/jdo/JdoKeyManagerTest.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=1311390&r1=1311389&r2=1311390&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 19:27:59 2012
@@ -36,15 +36,15 @@ import javax.xml.stream.XMLStreamExcepti
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;
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java?rev=1311390&r1=1311389&r2=1311390&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java
Mon Apr 9 19:27:59 2012
@@ -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() );
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLoginService.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLoginService.java?rev=1311390&r1=1311389&r2=1311390&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLoginService.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLoginService.java
Mon Apr 9 19:27:59 2012
@@ -20,12 +20,12 @@ package org.apache.archiva.redback.rest.
*/
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;
Modified:
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/pom.xml?rev=1311390&r1=1311389&r2=1311390&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/pom.xml
Mon Apr 9 19:27:59 2012
@@ -120,7 +120,7 @@
<goal>jpox-jdo-mapping</goal>
</goals>
<configuration>
-
<outputDirectory>${basedir}/target/classes/org/codehaus/plexus/redback/keys/jdo</outputDirectory>
+
<outputDirectory>${basedir}/target/classes/org/apache/archiva/redback/keys/jdo</outputDirectory>
</configuration>
</execution>
</executions>
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=1311390&r1=1311389&r2=1311390&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
Mon Apr 9 19:27:59 2012
@@ -27,8 +27,6 @@ import org.codehaus.plexus.jdo.PlexusSto
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;
Modified:
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo?rev=1311390&r1=1311389&r2=1311390&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo
(original)
+++
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo
Mon Apr 9 19:27:59 2012
@@ -23,11 +23,11 @@
<id>redback-keys-jdo</id>
<name>RedbackKeyManagementJdo</name>
<version>1.0.1</version>
- <description>Plexus Redback :: Key Management JDO Store.</description>
+ <description>Archiva Redback :: Key Management JDO Store.</description>
<defaults>
<default>
<key>package</key>
- <value>org.codehaus.plexus.redback.keys.jdo</value>
+ <value>org.apache.archiva.redback.keys.jdo</value>
</default>
</defaults>
Modified:
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/apache/archiva/redback/keys/jdo/JdoKeyManagerTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/apache/archiva/redback/keys/jdo/JdoKeyManagerTest.java?rev=1311390&r1=1311389&r2=1311390&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/apache/archiva/redback/keys/jdo/JdoKeyManagerTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/apache/archiva/redback/keys/jdo/JdoKeyManagerTest.java
Mon Apr 9 19:27:59 2012
@@ -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();
