svn commit: r1310809 - in /archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src: main/java/org/apache/ main/java/org/apache/archiva/ main/java/org/apache/archiva/redback/ main/java/org/apache/archiva/redback/us...

[ol...@apache.org]

Author: olamy
Date: Sat Apr  7 18:03:25 2012
New Revision: 1310809

URL: http://svn.apache.org/viewvc?rev=1310809&view=rev
Log:
package move to o.a.a.r module redback-users-jdo

Added:
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
      - copied, changed from r1310770, archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/JdoUserManager.java
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserQuery.java
      - copied, changed from r1310770, archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/JdoUserQuery.java
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/Messages.java
      - copied, changed from r1310770, archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/Messages.java
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/apache/
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/apache/archiva/
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/apache/archiva/redback/
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/apache/archiva/redback/users/
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/apache/archiva/redback/users/jdo/
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/apache/archiva/redback/users/jdo/messages.properties   (with props)
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java
      - copied, changed from r1310770, archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/codehaus/plexus/redback/users/jdo/JdoUserManagerTest.java
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/org/apache/
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/org/apache/archiva/
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/org/apache/archiva/redback/
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/org/apache/archiva/redback/config-defaults.properties
      - copied unchanged from r1310770, archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/org/codehaus/plexus/redback/config-defaults.properties
Removed:
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/JdoUserManager.java
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/JdoUserQuery.java
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/Messages.java
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/codehaus/
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/codehaus/
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/org/codehaus/
Modified:
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/META-INF/spring-context.xml

Copied: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java (from r1310770, archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/JdoUserManager.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java?p2=archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java&p1=archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/JdoUserManager.java&r1=1310770&r2=1310809&rev=1310809&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/JdoUserManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java Sat Apr  7 18:03:25 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.users.jdo;
+package org.apache.archiva.redback.users.jdo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -30,6 +30,8 @@ import org.codehaus.plexus.jdo.PlexusSto
 import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
 import org.apache.archiva.redback.users.PermanentUserException;
 import org.apache.archiva.redback.users.UserQuery;
+import org.codehaus.plexus.redback.users.jdo.JdoUser;
+import org.codehaus.plexus.redback.users.jdo.UsersManagementModelloMetadata;
 import org.codehaus.plexus.util.StringUtils;
 import org.jpox.JDOClassLoaderResolver;
 import org.springframework.stereotype.Service;

Copied: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserQuery.java (from r1310770, archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/JdoUserQuery.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserQuery.java?p2=archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserQuery.java&p1=archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/JdoUserQuery.java&r1=1310770&r2=1310809&rev=1310809&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/JdoUserQuery.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserQuery.java Sat Apr  7 18:03:25 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.users.jdo;
+package org.apache.archiva.redback.users.jdo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/Messages.java (from r1310770, archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/Messages.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/Messages.java?p2=archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/Messages.java&p1=archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/Messages.java&r1=1310770&r2=1310809&rev=1310809&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/codehaus/plexus/redback/users/jdo/Messages.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/Messages.java Sat Apr  7 18:03:25 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.users.jdo;
+package org.apache.archiva.redback.users.jdo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/META-INF/spring-context.xml?rev=1310809&r1=1310808&r2=1310809&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/META-INF/spring-context.xml Sat Apr  7 18:03:25 2012
@@ -28,6 +28,6 @@
         default-lazy-init="true">
 
   <context:annotation-config />
-  <context:component-scan base-package="org.codehaus.plexus.redback.users.jdo"/>
+  <context:component-scan base-package="org.apache.archiva.redback.users.jdo"/>
 
 </beans>
\ No newline at end of file

Added: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/apache/archiva/redback/users/jdo/messages.properties
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/apache/archiva/redback/users/jdo/messages.properties?rev=1310809&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/apache/archiva/redback/users/jdo/messages.properties (added)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/apache/archiva/redback/users/jdo/messages.properties Sat Apr  7 18:03:25 2012
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+user.manager.cannot.add.user.without.username=User.username must be supplied on an .addUser() request.
+user.manager.cannot.add.user.without.password=User.password must be supplied on an .addUser() request.

Propchange: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/apache/archiva/redback/users/jdo/messages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/apache/archiva/redback/users/jdo/messages.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java (from r1310770, archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/codehaus/plexus/redback/users/jdo/JdoUserManagerTest.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java?p2=archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java&p1=archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/codehaus/plexus/redback/users/jdo/JdoUserManagerTest.java&r1=1310770&r2=1310809&rev=1310809&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/codehaus/plexus/redback/users/jdo/JdoUserManagerTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java Sat Apr  7 18:03:25 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.users.jdo;
+package org.apache.archiva.redback.users.jdo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,7 @@ package org.codehaus.plexus.redback.user
  * under the License.
  */
 
+import org.apache.archiva.redback.users.jdo.JdoUserManager;
 import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
 import org.codehaus.plexus.redback.common.jdo.test.StoreManagerDebug;
 import org.codehaus.plexus.redback.users.provider.test.AbstractUserManagerTestCase;