Author: jmcconnell
Date: Tue Sep  4 08:10:36 2007
New Revision: 572702

URL: http://svn.apache.org/viewvc?rev=572702&view=rev
Log:
revert my last commit, brett pointed out that this was legacy migration...-r572701:572700

Modified:
    maven/continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/LegacyJdoDataManagementTool.java
    maven/continuum/trunk/continuum-data-management/redback-legacy/pom.xml
    maven/continuum/trunk/continuum-data-management/redback-legacy/src/main/mdo/keys-jdo.mdo
    maven/continuum/trunk/continuum-data-management/redback-legacy/src/main/mdo/rbac-jdo.mdo
    maven/continuum/trunk/continuum-data-management/redback-legacy/src/main/mdo/users-jdo.mdo

Modified: maven/continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/LegacyJdoDataManagementTool.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/LegacyJdoDataManagementTool.java?rev=572702&r1=572701&r2=572702&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/LegacyJdoDataManagementTool.java (original)
+++ maven/continuum/trunk/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/LegacyJdoDataManagementTool.java Tue Sep  4 08:10:36 2007
@@ -24,29 +24,29 @@
 import org.codehaus.plexus.jdo.JdoFactory;
 import org.codehaus.plexus.jdo.PlexusJdoUtils;
 import org.codehaus.plexus.jdo.PlexusStoreException;
-import org.codehaus.plexus.redback.rbac.jdo.v0_9_0.JdoOperation;
-import org.codehaus.plexus.redback.rbac.jdo.v0_9_0.JdoPermission;
-import org.codehaus.plexus.redback.rbac.jdo.v0_9_0.JdoResource;
-import org.codehaus.plexus.redback.rbac.jdo.v0_9_0.JdoRole;
-import org.codehaus.plexus.redback.rbac.jdo.v0_9_0.JdoUserAssignment;
-import org.codehaus.plexus.redback.rbac.jdo.v0_9_0.RbacDatabase;
-import org.codehaus.plexus.redback.rbac.jdo.v0_9_0.RbacJdoModelModelloMetadata;
-import org.codehaus.plexus.redback.rbac.jdo.v0_9_0.io.stax.RbacJdoModelStaxReader;
-import org.codehaus.plexus.redback.rbac.jdo.v0_9_0.io.stax.RbacJdoModelStaxWriter;
-import org.codehaus.plexus.redback.keys.jdo.v0_9_0.AuthenticationKeyDatabase;
-import org.codehaus.plexus.redback.keys.jdo.v0_9_0.JdoAuthenticationKey;
-import org.codehaus.plexus.redback.keys.jdo.v0_9_0.RedbackKeyManagementJdoModelloMetadata;
-import org.codehaus.plexus.redback.keys.jdo.v0_9_0.io.stax.RedbackKeyManagementJdoStaxReader;
-import org.codehaus.plexus.redback.keys.jdo.v0_9_0.io.stax.RedbackKeyManagementJdoStaxWriter;
-import org.codehaus.plexus.redback.rbac.RBACObjectAssertions;
-import org.codehaus.plexus.redback.rbac.RbacManagerException;
-import org.codehaus.plexus.redback.users.Messages;
-import org.codehaus.plexus.redback.users.UserManagerException;
-import org.codehaus.plexus.redback.users.jdo.v0_9_0.JdoUser;
-import org.codehaus.plexus.redback.users.jdo.v0_9_0.UserDatabase;
-import org.codehaus.plexus.redback.users.jdo.v0_9_0.UserManagementModelloMetadata;
-import org.codehaus.plexus.redback.users.jdo.v0_9_0.io.stax.UserManagementStaxReader;
-import org.codehaus.plexus.redback.users.jdo.v0_9_0.io.stax.UserManagementStaxWriter;
+import org.codehaus.plexus.security.authorization.rbac.jdo.v0_9_0.JdoOperation;
+import org.codehaus.plexus.security.authorization.rbac.jdo.v0_9_0.JdoPermission;
+import org.codehaus.plexus.security.authorization.rbac.jdo.v0_9_0.JdoResource;
+import org.codehaus.plexus.security.authorization.rbac.jdo.v0_9_0.JdoRole;
+import org.codehaus.plexus.security.authorization.rbac.jdo.v0_9_0.JdoUserAssignment;
+import org.codehaus.plexus.security.authorization.rbac.jdo.v0_9_0.RbacDatabase;
+import org.codehaus.plexus.security.authorization.rbac.jdo.v0_9_0.RbacJdoModelModelloMetadata;
+import org.codehaus.plexus.security.authorization.rbac.jdo.v0_9_0.io.stax.RbacJdoModelStaxReader;
+import org.codehaus.plexus.security.authorization.rbac.jdo.v0_9_0.io.stax.RbacJdoModelStaxWriter;
+import org.codehaus.plexus.security.keys.jdo.v0_9_0.AuthenticationKeyDatabase;
+import org.codehaus.plexus.security.keys.jdo.v0_9_0.JdoAuthenticationKey;
+import org.codehaus.plexus.security.keys.jdo.v0_9_0.PlexusSecurityKeyManagementJdoModelloMetadata;
+import org.codehaus.plexus.security.keys.jdo.v0_9_0.io.stax.PlexusSecurityKeyManagementJdoStaxReader;
+import org.codehaus.plexus.security.keys.jdo.v0_9_0.io.stax.PlexusSecurityKeyManagementJdoStaxWriter;
+import org.codehaus.plexus.security.rbac.RBACObjectAssertions;
+import org.codehaus.plexus.security.rbac.RbacManagerException;
+import org.codehaus.plexus.security.user.Messages;
+import org.codehaus.plexus.security.user.UserManagerException;
+import org.codehaus.plexus.security.user.jdo.v0_9_0.JdoUser;
+import org.codehaus.plexus.security.user.jdo.v0_9_0.UserDatabase;
+import org.codehaus.plexus.security.user.jdo.v0_9_0.UserManagementModelloMetadata;
+import org.codehaus.plexus.security.user.jdo.v0_9_0.io.stax.UserManagementStaxReader;
+import org.codehaus.plexus.security.user.jdo.v0_9_0.io.stax.UserManagementStaxWriter;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
 
