package change for redback-rbac-jdo generated classes

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1311398 13f79535-47bb-0310-9956-ffa450edef68

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 db3e55342438405275039e9b69310eff7257b6a4..82c7a2bb30c7837959e314c23ea6f6bcabea6af1 100644 (file)
--- 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
@@ -43,14 +43,14 @@ 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.rbac.jdo.RbacDatabase;
+import org.apache.archiva.redback.rbac.jdo.io.stax.RbacJdoModelStaxReader;
+import org.apache.archiva.redback.rbac.jdo.io.stax.RbacJdoModelStaxWriter;
 import org.apache.archiva.redback.users.UserManager;
 import org.apache.archiva.redback.keys.KeyManagerException;
 import org.apache.archiva.redback.rbac.RBACManager;
 import org.apache.archiva.redback.rbac.Resource;
 import org.apache.archiva.redback.rbac.UserAssignment;
-import org.codehaus.plexus.redback.rbac.jdo.RbacDatabase;
-import org.codehaus.plexus.redback.rbac.jdo.io.stax.RbacJdoModelStaxReader;
-import org.codehaus.plexus.redback.rbac.jdo.io.stax.RbacJdoModelStaxWriter;
 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;

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
index e56d30cae7e6409725d07a3087f70a5bd223e0f5..9135d0fb7b858e6781004e64a31d3f0fc90f3b21 100644 (file)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
@@ -31,12 +31,6 @@ import org.apache.archiva.redback.rbac.Role;
 import org.apache.archiva.redback.rbac.UserAssignment;
 import org.apache.archiva.redback.rbac.Permission;
 import org.apache.archiva.redback.rbac.RBACObjectAssertions;
-import org.codehaus.plexus.redback.rbac.jdo.JdoOperation;
-import org.codehaus.plexus.redback.rbac.jdo.JdoPermission;
-import org.codehaus.plexus.redback.rbac.jdo.JdoResource;
-import org.codehaus.plexus.redback.rbac.jdo.JdoRole;
-import org.codehaus.plexus.redback.rbac.jdo.JdoUserAssignment;
-import org.codehaus.plexus.redback.rbac.jdo.RbacJdoModelModelloMetadata;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java
index a36215fcb37c999698924a751cfee58aa3ba936e..edc02efcb4facc3f80f6672ceb4225b83e467527 100644 (file)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java
@@ -25,7 +25,6 @@ import org.apache.archiva.redback.rbac.RbacManagerException;
 import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
 import org.apache.archiva.redback.rbac.Role;
 import org.codehaus.plexus.jdo.JdoFactory;
-import org.codehaus.plexus.redback.rbac.jdo.JdoRole;
 import org.codehaus.plexus.util.StringUtils;
 import org.springframework.stereotype.Service;
 

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/mdo/rbac-jdo.mdo b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/mdo/rbac-jdo.mdo
index 966440f0560ee45a97419726b3e6f85efe63acd7..2d2b3961ca2ade72d745997ba870eac9d3833b6c 100644 (file)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/mdo/rbac-jdo.mdo
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/mdo/rbac-jdo.mdo
@@ -27,7 +27,7 @@
   <defaults>
     <default>
       <key>package</key>
-      <value>org.codehaus.plexus.redback.rbac.jdo</value>
+      <value>org.apache.archiva.redback.rbac.jdo</value>
     </default>
   </defaults>
   <classes>

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
index ee17048796ec640ff31238ebcd2be82026749954..dd5d5a77dc03b40ba0401ca16689aa82e28b6743 100644 (file)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
@@ -116,7 +116,7 @@ public class JdoRbacManagerTest
         }
 
         URL[] jdoFileUrls =
-            new URL[]{ getClass().getResource( "/org/codehaus/plexus/redback/rbac/jdo/package.jdo" ) }; //$NON-NLS-1$
+            new URL[]{ getClass().getResource( "/org/apache/archiva/redback/rbac/jdo/package.jdo" ) }; //$NON-NLS-1$
 
 
 

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/RbacJdoModelStaxTest.java b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/RbacJdoModelStaxTest.java
index 1f52ac839f712dac6a98feae029fa1bcd960b06f..2fcb9c553146cf0e95956c57003b00bab74f8ebf 100644 (file)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/RbacJdoModelStaxTest.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/RbacJdoModelStaxTest.java
@@ -33,14 +33,9 @@ import junit.framework.TestCase;
 
 import org.apache.archiva.redback.rbac.Operation;
 import org.apache.archiva.redback.rbac.Resource;
-import org.codehaus.plexus.redback.rbac.jdo.JdoOperation;
-import org.codehaus.plexus.redback.rbac.jdo.JdoPermission;
-import org.codehaus.plexus.redback.rbac.jdo.JdoResource;
-import org.codehaus.plexus.redback.rbac.jdo.JdoRole;
-import org.codehaus.plexus.redback.rbac.jdo.JdoUserAssignment;
-import org.codehaus.plexus.redback.rbac.jdo.RbacDatabase;
-import org.codehaus.plexus.redback.rbac.jdo.io.stax.RbacJdoModelStaxReader;
-import org.codehaus.plexus.redback.rbac.jdo.io.stax.RbacJdoModelStaxWriter;
+import org.apache.archiva.redback.rbac.jdo.io.stax.RbacJdoModelStaxReader;
+import org.apache.archiva.redback.rbac.jdo.io.stax.RbacJdoModelStaxWriter;
+
 
 /**
  * Test the StAX reader and writer generated.