svn commit: r1311398 - in /archiva/redback/redback-core/trunk: redback-data-management/src/main/java/org/apache/archiva/redback/management/ redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/ redback-...

[ol...@apache.org]

Author: olamy
Date: Mon Apr  9 19:43:58 2012
New Revision: 1311398

URL: http://svn.apache.org/viewvc?rev=1311398&view=rev
Log:
package change for redback-rbac-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-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
    archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java
    archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/mdo/rbac-jdo.mdo
    archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
    archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/RbacJdoModelStaxTest.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=1311398&r1=1311397&r2=1311398&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:43:58 2012
@@ -43,14 +43,14 @@ import org.apache.archiva.redback.rbac.O
 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;

Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java?rev=1311398&r1=1311397&r2=1311398&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java Mon Apr  9 19:43:58 2012
@@ -31,12 +31,6 @@ import org.apache.archiva.redback.rbac.R
 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;

Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java?rev=1311398&r1=1311397&r2=1311398&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java Mon Apr  9 19:43:58 2012
@@ -25,7 +25,6 @@ import org.apache.archiva.redback.rbac.R
 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;
 

Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/mdo/rbac-jdo.mdo
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/mdo/rbac-jdo.mdo?rev=1311398&r1=1311397&r2=1311398&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/mdo/rbac-jdo.mdo (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/mdo/rbac-jdo.mdo Mon Apr  9 19:43:58 2012
@@ -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>

Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java?rev=1311398&r1=1311397&r2=1311398&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java Mon Apr  9 19:43:58 2012
@@ -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$
 
 
 

Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/RbacJdoModelStaxTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/RbacJdoModelStaxTest.java?rev=1311398&r1=1311397&r2=1311398&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/RbacJdoModelStaxTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/RbacJdoModelStaxTest.java Mon Apr  9 19:43:58 2012
@@ -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.