diff options
7 files changed, 28 insertions, 9 deletions
diff --git a/archiva-configuration/pom.xml b/archiva-configuration/pom.xml index f1be14e02..1a60c2d7c 100644 --- a/archiva-configuration/pom.xml +++ b/archiva-configuration/pom.xml @@ -46,10 +46,16 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-registry</artifactId> + <groupId>org.codehaus.plexus.registry</groupId> + <artifactId>plexus-registry-api</artifactId> <version>1.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.codehaus.plexus.registry</groupId> + <artifactId>plexus-registry-commons</artifactId> + <version>1.0-SNAPSHOT</version> + <scope>test</scope> + </dependency> <!-- Test Deps --> <dependency> <groupId>easymock</groupId> diff --git a/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml b/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml index fcdc6e1b9..55daf43f2 100644 --- a/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml +++ b/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml @@ -34,7 +34,7 @@ <component> <role>org.codehaus.plexus.registry.Registry</role> <role-hint>empty</role-hint> - <implementation>org.codehaus.plexus.registry.CommonsConfigurationRegistry</implementation> + <implementation>org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry</implementation> <configuration> </configuration> </component> @@ -53,7 +53,7 @@ <component> <role>org.codehaus.plexus.registry.Registry</role> <role-hint>configured</role-hint> - <implementation>org.codehaus.plexus.registry.CommonsConfigurationRegistry</implementation> + <implementation>org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry</implementation> <configuration> <properties> <system/> @@ -77,7 +77,7 @@ <component> <role>org.codehaus.plexus.registry.Registry</role> <role-hint>save</role-hint> - <implementation>org.codehaus.plexus.registry.CommonsConfigurationRegistry</implementation> + <implementation>org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry</implementation> <configuration> <properties> <xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="true" @@ -100,7 +100,7 @@ <component> <role>org.codehaus.plexus.registry.Registry</role> <role-hint>read-saved</role-hint> - <implementation>org.codehaus.plexus.registry.CommonsConfigurationRegistry</implementation> + <implementation>org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry</implementation> <configuration> <properties> <xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="true" diff --git a/archiva-core/pom.xml b/archiva-core/pom.xml index 0f4f056bc..141a66d69 100644 --- a/archiva-core/pom.xml +++ b/archiva-core/pom.xml @@ -72,6 +72,12 @@ <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.plexus.registry</groupId> + <artifactId>plexus-registry-commons</artifactId> + <version>1.0-SNAPSHOT</version> + <scope>test</scope> + </dependency> <!-- needed for PlexusTestCase --> <dependency> <groupId>org.codehaus.plexus</groupId> diff --git a/archiva-core/src/test/resources/org/apache/maven/archiva/repositories/DefaultActiveManagedRepositoriesTest.xml b/archiva-core/src/test/resources/org/apache/maven/archiva/repositories/DefaultActiveManagedRepositoriesTest.xml index 2e59f080c..34d15023a 100644 --- a/archiva-core/src/test/resources/org/apache/maven/archiva/repositories/DefaultActiveManagedRepositoriesTest.xml +++ b/archiva-core/src/test/resources/org/apache/maven/archiva/repositories/DefaultActiveManagedRepositoriesTest.xml @@ -22,7 +22,7 @@ <components> <component> <role>org.codehaus.plexus.registry.Registry</role> - <implementation>org.codehaus.plexus.registry.CommonsConfigurationRegistry</implementation> + <implementation>org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry</implementation> <role-hint>commons-configuration</role-hint> <configuration> <properties> diff --git a/archiva-core/src/test/resources/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutorTest.xml b/archiva-core/src/test/resources/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutorTest.xml index 2e59f080c..34d15023a 100644 --- a/archiva-core/src/test/resources/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutorTest.xml +++ b/archiva-core/src/test/resources/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutorTest.xml @@ -22,7 +22,7 @@ <components> <component> <role>org.codehaus.plexus.registry.Registry</role> - <implementation>org.codehaus.plexus.registry.CommonsConfigurationRegistry</implementation> + <implementation>org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry</implementation> <role-hint>commons-configuration</role-hint> <configuration> <properties> diff --git a/archiva-webapp/pom.xml b/archiva-webapp/pom.xml index 64da6ad83..d7c04e2c0 100644 --- a/archiva-webapp/pom.xml +++ b/archiva-webapp/pom.xml @@ -98,6 +98,11 @@ <version>2.2.4</version> </dependency> <dependency> + <groupId>org.codehaus.plexus.registry</groupId> + <artifactId>plexus-registry-commons</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-api</artifactId> </dependency> diff --git a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml index 6be24dde9..b99ee8262 100644 --- a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml +++ b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml @@ -23,7 +23,7 @@ <component> <role>org.codehaus.plexus.registry.Registry</role> - <implementation>org.codehaus.plexus.registry.CommonsConfigurationRegistry</implementation> + <implementation>org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry</implementation> <role-hint>commons-configuration</role-hint> <configuration> <properties> @@ -111,10 +111,12 @@ <name>org.jpox.poid.transactionIsolation</name> <value>READ_UNCOMMITTED</value> </property> +<!-- <property> <name>org.jpox.rdbms.dateTimezone</name> <value>JDK_DEFAULT_TIMEZONE</value> </property> +--> <!-- <property> <name>org.jpox.identifier.case</name> |