Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove deprecated code. Change logging of .cvspass missing to debug..

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114251 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
epugh 2003-10-29 14:40:37 +00:00
parent 8fe381e4ce
commit 6c4f5a2fa3
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java
View File

@ -45,10 +45,10 @@ package org.apache.maven.cvslib;
* ====================================================================
*/
import java.io.ByteArrayInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringBufferInputStream;
import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.Date;
@ -92,7 +92,9 @@ class CvsChangeLogGenerator extends AbstractChangeLogGenerator
/**
* Execute cvslib client driving the given parser.
*
* @todo Currently the output from the logListener is a String, which is
* then converted to an InputStream. The output of logListener really should
* be an input stream.
* @param parser A {@link ChangeLogParser parser}to process the scm
* output.
* @return A collection of {@link ChangeLogEntry entries}parsed from the
@ -121,11 +123,11 @@ class CvsChangeLogGenerator extends AbstractChangeLogGenerator
clParser = parser;
CvsConnection connection = new CvsConnection();
String[] args = getScmLogCommand().getArguments();
CvsLogListener ml = new CvsLogListener();
CvsLogListener logListener = new CvsLogListener();
CvsConnection.processCommand(args, this.changeLogExecutor.getBasedir().toString(), ml);
CvsConnection.processCommand(args, this.changeLogExecutor.getBasedir().toString(), logListener);
entries = clParser.parse(new StringBufferInputStream(ml.getStdout().toString()));
entries = clParser.parse(new ByteArrayInputStream(logListener.getStdout().toString().getBytes()));
return entries;
}

7
changelog/src/main/org/apache/maven/cvslib/CvsConnection.java
View File

@ -279,7 +279,7 @@ public class CvsConnection
}
catch (IOException e)
{
LOG.error("Could not read password for host: " + e);
LOG.debug("Could not read password for host: " + e);
return null;
}
finally
@ -341,10 +341,7 @@ public class CvsConnection
if (globalOptions.getCVSRoot() == null)
{
LOG.error(
"No CVS root is set. Use the cvs.root "
+ "property, e.g. java -Dcvs.root=\":pserver:user@host:/usr/cvs\""
+ " or start the application in a directory containing a CVS subdirectory"
+ " or use the -d command switch.");
"No CVS root is set. Check your <repository> information in the POM.");
return false;
}

16
changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java
View File

@ -65,7 +65,7 @@ import junit.framework.TestCase;
/**
* @author <a href="bwalding@jakarta.org">Ben Walding</a>
* @version $Id: CvsChangeLogGeneratorTest.java,v 1.6 2003/10/25 18:33:13 epugh Exp $
* @version $Id: CvsChangeLogGeneratorTest.java,v 1.7 2003/10/29 14:40:37 epugh Exp $
*/
class ExposeGenerator extends CvsChangeLogGenerator
{
@ -78,7 +78,7 @@ class ExposeGenerator extends CvsChangeLogGenerator
/**
* @author <a href="bwalding@jakarta.org">Ben Walding</a>
* @version $Id: CvsChangeLogGeneratorTest.java,v 1.6 2003/10/25 18:33:13 epugh Exp $
* @version $Id: CvsChangeLogGeneratorTest.java,v 1.7 2003/10/29 14:40:37 epugh Exp $
*/
public class CvsChangeLogGeneratorTest extends TestCase
{
@ -102,23 +102,23 @@ public class CvsChangeLogGeneratorTest extends TestCase
new Test(null, "", NullPointerException.class),
new Test("asd:asd", "", IllegalArgumentException.class),
new Test(
"scm:csvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-turbine-maven",
"scm:csvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven",
"",
IllegalArgumentException.class),
new Test(
"scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-turbine-maven",
"scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven",
"cvs|-d|:pserver:anoncvs@cvs.apache.org:/home/cvspublic|log",
null),
new Test(
"scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-turbine-maven:anoncvs",
"scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven:anoncvs",
"",
IllegalArgumentException.class),
new Test(
"scm|cvs|pserver|anoncvs@cvs.apache.org|D:\\home\\cvspublic|jakarta-turbine-maven",
"scm|cvs|pserver|anoncvs@cvs.apache.org|D:\\home\\cvspublic|maven",
"cvs|-d|:pserver:anoncvs@cvs.apache.org:D:\\home\\cvspublic|log",
null),
new Test(
"scm|cvs|pserver|anoncvs@cvs.apache.org|D:/home/cvspublic|jakarta-turbine-maven",
"scm|cvs|pserver|anoncvs@cvs.apache.org|D:/home/cvspublic|maven",
"cvs|-d|:pserver:anoncvs@cvs.apache.org:D:/home/cvspublic|log",
null),
new Test(
@ -126,7 +126,7 @@ public class CvsChangeLogGeneratorTest extends TestCase
"cvs|-d|anoncvs@cvs.apache.org:/home/cvspublic|log",
null) ,
new Test(
"scm|cvs|local|local|D:/home/cvspublic|jakarta-turbine-maven",
"scm|cvs|local|local|D:/home/cvspublic|maven",
"cvs|-d|D:/home/cvspublic|log",
null)};