cannot use @Inject for old plexus components'

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1134352 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
index d767f9ac4e6aafe96b43b2bcbf5066f90c9d63dc..24e4a9797c414303b3dfb814bfe9a8fdb9327914 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
@@ -76,7 +76,6 @@ public class ValidateChecksumConsumer
     /**
      * plexus.requirement
      */
-    @Inject
     private ChecksumFile checksum;
 
     /**
@@ -174,6 +173,7 @@ public class ValidateChecksumConsumer
     public void initialize()
         throws PlexusSisuBridgeException
     {
+        checksum = plexusSisuBridge.lookup( ChecksumFile.class );
         digesterList = plexusSisuBridge.lookupList( Digester.class );
         for ( Iterator<Digester> itDigesters = digesterList.iterator(); itDigesters.hasNext(); )
         {

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java
index 67881abfcf39b5e09b7c3df3648bae1448597ca9..a734687f512faac05eb0d07ffe2e1c392c03c04b 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java
@@ -72,7 +72,7 @@ public class RepositoryArchivaTaskScheduler
     private Scheduler scheduler;
 
     @Inject
-    CronExpressionValidator cronValidator;
+    private CronExpressionValidator cronValidator;
 
     /**
      * plexus.requirement role-hint="repository-scanning"