You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ep...@apache.org on 2003/10/29 15:40:38 UTC
cvs commit: maven/src/plugins-build/changelog/src/main/org/apache/maven/cvslib CvsConnection.java CvsChangeLogGenerator.java
epugh 2003/10/29 06:40:37
Modified: src/plugins-build/changelog/src/test/org/apache/maven/cvslib
CvsChangeLogGeneratorTest.java
src/plugins-build/changelog/src/main/org/apache/maven/cvslib
CvsConnection.java CvsChangeLogGenerator.java
Log:
Remove deprecated code. Change logging of .cvspass missing to debug..
Revision Changes Path
1.7 +8 -8 maven/src/plugins-build/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java
Index: CvsChangeLogGeneratorTest.java
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CvsChangeLogGeneratorTest.java 25 Oct 2003 18:33:13 -0000 1.6
+++ CvsChangeLogGeneratorTest.java 29 Oct 2003 14:40:37 -0000 1.7
@@ -102,23 +102,23 @@
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 @@
"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)};
1.3 +2 -5 maven/src/plugins-build/changelog/src/main/org/apache/maven/cvslib/CvsConnection.java
Index: CvsConnection.java
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/changelog/src/main/org/apache/maven/cvslib/CvsConnection.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CvsConnection.java 28 Oct 2003 18:18:26 -0000 1.2
+++ CvsConnection.java 29 Oct 2003 14:40:37 -0000 1.3
@@ -279,7 +279,7 @@
}
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 @@
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;
}
1.8 +7 -5 maven/src/plugins-build/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java
Index: CvsChangeLogGenerator.java
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CvsChangeLogGenerator.java 25 Oct 2003 18:33:14 -0000 1.7
+++ CvsChangeLogGenerator.java 29 Oct 2003 14:40:37 -0000 1.8
@@ -45,10 +45,10 @@
* ====================================================================
*/
+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 @@
/**
* 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 @@
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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org