diff options
| author | Olivier Lamy <olamy@apache.org> | 2011-09-15 17:36:22 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2011-09-15 17:36:22 +0000 |
| commit | c8ef0abdec0e4943b190224eea849b1656e59e6f (patch) | |
| tree | 83ad4b111cf904c7b4c0328945e4708f2c57caf6 /archiva-modules/archiva-base/archiva-converter | |
| parent | 4579f684aa761897191c06736b7fd4f12b2e1369 (diff) | |
| download | archiva-c8ef0abdec0e4943b190224eea849b1656e59e6f.tar.gz archiva-c8ef0abdec0e4943b190224eea849b1656e59e6f.zip | |
[MRM-1520] remove duplicate beans : move model beans to a single package
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1171188 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-base/archiva-converter')
3 files changed, 5 insertions, 5 deletions
diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java index 01b0fd78d..85d8a1dfa 100644 --- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java +++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java @@ -19,7 +19,7 @@ package org.apache.archiva.converter.legacy; * under the License. */ -import org.apache.archiva.admin.model.managed.ManagedRepository; +import org.apache.archiva.admin.model.beans.ManagedRepository; import org.apache.archiva.common.plexusbridge.PlexusSisuBridge; import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException; import org.apache.archiva.converter.RepositoryConversionException; diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java index 6f06acc33..bf0770857 100644 --- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java +++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java @@ -19,7 +19,7 @@ package org.apache.archiva.converter.legacy; * under the License. */ -import org.apache.archiva.admin.model.managed.ManagedRepository; +import org.apache.archiva.admin.model.beans.ManagedRepository; import org.apache.archiva.common.plexusbridge.PlexusSisuBridge; import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException; import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer; diff --git a/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/mock/MockArchivaAdministration.java b/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/mock/MockArchivaAdministration.java index 4e2230490..e330f2953 100644 --- a/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/mock/MockArchivaAdministration.java +++ b/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/mock/MockArchivaAdministration.java @@ -21,9 +21,9 @@ package org.apache.archiva.converter.mock; import org.apache.archiva.admin.model.AuditInformation; import org.apache.archiva.admin.model.RepositoryAdminException; import org.apache.archiva.admin.model.admin.ArchivaAdministration; -import org.apache.archiva.admin.model.admin.FileType; -import org.apache.archiva.admin.model.admin.LegacyArtifactPath; -import org.apache.archiva.admin.model.admin.OrganisationInformation; +import org.apache.archiva.admin.model.beans.FileType; +import org.apache.archiva.admin.model.beans.LegacyArtifactPath; +import org.apache.archiva.admin.model.beans.OrganisationInformation; import java.util.List; |