Repository: archiva
Updated Branches:
  refs/heads/master 54f97d54c -> 6e1b60e43


make optional for Spring

in case of tests that don't add any repository listeners to the classpath


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/fcf2e3e2
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/fcf2e3e2
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/fcf2e3e2

Branch: refs/heads/master
Commit: fcf2e3e27c39a825186af57fd4d1f89b55be4b87
Parents: 54f97d5
Author: Brett Porter <[email protected]>
Authored: Wed Jul 30 15:32:54 2014 +1000
Committer: Brett Porter <[email protected]>
Committed: Wed Jul 30 16:07:38 2014 +1000

----------------------------------------------------------------------
 .../archiva/consumers/core/repository/RepositoryPurgeConsumer.java | 2 ++
 .../archiva/metadata/repository/DefaultMetadataResolver.java       | 2 ++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/fcf2e3e2/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
----------------------------------------------------------------------
diff --git 
a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
 
b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
index 5b6be2e..53c6f12 100644
--- 
a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
+++ 
b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
@@ -37,6 +37,7 @@ import 
org.apache.archiva.repository.RepositoryNotFoundException;
 import org.apache.archiva.repository.events.RepositoryListener;
 import org.apache.archiva.repository.metadata.MetadataTools;
 import org.apache.archiva.redback.components.registry.RegistryListener;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
 
@@ -98,6 +99,7 @@ public class RepositoryPurgeConsumer
      *
      */
     @Inject
+    @Autowired(required = false)
     private List<RepositoryListener> listeners = Collections.emptyList();
 
     /**

http://git-wip-us.apache.org/repos/asf/archiva/blob/fcf2e3e2/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
----------------------------------------------------------------------
diff --git 
a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
 
b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
index 903aed6..559798a 100644
--- 
a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
+++ 
b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
@@ -33,6 +33,7 @@ import org.apache.archiva.redback.components.cache.Cache;
 import org.apache.archiva.repository.events.RepositoryListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
@@ -78,6 +79,7 @@ public class DefaultMetadataResolver
     private RepositoryStorage repositoryStorage;
 
     @Inject
+    @Autowired(required = false)
     private List<RepositoryListener> listeners;
 
     /**

Reply via email to