]> source.dussan.org Git - archiva.git/commitdiff
use o.a.a package namespace for spring-jdo2 component
authorOlivier Lamy <olamy@apache.org>
Wed, 11 Apr 2012 19:15:44 +0000 (19:15 +0000)
committerOlivier Lamy <olamy@apache.org>
Wed, 11 Apr 2012 19:15:44 +0000 (19:15 +0000)
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1324919 13f79535-47bb-0310-9956-ffa450edef68

19 files changed:
redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java
redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml
redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/apache/archiva/redback/keys/jdo/JdoKeyManager.java
redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/apache/archiva/redback/keys/jdo/JdoKeyManagerTest.java
redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml
redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java
redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml
redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/JpoxRoleManagerTest.java
redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
redback-system/src/test/resources/spring-context.xml
redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java

index 8be9c9c269825a1544fc37f1bafc7b290e5bf521..98d253f09d824b4b0886c0c5351f09afdf7c5892 100644 (file)
@@ -19,12 +19,12 @@ package org.apache.archiva.redback.common.jdo;
  * under the License.
  */
 
+import org.apache.archiva.redback.components.jdo.DefaultConfigurableJdoFactory;
 import org.apache.archiva.redback.configuration.UserConfiguration;
 import org.apache.commons.lang.StringUtils;
 import org.codehaus.plexus.interpolation.InterpolationException;
 import org.codehaus.plexus.interpolation.PropertiesBasedValueSource;
 import org.codehaus.plexus.interpolation.StringSearchInterpolator;
-import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
index c51d6996712a17d79fac201d102408f82e4b6880..d931c5b082ba898c782c4862ee693a6affbbbaa1 100644 (file)
@@ -21,11 +21,10 @@ package org.apache.archiva.redback.integration.mail;
 
 import junit.framework.TestCase;
 import net.sf.ehcache.CacheManager;
-import org.apache.archiva.redback.integration.mail.MailGenerator;
+import org.apache.archiva.redback.components.jdo.DefaultConfigurableJdoFactory;
 import org.apache.archiva.redback.keys.AuthenticationKey;
 import org.apache.archiva.redback.keys.KeyManager;
 import org.apache.archiva.redback.policy.UserSecurityPolicy;
-import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
 import org.apache.archiva.redback.keys.KeyManagerException;
 import org.jpox.SchemaTool;
 import org.junit.Before;
index 6067c80677028796d5cb9e5fe33bdc9eadbf4c95..6285b356273c0995f5434ee545cf2d3f999cdd08 100644 (file)
@@ -28,7 +28,7 @@
 
   <context:property-placeholder system-properties-mode="OVERRIDE"/>
 
-  <bean name="jdoFactory#users" class="org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory">
+  <bean name="jdoFactory#users" class="org.apache.archiva.redback.components.jdo.DefaultConfigurableJdoFactory">
     <property name="driverName" value="org.hsqldb.jdbcDriver"/>
     <property name="url" value="jdbc:hsqldb:mem:redback-users-tests" />
     <property name="userName" value="sa"/>
index a47f5c918cb218f2257dfe091e8eb1551e4391a1..59ecd5d22cb92f60c014a08262b5ef264ae13542 100755 (executable)
   -->
 
   <!--
-  <bean name="jdoFactory#users" class="org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory">
+  <bean name="jdoFactory#users" class="org.apache.archiva.redback.components.jdo.DefaultConfigurableJdoFactory">
     <property name="persistenceManagerFactoryClass" value="org.jpox.PersistenceManagerFactoryImpl"/>
     <property name="driverName" value="org.hsqldb.jdbcDriver"/>
     <property name="url" value="jdbc:hsqldb:mem:UnitTest"/>
index 0011db39c610e521b3c8abc81446f7ff93330ace..730d669a00dac490eb9e7fdcd44962e668dcbeb0 100644 (file)
@@ -26,7 +26,7 @@
            http://www.springframework.org/schema/context 
            http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
-  <bean name="jdoFactory#users" class="org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory">
+  <bean name="jdoFactory#users" class="org.apache.archiva.redback.components.jdo.DefaultConfigurableJdoFactory">
     <property name="driverName" value="org.hsqldb.jdbcDriver"/>
     <property name="url" value="jdbc:hsqldb:mem:redback-users-tests" />
     <property name="userName" value="sa"/>
index c2b382b926ae23a180f55852c748203da27a63dd..908ec44654d2288f4cc56556dd1e83e655ecdec5 100644 (file)
@@ -19,11 +19,11 @@ package org.apache.archiva.redback.keys.jdo;
  * under the License.
  */
 
