I think this fix should go onto the 1.0.x branch for the point release, and it's probably good to keep the merge separate :)

On 06/03/2008, at 7:39 PM, nicolas de loof wrote:

Ooops, forgot I switched my SVN working copy to the springy branch...

As we are now ready to merge with trunk, does this really matter ?
Nico.

2008/3/5, Brett Porter <[EMAIL PROTECTED]>:

shouldn't this be on trunk and 1.0.x branch, not on the spring branch?

On 06/03/2008, at 12:24 AM, [EMAIL PROTECTED] wrote:

Author: nicolas
Date: Wed Mar  5 05:24:50 2008
New Revision: 633841

URL: http://svn.apache.org/viewvc?rev=633841&view=rev
Log:
fix inversion between calssifier & version

Modified:
  maven/archiva/branches/springy/archiva-web/archiva-webapp/src/
main/java/org/apache/maven/archiva/web/action/admin/legacy/
AddLegacyArtifactPathAction.java

Modified: maven/archiva/branches/springy/archiva-web/archiva-webapp/
src/main/java/org/apache/maven/archiva/web/action/admin/legacy/
AddLegacyArtifactPathAction.java
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java?rev=633841&r1=633840&r2=633841&view=diff
=
=
=
=
=
=
=
=
= = ====================================================================
--- maven/archiva/branches/springy/archiva-web/archiva-webapp/src/
main/java/org/apache/maven/archiva/web/action/admin/legacy/
AddLegacyArtifactPathAction.java (original)
+++ maven/archiva/branches/springy/archiva-web/archiva-webapp/src/
main/java/org/apache/maven/archiva/web/action/admin/legacy/
AddLegacyArtifactPathAction.java Wed Mar  5 05:24:50 2008
@@ -78,7 +78,7 @@
   public String commit()
   {
       this.legacyArtifactPath.setArtifact(
-            this.groupId + ":" + this.artifactId + ":" +
this.classifier + ":" +  this.version + ":" + this.type );
+            this.groupId + ":" + this.artifactId + ":" +
this.version + ":" +  this.classifier + ":" + this.type );

       // Check the proposed Artifact macthes the path
       ArtifactReference artifact = new ArtifactReference();




--
Brett Porter
[EMAIL PROTECTED]
http://blogs.exist.com/bporter/



--
Brett Porter
[EMAIL PROTECTED]
http://blogs.exist.com/bporter/

Reply via email to