Author: olamy
Date: Mon Aug 22 15:11:34 2011
New Revision: 1160293
URL: http://svn.apache.org/viewvc?rev=1160293&view=rev
Log:
simplify inject of bean list
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/KnownRepositoryContentConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractActionSupport.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/KnownRepositoryContentConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/KnownRepositoryContentConsumer.java?rev=1160293&r1=1160292&r2=1160293&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/KnownRepositoryContentConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/KnownRepositoryContentConsumer.java
Mon Aug 22 15:11:34 2011
@@ -27,5 +27,5 @@ package org.apache.maven.archiva.consume
public interface KnownRepositoryContentConsumer
extends RepositoryContentConsumer
{
-
+ // no op
}
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java?rev=1160293&r1=1160292&r2=1160293&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
Mon Aug 22 15:11:34 2011
@@ -107,12 +107,13 @@ public class RepositoryPurgeConsumer
private boolean deleteReleasedSnapshots;
- @Inject
- private ApplicationContext applicationContext;
+ //@Inject
+ //private ApplicationContext applicationContext;
/**
* plexus.requirement
role="org.apache.archiva.repository.events.RepositoryListener"
*/
+ @Inject
private List<RepositoryListener> listeners = Collections.emptyList();
/**
@@ -250,8 +251,8 @@ public class RepositoryPurgeConsumer
@PostConstruct
public void initialize()
{
- this.listeners =
- new ArrayList<RepositoryListener>(
applicationContext.getBeansOfType( RepositoryListener.class ).values() );
+ //this.listeners =
+ // new ArrayList<RepositoryListener>(
applicationContext.getBeansOfType( RepositoryListener.class ).values() );
configuration.addChangeListener( this );
initIncludes();
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java?rev=1160293&r1=1160292&r2=1160293&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
Mon Aug 22 15:11:34 2011
@@ -116,22 +116,25 @@ public class DefaultRepositoryProxyConne
@Named( value = "metadataTools#default" )
private MetadataTools metadataTools;
- @Inject
- private ApplicationContext applicationContext;
+ //@Inject
+ //private ApplicationContext applicationContext;
/**
* plexus.requirement
role="org.apache.maven.archiva.policies.PreDownloadPolicy"
*/
+ @Inject
private Map<String, PreDownloadPolicy> preDownloadPolicies;
/**
* plexus.requirement
role="org.apache.maven.archiva.policies.PostDownloadPolicy"
*/
+ @Inject
private Map<String, PostDownloadPolicy> postDownloadPolicies;
/**
* plexus.requirement
role="org.apache.maven.archiva.policies.DownloadErrorPolicy"
*/
+ @Inject
private Map<String, DownloadErrorPolicy> downloadErrorPolicies;
/**
@@ -162,9 +165,9 @@ public class DefaultRepositoryProxyConne
{
initConnectorsAndNetworkProxies();
archivaConfiguration.addChangeListener( this );
- this.postDownloadPolicies = applicationContext.getBeansOfType(
PostDownloadPolicy.class );
- this.preDownloadPolicies = applicationContext.getBeansOfType(
PreDownloadPolicy.class );
- this.downloadErrorPolicies = applicationContext.getBeansOfType(
DownloadErrorPolicy.class );
+ //this.postDownloadPolicies = applicationContext.getBeansOfType(
PostDownloadPolicy.class );
+ //his.preDownloadPolicies = applicationContext.getBeansOfType(
PreDownloadPolicy.class );
+ //this.downloadErrorPolicies = applicationContext.getBeansOfType(
DownloadErrorPolicy.class );
}
@SuppressWarnings( "unchecked" )
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java?rev=1160293&r1=1160292&r2=1160293&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java
Mon Aug 22 15:11:34 2011
@@ -62,16 +62,17 @@ public abstract class AbstractDefaultRep
/**
* plexus.requirement
role="org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider"
*/
- protected List<? extends ArtifactMappingProvider> artifactMappingProviders;
-
@Inject
- protected ApplicationContext applicationContext;
+ protected List<ArtifactMappingProvider> artifactMappingProviders;
+
+ //@Inject
+ //protected ApplicationContext applicationContext;
@PostConstruct
protected void initialize()
{
- artifactMappingProviders = new ArrayList<ArtifactMappingProvider>(
- applicationContext.getBeansOfType( ArtifactMappingProvider.class
).values() );
+ //artifactMappingProviders = new ArrayList<ArtifactMappingProvider>(
+ // applicationContext.getBeansOfType( ArtifactMappingProvider.class
).values() );
}
public ArtifactReference toArtifactReference( String path )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractActionSupport.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractActionSupport.java?rev=1160293&r1=1160292&r2=1160293&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractActionSupport.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractActionSupport.java
Mon Aug 22 15:11:34 2011
@@ -58,6 +58,7 @@ public abstract class AbstractActionSupp
/**
* plexus.requirement role="org.apache.archiva.audit.AuditListener"
*/
+ @Inject
private List<AuditListener> auditListeners = new
ArrayList<AuditListener>();
/**
@@ -75,8 +76,7 @@ public abstract class AbstractActionSupp
@PostConstruct
public void initialize()
{
- // TODO some caching here
- this.auditListeners = Lists.newArrayList(
applicationContext.getBeansOfType( AuditListener.class ).values() );
+ // no op
}
@SuppressWarnings( "unchecked" )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java?rev=1160293&r1=1160292&r2=1160293&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
Mon Aug 22 15:11:34 2011
@@ -125,6 +125,7 @@ public class DeleteArtifactAction
/**
* plexus.requirement
role="org.apache.archiva.repository.events.RepositoryListener"
*/
+ @Inject
private List<RepositoryListener> listeners;
private ChecksumAlgorithm[] algorithms = new ChecksumAlgorithm[]{
ChecksumAlgorithm.SHA1, ChecksumAlgorithm.MD5 };
@@ -133,7 +134,6 @@ public class DeleteArtifactAction
public void initialize()
{
super.initialize();
- listeners = Lists.newArrayList( applicationContext.getBeansOfType(
RepositoryListener.class ).values() );
}
public String getGroupId()
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java?rev=1160293&r1=1160292&r2=1160293&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
Mon Aug 22 15:11:34 2011
@@ -110,6 +110,7 @@ public class ArchivaDavResourceFactory
/**
* plexus.requirement role="org.apache.archiva.audit.AuditListener"
*/
+ @Inject
private List<AuditListener> auditListeners = new
ArrayList<AuditListener>();
/**
@@ -145,7 +146,6 @@ public class ArchivaDavResourceFactory
/**
* plexus.requirement
*/
- //Inject
private ArchivaConfiguration archivaConfiguration;
/**
@@ -169,21 +169,16 @@ public class ArchivaDavResourceFactory
/**
* plexus.requirement
*/
- //Inject
private ChecksumFile checksum;
/**
* plexus.requirement role-hint="sha1"
*/
- //Inject
- //Named( value = "digester#sha1" )
private Digester digestSha1;
/**
* plexus.requirement role-hint="md5";
*/
- //Inject
- //Named( value = "digester#md5" )
private Digester digestMd5;
/**
@@ -193,7 +188,6 @@ public class ArchivaDavResourceFactory
@Named( value = "archivaTaskScheduler#repository" )
private RepositoryArchivaTaskScheduler scheduler;
- //Inject
private ApplicationContext applicationContext;
@Inject
@@ -209,8 +203,6 @@ public class ArchivaDavResourceFactory
this.digestSha1 = plexusSisuBridge.lookup( Digester.class, "sha1" );
repositoryRequest = new RepositoryRequest( new LegacyPathParser(
archivaConfiguration ) );
- this.auditListeners =
- new ArrayList<AuditListener>( applicationContext.getBeansOfType(
AuditListener.class ).values() );
}
@PostConstruct
Modified:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java?rev=1160293&r1=1160292&r2=1160293&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
(original)
+++
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
Mon Aug 22 15:11:34 2011
@@ -82,17 +82,18 @@ public class DefaultMetadataResolver
/**
* plexus.requirement
role="org.apache.archiva.repository.events.RepositoryListener"
*/
+ @Inject
private List<RepositoryListener> listeners;
- @Inject
- private ApplicationContext applicationContext;
+ //@Inject
+ //private ApplicationContext applicationContext;
@PostConstruct
private void initialize()
{
- listeners =
- new ArrayList<RepositoryListener>(
applicationContext.getBeansOfType( RepositoryListener.class ).values() );
+ //listeners =
+ // new ArrayList<RepositoryListener>(
applicationContext.getBeansOfType( RepositoryListener.class ).values() );
}
public ProjectVersionMetadata resolveProjectVersion( RepositorySession
session, String repoId, String namespace,
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java?rev=1160293&r1=1160292&r2=1160293&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
Mon Aug 22 15:11:34 2011
@@ -46,13 +46,14 @@ public class Maven2RepositoryPathTransla
private static final Pattern TIMESTAMP_PATTERN = Pattern.compile(
"([0-9]{8}.[0-9]{6})-([0-9]+).*" );
- @Inject
- private ApplicationContext applicationContext;
+ //@Inject
+ //private ApplicationContext applicationContext;
/**
* plexus.requirement
role="org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider"
* see #initialize
*/
+ @Inject
private List<ArtifactMappingProvider> artifactMappingProviders;
public Maven2RepositoryPathTranslator()
@@ -63,8 +64,9 @@ public class Maven2RepositoryPathTransla
@PostConstruct
public void initialize()
{
- artifactMappingProviders = new ArrayList<ArtifactMappingProvider>(
- applicationContext.getBeansOfType( ArtifactMappingProvider.class
).values() );
+
+ //artifactMappingProviders = new ArrayList<ArtifactMappingProvider>(
+ // applicationContext.getBeansOfType( ArtifactMappingProvider.class
).values() );
}