+import org.apache.archiva.redback.components.jdo.JdoFactory;
+import org.apache.archiva.redback.components.jdo.PlexusJdoUtils;
+import org.apache.archiva.redback.components.jdo.PlexusObjectNotFoundException;
+import org.apache.archiva.redback.components.jdo.PlexusStoreException;
 import org.apache.archiva.redback.keys.AuthenticationKey;
-import org.codehaus.plexus.jdo.JdoFactory;
-import org.codehaus.plexus.jdo.PlexusJdoUtils;
-import org.codehaus.plexus.jdo.PlexusObjectNotFoundException;
-import org.codehaus.plexus.jdo.PlexusStoreException;
 import org.apache.archiva.redback.keys.AbstractKeyManager;
 import org.apache.archiva.redback.keys.KeyManagerException;
 import org.apache.archiva.redback.keys.KeyNotFoundException;
index 31d7dd1887ed985c6dac5683690bd6243ce47429..c7430cb177436452c34a6f4414c9c9a4a80f3b17 100644 (file)
@@ -19,8 +19,8 @@ package org.apache.archiva.redback.keys.jdo;
  * under the License.
  */
 
+import org.apache.archiva.redback.components.jdo.DefaultConfigurableJdoFactory;
 import org.apache.archiva.redback.keys.KeyManager;
-import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
 import org.apache.archiva.redback.keys.KeyManagerTestCase;
 import org.jpox.SchemaTool;
 import org.junit.Before;
index 9c6d7f55d997a35c6e756e859c3ec6f82c2ba4b5..0502105f27524c066cdd1c66c2da7071bfdd9fb3 100644 (file)
@@ -23,7 +23,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-  <bean name="jdoFactory#users" class="org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory">
+  <bean name="jdoFactory#users" class="org.apache.archiva.redback.components.jdo.DefaultConfigurableJdoFactory">
     <property name="driverName" value="org.hsqldb.jdbcDriver"/>
     <property name="url" value="jdbc:hsqldb:mem:redback-users-tests" />
     <property name="userName" value="sa"/>
index d732d499d7a80761d2a064d0d70078edb78e6d9f..5b5d818cf024da3c7159cb45aa16f6298a56e835 100755 (executable)
@@ -24,7 +24,7 @@
            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
        default-lazy-init="false">
 
-  <bean name="jdoFactory#users" class="org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory">
+  <bean name="jdoFactory#users" class="org.apache.archiva.redback.components.jdo.DefaultConfigurableJdoFactory">
     <property name="driverName" value="org.hsqldb.jdbcDriver"/>
     <property name="url" value="jdbc:hsqldb:mem:redback-users-tests" />
     <property name="userName" value="sa"/>
index edc02efcb4facc3f80f6672ceb4225b83e467527..655b682b002688636cf670312777cd4c79dcddde 100644 (file)
@@ -24,7 +24,7 @@ import org.apache.archiva.redback.rbac.RBACManagerListener;
 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.apache.archiva.redback.components.jdo.JdoFactory;
 import org.codehaus.plexus.util.StringUtils;
 import org.springframework.stereotype.Service;
 
index dd5d5a77dc03b40ba0401ca16689aa82e28b6743..8f2739ab40f94789df784b5dcbf95fc1a655a8a3 100644 (file)
@@ -20,8 +20,8 @@ package org.apache.archiva.redback.rbac.jdo;
  */
 
 import net.sf.ehcache.CacheManager;
+import org.apache.archiva.redback.components.jdo.DefaultConfigurableJdoFactory;
 import org.apache.archiva.redback.rbac.RbacManagerException;
-import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
 import org.apache.archiva.redback.common.jdo.test.StoreManagerDebug;
 import org.apache.archiva.redback.rbac.RBACManager;
 import org.apache.archiva.redback.tests.AbstractRbacManagerTestCase;
index 48c699c4b731c6b348d9c991ef04fb96e19a440c..041a3f26b36b85480ed916b1f542ea953a62a75e 100644 (file)
@@ -23,7 +23,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-  <bean name="jdoFactory#users" class="org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory">
+  <bean name="jdoFactory#users" class="org.apache.archiva.redback.components.jdo.DefaultConfigurableJdoFactory">
     <property name="driverName" value="org.hsqldb.jdbcDriver"/>
     <property name="url" value="jdbc:hsqldb:mem:redback-users-tests" />
     <property name="userName" value="sa"/>
index 7adf5f759fab3f01e479888cbff59ae4ca29e96d..db12f10344332bd62c170aed2dd4724eda79b818 100755 (executable)
@@ -23,7 +23,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-  <bean name="jdoFactory#users" class="org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory">
+  <bean name="jdoFactory#users" class="org.apache.archiva.redback.components.jdo.DefaultConfigurableJdoFactory">
     <property name="driverName" value="org.hsqldb.jdbcDriver"/>
     <property name="url" value="jdbc:hsqldb:mem:redback-users-tests" />
     <property name="userName" value="sa"/>
