From: Olivier Lamy <olamy@apache.org>
Date: Wed, 28 Sep 2011 21:37:38 +0000 (+0000)
Subject: small hack for packaging maven-plugin in artifact url calculation
X-Git-Tag: archiva-1.4-M1~171
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ddb8a0a59520903b5c2f93e7e35c65bbb24e3140;p=archiva.git

small hack for packaging maven-plugin in artifact url calculation

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

diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
index 957b22627..a2fef9420 100644
--- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
@@ -468,12 +468,13 @@ public class NexusRepositorySearch
 
     /**
      * calculate baseUrl without the context and base Archiva Url
+     *
      * @param artifactInfo
      * @return
      */
     protected String getBaseUrl( ArtifactInfo artifactInfo )
     {
-        StringBuilder sb = new StringBuilder( );
+        StringBuilder sb = new StringBuilder();
 
         sb.append( '/' ).append( StringUtils.replaceChars( artifactInfo.groupId, '.', '/' ) );
         sb.append( '/' ).append( artifactInfo.artifactId );
@@ -484,7 +485,15 @@ public class NexusRepositorySearch
         {
             sb.append( '-' ).append( artifactInfo.classifier );
         }
-        sb.append( '.' ).append( artifactInfo.packaging );
+        // maven-plugin packaging is a jar
+        if ( StringUtils.equals( "maven-plugin", artifactInfo.packaging ) )
+        {
+            sb.append( "jar" );
+        }
+        else
+        {
+            sb.append( '.' ).append( artifactInfo.packaging );
+        }
 
         return sb.toString();
     }