svn commit: r1158274 - in /archiva/trunk/archiva-modules: archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/ archiva-web/archiva-webapp/src/test/resources/

[olamy]

Author: olamy
Date: Tue Aug 16 13:51:48 2011
New Revision: 1158274

URL: http://svn.apache.org/viewvc?rev=1158274&view=rev
Log:
fix typo and use lookup rather than empty constructor for components coming 
from maven-indexer

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/DigesterUtils.java
    
archiva/trunk/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/MavenIndexerUtils.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/DigesterUtils.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/DigesterUtils.java?rev=1158274&r1=1158273&r2=1158274&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/DigesterUtils.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/DigesterUtils.java
 Tue Aug 16 13:51:48 2011
@@ -52,12 +52,17 @@ public class DigesterUtils
         {
             // olamy when the TCL is not a URLClassLoader lookupList fail !
             // when using tomcat maven plugin so adding a simple hack
-            log.warn( "using lookList from sisu plexus failed so build plexus 
Digesters manually" );
+            log.warn( "using lookupList from sisu plexus failed so build 
plexus Digesters manually" );
 
             allDigesters = Arrays.asList( new Sha1Digester(), new 
Md5Digester() );
 
         }
 
+        if ( allDigesters == null || allDigesters.isEmpty() )
+        {
+            throw  new PlexusSisuBridgeException( "no way to initiliaze 
IndexCreator" );
+        }
+
         log.debug( "allIndexCreators {}", allDigesters );
 
     }

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/MavenIndexerUtils.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/MavenIndexerUtils.java?rev=1158274&r1=1158273&r2=1158274&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/MavenIndexerUtils.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/MavenIndexerUtils.java
 Tue Aug 16 13:51:48 2011
@@ -38,7 +38,7 @@ import java.util.List;
  * @author Olivier Lamy
  * @since 1.4
  */
-@Service("mavenIndexerUtils")
+@Service( "mavenIndexerUtils" )
 public class MavenIndexerUtils
 {
 
@@ -56,15 +56,22 @@ public class MavenIndexerUtils
         {
             // olamy when the TCL is not a URLClassLoader lookupList fail !
             // when using tomcat maven plugin so adding a simple hack
-            log.warn( "using lookList from sisu plexus failed so build 
indexCreator manually" );
+            log.warn( "using lookupList from sisu plexus failed so build 
indexCreator manually" );
 
             allIndexCreators =
-                Arrays.asList( new OSGIArtifactIndexCreator(), new 
MavenArchetypeArtifactInfoIndexCreator(),
-                               new MinimalArtifactInfoIndexCreator(), new 
JarFileContentsIndexCreator(),
-                               new MavenPluginArtifactInfoIndexCreator() );
+                Arrays.asList( plexusSisuBridge.lookup( IndexCreator.class, 
OSGIArtifactIndexCreator.ID ),
+                               plexusSisuBridge.lookup( IndexCreator.class, 
MavenArchetypeArtifactInfoIndexCreator.ID ),
+                               plexusSisuBridge.lookup( IndexCreator.class, 
MinimalArtifactInfoIndexCreator.ID ),
+                               plexusSisuBridge.lookup( IndexCreator.class, 
JarFileContentsIndexCreator.ID ),
+                               plexusSisuBridge.lookup( IndexCreator.class, 
MavenPluginArtifactInfoIndexCreator.ID ) );
 
         }
 
+        if ( allIndexCreators == null || allIndexCreators.isEmpty() )
+        {
+            throw new PlexusSisuBridgeException( "no way to initiliaze 
IndexCreator" );
+        }
+
         log.debug( "allIndexCreators {}", allIndexCreators );
     }
 

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml?rev=1158274&r1=1158273&r2=1158274&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
 Tue Aug 16 13:51:48 2011
@@ -33,6 +33,13 @@
   <logger name="org.apache.archiva.indexer.search.NexusRepositorySearch">
     <level value="debug"/>
   </logger>
+  <logger name="org.apache.archiva.common.plexusbridge.MavenIndexerUtils">
+    <level value="debug"/>
+  </logger>
+  <logger name="JPOX">
+    <level value="error"/>
+  </logger>
+
   <logger name="org.apache.commons.configuration.DefaultConfigurationBuilder">
     <level value="error"/>
   </logger>