You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2006/09/13 07:21:12 UTC
svn commit: r442847 - in /maven/archiva/trunk/archiva-discoverer/src:
main/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscoverer.java
test/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscovererTest.java
Author: brett
Date: Tue Sep 12 22:21:12 2006
New Revision: 442847
URL: http://svn.apache.org/viewvc?view=rev&rev=442847
Log:
[MRM-163] add support for legacy repo javadoc and source jars
Submitted by: nicolas de loof
Modified:
maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscoverer.java
maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscovererTest.java
Modified: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscoverer.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscoverer.java?view=diff&rev=442847&r1=442846&r2=442847
==============================================================================
--- maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscoverer.java (original)
+++ maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscoverer.java Tue Sep 12 22:21:12 2006
@@ -90,6 +90,14 @@
avceTokenList.addLast( lastAvceToken );
}
+ else if ( lastAvceToken.endsWith( "javadoc.jar" ) )
+ {
+ type = "javadoc.jar";
+
+ lastAvceToken = lastAvceToken.substring( 0, lastAvceToken.length() - ".jar".length() );
+
+ avceTokenList.addLast( lastAvceToken );
+ }
else if ( lastAvceToken.endsWith( ".zip" ) )
{
type = "distribution-zip";
@@ -105,7 +113,7 @@
if ( extPos > 0 )
{
String ext = lastAvceToken.substring( extPos + 1 );
- if ( type.equals( ext ) )
+ if ( type.equals( ext ) || "plugin".equals( type ) )
{
lastAvceToken = lastAvceToken.substring( 0, extPos );
Modified: maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscovererTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscovererTest.java?view=diff&rev=442847&r1=442846&r2=442847
==============================================================================
--- maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscovererTest.java (original)
+++ maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscovererTest.java Tue Sep 12 22:21:12 2006
@@ -482,6 +482,37 @@
assertEquals( createArtifact( "javax.sql", "jdbc", "2.0" ), artifact );
}
+ public void testJavadoc()
+ throws ComponentLookupException, DiscovererException
+ {
+ String testPath = "javax.sql/javadoc.jars/jdbc-2.0-javadoc.jar";
+
+ Artifact artifact = discoverer.buildArtifact( testPath );
+
+ assertEquals( createArtifact( "javax.sql", "jdbc", "2.0", "javadoc.jar", "javadoc" ), artifact );
+ }
+
+ public void testSources()
+ throws ComponentLookupException, DiscovererException
+ {
+ String testPath = "javax.sql/java-sources/jdbc-2.0-sources.jar";
+
+ Artifact artifact = discoverer.buildArtifact( testPath );
+
+ assertEquals( createArtifact( "javax.sql", "jdbc", "2.0", "java-source", "sources" ), artifact );
+ }
+
+ public void testPlugin()
+ throws ComponentLookupException, DiscovererException
+ {
+ String testPath = "maven/plugins/maven-test-plugin-1.8.jar";
+
+ Artifact artifact = discoverer.buildArtifact( testPath );
+
+ assertEquals( createArtifact( "maven", "maven-test-plugin", "1.8", "plugin" ), artifact );
+ }
+
+
private List discoverArtifacts()
throws DiscovererException
{