@@ -180,7 +180,7 @@
 
         database.setKeys( keys );
 
-        RedbackKeyManagementJdoStaxWriter writer = new RedbackKeyManagementJdoStaxWriter();
+        PlexusSecurityKeyManagementJdoStaxWriter writer = new PlexusSecurityKeyManagementJdoStaxWriter();
         FileWriter fileWriter = new FileWriter( new File( backupDirectory, KEYS_XML_NAME ) );
         try
         {
@@ -355,7 +355,7 @@
     public void restoreKeysDatabase( File backupDirectory )
         throws IOException, XMLStreamException
     {
-    	RedbackKeyManagementJdoStaxReader reader = new RedbackKeyManagementJdoStaxReader();
+        PlexusSecurityKeyManagementJdoStaxReader reader = new PlexusSecurityKeyManagementJdoStaxReader();
 
         FileReader fileReader = new FileReader( new File( backupDirectory, KEYS_XML_NAME ) );
 
@@ -397,6 +397,6 @@
     public void eraseKeysDatabase()
     {
         PlexusJdoUtils.removeAll( getPersistenceManager(), JdoAuthenticationKey.class );
-        PlexusJdoUtils.removeAll( getPersistenceManager(), RedbackKeyManagementJdoModelloMetadata.class );
+        PlexusJdoUtils.removeAll( getPersistenceManager(), PlexusSecurityKeyManagementJdoModelloMetadata.class );
     }
 }

Modified: maven/continuum/trunk/continuum-data-management/redback-legacy/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-data-management/redback-legacy/pom.xml?rev=572702&r1=572701&r2=572702&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-data-management/redback-legacy/pom.xml (original)
+++ maven/continuum/trunk/continuum-data-management/redback-legacy/pom.xml Tue Sep  4 08:10:36 2007
@@ -33,7 +33,7 @@
             <configuration>
               <model>src/main/mdo/rbac-jdo.mdo</model>
               <outputDirectory>
-                ${basedir}/target/classes/org/codehaus/plexus/redback/rbac/jdo
+                ${basedir}/target/classes/org/codehaus/plexus/security/authorization/rbac/jdo
               </outputDirectory>
             </configuration>
           </execution>
@@ -45,7 +45,7 @@
             <configuration>
               <model>src/main/mdo/rbac-jdo.mdo</model>
               <outputDirectory>
-                ${basedir}/target/classes/org/codehaus/plexus/redback/rbac/jdo
+                ${basedir}/target/classes/org/codehaus/plexus/security/authorization/rbac/jdo
               </outputDirectory>
               <replicationParameters>true</replicationParameters>
             </configuration>
@@ -70,7 +70,7 @@
             <configuration>
               <model>src/main/mdo/keys-jdo.mdo</model>
               <outputDirectory>
-                ${basedir}/target/classes/org/codehaus/plexus/redback/keys/jdo
+                ${basedir}/target/classes/org/codehaus/plexus/security/keys/jdo
               </outputDirectory>
             </configuration>
           </execution>
@@ -82,7 +82,7 @@
             <configuration>
               <model>src/main/mdo/keys-jdo.mdo</model>
               <outputDirectory>
-                ${basedir}/target/classes/org/codehaus/plexus/redback/keys/jdo
+                ${basedir}/target/classes/org/codehaus/plexus/security/keys/jdo
               </outputDirectory>
               <replicationParameters>true</replicationParameters>
             </configuration>
@@ -107,7 +107,7 @@
             <configuration>
               <model>src/main/mdo/users-jdo.mdo</model>
               <outputDirectory>
-                ${basedir}/target/classes/org/codehaus/plexus/redback/users/jdo
+                ${basedir}/target/classes/org/codehaus/plexus/security/user/jdo
               </outputDirectory>
             </configuration>
           </execution>
@@ -119,7 +119,7 @@
             <configuration>
               <model>src/main/mdo/users-jdo.mdo</model>
               <outputDirectory>
-                ${basedir}/target/classes/org/codehaus/plexus/redback/users/jdo
+                ${basedir}/target/classes/org/codehaus/plexus/security/user/jdo
               </outputDirectory>
               <replicationParameters>true</replicationParameters>
             </configuration>
@@ -139,9 +139,9 @@
             <configuration>
               <tasks>
                 <!-- Workaround for MODELLO-89 -->
-                <replace file="target/generated-sources/modello/org/codehaus/plexus/redback/keys/jdo/v0_9_0/RedbackKeyManagementJdoModelloMetadata.java" token="jdo;" value="jdo.v0_9_0;" />
-                <replace file="target/generated-sources/modello/org/codehaus/plexus/redback/rbac/jdo/v0_9_0/RbacJdoModelModelloMetadata.java" token="jdo;" value="jdo.v0_9_0;" />
-                <replace file="target/generated-sources/modello/org/codehaus/plexus/redback/users/jdo/v0_9_0/UserManagementModelloMetadata.java" token="jdo;" value="jdo.v0_9_0;" />
+                <replace file="target/generated-sources/modello/org/codehaus/plexus/security/keys/jdo/v0_9_0/PlexusSecurityKeyManagementJdoModelloMetadata.java" token="jdo;" value="jdo.v0_9_0;" />
+                <replace file="target/generated-sources/modello/org/codehaus/plexus/security/authorization/rbac/jdo/v0_9_0/RbacJdoModelModelloMetadata.java" token="jdo;" value="jdo.v0_9_0;" />
+                <replace file="target/generated-sources/modello/org/codehaus/plexus/security/user/jdo/v0_9_0/UserManagementModelloMetadata.java" token="jdo;" value="jdo.v0_9_0;" />
               </tasks>
             </configuration>
             <goals>
@@ -154,11 +154,11 @@
             <configuration>
               <tasks>
                 <!-- Workaround for MODELLO-91 -->
-                <replace dir="target/classes/org/codehaus/plexus/redback/users/jdo" token="name=&quot;USER_PASSWORD&quot;" value="name=&quot;PASSWORD&quot;" />
-                <replace dir="target/classes/org/codehaus/plexus/redback/rbac/jdo" token="SECURITY_" value="" />
-                <replace dir="target/classes/org/codehaus/plexus/redback/rbac/jdo" token="name=&quot;RBAC_OPERATION&quot;" value="name=&quot;OPERATION&quot;" />
-                <replace dir="target/classes/org/codehaus/plexus/redback/rbac/jdo" token="name=&quot;RBAC_RESOURCE&quot;" value="name=&quot;RESOURCE&quot;" />
-                <replace dir="target/classes/org/codehaus/plexus/redback/rbac/jdo" token="name=&quot;LAST_UPDATED&quot;" value="name=&quot;TIMESTAMP&quot;" />
+                <replace dir="target/classes/org/codehaus/plexus/security/user/jdo" token="name=&quot;USER_PASSWORD&quot;" value="name=&quot;PASSWORD&quot;" />
+                <replace dir="target/classes/org/codehaus/plexus/security/authorization/rbac/jdo" token="SECURITY_" value="" />
+                <replace dir="target/classes/org/codehaus/plexus/security/authorization/rbac/jdo" token="name=&quot;RBAC_OPERATION&quot;" value="name=&quot;OPERATION&quot;" />
+                <replace dir="target/classes/org/codehaus/plexus/security/authorization/rbac/jdo" token="name=&quot;RBAC_RESOURCE&quot;" value="name=&quot;RESOURCE&quot;" />
+                <replace dir="target/classes/org/codehaus/plexus/security/authorization/rbac/jdo" token="name=&quot;LAST_UPDATED&quot;" value="name=&quot;TIMESTAMP&quot;" />
               </tasks>
             </configuration>
             <goals>
@@ -199,19 +199,19 @@
       <version>1.0.1</version>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus.redback</groupId>
-      <artifactId>redback-keys-api</artifactId>
-      <version>1.0-alpha-2</version>
+      <groupId>org.codehaus.plexus.security</groupId>
+      <artifactId>plexus-security-keys-api</artifactId>
+      <version>1.0-alpha-5</version>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus.redback</groupId>
-      <artifactId>redback-rbac-model</artifactId>
-      <version>1.0-alpha-2</version>
+      <groupId>org.codehaus.plexus.security</groupId>
+      <artifactId>plexus-security-authorization-rbac-model</artifactId>
+      <version>1.0-alpha-5</version>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus.redback</groupId>
-      <artifactId>redback-users-api</artifactId>
-      <version>1.0-alpha-2</version>
+      <groupId>org.codehaus.plexus.security</groupId>
+      <artifactId>plexus-security-user-management-api</artifactId>
+      <version>1.0-alpha-5</version>
     </dependency>
   </dependencies>
 </project>

Modified: maven/continuum/trunk/continuum-data-management/redback-legacy/src/main/mdo/keys-jdo.mdo
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-data-management/redback-legacy/src/main/mdo/keys-jdo.mdo?rev=572702&r1=572701&r2=572702&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-data-management/redback-legacy/src/main/mdo/keys-jdo.mdo (original)
+++ maven/continuum/trunk/continuum-data-management/redback-legacy/src/main/mdo/keys-jdo.mdo Tue Sep  4 08:10:36 2007
@@ -20,14 +20,14 @@
   -->
 
 <model>
-  <id>redback-keys-jdo</id>
-  <name>RedbackKeyManagementJdo</name>
+  <id>plexus-security-keys-jdo</id>
+  <name>PlexusSecurityKeyManagementJdo</name>
   <version>0.9.0</version>
-  <description>Redback :: Key Management JDO Store.</description>
+  <description>Plexus Security :: Key Management JDO Store.</description>
   <defaults>
     <default>
       <key>package</key>
-      <value>org.codehaus.plexus.redback.keys.jdo</value>
+      <value>org.codehaus.plexus.security.keys.jdo</value>
     </default>
   </defaults>
 
@@ -50,10 +50,10 @@
       <name>JdoAuthenticationKey</name>
       <version>0.9.0</version>
       <interfaces>
-        <interface>org.codehaus.plexus.redback.keys.AuthenticationKey</interface>
+        <interface>org.codehaus.plexus.security.keys.AuthenticationKey</interface>
       </interfaces>
       <description>
-        @plexus.component role="org.codehaus.plexus.redback.keys.AuthenticationKey"
+        @plexus.component role="org.codehaus.plexus.security.keys.AuthenticationKey"
         role-hint="jdo"
       </description>
       <fields>

Modified: maven/continuum/trunk/continuum-data-management/redback-legacy/src/main/mdo/rbac-jdo.mdo
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-data-management/redback-legacy/src/main/mdo/rbac-jdo.mdo?rev=572702&r1=572701&r2=572702&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-data-management/redback-legacy/src/main/mdo/rbac-jdo.mdo (original)
+++ maven/continuum/trunk/continuum-data-management/redback-legacy/src/main/mdo/rbac-jdo.mdo Tue Sep  4 08:10:36 2007
@@ -26,7 +26,7 @@
   <defaults>
     <default>
       <key>package</key>
-      <value>org.codehaus.plexus.redback.rbac.jdo</value>
+      <value>org.codehaus.plexus.security.authorization.rbac.jdo</value>
     </default>
   </defaults>
   <classes>
@@ -84,9 +84,9 @@
       <name>JdoRole</name>
       <version>0.9.0</version>
       <interfaces>
-        <interface>org.codehaus.plexus.redback.rbac.Role</interface>
+        <interface>org.codehaus.plexus.security.rbac.Role</interface>
       </interfaces>
-      <superClass>org.codehaus.plexus.redback.rbac.AbstractRole</superClass>
+      <superClass>org.codehaus.plexus.security.rbac.AbstractRole</superClass>
       <fields>
         <field jpox.primary-key="true" jpox.value-strategy="off">
           <name>name</name>
@@ -126,7 +126,7 @@
                        jpox.dependent="false"
                        java.generate-break="false" 
                        java.generate-create="false"
-                       zjava.use-interface="org.codehaus.plexus.redback.rbac.Role">
+                       zjava.use-interface="org.codehaus.plexus.security.rbac.Role">
             <type>String</type>
             <multiplicity>*</multiplicity>
           </association>
@@ -145,7 +145,7 @@
                        java.init="field"
                        java.generate-break="false"
                        java.generate-create="false"
-                       java.use-interface="org.codehaus.plexus.redback.rbac.Permission">
+                       java.use-interface="org.codehaus.plexus.security.rbac.Permission">
             <type>JdoPermission</type>
             <multiplicity>*</multiplicity>
           </association>
@@ -159,7 +159,7 @@
       <name>JdoPermission</name>
       <version>0.9.0</version>
       <interfaces>
-        <interface>org.codehaus.plexus.redback.rbac.Permission</interface>
+        <interface>org.codehaus.plexus.security.rbac.Permission</interface>
       </interfaces>
       <fields>
         <field jpox.primary-key="true" jpox.value-strategy="off">
@@ -186,7 +186,7 @@
           <version>0.9.0</version>
           <association stash.part="true" 
                        xml.reference="true"
-                       java.use-interface="org.codehaus.plexus.redback.rbac.Operation"
+                       java.use-interface="org.codehaus.plexus.security.rbac.Operation"
                        jpox.dependent="false">
             <type>JdoOperation</type>
             <multiplicity>1</multiplicity>
@@ -197,7 +197,7 @@
           <version>0.9.0</version>
           <association stash.part="true" 
                        xml.reference="true"
-                       java.use-interface="org.codehaus.plexus.redback.rbac.Resource"
+                       java.use-interface="org.codehaus.plexus.security.rbac.Resource"
                        jpox.dependent="false">
             <type>JdoResource</type>
             <multiplicity>1</multiplicity>
@@ -212,7 +212,7 @@
       <name>JdoOperation</name>
       <version>0.9.0</version>
       <interfaces>
-        <interface>org.codehaus.plexus.redback.rbac.Operation</interface>
+        <interface>org.codehaus.plexus.security.rbac.Operation</interface>
       </interfaces>
       <fields>
         <field jpox.primary-key="true" jpox.value-strategy="off">
@@ -254,7 +254,7 @@
         In RBAC terms, this is the entity which an operation is associated with that which permissions are based on.
       </description>
       <interfaces>
-        <interface>org.codehaus.plexus.redback.rbac.Resource</interface>
+        <interface>org.codehaus.plexus.security.rbac.Resource</interface>
       </interfaces>
       <fields>
         <field jpox.primary-key="true" jpox.value-strategy="off">
@@ -293,9 +293,9 @@
       <description>binding of a principal to a role</description>
       <version>0.9.0</version>
       <interfaces>
-        <interface>org.codehaus.plexus.redback.rbac.UserAssignment</interface>
+        <interface>org.codehaus.plexus.security.rbac.UserAssignment</interface>
       </interfaces>
-      <superClass>org.codehaus.plexus.redback.rbac.AbstractUserAssignment</superClass>
+      <superClass>org.codehaus.plexus.security.rbac.AbstractUserAssignment</superClass>
       <fields>
         <field jpox.primary-key="true" jpox.value-strategy="off">
           <name>principal</name>

Modified: maven/continuum/trunk/continuum-data-management/redback-legacy/src/main/mdo/users-jdo.mdo
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-data-management/redback-legacy/src/main/mdo/users-jdo.mdo?rev=572702&r1=572701&r2=572702&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-data-management/redback-legacy/src/main/mdo/users-jdo.mdo (original)
+++ maven/continuum/trunk/continuum-data-management/redback-legacy/src/main/mdo/users-jdo.mdo Tue Sep  4 08:10:36 2007
@@ -19,14 +19,14 @@
   -->
 
 <model>
-  <id>redback-user-management-provider-jdo</id>
+  <id>plexus-security-user-management-provider-jdo</id>
   <name>UserManagement</name>
   <version>0.9.0</version>
-  <description>Redback User Management object model.</description>
+  <description>Plexus Security User Management object model.</description>
   <defaults>
     <default>
       <key>package</key>
-      <value>org.codehaus.plexus.redback.users.jdo</value>
+      <value>org.codehaus.plexus.security.user.jdo</value>
     </default>
   </defaults>
 
@@ -49,10 +49,10 @@
       <name>JdoUser</name>
       <version>0.9.0</version>
       <interfaces>
-        <interface>org.codehaus.plexus.redback.users.User</interface>
+        <interface>org.codehaus.plexus.security.user.User</interface>
       </interfaces>
       <description>
-        @plexus.component role="org.codehaus.plexus.redback.users.User"
+        @plexus.component role="org.codehaus.plexus.security.user.User"
         role-hint="jdo"
       </description>
       <fields>