svn commit: r1350773 - in /archiva/trunk/archiva-modules/archiva-web: archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/ archiva-webapp...

[ol...@apache.org]

Author: olamy
Date: Fri Jun 15 20:10:08 2012
New Revision: 1350773

URL: http://svn.apache.org/viewvc?rev=1350773&view=rev
Log:
restore backward comp for the struts webapp

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/Artifact.java
    archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/ArtifactDownloadInfoBuilder.java
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/ShowArtifactActionTest.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/Artifact.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/Artifact.java?rev=1350773&r1=1350772&r2=1350773&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/Artifact.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/Artifact.java Fri Jun 15 20:10:08 2012
@@ -151,6 +151,12 @@ public class Artifact
      */
     private String path;
 
+    /**
+     * concat of artifactId+'-'+version+'.'+type
+     * @since 1.4-M3
+     */
+    private String id;
+
 
     public Artifact()
     {
@@ -405,6 +411,16 @@ public class Artifact
         this.path = path;
     }
 
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId( String id )
+    {
+        this.id = id;
+    }
+
     @Override
     public String toString()
     {
@@ -434,6 +450,7 @@ public class Artifact
         sb.append( ", size='" ).append( size ).append( '\'' );
         sb.append( ", type='" ).append( type ).append( '\'' );
         sb.append( ", path='" ).append( path ).append( '\'' );
+        sb.append( ", id='" ).append( id ).append( '\'' );
         sb.append( '}' );
         return sb.toString();
     }

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/ArtifactDownloadInfoBuilder.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/ArtifactDownloadInfoBuilder.java?rev=1350773&r1=1350772&r2=1350773&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/ArtifactDownloadInfoBuilder.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/ArtifactDownloadInfoBuilder.java Fri Jun 15 20:10:08 2012
@@ -111,6 +111,9 @@ public class ArtifactDownloadInfoBuilder
         artifact.setContext( managedRepositoryContent.getId() );
         DecimalFormat df = new DecimalFormat( "#,###.##", new DecimalFormatSymbols( Locale.US ) );
         artifact.setSize( df.format( s ) + " " + symbol );
+
+        artifact.setId( ref.getArtifactId() + "-" + ref.getVersion() + "." + ref.getType() );
+
         return artifact;
 
     }

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/ShowArtifactActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/ShowArtifactActionTest.java?rev=1350773&r1=1350772&r2=1350773&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/ShowArtifactActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/ShowArtifactActionTest.java Fri Jun 15 20:10:08 2012
@@ -566,7 +566,7 @@ public class ShowArtifactActionTest
             List<Artifact> list = artifactMap.get( artifact.getVersion() );
             Artifact actual = list.get( 0 );
             assertEquals( artifact.getNamespace(), actual.getGroupId() );
-            assertEquals( artifact.getId(), actual.getArtifactId() );
+            assertEquals( artifact.getId(),actual.getId() );
             // olamy test has no more sense as we reuse an other object now
             //assertEquals( artifact.getProject(), actual.getGroupId() );
             assertEquals( artifact.getRepositoryId(), actual.getRepositoryId() );