You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ev...@apache.org on 2006/08/28 17:19:58 UTC
svn commit: r437725 - in /maven/sandbox/maven-shared-jar: ./ src/main/java/org/apache/maven/shared/jar/ src/main/java/org/apache/maven/shared/jar/taxon/exposers/ src/test/java/org/apache/maven/shared/jar/classes/

Author: evenisse
Date: Mon Aug 28 08:19:58 2006
New Revision: 437725

URL: http://svn.apache.org/viewvc?rev=437725&view=rev
Log:
o fix archiva groupId
o Fix archiva package names

Modified:
    maven/sandbox/maven-shared-jar/pom.xml
    maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/Jar.java
    maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/taxon/exposers/RepositorySearchExposer.java
    maven/sandbox/maven-shared-jar/src/test/java/org/apache/maven/shared/jar/classes/JarClassesAnalyzerTest.java

Modified: maven/sandbox/maven-shared-jar/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/maven-shared-jar/pom.xml?rev=437725&r1=437724&r2=437725&view=diff
==============================================================================
--- maven/sandbox/maven-shared-jar/pom.xml (original)
+++ maven/sandbox/maven-shared-jar/pom.xml Mon Aug 28 08:19:58 2006
@@ -115,7 +115,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.maven.repository</groupId>
+      <groupId>org.apache.maven.archiva</groupId>
       <artifactId>archiva-utils</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>

Modified: maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/Jar.java
URL: http://svn.apache.org/viewvc/maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/Jar.java?rev=437725&r1=437724&r2=437725&view=diff
==============================================================================
--- maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/Jar.java (original)
+++ maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/Jar.java Mon Aug 28 08:19:58 2006
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-import org.apache.maven.repository.digest.Digester;
-import org.apache.maven.repository.digest.DigesterException;
-import org.apache.maven.repository.digest.StreamingDigester;
+import org.apache.maven.archiva.digest.Digester;
+import org.apache.maven.archiva.digest.DigesterException;
+import org.apache.maven.archiva.digest.StreamingDigester;
 import org.apache.maven.shared.jar.classes.JarClasses;
 import org.apache.maven.shared.jar.taxon.JarTaxon;
 import org.codehaus.plexus.logging.AbstractLogEnabled;

Modified: maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/taxon/exposers/RepositorySearchExposer.java
URL: http://svn.apache.org/viewvc/maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/taxon/exposers/RepositorySearchExposer.java?rev=437725&r1=437724&r2=437725&view=diff
==============================================================================
--- maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/taxon/exposers/RepositorySearchExposer.java (original)
+++ maven/sandbox/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/taxon/exposers/RepositorySearchExposer.java Mon Aug 28 08:19:58 2006
@@ -17,8 +17,8 @@
  */
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.repository.digest.Digester;
-import org.apache.maven.repository.digest.StreamingDigester;
+import org.apache.maven.archiva.digest.Digester;
+import org.apache.maven.archiva.digest.StreamingDigester;
 import org.apache.maven.shared.jar.taxon.AbstractJarTaxonExposer;
 import org.apache.maven.shared.jar.taxon.RepositoryHashSearch;
 
@@ -35,7 +35,7 @@
     extends AbstractJarTaxonExposer
 {
     /**
-     * @plexus.requirement role="org.apache.maven.repository.digest.Digester" role-hint="sha1"
+     * @plexus.requirement role="org.apache.maven.archiva.digest.Digester" role-hint="sha1"
      */
     private Digester digester;
 

Modified: maven/sandbox/maven-shared-jar/src/test/java/org/apache/maven/shared/jar/classes/JarClassesAnalyzerTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/maven-shared-jar/src/test/java/org/apache/maven/shared/jar/classes/JarClassesAnalyzerTest.java?rev=437725&r1=437724&r2=437725&view=diff
==============================================================================
--- maven/sandbox/maven-shared-jar/src/test/java/org/apache/maven/shared/jar/classes/JarClassesAnalyzerTest.java (original)
+++ maven/sandbox/maven-shared-jar/src/test/java/org/apache/maven/shared/jar/classes/JarClassesAnalyzerTest.java Mon Aug 28 08:19:58 2006
@@ -32,13 +32,21 @@
         throws Exception
     {
         File jarfile = new File( getSampleJarsDirectory(), filename );
+        try
+        {
         Jar jar = (Jar) lookup( Jar.ROLE );
         jar.setFile( jarfile );
 
         JarClasses jclass = jar.getClasses();
         assertNotNull( "JarClasses", jclass );
 
-        return jclass;
+            return jclass;
+        }
+        catch(Exception e)
+        {
+            e.printStackTrace( );
+            throw e;
+        }
     }
 
     public void testAnalyzeJXR()