index 69ff5c82313a3eec2563e71f0f8a8bc1fdf95ad0..8af39e54370888f2935e9d100e1cb8a6f70befb2 100644 (file)
@@ -20,7 +20,7 @@ package org.apache.archiva.redback.role;
  */
 
 import org.apache.archiva.redback.rbac.jdo.JdoRbacManager;
-import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
+import org.apache.archiva.redback.components.jdo.DefaultConfigurableJdoFactory;
 import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
index fdaa6dea537f84b071aa15497f0fab3fe1cfd683..e1f37b2dc676a0bacdb0b9b9d7fa1de199d12d27 100644 (file)
@@ -51,7 +51,7 @@
     <property name="enableCache" value="false"/>
   </bean>
 
-  <bean name="jdoFactory#users" class="org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory">
+  <bean name="jdoFactory#users" class="org.apache.archiva.redback.components.jdo.DefaultConfigurableJdoFactory">
     <property name="driverName" value="org.hsqldb.jdbcDriver"/>
     <property name="url" value="jdbc:hsqldb:mem:redback-jpox-role-manager-test" />
     <property name="userName" value="sa"/>
index fbc7e06aee15a819e1e1da180c6a7a22e1b71c48..95277c44914a5b14ed8091827d9888a1d2aa4ee2 100755 (executable)
@@ -25,7 +25,7 @@
        default-lazy-init="false">
 
 
-  <bean name="jdoFactory#users" class="org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory">
+  <bean name="jdoFactory#users" class="org.apache.archiva.redback.components.jdo.DefaultConfigurableJdoFactory">
     <property name="driverName" value="org.hsqldb.jdbcDriver"/>
     <property name="url" value="jdbc:hsqldb:mem:redback-users-tests" />
     <property name="userName" value="sa"/>
index 9c6d7f55d997a35c6e756e859c3ec6f82c2ba4b5..0502105f27524c066cdd1c66c2da7071bfdd9fb3 100644 (file)
@@ -23,7 +23,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-  <bean name="jdoFactory#users" class="org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory">
+  <bean name="jdoFactory#users" class="org.apache.archiva.redback.components.jdo.DefaultConfigurableJdoFactory">
     <property name="driverName" value="org.hsqldb.jdbcDriver"/>
     <property name="url" value="jdbc:hsqldb:mem:redback-users-tests" />
     <property name="userName" value="sa"/>
index 8de8bce7aa1a4ac20f6da9684dd347eb45bc2d5b..ce33caa9352e98f4563bf790bc298f67ce550de8 100644 (file)
@@ -19,6 +19,8 @@ package org.apache.archiva.redback.users.jdo;
  * under the License.
  */
 
+import org.apache.archiva.redback.components.jdo.JdoFactory;
+import org.apache.archiva.redback.components.jdo.PlexusJdoUtils;
 import org.apache.archiva.redback.policy.UserSecurityPolicy;
 import org.apache.archiva.redback.users.AbstractUserManager;
 import org.apache.archiva.redback.users.PermanentUserException;
@@ -26,10 +28,8 @@ import org.apache.archiva.redback.users.User;
 import org.apache.archiva.redback.users.UserManagerException;
 import org.apache.archiva.redback.users.UserNotFoundException;
 import org.apache.archiva.redback.users.UserQuery;
-import org.codehaus.plexus.jdo.JdoFactory;
-import org.codehaus.plexus.jdo.PlexusJdoUtils;
-import org.codehaus.plexus.jdo.PlexusObjectNotFoundException;
-import org.codehaus.plexus.jdo.PlexusStoreException;
+import org.apache.archiva.redback.components.jdo.PlexusObjectNotFoundException;
+import org.apache.archiva.redback.components.jdo.PlexusStoreException;
 import org.codehaus.plexus.util.StringUtils;
 import org.jpox.JDOClassLoaderResolver;
 import org.springframework.stereotype.Service;
index e0ab05a5f9a70a6e8f132f5a27101f343e751508..f0279b8379fb4c67c7f0825a33efc9cff8539346 100644 (file)
@@ -19,7 +19,7 @@ package org.apache.archiva.redback.users.jdo;
  * under the License.
  */
 
-import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
+import org.apache.archiva.redback.components.jdo.DefaultConfigurableJdoFactory;
 import org.apache.archiva.redback.common.jdo.test.StoreManagerDebug;
 import org.apache.archiva.redback.users.provider.test.AbstractUserManagerTestCase;
 import org.jpox.AbstractPersistenceManagerFactory;