You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2005/12/08 00:09:05 UTC

svn commit: r354895 - in /maven/maven-1/plugins/trunk/scm: src/main/org/apache/maven/plugins/scm/ScmBean.java xdocs/changes.xml

Author: ltheussl
Date: Wed Dec  7 15:09:03 2005
New Revision: 354895

URL: http://svn.apache.org/viewcvs?rev=354895&view=rev
Log:
PR: MPSCM-65
Submitted by: Phil Steitz

When pom.repository.connection ends with '/' checkout fails.

Modified:
    maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
    maven/maven-1/plugins/trunk/scm/xdocs/changes.xml

Modified: maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java?rev=354895&r1=354894&r2=354895&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java (original)
+++ maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java Wed Dec  7 15:09:03 2005
@@ -107,6 +107,10 @@
 
         if ( repository.getProvider().equals( "svn" ) )
         {
+            if ( url.endsWith("/") )
+            {
+                repository = scmManager.makeScmRepository( url.substring(0, url.length() - 1 ));
+            }
             SvnScmProviderRepository svnRepo = (SvnScmProviderRepository) repository.getProviderRepository();
 
             if ( username != null && username.length() > 0 )

Modified: maven/maven-1/plugins/trunk/scm/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/xdocs/changes.xml?rev=354895&r1=354894&r2=354895&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/scm/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/scm/xdocs/changes.xml Wed Dec  7 15:09:03 2005
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.6-SNAPSHOT" date="in SVN">
+      <action dev="ltheussl" type="fix" issue="MPSCM-65" due-to="Phil Steitz">When pom.repository.connection ends with '/' checkout fails.</action>
       <action dev="ltheussl" type="fix" issue="MPSCM-57">Re-add changes.xml file to display announcements.</action>
       <action dev="aheritier" type="update" issue="MPSCM-66">Update to released version of maven-scm.</action>
       <action dev="brett" type="add" issue="MPSCM-47,MPSCM-54">New scm:checkin goal.</action>



Re: svn commit: r354895 - in /maven/maven-1/plugins/trunk/scm: src/main/org/apache/maven/plugins/scm/ScmBean.java xdocs/changes.xml

Posted by dan tran <da...@gmail.com>.
OK, I will open a JIRA for this.

-D


On 12/7/05, Lukas Theussl <lt...@apache.org> wrote:
>
> Check the comment by Phil when he submitted the patch:
> http://jira.codehaus.org/browse/MPSCM-65
>
> "... what really should be patched is the parseUrl method in
> o.a.m.scm.provider.svn.repository.ScmProviderRepository"
>
> -Lukas
>
>
> dan tran wrote:
> > I wonder if this fix need to propagate the maven-scm-plugin (m2)
> > maven-release-plugin as well.
> >
> > -D
> >
> >
> > On 12/7/05, ltheussl@apache.org <lt...@apache.org> wrote:
> >
> >>Author: ltheussl
> >>Date: Wed Dec  7 15:09:03 2005
> >>New Revision: 354895
> >>
> >>URL: http://svn.apache.org/viewcvs?rev=354895&view=rev
> >>Log:
> >>PR: MPSCM-65
> >>Submitted by: Phil Steitz
> >>
> >>When pom.repository.connection ends with '/' checkout fails.
> >>
> >>Modified:
> >>
>
> >>maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
> >>   maven/maven-1/plugins/trunk/scm/xdocs/changes.xml
> >>
> >>Modified:
>
> >>maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
> >>URL:
> >>
> http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java?rev=354895&r1=354894&r2=354895&view=diff
> >>
>
> >>==============================================================================
> >>---
>
> >>maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
> >>(original)
> >>+++
>
> >>maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
> >>Wed Dec  7 15:09:03 2005
> >>@@ -107,6 +107,10 @@
> >>
> >>        if ( repository.getProvider().equals( "svn" ) )
> >>        {
> >>+            if ( url.endsWith("/") )
> >>+            {
> >>+                repository = scmManager.makeScmRepository(
> url.substring(0,
> >>url.length() - 1 ));
> >>+            }
> >>            SvnScmProviderRepository svnRepo =
> (SvnScmProviderRepository)
> >>repository.getProviderRepository();
> >>
> >>            if ( username != null && username.length() > 0 )
> >>
> >>Modified: maven/maven-1/plugins/trunk/scm/xdocs/changes.xml
> >>URL:
> >>
> http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/xdocs/changes.xml?rev=354895&r1=354894&r2=354895&view=diff
> >>
>
> >>==============================================================================
> >>--- maven/maven-1/plugins/trunk/scm/xdocs/changes.xml (original)
> >>+++ maven/maven-1/plugins/trunk/scm/xdocs/changes.xml Wed Dec  7
> 15:09:03
> >>2005
> >>@@ -25,6 +25,7 @@
> >>  </properties>
> >>  <body>
> >>    <release version="1.6-SNAPSHOT" date="in SVN">
> >>+      <action dev="ltheussl" type="fix" issue="MPSCM-65" due-to="Phil
> >>Steitz">When pom.repository.connection ends with '/' checkout
> >>fails.</action>
> >>      <action dev="ltheussl" type="fix" issue="MPSCM-57">Re-add
> >>changes.xml file to display announcements.</action>
> >>      <action dev="aheritier" type="update" issue="MPSCM-66">Update to
> >>released version of maven-scm.</action>
> >>      <action dev="brett" type="add" issue="MPSCM-47,MPSCM-54">New
> >>scm:checkin goal.</action>
> >>
> >>
> >>
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>

Re: svn commit: r354895 - in /maven/maven-1/plugins/trunk/scm: src/main/org/apache/maven/plugins/scm/ScmBean.java xdocs/changes.xml

Posted by Lukas Theussl <lt...@apache.org>.
Check the comment by Phil when he submitted the patch:
http://jira.codehaus.org/browse/MPSCM-65

"... what really should be patched is the parseUrl method in 
o.a.m.scm.provider.svn.repository.ScmProviderRepository"

-Lukas


dan tran wrote:
> I wonder if this fix need to propagate the maven-scm-plugin (m2)
> maven-release-plugin as well.
> 
> -D
> 
> 
> On 12/7/05, ltheussl@apache.org <lt...@apache.org> wrote:
> 
>>Author: ltheussl
>>Date: Wed Dec  7 15:09:03 2005
>>New Revision: 354895
>>
>>URL: http://svn.apache.org/viewcvs?rev=354895&view=rev
>>Log:
>>PR: MPSCM-65
>>Submitted by: Phil Steitz
>>
>>When pom.repository.connection ends with '/' checkout fails.
>>
>>Modified:
>>
>>maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
>>   maven/maven-1/plugins/trunk/scm/xdocs/changes.xml
>>
>>Modified:
>>maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
>>URL:
>>http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java?rev=354895&r1=354894&r2=354895&view=diff
>>
>>==============================================================================
>>---
>>maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
>>(original)
>>+++
>>maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
>>Wed Dec  7 15:09:03 2005
>>@@ -107,6 +107,10 @@
>>
>>        if ( repository.getProvider().equals( "svn" ) )
>>        {
>>+            if ( url.endsWith("/") )
>>+            {
>>+                repository = scmManager.makeScmRepository( url.substring(0,
>>url.length() - 1 ));
>>+            }
>>            SvnScmProviderRepository svnRepo = (SvnScmProviderRepository)
>>repository.getProviderRepository();
>>
>>            if ( username != null && username.length() > 0 )
>>
>>Modified: maven/maven-1/plugins/trunk/scm/xdocs/changes.xml
>>URL:
>>http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/xdocs/changes.xml?rev=354895&r1=354894&r2=354895&view=diff
>>
>>==============================================================================
>>--- maven/maven-1/plugins/trunk/scm/xdocs/changes.xml (original)
>>+++ maven/maven-1/plugins/trunk/scm/xdocs/changes.xml Wed Dec  7 15:09:03
>>2005
>>@@ -25,6 +25,7 @@
>>  </properties>
>>  <body>
>>    <release version="1.6-SNAPSHOT" date="in SVN">
>>+      <action dev="ltheussl" type="fix" issue="MPSCM-65" due-to="Phil
>>Steitz">When pom.repository.connection ends with '/' checkout
>>fails.</action>
>>      <action dev="ltheussl" type="fix" issue="MPSCM-57">Re-add
>>changes.xml file to display announcements.</action>
>>      <action dev="aheritier" type="update" issue="MPSCM-66">Update to
>>released version of maven-scm.</action>
>>      <action dev="brett" type="add" issue="MPSCM-47,MPSCM-54">New
>>scm:checkin goal.</action>
>>
>>
>>
> 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org


Re: svn commit: r354895 - in /maven/maven-1/plugins/trunk/scm: src/main/org/apache/maven/plugins/scm/ScmBean.java xdocs/changes.xml

Posted by dan tran <da...@gmail.com>.
I wonder if this fix need to propagate the maven-scm-plugin (m2)
maven-release-plugin as well.

-D


On 12/7/05, ltheussl@apache.org <lt...@apache.org> wrote:
>
> Author: ltheussl
> Date: Wed Dec  7 15:09:03 2005
> New Revision: 354895
>
> URL: http://svn.apache.org/viewcvs?rev=354895&view=rev
> Log:
> PR: MPSCM-65
> Submitted by: Phil Steitz
>
> When pom.repository.connection ends with '/' checkout fails.
>
> Modified:
>
> maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
>    maven/maven-1/plugins/trunk/scm/xdocs/changes.xml
>
> Modified:
> maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
> URL:
> http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java?rev=354895&r1=354894&r2=354895&view=diff
>
> ==============================================================================
> ---
> maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
> (original)
> +++
> maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
> Wed Dec  7 15:09:03 2005
> @@ -107,6 +107,10 @@
>
>         if ( repository.getProvider().equals( "svn" ) )
>         {
> +            if ( url.endsWith("/") )
> +            {
> +                repository = scmManager.makeScmRepository( url.substring(0,
> url.length() - 1 ));
> +            }
>             SvnScmProviderRepository svnRepo = (SvnScmProviderRepository)
> repository.getProviderRepository();
>
>             if ( username != null && username.length() > 0 )
>
> Modified: maven/maven-1/plugins/trunk/scm/xdocs/changes.xml
> URL:
> http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/xdocs/changes.xml?rev=354895&r1=354894&r2=354895&view=diff
>
> ==============================================================================
> --- maven/maven-1/plugins/trunk/scm/xdocs/changes.xml (original)
> +++ maven/maven-1/plugins/trunk/scm/xdocs/changes.xml Wed Dec  7 15:09:03
> 2005
> @@ -25,6 +25,7 @@
>   </properties>
>   <body>
>     <release version="1.6-SNAPSHOT" date="in SVN">
> +      <action dev="ltheussl" type="fix" issue="MPSCM-65" due-to="Phil
> Steitz">When pom.repository.connection ends with '/' checkout
> fails.</action>
>       <action dev="ltheussl" type="fix" issue="MPSCM-57">Re-add
> changes.xml file to display announcements.</action>
>       <action dev="aheritier" type="update" issue="MPSCM-66">Update to
> released version of maven-scm.</action>
>       <action dev="brett" type="add" issue="MPSCM-47,MPSCM-54">New
> scm:checkin goal.</action>
>
>
>