diff options
author | Olivier Lamy <olamy@apache.org> | 2012-04-12 15:08:39 +0000 |
---|---|---|
committer | Olivier Lamy <olamy@apache.org> | 2012-04-12 15:08:39 +0000 |
commit | ac5be1730cd0cd9aced06db79e136237a7ac04c1 (patch) | |
tree | d9d2a01689ac4432df95f181dc1fdcd82a52257e /archiva-modules/archiva-base/archiva-repository-layer | |
parent | 9180f0d490b5e91e0ea6eabba7faa2fe2c7db9e7 (diff) | |
download | archiva-ac5be1730cd0cd9aced06db79e136237a7ac04c1.tar.gz archiva-ac5be1730cd0cd9aced06db79e136237a7ac04c1.zip |
use o.a.a package namespace for spring-registry-api component
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1325311 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-base/archiva-repository-layer')
3 files changed, 7 insertions, 7 deletions
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java index 2de5d6f35..ae98bf6d2 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java @@ -26,8 +26,8 @@ import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.ConfigurationNames; -import org.codehaus.plexus.registry.Registry; -import org.codehaus.plexus.registry.RegistryListener; +import org.apache.archiva.redback.components.registry.Registry; +import org.apache.archiva.redback.components.registry.RegistryListener; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java index eab28b403..2f0ff245a 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java @@ -35,6 +35,8 @@ import org.apache.archiva.model.Plugin; import org.apache.archiva.model.ProjectReference; import org.apache.archiva.model.SnapshotVersion; import org.apache.archiva.model.VersionedReference; +import org.apache.archiva.redback.components.registry.Registry; +import org.apache.archiva.redback.components.registry.RegistryListener; import org.apache.archiva.repository.ContentNotFoundException; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RemoteRepositoryContent; @@ -45,8 +47,6 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import org.apache.commons.lang.time.DateUtils; -import org.codehaus.plexus.registry.Registry; -import org.codehaus.plexus.registry.RegistryListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/MockConfiguration.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/MockConfiguration.java index 05dd31a59..2a9339737 100755 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/MockConfiguration.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/MockConfiguration.java @@ -22,9 +22,9 @@ package org.apache.archiva.repository; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.ConfigurationListener; -import org.codehaus.plexus.registry.Registry; -import org.codehaus.plexus.registry.RegistryException; -import org.codehaus.plexus.registry.RegistryListener; +import org.apache.archiva.redback.components.registry.Registry; +import org.apache.archiva.redback.components.registry.RegistryException; +import org.apache.archiva.redback.components.registry.RegistryListener; import org.easymock.MockControl; import org.springframework.stereotype.Service; |