add an other hack when using tomcat maven plugin and issue with TCCL not URLClassLoader with sisu

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

1 files changed, 7 insertions, 3 deletions

diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
index b4e3abf3d..f9a89b5e0 100644
--- a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
+++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
@@ -19,6 +19,7 @@ package org.apache.maven.archiva.converter.artifact;
  * under the License.
  */
 
+import org.apache.archiva.common.plexusbridge.DigesterUtils;
 import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
 import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
 import org.apache.commons.io.FileUtils;
@@ -78,11 +79,14 @@ public class LegacyToDefaultConverter
      * {@link List}<{@link Digester}
      * plexus.requirement role="org.codehaus.plexus.digest.Digester"
      */
-    private List<Digester> digesters;
+    private List<? extends Digester> digesters;
 
     @Inject
     private PlexusSisuBridge plexusSisuBridge;
 
+    @Inject
+    private DigesterUtils digesterUtils;
+
     /**
      * plexus.requirement
      */
@@ -114,7 +118,7 @@ public class LegacyToDefaultConverter
     public void initialize()
         throws PlexusSisuBridgeException
     {
-        this.digesters = plexusSisuBridge.lookupList( Digester.class );
+        this.digesters = digesterUtils.getAllDigesters();
         translator = plexusSisuBridge.lookup( ModelConverter.class );
         artifactFactory = plexusSisuBridge.lookup( ArtifactFactory.class );
         artifactHandlerManager = plexusSisuBridge.lookup( ArtifactHandlerManager.class );
@@ -716,7 +720,7 @@ public class LegacyToDefaultConverter
     }
 
 
-    public List<Digester> getDigesters()
+    public List<? extends Digester> getDigesters()
     {
         return digesters;
     }