You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ni...@apache.org on 2008/03/05 14:24:52 UTC
svn commit: r633841 -
/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
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();
Re: svn commit: r633841 - /maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
Posted by nicolas de loof <ni...@apache.org>.
Right, I'll report this in 1.0.x
2008/3/6, Brett Porter <br...@apache.org>:
>
> 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 <br...@apache.org>:
> >>
> >> shouldn't this be on trunk and 1.0.x branch, not on the spring
> >> branch?
> >>
> >> On 06/03/2008, at 12:24 AM, nicolas@apache.org 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
> >> brett@apache.org
> >> http://blogs.exist.com/bporter/
> >>
> >>
>
> --
> Brett Porter
> brett@apache.org
> http://blogs.exist.com/bporter/
>
>
Re: svn commit: r633841 - /maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
Posted by Brett Porter <br...@apache.org>.
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 <br...@apache.org>:
>>
>> shouldn't this be on trunk and 1.0.x branch, not on the spring
>> branch?
>>
>> On 06/03/2008, at 12:24 AM, nicolas@apache.org 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
>> brett@apache.org
>> http://blogs.exist.com/bporter/
>>
>>
--
Brett Porter
brett@apache.org
http://blogs.exist.com/bporter/
Re: svn commit: r633841 - /maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
Posted by nicolas de loof <ni...@apache.org>.
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 <br...@apache.org>:
>
> shouldn't this be on trunk and 1.0.x branch, not on the spring branch?
>
> On 06/03/2008, at 12:24 AM, nicolas@apache.org 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
> brett@apache.org
> http://blogs.exist.com/bporter/
>
>
Re: svn commit: r633841 - /maven/archiva/branches/springy/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
Posted by Brett Porter <br...@apache.org>.
shouldn't this be on trunk and 1.0.x branch, not on the spring branch?
On 06/03/2008, at 12:24 AM, nicolas@apache.org 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
brett@apache.org
http://blogs.exist.com/bporter/