svn commit: r488862 - in /maven/maven-1/plugins/trunk/xdoc: src/main/org/apache/maven/xdoc/util/ScmUtil.java src/test/org/apache/maven/xdoc/util/ScmUtilTest.java xdocs/changes.xml

[ltheussl]

Author: ltheussl
Date: Tue Dec 19 16:11:48 2006
New Revision: 488862

URL: http://svn.apache.org/viewvc?view=rev&rev=488862
Log:
PR: MPXDOC-202
Plugin fails with anonymous access and empty password in scm url.

Modified:
    
maven/maven-1/plugins/trunk/xdoc/src/main/org/apache/maven/xdoc/util/ScmUtil.java
    
maven/maven-1/plugins/trunk/xdoc/src/test/org/apache/maven/xdoc/util/ScmUtilTest.java
    maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml

Modified: 
maven/maven-1/plugins/trunk/xdoc/src/main/org/apache/maven/xdoc/util/ScmUtil.java
URL: 
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/src/main/org/apache/maven/xdoc/util/ScmUtil.java?view=diff&rev=488862&r1=488861&r2=488862
==============================================================================
--- 
maven/maven-1/plugins/trunk/xdoc/src/main/org/apache/maven/xdoc/util/ScmUtil.java
 (original)
+++ 
maven/maven-1/plugins/trunk/xdoc/src/main/org/apache/maven/xdoc/util/ScmUtil.java
 Tue Dec 19 16:11:48 2006
@@ -566,9 +566,19 @@
                     throw new IllegalArgumentException(
                         "cvs local repository connection string doesn't 
contain five tokens" );
                 }
-            }
+            }else if ( ( tokens.length == 7 ) && tokens[2].equals( "pserver" ) 
&& tokens[4].startsWith("@"))
+            {
+                String[] newTokens = new String[6];
 
-            if ( tokens.length != 6 )
+                newTokens[0] = tokens[0];
+                newTokens[1] = tokens[1];
+                newTokens[2] = tokens[2];
+                newTokens[3] = tokens[3] + tokens[4];
+                newTokens[4] = tokens[5];
+                newTokens[5] = tokens[6];
+                tokens = newTokens;
+            }
+            else if ( tokens.length != 6 )
             {
                 throw new IllegalArgumentException(
                     "cvs repository connection string doesn't contain six 
tokens" );

Modified: 
maven/maven-1/plugins/trunk/xdoc/src/test/org/apache/maven/xdoc/util/ScmUtilTest.java
URL: 
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/src/test/org/apache/maven/xdoc/util/ScmUtilTest.java?view=diff&rev=488862&r1=488861&r2=488862
==============================================================================
--- 
maven/maven-1/plugins/trunk/xdoc/src/test/org/apache/maven/xdoc/util/ScmUtilTest.java
 (original)
+++ 
maven/maven-1/plugins/trunk/xdoc/src/test/org/apache/maven/xdoc/util/ScmUtilTest.java
 Tue Dec 19 16:11:48 2006
@@ -31,6 +31,8 @@
         "scm:cvs|pserver|[EMAIL PROTECTED]|C:/repositories|module_name";
     private final String cvs2 =
         "scm:cvs:ext:[EMAIL PROTECTED]:/cvs/root:module";
+    private final String cvs3 =
+        "scm:cvs:pserver:anoncvs:@cvs.apache.org:/cvs/root:module";
     private final String svn = "scm:svn:http://svn.apache.org/svn/root/module";;
     private final String perforce1 =
         "scm:perforce:[EMAIL PROTECTED]:21:path_to_repository";
@@ -47,6 +49,7 @@
     {
         assertEquals( scmUtil.getSCMConnectionSeparator( cvs1 ), "|" );
         assertEquals( scmUtil.getSCMConnectionSeparator( cvs2 ), ":" );
+        assertEquals( scmUtil.getSCMConnectionSeparator( cvs3 ), ":" );
         assertEquals( scmUtil.getSCMConnectionSeparator( svn ), ":" );
     }
 
@@ -54,6 +57,7 @@
     {
         assertEquals( scmUtil.getScmType( cvs1 ), "cvs" );
         assertEquals( scmUtil.getScmType( cvs2 ), "cvs" );
+        assertEquals( scmUtil.getScmType( cvs3 ), "cvs" );
         assertEquals( scmUtil.getScmType( svn ), "svn" );
         assertNull( scmUtil.getScmType( invalid ) );
     }
@@ -62,6 +66,7 @@
     {
         assertEquals( scmUtil.getCvsModule( cvs1 ), "module_name" );
         assertEquals( scmUtil.getCvsModule( cvs2 ), "module" );
+        assertEquals( scmUtil.getCvsModule( cvs3 ), "module" );
         assertNull( scmUtil.getCvsModule( invalid ) );
     }
 
@@ -75,6 +80,10 @@
             "scm:cvs:ext:username:@cvs.apache.org:/cvs/root:module" );
         assertEquals( scmUtil.getCvsConnection( cvs2, "john_doe" ),
             "scm:cvs:ext:[EMAIL PROTECTED]:/cvs/root:module" );
+        assertEquals( scmUtil.getCvsConnection( cvs3, "" ),
+            "scm:cvs:pserver:anoncvs:@cvs.apache.org:/cvs/root:module" );
+        assertEquals( scmUtil.getCvsConnection( cvs3, "john_doe" ),
+            "scm:cvs:pserver:[EMAIL PROTECTED]:/cvs/root:module" );
         assertEquals( scmUtil.getCvsConnection( svn, "" ), "" );
     }
 

Modified: maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml?view=diff&rev=488862&r1=488861&r2=488862
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Tue Dec 19 16:11:48 2006
@@ -27,6 +27,7 @@
   </properties>
   <body>
     <release version="1.10.1-SNAPSHOT" date="In SVN">
+      <action dev="ltheussl" type="fix" issue="MPXDOC-202">Plugin fails with 
anonymous access and empty password in scm url.</action>
       <action dev="aheritier" type="update">Change margin between menu items 
in stylus.css.</action>
       <action dev="ltheussl" type="fix" issue="MPXDOC-201">Plugin fails if 
there is an index.xml in the filesystem root directory.</action>
       <action dev="ltheussl" type="fix" issue="MPXDOC-199">Improve 
stylus.css.</action>