over crowded. git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@470634 13f79535-47bb-0310-9956-ffa450edef68tags/archiva-0.9-alpha-1
@@ -24,12 +24,12 @@ import java.io.File; | |||
/** | |||
* @author Jason van Zyl | |||
*/ | |||
public interface RepositoryManager | |||
public interface Archiva | |||
{ | |||
/** | |||
* Role of the Repository Manager | |||
*/ | |||
String ROLE = RepositoryManager.class.getName(); | |||
String ROLE = Archiva.class.getName(); | |||
/** | |||
* Convert a legacy repository to a modern repository. This means a Maven 1.x repository |
@@ -0,0 +1,46 @@ | |||
package org.apache.maven.archiva; | |||
/* | |||
* Copyright 2005-2006 The Apache Software Foundation. | |||
* | |||
* Licensed 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. | |||
*/ | |||
import org.apache.maven.archiva.conversion.LegacyRepositoryConverter; | |||
import org.apache.maven.archiva.converter.RepositoryConversionException; | |||
import org.apache.maven.archiva.discoverer.DiscovererException; | |||
import java.io.File; | |||
/** | |||
* @author Jason van Zyl | |||
* @plexus.component | |||
* @todo turn this into a general conversion component and hide all this crap here. | |||
*/ | |||
public class DefaultArchiva | |||
implements Archiva | |||
{ | |||
/** | |||
* @plexus.requirement | |||
*/ | |||
private LegacyRepositoryConverter legacyRepositoryConverter; | |||
public void convertLegacyRepository( File legacyRepositoryDirectory, | |||
File repositoryDirectory, | |||
boolean includeSnapshots ) | |||
throws RepositoryConversionException, DiscovererException | |||
{ | |||
legacyRepositoryConverter.convertLegacyRepository( legacyRepositoryDirectory, repositoryDirectory, | |||
includeSnapshots ); | |||
} | |||
} |
@@ -1,34 +1,19 @@ | |||
package org.apache.maven.archiva; | |||
/* | |||
* Copyright 2005-2006 The Apache Software Foundation. | |||
* | |||
* Licensed 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. | |||
*/ | |||
package org.apache.maven.archiva.conversion; | |||
import org.apache.maven.archiva.converter.RepositoryConversionException; | |||
import org.apache.maven.archiva.Archiva; | |||
import org.apache.maven.archiva.reporting.ReportingStore; | |||
import org.apache.maven.archiva.reporting.ReportGroup; | |||
import org.apache.maven.archiva.reporting.ReportingDatabase; | |||
import org.apache.maven.archiva.reporting.ReportingStoreException; | |||
import org.apache.maven.archiva.converter.RepositoryConverter; | |||
import org.apache.maven.archiva.converter.RepositoryConversionException; | |||
import org.apache.maven.archiva.discoverer.ArtifactDiscoverer; | |||
import org.apache.maven.archiva.discoverer.DiscovererException; | |||
import org.apache.maven.archiva.discoverer.filter.AcceptAllArtifactFilter; | |||
import org.apache.maven.archiva.discoverer.filter.SnapshotArtifactFilter; | |||
import org.apache.maven.archiva.reporting.ReportGroup; | |||
import org.apache.maven.archiva.reporting.ReportingDatabase; | |||
import org.apache.maven.archiva.reporting.ReportingStore; | |||
import org.apache.maven.archiva.reporting.ReportingStoreException; | |||
import org.apache.maven.artifact.repository.ArtifactRepository; | |||
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; | |||
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; | |||
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; | |||
import org.apache.maven.artifact.repository.ArtifactRepository; | |||
import org.apache.maven.artifact.resolver.filter.ArtifactFilter; | |||
import java.io.File; | |||
@@ -38,9 +23,10 @@ import java.util.List; | |||
/** | |||
* @author Jason van Zyl | |||
* @plexus.component | |||
* @todo turn this into a general conversion component and hide all this crap here. | |||
*/ | |||
public class DefaultRepositoryManager | |||
implements RepositoryManager | |||
public class DefaultLegacyRepositoryConverter | |||
implements LegacyRepositoryConverter | |||
{ | |||
/** | |||
* @plexus.requirement role-hint="legacy" |
@@ -0,0 +1,25 @@ | |||
package org.apache.maven.archiva.conversion; | |||
import org.apache.maven.archiva.converter.RepositoryConversionException; | |||
import org.apache.maven.archiva.discoverer.DiscovererException; | |||
import java.io.File; | |||
/** | |||
* @author Jason van Zyl | |||
*/ | |||
public interface LegacyRepositoryConverter | |||
{ | |||
String ROLE = LegacyRepositoryConverter.class.getName(); | |||
/** | |||
* Convert a legacy repository to a modern repository. This means a Maven 1.x repository | |||
* using v3 POMs to a Maven 2.x repository using v4.0.0 POMs. | |||
* | |||
* @param legacyRepositoryDirectory | |||
* @param repositoryDirectory | |||
* @throws org.apache.maven.archiva.converter.RepositoryConversionException | |||
*/ | |||
void convertLegacyRepository( File legacyRepositoryDirectory, File repositoryDirectory, boolean includeSnapshots ) | |||
throws RepositoryConversionException, DiscovererException; | |||
} |
@@ -33,7 +33,7 @@ public class RepositoryManagerTest | |||
File repositoryDirectory = getTestFile( "target/maven-2.x-repository" ); | |||
RepositoryManager rm = (RepositoryManager) lookup( RepositoryManager.ROLE ); | |||
Archiva rm = (Archiva) lookup( Archiva.ROLE ); | |||
rm.convertLegacyRepository( legacyRepositoryDirectory, repositoryDirectory, true ); | |||
} |