You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ju...@apache.org on 2003/04/24 01:32:11 UTC

cvs commit: jakarta-commons-sandbox/jrcs/src/java/org/apache/commons/jrcs/tools JDiff.java

juanco      2003/04/23 16:32:11

  Modified:    jrcs     build.xml
               jrcs/src/java/org/apache/commons/jrcs/tools JDiff.java
  Log:
  make ant build tools too
  
  Revision  Changes    Path
  1.8       +2 -1      jakarta-commons-sandbox/jrcs/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jrcs/build.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build.xml	21 Dec 2002 16:50:05 -0000	1.7
  +++ build.xml	23 Apr 2003 23:32:09 -0000	1.8
  @@ -179,6 +179,7 @@
              debug="on" optimize="on" deprecation="on" >
              <include name="**/jrcs/diff/**/*.java" />
              <include name="**/jrcs/util/**/*.java" />
  +           <include name="**/jrcs/tools/**/*.java" />
         <exclude name="**/*Test*.class" />
       </javac>
   
  
  
  
  1.2       +2 -10     jakarta-commons-sandbox/jrcs/src/java/org/apache/commons/jrcs/tools/JDiff.java
  
  Index: JDiff.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jrcs/src/java/org/apache/commons/jrcs/tools/JDiff.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JDiff.java	28 May 2002 16:45:53 -0000	1.1
  +++ JDiff.java	23 Apr 2003 23:32:10 -0000	1.2
  @@ -105,10 +105,8 @@
               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());
  @@ -120,14 +118,8 @@
                   //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");
  +                    System.err.println("INTERNAL ERROR:"
  +                                        + "files differ after patching!");
                   }
               }
               catch (Throwable o)
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Re: cvs commit: jakarta-commons-sandbox/jrcs/src/java/org/apache/commons/jrcs/tools JDiff.java

Posted by Juancarlo AƱez <ju...@suigeneris.org>.
> I just noticed that the sources in jcrs contain the wrong license,
> they talk about Maven instead of Commons.  Could you please fix them
> (a template is in the LICENSE.txt file in the root of the sandbox
> module).

Will do.

Juanco

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Re: cvs commit: jakarta-commons-sandbox/jrcs/src/java/org/apache/commons/jrcs/tools JDiff.java

Posted by Stefan Bodewig <bo...@apache.org>.
I just noticed that the sources in jcrs contain the wrong license,
they talk about Maven instead of Commons.  Could you please fix them
(a template is in the LICENSE.txt file in the root of the sandbox
module).

And, oh, it's 2003 already.

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org