Apache/archiva
1
0
Fork 0
mirror of https://github.com/apache/archiva.git synced 2025-02-21 01:15:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix location of beans

Browse Source
This commit is contained in:
Brett Porter 2014-07-31 15:12:13 +10:00
parent fafb8d284f
commit 9bf5cb099f
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
View File

@ -22,8 +22,6 @@
import com.sampullara.cli.Args;
import com.sampullara.cli.Argument;
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.consumers.ConsumerException;
import org.apache.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
@ -163,7 +161,7 @@ else if ( command.listConsumers )
}
private void doScan( String path, String[] consumers )
throws ConsumerException, MalformedURLException, PlexusSisuBridgeException
throws ConsumerException, MalformedURLException
{
ManagedRepository repo = new ManagedRepository();
repo.setId( "cliRepo" );
@ -179,7 +177,7 @@ private void doScan( String path, String[] consumers )
List<String> ignoredContent = new ArrayList<>();
ignoredContent.addAll( Arrays.asList( RepositoryScanner.IGNORABLE_CONTENT ) );
RepositoryScanner scanner = lookup( RepositoryScanner.class );
RepositoryScanner scanner = applicationContext.getBean( RepositoryScanner.class );
try
{
@ -194,15 +192,8 @@ private void doScan( String path, String[] consumers )
}
}
private <T> T lookup( Class<T> clazz )
throws PlexusSisuBridgeException
{
PlexusSisuBridge plexusSisuBridge = applicationContext.getBean( PlexusSisuBridge.class );
return plexusSisuBridge.lookup( clazz );
}
private List<KnownRepositoryContentConsumer> getConsumerList( String[] consumers )
throws ConsumerException, PlexusSisuBridgeException
throws ConsumerException
{
List<KnownRepositoryContentConsumer> consumerList = new ArrayList<>();
@ -224,7 +215,6 @@ private List<KnownRepositoryContentConsumer> getConsumerList( String[] consumers
}
private void dumpAvailableConsumers()
throws PlexusSisuBridgeException
{
Map<String, KnownRepositoryContentConsumer> availableConsumers = getConsumers();
@ -241,7 +231,6 @@ private void dumpAvailableConsumers()
@SuppressWarnings( "unchecked" )
private Map<String, KnownRepositoryContentConsumer> getConsumers()
throws PlexusSisuBridgeException
{
Map<String, KnownRepositoryContentConsumer> beans =
applicationContext.getBeansOfType( KnownRepositoryContentConsumer.class );
@ -259,9 +248,9 @@ private Map<String, KnownRepositoryContentConsumer> getConsumers()
}
private void doConversion( String properties )
throws IOException, RepositoryConversionException, PlexusSisuBridgeException
throws IOException, RepositoryConversionException
{
LegacyRepositoryConverter legacyRepositoryConverter = lookup( LegacyRepositoryConverter.class );
LegacyRepositoryConverter legacyRepositoryConverter = applicationContext.getBean( LegacyRepositoryConverter.class );
Properties p = new Properties();