You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2004/05/30 01:21:26 UTC
cvs commit: maven/src/java/org/apache/maven/project Repository.java
dion 2004/05/29 16:21:26
Modified: src/test/java/org/apache/maven/project Tag: MAVEN-1_0-BRANCH
RepositoryTest.java
src/java/org/apache/maven/project Tag: MAVEN-1_0-BRANCH
Repository.java
Log:
Fixes for MAVEN-1298. Maven calls getCvsRoot() for non CVS connection strings and
this causes index out of bounds exceptions in the cvs specific methods.
Revision Changes Path
No revision
No revision
1.1.10.3 +6 -2 maven/src/test/java/org/apache/maven/project/RepositoryTest.java
Index: RepositoryTest.java
===================================================================
RCS file: /home/cvs/maven/src/test/java/org/apache/maven/project/RepositoryTest.java,v
retrieving revision 1.1.10.2
retrieving revision 1.1.10.3
diff -u -r1.1.10.2 -r1.1.10.3
--- RepositoryTest.java 29 May 2004 04:46:28 -0000 1.1.10.2
+++ RepositoryTest.java 29 May 2004 23:21:26 -0000 1.1.10.3
@@ -97,8 +97,12 @@
public void testGetCvsRoot() throws Exception
{
- // JUnitDoclet begin method getCvsRoot
- // JUnitDoclet end method getCvsRoot
+ repository.setConnection("scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:module");
+ String root = repository.getCvsRoot();
+ assertEquals("Wrong root returned", ":pserver:anoncvs@cvs.apache.org:/home/cvspublic", root);
+ repository.setConnection("scm|svn|http://svn.apache.org/repos");
+ root = repository.getCvsRoot();
+ assertEquals("Wrong root for non CVS string", "", root);
}
public void testGetCvsModule() throws Exception
No revision
No revision
1.18.4.5 +16 -1 maven/src/java/org/apache/maven/project/Repository.java
Index: Repository.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/project/Repository.java,v
retrieving revision 1.18.4.4
retrieving revision 1.18.4.5
diff -u -r1.18.4.4 -r1.18.4.5
--- Repository.java 29 May 2004 04:46:28 -0000 1.18.4.4
+++ Repository.java 29 May 2004 23:21:26 -0000 1.18.4.5
@@ -158,6 +158,11 @@
public String getCvsServer(String conn)
{
String[] tokens = splitSCMConnection(conn);
+ if (!tokens[1].equals("cvs"))
+ {
+ return "";
+ }
+
if(tokens[3].indexOf('@') >= 0)
{
return tokens[3].substring(tokens[3].indexOf('@')+1);
@@ -180,6 +185,12 @@
public String getCvsRoot(String conn, String username)
{
String[] tokens = splitSCMConnection(conn);
+
+ if (!tokens[1].equals("cvs"))
+ {
+ return "";
+ }
+
if(tokens[3].indexOf('@') >= 0)
{
if (username.length() == 0)
@@ -203,6 +214,10 @@
public String getCvsModule(String conn)
{
String[] tokens = splitSCMConnection(conn);
+ if (!tokens[1].equals("cvs"))
+ {
+ return "";
+ }
return tokens[5];
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org