* under the License.
*/
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
import com.sampullara.cli.Args;
import com.sampullara.cli.Argument;
+import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
+import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
import org.apache.archiva.repository.scanner.RepositoryScanStatistics;
import org.apache.archiva.repository.scanner.RepositoryScanner;
import org.apache.archiva.repository.scanner.RepositoryScannerException;
import org.apache.maven.archiva.converter.RepositoryConversionException;
import org.apache.maven.archiva.converter.legacy.LegacyRepositoryConverter;
import org.apache.maven.artifact.manager.WagonManager;
-import org.codehaus.plexus.spring.PlexusClassPathXmlApplicationContext;
-import org.codehaus.plexus.spring.PlexusToSpringUtils;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
/**
* ArchivaCli
public static final String TARGET_REPO_PATH = "targetRepositoryPath";
public static final String BLACKLISTED_PATTERNS = "blacklistPatterns";
-
+
public static final String POM_PROPERTIES = "/META-INF/maven/org.apache.archiva/archiva-cli/pom.properties";
private static String getVersion()
}
}
- private PlexusClassPathXmlApplicationContext applicationContext;
+ private ClassPathXmlApplicationContext applicationContext;
public ArchivaCli()
{
- applicationContext = new PlexusClassPathXmlApplicationContext(
- new String[]{"classpath*:/META-INF/spring-context.xml", "classpath*:/META-INF/plexus/components.xml"} );
+ applicationContext =
+ new ClassPathXmlApplicationContext( new String[]{ "classpath*:/META-INF/spring-context.xml" } );
}
public static void main( String[] args )
}
private void doScan( String path, String[] consumers )
- throws ConsumerException, MalformedURLException
+ throws ConsumerException, MalformedURLException, PlexusSisuBridgeException
{
// hack around poorly configurable project builder by pointing all repositories back at this location to be self
// contained
- WagonManager wagonManager = (WagonManager) applicationContext.getBean(
- PlexusToSpringUtils.buildSpringId( WagonManager.class.getName() ) );
+ PlexusSisuBridge plexusSisuBridge = applicationContext.getBean( PlexusSisuBridge.class );
+ WagonManager wagonManager = plexusSisuBridge.lookup( WagonManager.class );
wagonManager.addMirror( "internal", "*", new File( path ).toURL().toExternalForm() );
ManagedRepositoryConfiguration repo = new ManagedRepositoryConfiguration();
}
private Object lookup( Class<?> clazz )
+ throws PlexusSisuBridgeException
{
- return applicationContext.getBean( PlexusToSpringUtils.buildSpringId( clazz.getName(), null ) );
+ PlexusSisuBridge plexusSisuBridge = applicationContext.getBean( PlexusSisuBridge.class );
+ return plexusSisuBridge.lookup( clazz );
}
private List<KnownRepositoryContentConsumer> getConsumerList( String[] consumers )
- throws ConsumerException
+ throws ConsumerException, PlexusSisuBridgeException
{
List<KnownRepositoryContentConsumer> consumerList = new ArrayList<KnownRepositoryContentConsumer>();
}
private void dumpAvailableConsumers()
+ throws PlexusSisuBridgeException
{
Map<String, KnownRepositoryContentConsumer> availableConsumers = getConsumers();
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings( "unchecked" )
private Map<String, KnownRepositoryContentConsumer> getConsumers()
+ throws PlexusSisuBridgeException
{
- return PlexusToSpringUtils.lookupMap( "knownRepositoryContentConsumer", applicationContext );
+ PlexusSisuBridge plexusSisuBridge = applicationContext.getBean( PlexusSisuBridge.class );
+ return plexusSisuBridge.lookupMap( KnownRepositoryContentConsumer.class );
}
private void doConversion( String properties )
- throws FileNotFoundException, IOException, RepositoryConversionException
+ throws FileNotFoundException, IOException, RepositoryConversionException, PlexusSisuBridgeException
{
LegacyRepositoryConverter legacyRepositoryConverter =
(LegacyRepositoryConverter) lookup( LegacyRepositoryConverter.class );
private static class Commands
{
- @Argument(description = "Display help information", value = "help", alias = "h")
+ @Argument( description = "Display help information", value = "help", alias = "h" )
private boolean help;
- @Argument(description = "Display version information", value = "version", alias = "v")
+ @Argument( description = "Display version information", value = "version", alias = "v" )
private boolean version;
- @Argument(description = "List available consumers", value = "listconsumers", alias = "l")
+ @Argument( description = "List available consumers", value = "listconsumers", alias = "l" )
private boolean listConsumers;
- @Argument(description = "The consumers to use (comma delimited)", value = "consumers", alias = "u")
+ @Argument( description = "The consumers to use (comma delimited)", value = "consumers", alias = "u" )
private String consumers = "count-artifacts";
- @Argument(description = "Scan the specified repository", value = "scan", alias = "s")
+ @Argument( description = "Scan the specified repository", value = "scan", alias = "s" )
private boolean scan;
@Argument(
description = "Convert a legacy Maven 1.x repository to a Maven 2.x repository using a properties file to describe the conversion",
- value = "convert", alias = "c")
+ value = "convert", alias = "c" )
private boolean convert;
- @Argument(description = "The properties file for the conversion", value = "properties")
+ @Argument( description = "The properties file for the conversion", value = "properties" )
private String properties = "conversion.properties";
- @Argument(description = "The repository to scan", value = "repository")
+ @Argument( description = "The repository to scan", value = "repository" )
private String repository;
}
}
*/
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
+import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.maven.archiva.transaction.FileTransaction;
import org.apache.maven.model.converter.ModelConverter;
import org.apache.maven.model.converter.PomTranslationException;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.digest.Digester;
import org.codehaus.plexus.digest.DigesterException;
-import org.codehaus.plexus.digest.Md5Digester;
-import org.codehaus.plexus.digest.Sha1Digester;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.springframework.stereotype.Service;
import java.io.StringReader;
import java.io.StringWriter;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@PostConstruct
public void initialize()
- throws ComponentLookupException
+ throws PlexusSisuBridgeException
{
this.digesters = plexusSisuBridge.lookupList( Digester.class );
translator = plexusSisuBridge.lookup( ModelConverter.class );
*/
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
+import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
import org.apache.archiva.repository.scanner.RepositoryScanner;
import org.apache.archiva.repository.scanner.RepositoryScannerException;
import org.apache.maven.archiva.common.utils.PathUtil;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.springframework.stereotype.Service;
import javax.inject.Inject;
@Inject
public DefaultLegacyRepositoryConverter( PlexusSisuBridge plexusSisuBridge )
- throws ComponentLookupException
+ throws PlexusSisuBridgeException
{
artifactRepositoryFactory = plexusSisuBridge.lookup( ArtifactRepositoryFactory.class );
defaultLayout = plexusSisuBridge.lookup( ArtifactRepositoryLayout.class, "default" );
*/
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
+import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@Inject
public LegacyConverterArtifactConsumer( PlexusSisuBridge plexusSisuBridge )
- throws ComponentLookupException
+ throws PlexusSisuBridgeException
{
includes = new ArrayList<String>();
includes.add( "**/*.jar" );
import javax.annotation.PostConstruct;
import java.net.URL;
import java.util.List;
+import java.util.Map;
/**
* Simple component which will initiate the plexus shim component
*
* @author Olivier Lamy
*/
-@Service("plexusSisuBridge")
+@Service( "plexusSisuBridge" )
public class PlexusSisuBridge
{
@PostConstruct
public void initialize()
- throws PlexusContainerException
+ throws PlexusSisuBridgeException
{
DefaultContainerConfiguration conf = new DefaultContainerConfiguration();
conf.setClassWorld( classWorld );
- plexusContainer = new DefaultPlexusContainer( conf );
+ try
+ {
+ plexusContainer = new DefaultPlexusContainer( conf );
+ }
+ catch ( PlexusContainerException e )
+ {
+ throw new PlexusSisuBridgeException( e.getMessage(), e );
+ }
}
public <T> T lookup( Class<T> clazz )
- throws ComponentLookupException
+ throws PlexusSisuBridgeException
{
- return plexusContainer.lookup( clazz );
+ try
+ {
+ return plexusContainer.lookup( clazz );
+ }
+ catch ( ComponentLookupException e )
+ {
+ throw new PlexusSisuBridgeException( e.getMessage(), e );
+ }
}
public <T> T lookup( Class<T> clazz, String hint )
- throws ComponentLookupException
+ throws PlexusSisuBridgeException
{
- return plexusContainer.lookup( clazz, hint );
+ try
+ {
+ return plexusContainer.lookup( clazz, hint );
+ }
+ catch ( ComponentLookupException e )
+ {
+ throw new PlexusSisuBridgeException( e.getMessage(), e );
+ }
}
public <T> List<T> lookupList( Class<T> clazz )
- throws ComponentLookupException
+ throws PlexusSisuBridgeException
{
- return plexusContainer.lookupList( clazz );
+ try
+ {
+ return plexusContainer.lookupList( clazz );
+ }
+ catch ( ComponentLookupException e )
+ {
+ throw new PlexusSisuBridgeException( e.getMessage(), e );
+ }
+ }
+
+ public <T> Map<String, T> lookupMap( Class<T> clazz )
+ throws PlexusSisuBridgeException
+ {
+ try
+ {
+ return plexusContainer.lookupMap( clazz );
+ }
+ catch ( ComponentLookupException e )
+ {
+ throw new PlexusSisuBridgeException( e.getMessage(), e );
+ }
}
}
--- /dev/null
+package org.apache.archiva.common.plexusbridge;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * @author Olivier Lamy
+ */
+public class PlexusSisuBridgeException
+ extends Exception
+{
+ public PlexusSisuBridgeException( String message, Throwable throwable )
+ {
+ super( message, throwable );
+ }
+}
*/
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
+import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
import org.apache.archiva.metadata.repository.MetadataResolutionException;
import org.apache.archiva.metadata.repository.MetadataResolver;
import org.apache.archiva.metadata.repository.RepositorySession;
import org.apache.maven.shared.dependency.tree.traversal.CollectingDependencyNodeVisitor;
import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor;
import org.apache.maven.shared.dependency.tree.traversal.FilteringDependencyNodeVisitor;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@PostConstruct
public void initialize()
- throws ComponentLookupException
+ throws PlexusSisuBridgeException
{
factory = plexusSisuBridge.lookup( ArtifactFactory.class );
collector = plexusSisuBridge.lookup( ArtifactCollector.class );
import org.apache.archiva.checksum.ChecksumAlgorithm;
import org.apache.archiva.checksum.ChecksummedFile;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
+import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.model.ProjectMetadata;
import org.apache.archiva.metadata.model.ProjectVersionMetadata;
import org.apache.maven.model.building.ModelBuilder;
import org.apache.maven.model.building.ModelBuildingException;
import org.apache.maven.model.building.ModelBuildingRequest;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
* <p/>
* plexus.component role="org.apache.archiva.metadata.repository.storage.RepositoryStorage" role-hint="maven2"
*/
-@Service("repositoryStorage#maven2")
+@Service( "repositoryStorage#maven2" )
public class Maven2RepositoryStorage
implements RepositoryStorage
{
@PostConstruct
public void initialize()
- throws ComponentLookupException
+ throws PlexusSisuBridgeException
{
builder = plexusSisuBridge.lookup( ModelBuilder.class );
}