juanco 02/02/20 14:25:51
Modified: src/java/org/apache/maven/jrcs jdiff.java rcsp.java
src/java/org/apache/maven/jrcs/rcs Archive.java
Log:
removed extra carriage return at the end of each line
Revision Changes Path
1.3 +117 -117 jakarta-turbine-maven/src/java/org/apache/maven/jrcs/jdiff.java
Index: jdiff.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/jdiff.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jdiff.java 20 Feb 2002 20:08:37 -0000 1.2
+++ jdiff.java 20 Feb 2002 22:25:51 -0000 1.3
@@ -1,117 +1,117 @@
-package org.apache.maven.jrcs;
-
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2001 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Maven" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
- * written permission, please contact [EMAIL PROTECTED]
- *
- * 5. Products derived from this software may not be called "Apache",
- * "Apache Maven", nor may "Apache" appear in their name, without
- * prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
-import java.util.*;
-import java.io.*;
-import org.apache.maven.jrcs.diff.*;
-
-public class jdiff {
-
- static final String[] loadFile(String name) throws IOException
- {
- BufferedReader data = new BufferedReader(new FileReader(name));
- Vector v = new Vector();
- String s;
-
- while ((s = data.readLine()) != null)
- v.addElement(s);
-
- String[] result = new String[v.size()];
- v.copyInto(result);
- return result;
- }
-
- static final void ussage(String name) {
- System.err.println("Ussage: " + name + " file1 file2");
- }
-
- public static void main(String[] argv) throws Exception
- {
- if (argv.length < 2)
- ussage("jdiff");
- else {
- Object[] orig = loadFile(argv[0]);
- Object[] rev = loadFile(argv[1]);
-
- System.err.println("---go!----");
- Diff df = new Diff(orig);
- Revision r = df.diff(rev);
- System.err.println("---end!---");
-
- System.err.println("------");
- System.out.print(r.toString());
- System.err.println("------" + new Date());
-
- try {
- Object[] reco = r.patch(orig);
- String recos = Diff.arrayToString(reco);
- if (!Diff.compare(rev, reco)) {
- /*
- System.err.println("**********");
- System.err.print(Diff.arrayToString(rev));
- System.err.println("**********");
- System.err.print(recos);
- System.err.println("**********");
- */
- System.err.println("files differ");
- }
- }
- catch(Throwable o) {
- System.out.println("Patch failed");
- }
- }
- }
-}
+package org.apache.maven.jrcs;
+
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Maven" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact [EMAIL PROTECTED]
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * "Apache Maven", nor may "Apache" appear in their name, without
+ * prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+import java.util.*;
+import java.io.*;
+import org.apache.maven.jrcs.diff.*;
+
+public class jdiff {
+
+ static final String[] loadFile(String name) throws IOException
+ {
+ BufferedReader data = new BufferedReader(new FileReader(name));
+ Vector v = new Vector();
+ String s;
+
+ while ((s = data.readLine()) != null)
+ v.addElement(s);
+
+ String[] result = new String[v.size()];
+ v.copyInto(result);
+ return result;
+ }
+
+ static final void ussage(String name) {
+ System.err.println("Ussage: " + name + " file1 file2");
+ }
+
+ public static void main(String[] argv) throws Exception
+ {
+ if (argv.length < 2)
+ ussage("jdiff");
+ else {
+ Object[] orig = loadFile(argv[0]);
+ Object[] rev = loadFile(argv[1]);
+
+ System.err.println("---go!----");
+ Diff df = new Diff(orig);
+ Revision r = df.diff(rev);
+ System.err.println("---end!---");
+
+ System.err.println("------");
+ System.out.print(r.toString());
+ System.err.println("------" + new Date());
+
+ try {
+ Object[] reco = r.patch(orig);
+ String recos = Diff.arrayToString(reco);
+ if (!Diff.compare(rev, reco)) {
+ /*
+ System.err.println("**********");
+ System.err.print(Diff.arrayToString(rev));
+ System.err.println("**********");
+ System.err.print(recos);
+ System.err.println("**********");
+ */
+ System.err.println("files differ");
+ }
+ }
+ catch(Throwable o) {
+ System.out.println("Patch failed");
+ }
+ }
+ }
+}
1.4 +157 -157 jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcsp.java
Index: rcsp.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcsp.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rcsp.java 20 Feb 2002 20:08:37 -0000 1.3
+++ rcsp.java 20 Feb 2002 22:25:51 -0000 1.4
@@ -1,157 +1,157 @@
-package org.apache.maven.jrcs;
-
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2001 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Maven" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
- * written permission, please contact [EMAIL PROTECTED]
- *
- * 5. Products derived from this software may not be called "Apache",
- * "Apache Maven", nor may "Apache" appear in their name, without
- * prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
-import org.apache.maven.jrcs.rcs.*;
-import org.apache.maven.jrcs.diff.*;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-public class rcsp {
-
- static Archive arc;
- static Object[] orig;
-
- static public void main(String[] args) throws Exception {
-// try {
- if (args.length > 2)
- System.out.println("WRONG USSAGE: need at most one parameter");
- else {
- if (args.length >= 1)
- arc = new Archive(args[0]);
- else
- arc = new Archive("test,v",System.in);
- System.err.println();
- System.err.println("==========================================");
- //System.out.println(arc.toString());
- //System.out.println(arc.getRevision("5.2.7.1"));
- //System.out.println(arc.getRevision(args[1], true));
- //arc.addRevision(new Object[]{}, args[1]);
- orig = arc.getRevision("1.3");
- System.out.println("*-orig-*********");
- System.out.print(Diff.arrayToString(orig));
- System.out.println("**********");
- Object[] other = arc.getRevision("1.2");
- //!! commented out because of package access error (jvz).
- //System.out.println(Diff.diff(arc.removeKeywords(orig),
arc.removeKeywords(other)).toRCSString());
- trywith("1.2.3.1");
- trywith("1.2.3.5");
- trywith("1.2.3.1.");
- trywith("1.2");
- trywith("1.2.2");
- /*
- trywith("1.2.2.2");
- trywith("1.2.2.1.1");
- trywith("1.2.2");
- trywith("1.2.3");
- trywith("1.2.3");
- */
- }
-/* }
- catch(java.io.IOException e) {
- System.out.println(e.getClass().toString());
- System.out.println(e.getMessage());
- e.printStackTrace();
- }
-*/
- }
-
- static int n = 1;
- static void trywith(String ver) {
- try {
- System.out.println();
- System.out.println("-------------");
- System.out.println("Adding "+ ver);
-
- /*
- List editor = new ArrayList(Arrays.asList(orig));
- editor.subList(0,1).clear();
- editor.add(0, "hola!");
- Object[] rev = editor.toArray();
- */
- Object[] rev = Diff.randomEdit(orig, n++);
- //rev = Diff.stringToArray(arc.doKeywords(Diff.arrayToString(rev),
null));
- //System.out.print(Archive.arrayToString(rev));
-
- Version newVer = arc.addRevision(rev, ver);
- System.out.println( newVer + " added");
-
- if (newVer != null) {
- Object[] rec = arc.getRevision(newVer);
- //System.out.print(Archive.arrayToString(rec));
-
- /* !! commented out because of package access errors (jvz).
- if (!Diff.compare(arc.removeKeywords(rec), arc.removeKeywords(rev)))
{
- System.out.println("revisions differ!");
- System.out.println("**********");
- System.out.println(Diff.arrayToString(rec));
- System.out.println("**********");
- System.out.println(Diff.arrayToString(rev));
- System.out.println("**********");
- System.out.print(Diff.diff(rec, rev).toRCSString());
- System.out.println("**********");
- }
- */
- }
-
- System.out.println(ver + " OK");
- } catch(Exception e) {
- System.err.println(e.getMessage());
- e.printStackTrace();
- }
- }
-}
+package org.apache.maven.jrcs;
+
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Maven" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact [EMAIL PROTECTED]
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * "Apache Maven", nor may "Apache" appear in their name, without
+ * prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+import org.apache.maven.jrcs.rcs.*;
+import org.apache.maven.jrcs.diff.*;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class rcsp {
+
+ static Archive arc;
+ static Object[] orig;
+
+ static public void main(String[] args) throws Exception {
+// try {
+ if (args.length > 2)
+ System.out.println("WRONG USSAGE: need at most one parameter");
+ else {
+ if (args.length >= 1)
+ arc = new Archive(args[0]);
+ else
+ arc = new Archive("test,v",System.in);
+ System.err.println();
+ System.err.println("==========================================");
+ //System.out.println(arc.toString());
+ //System.out.println(arc.getRevision("5.2.7.1"));
+ //System.out.println(arc.getRevision(args[1], true));
+ //arc.addRevision(new Object[]{}, args[1]);
+ orig = arc.getRevision("1.3");
+ System.out.println("*-orig-*********");
+ System.out.print(Diff.arrayToString(orig));
+ System.out.println("**********");
+ Object[] other = arc.getRevision("1.2");
+ //!! commented out because of package access error (jvz).
+ //System.out.println(Diff.diff(arc.removeKeywords(orig),
arc.removeKeywords(other)).toRCSString());
+ trywith("1.2.3.1");
+ trywith("1.2.3.5");
+ trywith("1.2.3.1.");
+ trywith("1.2");
+ trywith("1.2.2");
+ /*
+ trywith("1.2.2.2");
+ trywith("1.2.2.1.1");
+ trywith("1.2.2");
+ trywith("1.2.3");
+ trywith("1.2.3");
+ */
+ }
+/* }
+ catch(java.io.IOException e) {
+ System.out.println(e.getClass().toString());
+ System.out.println(e.getMessage());
+ e.printStackTrace();
+ }
+*/
+ }
+
+ static int n = 1;
+ static void trywith(String ver) {
+ try {
+ System.out.println();
+ System.out.println("-------------");
+ System.out.println("Adding "+ ver);
+
+ /*
+ List editor = new ArrayList(Arrays.asList(orig));
+ editor.subList(0,1).clear();
+ editor.add(0, "hola!");
+ Object[] rev = editor.toArray();
+ */
+ Object[] rev = Diff.randomEdit(orig, n++);
+ //rev = Diff.stringToArray(arc.doKeywords(Diff.arrayToString(rev), null));
+ //System.out.print(Archive.arrayToString(rev));
+
+ Version newVer = arc.addRevision(rev, ver);
+ System.out.println( newVer + " added");
+
+ if (newVer != null) {
+ Object[] rec = arc.getRevision(newVer);
+ //System.out.print(Archive.arrayToString(rec));
+
+ /* !! commented out because of package access errors (jvz).
+ if (!Diff.compare(arc.removeKeywords(rec), arc.removeKeywords(rev))) {
+ System.out.println("revisions differ!");
+ System.out.println("**********");
+ System.out.println(Diff.arrayToString(rec));
+ System.out.println("**********");
+ System.out.println(Diff.arrayToString(rev));
+ System.out.println("**********");
+ System.out.print(Diff.diff(rec, rev).toRCSString());
+ System.out.println("**********");
+ }
+ */
+ }
+
+ System.out.println(ver + " OK");
+ } catch(Exception e) {
+ System.err.println(e.getMessage());
+ e.printStackTrace();
+ }
+ }
+}
1.4 +8 -2
jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs/Archive.java
Index: Archive.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs/Archive.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Archive.java 20 Feb 2002 22:07:46 -0000 1.3
+++ Archive.java 20 Feb 2002 22:25:51 -0000 1.4
@@ -165,8 +165,14 @@
public void save(String path)
throws java.io.IOException
{
- save(new java.io.FileOutputStream(path));
- this._filename = new java.io.File(path).getPath();
+ java.io.OutputStream output = new java.io.FileOutputStream(path);
+ try {
+ save(output);
+ this._filename = new java.io.File(path).getPath();
+ }
+ finally {
+ output.close();
+ }
}
protected void setHead(Version vernum) throws InvalidVersionNumberException {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
