zipdiff-cvs Mailing List for zipdiff
Status: Alpha
Brought to you by:
sullis
Menu
▾
▴
zipdiff-cvs — zipdiff CVS activity
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(50) |
Jul
(5) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
|---|
|
From: Sean S. <su...@us...> - 2004-09-17 02:10:13
|
Update of /cvsroot/zipdiff/zipdiff/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27544/xdocs Modified Files: related.xml Log Message: added zipcompare Index: related.xml =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/xdocs/related.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** related.xml 30 Jun 2004 07:35:06 -0000 1.6 --- related.xml 17 Sep 2004 02:10:04 -0000 1.7 *************** *** 15,18 **** --- 15,19 ---- <ul> <li><a href="http://jdiff.sourceforge.net/">http://jdiff.sourceforge.net/</a></li> + <li><a href="http://cvs.apache.org/viewcvs.cgi/xml-xmlbeans/v1/src/zipcompare/zipcompare/">zipcompare</a></li> <li><a href="http://ant.apache.org/manual/CoreTasks/cvstagdiff.html">http://ant.apache.org/manual/CoreTasks/cvstagdiff.html</a></li> <li><a href="http://www.cs.wisc.edu/~yuanwang/xdiff.html">http://www.cs.wisc.edu/~yuanwang/xdiff.html</a></li> |
|
From: Sean S. <su...@us...> - 2004-07-07 20:46:59
|
Update of /cvsroot/zipdiff/zipdiff/src/test/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26093/src/test/zipdiff Modified Files: DifferenceCalculatorTest.java Log Message: update Index: DifferenceCalculatorTest.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/test/zipdiff/DifferenceCalculatorTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DifferenceCalculatorTest.java 19 Jun 2004 20:28:28 -0000 1.6 --- DifferenceCalculatorTest.java 7 Jul 2004 20:46:50 -0000 1.7 *************** *** 34,37 **** --- 34,38 ---- private static String ENTRYB = "B"; private static String ENTRYC = "C"; + private static String ENTRY_CVS = "CVS/Root"; public static final String SYSTEM_TMP_DIR_PROPERTY = "java.io.tmpdir"; public static final String TEST_DIR_POSTFIX = File.separator + "UnitTestsDifferenceCalculatorTest"; *************** *** 132,136 **** new FileOutputStream(testJarOneEntryAContentsChangedFilename))); ! // ad an entry JarEntry entry1 = new JarEntry(ENTRYA); testJarOS.putNextEntry(entry1); --- 133,137 ---- new FileOutputStream(testJarOneEntryAContentsChangedFilename))); ! // add an entry JarEntry entry1 = new JarEntry(ENTRYA); testJarOS.putNextEntry(entry1); *************** *** 143,146 **** --- 144,151 ---- testJarOS.write(data1); + // add another entry + JarEntry cvs = new JarEntry(ENTRY_CVS); + testJarOS.putNextEntry(cvs); + testJarOS.flush(); testJarOS.close(); *************** *** 246,249 **** --- 251,255 ---- createJarOneEntryAContentsChanged(); DifferenceCalculator calc = new DifferenceCalculator(testJarOneEntryA1Filename, testJarOneEntryAContentsChangedFilename); + calc.setIgnoreCVSFiles(true); Differences differences = calc.getDifferences(); assertTrue(differences.hasDifferences()); |
|
From: Sean S. <su...@us...> - 2004-07-07 20:46:48
|
Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25877/src/main/zipdiff Modified Files: DifferenceCalculator.java Log Message: cleanup code that detects CVS folders Index: DifferenceCalculator.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/DifferenceCalculator.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DifferenceCalculator.java 7 Jul 2004 20:32:15 -0000 1.5 --- DifferenceCalculator.java 7 Jul 2004 20:46:38 -0000 1.6 *************** *** 293,297 **** while (iterAllNames.hasNext()) { String name = (String) iterAllNames.next(); ! if (names1.contains(name) && (!names2.contains(name))) { d.fileRemoved(name, (ZipEntry) m1.get(name)); } else if (names2.contains(name) && (!names1.contains(name))) { --- 293,300 ---- while (iterAllNames.hasNext()) { String name = (String) iterAllNames.next(); ! if (ignoreThisFile("", name)) { ! // do nothing ! } ! else if (names1.contains(name) && (!names2.contains(name))) { d.fileRemoved(name, (ZipEntry) m1.get(name)); } else if (names2.contains(name) && (!names1.contains(name))) { |
|
From: Sean S. <su...@us...> - 2004-07-07 20:32:24
|
Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23069/src/main/zipdiff Modified Files: DifferenceCalculator.java Log Message: improved method: isCVSFile Index: DifferenceCalculator.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/DifferenceCalculator.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DifferenceCalculator.java 27 Jun 2004 19:06:41 -0000 1.4 --- DifferenceCalculator.java 7 Jul 2004 20:32:15 -0000 1.5 *************** *** 104,120 **** * @return true if the file should be ignored. */ ! protected boolean ignoreThisFile(String filepath, String filename) { ! if (filename == null) { return false; } ! else if (isCVSFile(filepath, filename) && (ignoreCVSFiles() ) ) { return true; } else if (filesToIgnorePattern == null) { return false; } else { ! Matcher m = filesToIgnorePattern.matcher(filename); boolean match = m.matches(); if (match) { ! logger.log(Level.FINEST, "Found a match against : " + filename + " so excluding"); } return match; --- 104,120 ---- * @return true if the file should be ignored. */ ! protected boolean ignoreThisFile(String filepath, String entryName) { ! if (entryName == null) { return false; } ! else if (isCVSFile(filepath, entryName) && (ignoreCVSFiles() ) ) { return true; } else if (filesToIgnorePattern == null) { return false; } else { ! Matcher m = filesToIgnorePattern.matcher(entryName); boolean match = m.matches(); if (match) { ! logger.log(Level.FINEST, "Found a match against : " + entryName + " so excluding"); } return match; *************** *** 122,132 **** } ! protected boolean isCVSFile(String filepath, String filename) { ! if (filename == null) { return false; } ! else if ( (filepath.indexOf("CVS") != -1) || (filename.equals("CVS"))) { return true; --- 122,132 ---- } ! protected boolean isCVSFile(String filepath, String entryName) { ! if (entryName == null) { return false; } ! else if ( (filepath.indexOf("CVS/") != -1) || (entryName.indexOf("CVS/") != -1)) { return true; |
|
From: Sean S. <su...@us...> - 2004-07-04 00:42:36
|
Update of /cvsroot/zipdiff/zipdiff/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17416/xdocs Modified Files: tools.xml Log Message: Index: tools.xml =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/xdocs/tools.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tools.xml 19 Jun 2004 17:30:59 -0000 1.2 --- tools.xml 4 Jul 2004 00:42:27 -0000 1.3 *************** *** 18,21 **** --- 18,24 ---- <li><a href="http://www.junit.org/">JUnit</a></li> <li><a href="http://pmd.sourceforge.net/">PMD</a></li> + <li><a href="http://www.cvshome.org/">CVS</a></li> + <li><a href="http://www.tortoisecvs.org/">TortoiseCVS</a></li> + <li><a href="http://www.vim.org/">Vim</a></li> </ul> </p> |
|
From: Sean S. <su...@us...> - 2004-07-03 01:21:04
|
Update of /cvsroot/zipdiff/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12342 Modified Files: .cvsignore Log Message: Index: .cvsignore =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** .cvsignore 17 Apr 2004 05:35:56 -0000 1.4 --- .cvsignore 3 Jul 2004 01:20:55 -0000 1.5 *************** *** 4,5 **** --- 4,6 ---- build bin + junit-reports |
|
From: Sean S. <su...@us...> - 2004-06-30 07:35:32
|
Update of /cvsroot/zipdiff/zipdiff/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25816/xdocs Modified Files: index.xml Log Message: Index: index.xml =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/xdocs/index.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** index.xml 27 Jun 2004 22:09:05 -0000 1.18 --- index.xml 30 Jun 2004 07:35:24 -0000 1.19 *************** *** 23,27 **** </p> <p> ! The current version is 0.3 </p> </section> --- 23,27 ---- </p> <p> ! The current version is 0.4 </p> </section> |
|
From: Sean S. <su...@us...> - 2004-06-30 07:35:14
|
Update of /cvsroot/zipdiff/zipdiff/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25740/xdocs Modified Files: related.xml Log Message: Index: related.xml =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/xdocs/related.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** related.xml 13 Apr 2004 01:50:15 -0000 1.5 --- related.xml 30 Jun 2004 07:35:06 -0000 1.6 *************** *** 60,63 **** --- 60,65 ---- <ul> <li>Ant's <a href="http://ant.apache.org/manual/CoreTasks/ear.html">ear task</a></li> + <li>Maven's <a href="http://maven.apache.org/reference/plugins/ear/">ear plugin</a></li> + <li><a href="http://earutils.sourceforge.net/">http://earutils.sourceforge.net/</a></li> </ul> </subsection> *************** *** 66,69 **** --- 68,72 ---- <ul> <li>Ant's <a href="http://ant.apache.org/manual/CoreTasks/war.html">war task</a></li> + <li>Maven's <a href="http://maven.apache.org/reference/plugins/war/">war plugin</a></li> </ul> </subsection> |
|
From: Sean S. <su...@us...> - 2004-06-29 10:17:28
|
Update of /cvsroot/zipdiff/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13725 Modified Files: project.xml Log Message: Index: project.xml =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/project.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** project.xml 27 Jun 2004 20:40:22 -0000 1.8 --- project.xml 29 Jun 2004 00:23:30 -0000 1.9 *************** *** 11,15 **** <name>zipdiff</name> <id>zipdiff</id> ! <currentVersion>0.3</currentVersion> <organization> <name>zipdiff.sourceforge.net</name> --- 11,15 ---- <name>zipdiff</name> <id>zipdiff</id> ! <currentVersion>0.4</currentVersion> <organization> <name>zipdiff.sourceforge.net</name> |
|
From: Sean S. <su...@us...> - 2004-06-29 00:26:43
|
Update of /cvsroot/zipdiff/zipdiff/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14123/xdocs Modified Files: sample-output.html Log Message: Index: sample-output.html =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/xdocs/sample-output.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sample-output.html 27 Jun 2004 22:06:47 -0000 1.2 --- sample-output.html 29 Jun 2004 00:26:32 -0000 1.3 *************** *** 31,35 **** <td> <ul> ! <li>c.zip/bar.txt</li> <li>bar.txt</li> </ul> --- 31,35 ---- <td> <ul> ! <li>zzz/foo.txt</li> <li>bar.txt</li> </ul> *************** *** 57,63 **** <td> <ul> ! <li>c.zip</li> ! <li>c.zip/foo.txt</li> ! <li>foo.txt</li> </ul> </td> --- 57,63 ---- <td> <ul> ! <li>my.jar</li> ! <li>my.jar/Util.class</li> ! <li>hello.txt</li> </ul> </td> *************** *** 65,69 **** </table> <hr> ! Generated at Sun Jun 27 14:05:48 GMT-08:00 2004 </body> ! </html --- 65,70 ---- </table> <hr> ! <p>Generated at Sun Jun 27 14:05:48 GMT-08:00 2004</p> </body> ! </html> ! |
|
From: Sean S. <su...@us...> - 2004-06-29 00:24:00
|
Update of /cvsroot/zipdiff/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13757 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/build.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** build.xml 27 Jun 2004 20:53:25 -0000 1.13 --- build.xml 29 Jun 2004 00:23:49 -0000 1.14 *************** *** 16,20 **** <property name="javadoc.build.dir" value="${build.dir}/doc/api"/> <property name="classes.dir" value="${build.dir}/classes"/> ! <property name="distrib.name" value="zipdiff-0.3"/> <property name="distrib.jar.filename" value="zipdiff.jar"/> <property name="junit.jar" value="${basedir}/lib/junit.jar"/> --- 16,20 ---- <property name="javadoc.build.dir" value="${build.dir}/doc/api"/> <property name="classes.dir" value="${build.dir}/classes"/> ! <property name="distrib.name" value="zipdiff-0.4"/> <property name="distrib.jar.filename" value="zipdiff.jar"/> <property name="junit.jar" value="${basedir}/lib/junit.jar"/> |
|
From: Sean S. <su...@us...> - 2004-06-28 23:41:20
|
Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff/output In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5469/src/main/zipdiff/output Modified Files: package.html Log Message: Index: package.html =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/output/package.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** package.html 9 Jun 2004 15:29:14 -0000 1.1 --- package.html 28 Jun 2004 23:41:10 -0000 1.2 *************** *** 1,15 **** ! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> ! <html> ! <head> ! <!-- ! ! @(#)package.html ! ! --> ! </head> ! <body bgcolor="white"> ! ! Provides the interface and implementations used for formatting the output of the Zipdiff ant tasks. ! ! </body> ! </html> --- 1,15 ---- ! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> ! <html> ! <head> ! <!-- ! ! $Header$ ! ! --> ! </head> ! <body bgcolor="white"> ! ! Provides the interface and implementations used for formatting the output of the zipdiff Ant tasks. ! ! </body> ! </html> |
|
From: Sean S. <su...@us...> - 2004-06-28 23:40:34
|
Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff/output In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5336/src/main/zipdiff/output Modified Files: HtmlBuilder.java Log Message: close the HTML tag changed formatting Index: HtmlBuilder.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/output/HtmlBuilder.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** HtmlBuilder.java 27 Jun 2004 20:39:05 -0000 1.5 --- HtmlBuilder.java 28 Jun 2004 23:40:24 -0000 1.6 *************** *** 56,63 **** writeChanged(pw, d.getChanged().keySet()); pw.println("<hr>"); pw.println("Generated at " + new java.util.Date()); pw.println("</body>"); ! pw.println("</html"); pw.flush(); --- 56,65 ---- writeChanged(pw, d.getChanged().keySet()); pw.println("<hr>"); + pw.println("<p>"); pw.println("Generated at " + new java.util.Date()); + pw.println("</p>"); pw.println("</body>"); ! pw.println("</html>"); pw.flush(); |
|
From: Sean S. <su...@us...> - 2004-06-27 22:09:14
|
Update of /cvsroot/zipdiff/zipdiff/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18194/xdocs Modified Files: index.xml Log Message: Index: index.xml =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/xdocs/index.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** index.xml 27 Jun 2004 22:02:52 -0000 1.17 --- index.xml 27 Jun 2004 22:09:05 -0000 1.18 *************** *** 17,21 **** Run it standalone or as an <a href="http://ant.apache.org/">Ant</a> task. ! The tool supports three <a href="output.html">output</a> formats: plain text, XML, and HTML. </p> <p> --- 17,21 ---- Run it standalone or as an <a href="http://ant.apache.org/">Ant</a> task. ! The tool supports three output formats: plain text, XML, and <a href="sample-output.html">HTML</a>. </p> <p> |
|
From: Sean S. <su...@us...> - 2004-06-27 22:06:58
|
Update of /cvsroot/zipdiff/zipdiff/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17674/xdocs Modified Files: sample-output.html Log Message: Index: sample-output.html =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/xdocs/sample-output.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sample-output.html 27 Jun 2004 22:02:53 -0000 1.1 --- sample-output.html 27 Jun 2004 22:06:47 -0000 1.2 *************** *** 20,28 **** </style> ! <p>First file: c:\download\zipdiff\zipdiff-0.2.zip<br> ! Second file: c:\download\zipdiff\zipdiff-0.3.zip</p> <TABLE CELLSPACING="1" CELLPADDING="3" WIDTH="100%" BORDER="0"> <tr> ! <td class="diffs" colspan="2">Added (72 entries)</td> </tr> <tr> --- 20,28 ---- </style> ! <p>First file: c:\a.zip<br> ! Second file: c:\b.zip</p> <TABLE CELLSPACING="1" CELLPADDING="3" WIDTH="100%" BORDER="0"> <tr> ! <td class="diffs" colspan="2">Added (2 entries)</td> </tr> <tr> *************** *** 31,106 **** <td> <ul> ! <li>zipdiff-0.3/src/main/zipdiff/output/HtmlBuilder.java</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/TypeHandler.class</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar</li> ! <li>zipdiff-0.3/src/</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/MissingArgumentException.class</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/HelpFormatter$StringBufferComparator.class</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/Parser.class</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/PatternOptionBuilder.class</li> ! <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/Differences.class</li> ! <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/Main.class</li> ! <li>zipdiff-0.3/src/test/zipdiff/</li> ! <li>zipdiff-0.3/src/main/zipdiff/output/TextBuilder.java</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/UnrecognizedOptionException.class</li> ! <li>zipdiff-0.3/src/test/zipdiff/DifferenceCalculatorTest.java</li> ! <li>zipdiff-0.3/src/main/zipdiff/ant/package.html</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/Options.class</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/Option.class</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/HelpFormatter$1.class</li> ! <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/output/XmlBuilder.class</li> ! <li>zipdiff-0.3/LICENSE.txt</li> ! <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/</li> ! <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/output/HtmlBuilder.class</li> ! <li>zipdiff-0.3/src/main/zipdiff/Main.java</li> ! <li>zipdiff-0.3/src/main/zipdiff/output/AbstractBuilder.java</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/BasicParser.class</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/</li> ! <li>zipdiff-0.3/src/main/zipdiff/Differences.java</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/</li> ! <li>zipdiff-0.3/src/main/zipdiff/ant/ZipDiffTask.java</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/MissingOptionException.class</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/GnuParser.class</li> ! <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/DifferenceCalculator.class</li> ! <li>zipdiff-0.3/src/main/zipdiff/output/Builder.java</li> ! <li>zipdiff-0.3/</li> ! <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/output/TextBuilder.class</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/AlreadySelectedException.class</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/META-INF/LICENSE.txt</li> ! <li>zipdiff-0.3/src/main/zipdiff/ant/</li> ! <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/output/</li> ! <li>zipdiff-0.3/src/main/zipdiff/output/XmlBuilder.java</li> ! <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/ant/</li> ! <li>zipdiff-0.3/NOTICE.txt</li> ! <li>zipdiff-0.3/src/main/</li> ! <li>zipdiff-0.3/commons-cli-1.0-LICENSE</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/HelpFormatter.class</li> ! <li>zipdiff-0.3/src/main/zipdiff/output/</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/</li> ! <li>zipdiff-0.3/src/main/zipdiff/output/package.html</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/CommandLineParser.class</li> ! <li>zipdiff-0.3/build/zipdiff.jar</li> ! <li>zipdiff-0.3/build/zipdiff.jar/META-INF/MANIFEST.MF</li> ! <li>zipdiff-0.3/src/main/zipdiff/DifferenceCalculator.java</li> ! <li>zipdiff-0.3/src/metadata/JAR-manifest.txt</li> ! <li>zipdiff-0.3/src/test/</li> ! <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/output/Builder.class</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/OptionGroup.class</li> ! <li>zipdiff-0.3/src/metadata/</li> ! <li>zipdiff-0.3/readme.txt</li> ! <li>zipdiff-0.3/build/zipdiff.jar/META-INF/</li> ! <li>zipdiff-0.3/build/</li> ! <li>zipdiff-0.3/src/main/zipdiff/package.html</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/META-INF/MANIFEST.MF</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/META-INF/</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/PosixParser.class</li> ! <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/output/AbstractBuilder.class</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/CommandLine.class</li> ! <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/ant/ZipDiffTask.class</li> ! <li>zipdiff-0.3/build.xml</li> ! <li>zipdiff-0.3/src/main/zipdiff/</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/ParseException.class</li> ! <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/OptionBuilder.class</li> </ul> </td> --- 31,36 ---- <td> <ul> ! <li>c.zip/bar.txt</li> ! <li>bar.txt</li> </ul> </td> *************** *** 109,113 **** <TABLE CELLSPACING="1" CELLPADDING="3" WIDTH="100%" BORDER="0"> <tr> ! <td class="diffs" colspan="2">Removed (63 entries)</td> </tr> <tr> --- 39,43 ---- <TABLE CELLSPACING="1" CELLPADDING="3" WIDTH="100%" BORDER="0"> <tr> ! <td class="diffs" colspan="2">Removed (0 entries)</td> </tr> <tr> *************** *** 115,183 **** </td> <td> - <ul> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/META-INF/LICENSE.txt</li> - <li>zipdiff-0.2/</li> - <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/Main.class</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/HelpFormatter$1.class</li> - <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/output/XmlBuilder.class</li> - <li>zipdiff-0.2/src/main/zipdiff/ant/ZipDiffTask.java</li> - <li>zipdiff-0.2/src/main/zipdiff/output/TextBuilder.java</li> - <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/output/</li> - <li>zipdiff-0.2/build/</li> - <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/Differences.class</li> - <li>zipdiff-0.2/src/</li> - <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/output/Builder.class</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/TypeHandler.class</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/Options.class</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/PatternOptionBuilder.class</li> - <li>zipdiff-0.2/src/main/zipdiff/Main.java</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/PosixParser.class</li> - <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/ant/ZipDiffTask.class</li> - <li>zipdiff-0.2/src/main/zipdiff/</li> - <li>zipdiff-0.2/src/metadata/</li> - <li>zipdiff-0.2/src/main/zipdiff/output/Builder.java</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/META-INF/</li> - <li>zipdiff-0.2/src/main/zipdiff/Differences.java</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/CommandLineParser.class</li> - <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/META-INF/MANIFEST.MF</li> - <li>zipdiff-0.2/src/metadata/JAR-manifest.txt</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/OptionBuilder.class</li> - <li>zipdiff-0.2/build/zipdiff.jar</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/HelpFormatter.class</li> - <li>zipdiff-0.2/build/zipdiff.jar/META-INF/</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/MissingArgumentException.class</li> - <li>zipdiff-0.2/src/main/zipdiff/ant/</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/GnuParser.class</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/ParseException.class</li> - <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/output/HtmlBuilder.class</li> - <li>zipdiff-0.2/src/main/zipdiff/output/XmlBuilder.java</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/UnrecognizedOptionException.class</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/Parser.class</li> - <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/DifferenceCalculator.class</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/CommandLine.class</li> - <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/output/TextBuilder.class</li> - <li>zipdiff-0.2/LICENSE.txt</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar</li> - <li>zipdiff-0.2/commons-cli-1.0-LICENSE</li> - <li>zipdiff-0.2/src/main/zipdiff/DifferenceCalculator.java</li> - <li>zipdiff-0.2/src/main/zipdiff/output/HtmlBuilder.java</li> - <li>zipdiff-0.2/src/main/</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/HelpFormatter$StringBufferComparator.class</li> - <li>zipdiff-0.2/readme.txt</li> - <li>zipdiff-0.2/build/zipdiff.jar/META-INF/MANIFEST.MF</li> - <li>zipdiff-0.2/build.xml</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/Option.class</li> - <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/ant/</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/BasicParser.class</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/OptionGroup.class</li> - <li>zipdiff-0.2/src/main/zipdiff/output/</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/MissingOptionException.class</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/AlreadySelectedException.class</li> - <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/</li> - </ul> </td> </tr> --- 45,48 ---- *************** *** 185,189 **** <TABLE CELLSPACING="1" CELLPADDING="3" WIDTH="100%" BORDER="0"> <tr> ! <td class="diffs" colspan="2">Changed (0 entries)</td> </tr> <tr> --- 50,54 ---- <TABLE CELLSPACING="1" CELLPADDING="3" WIDTH="100%" BORDER="0"> <tr> ! <td class="diffs" colspan="2">Changed (3 entries)</td> </tr> <tr> *************** *** 191,199 **** </td> <td> </td> </tr> </table> <hr> ! Generated at Sun Jun 27 13:17:31 GMT-08:00 2004 </body> </html --- 56,69 ---- </td> <td> + <ul> + <li>c.zip</li> + <li>c.zip/foo.txt</li> + <li>foo.txt</li> + </ul> </td> </tr> </table> <hr> ! Generated at Sun Jun 27 14:05:48 GMT-08:00 2004 </body> </html |
|
From: Sean S. <su...@us...> - 2004-06-27 22:03:06
|
Update of /cvsroot/zipdiff/zipdiff/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16974/xdocs Modified Files: index.xml Added Files: sample-output.html output.xml Log Message: sample output Index: index.xml =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/xdocs/index.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** index.xml 27 Jun 2004 21:14:30 -0000 1.16 --- index.xml 27 Jun 2004 22:02:52 -0000 1.17 *************** *** 17,21 **** Run it standalone or as an <a href="http://ant.apache.org/">Ant</a> task. ! The tool supports three output formats: plain text, XML, and HTML. </p> <p> --- 17,21 ---- Run it standalone or as an <a href="http://ant.apache.org/">Ant</a> task. ! The tool supports three <a href="output.html">output</a> formats: plain text, XML, and HTML. </p> <p> --- NEW FILE: sample-output.html --- <html> <META http-equiv="Content-Type" content="text/html"> <head> <title>File differences</title> </head> <body text="#000000" vlink="#000000" alink="#000000" link="#000000"> <style type="text/css"> body, p { font-family: verdana,arial,helvetica; font-size: 80%; color:#000000; } .diffs { font-family: verdana,arial,helvetica; font-size: 80%; font-weight: bold; text-align:left; background:#a6caf0; } tr, td { font-family: verdana,arial,helvetica; font-size: 80%; background:#eeeee0; } </style> <p>First file: c:\download\zipdiff\zipdiff-0.2.zip<br> Second file: c:\download\zipdiff\zipdiff-0.3.zip</p> <TABLE CELLSPACING="1" CELLPADDING="3" WIDTH="100%" BORDER="0"> <tr> <td class="diffs" colspan="2">Added (72 entries)</td> </tr> <tr> <td width="20"> </td> <td> <ul> <li>zipdiff-0.3/src/main/zipdiff/output/HtmlBuilder.java</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/TypeHandler.class</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar</li> <li>zipdiff-0.3/src/</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/MissingArgumentException.class</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/HelpFormatter$StringBufferComparator.class</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/Parser.class</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/PatternOptionBuilder.class</li> <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/Differences.class</li> <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/Main.class</li> <li>zipdiff-0.3/src/test/zipdiff/</li> <li>zipdiff-0.3/src/main/zipdiff/output/TextBuilder.java</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/UnrecognizedOptionException.class</li> <li>zipdiff-0.3/src/test/zipdiff/DifferenceCalculatorTest.java</li> <li>zipdiff-0.3/src/main/zipdiff/ant/package.html</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/Options.class</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/Option.class</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/HelpFormatter$1.class</li> <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/output/XmlBuilder.class</li> <li>zipdiff-0.3/LICENSE.txt</li> <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/</li> <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/output/HtmlBuilder.class</li> <li>zipdiff-0.3/src/main/zipdiff/Main.java</li> <li>zipdiff-0.3/src/main/zipdiff/output/AbstractBuilder.java</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/BasicParser.class</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/</li> <li>zipdiff-0.3/src/main/zipdiff/Differences.java</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/</li> <li>zipdiff-0.3/src/main/zipdiff/ant/ZipDiffTask.java</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/MissingOptionException.class</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/GnuParser.class</li> <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/DifferenceCalculator.class</li> <li>zipdiff-0.3/src/main/zipdiff/output/Builder.java</li> <li>zipdiff-0.3/</li> <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/output/TextBuilder.class</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/AlreadySelectedException.class</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/META-INF/LICENSE.txt</li> <li>zipdiff-0.3/src/main/zipdiff/ant/</li> <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/output/</li> <li>zipdiff-0.3/src/main/zipdiff/output/XmlBuilder.java</li> <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/ant/</li> <li>zipdiff-0.3/NOTICE.txt</li> <li>zipdiff-0.3/src/main/</li> <li>zipdiff-0.3/commons-cli-1.0-LICENSE</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/HelpFormatter.class</li> <li>zipdiff-0.3/src/main/zipdiff/output/</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/</li> <li>zipdiff-0.3/src/main/zipdiff/output/package.html</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/CommandLineParser.class</li> <li>zipdiff-0.3/build/zipdiff.jar</li> <li>zipdiff-0.3/build/zipdiff.jar/META-INF/MANIFEST.MF</li> <li>zipdiff-0.3/src/main/zipdiff/DifferenceCalculator.java</li> <li>zipdiff-0.3/src/metadata/JAR-manifest.txt</li> <li>zipdiff-0.3/src/test/</li> <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/output/Builder.class</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/OptionGroup.class</li> <li>zipdiff-0.3/src/metadata/</li> <li>zipdiff-0.3/readme.txt</li> <li>zipdiff-0.3/build/zipdiff.jar/META-INF/</li> <li>zipdiff-0.3/build/</li> <li>zipdiff-0.3/src/main/zipdiff/package.html</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/META-INF/MANIFEST.MF</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/META-INF/</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/PosixParser.class</li> <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/output/AbstractBuilder.class</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/CommandLine.class</li> <li>zipdiff-0.3/build/zipdiff.jar/zipdiff/ant/ZipDiffTask.class</li> <li>zipdiff-0.3/build.xml</li> <li>zipdiff-0.3/src/main/zipdiff/</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/ParseException.class</li> <li>zipdiff-0.3/build/commons-cli-1.0.jar/org/apache/commons/cli/OptionBuilder.class</li> </ul> </td> </tr> </table> <TABLE CELLSPACING="1" CELLPADDING="3" WIDTH="100%" BORDER="0"> <tr> <td class="diffs" colspan="2">Removed (63 entries)</td> </tr> <tr> <td width="20"> </td> <td> <ul> <li>zipdiff-0.2/build/commons-cli-1.0.jar/META-INF/LICENSE.txt</li> <li>zipdiff-0.2/</li> <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/Main.class</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/HelpFormatter$1.class</li> <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/output/XmlBuilder.class</li> <li>zipdiff-0.2/src/main/zipdiff/ant/ZipDiffTask.java</li> <li>zipdiff-0.2/src/main/zipdiff/output/TextBuilder.java</li> <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/output/</li> <li>zipdiff-0.2/build/</li> <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/Differences.class</li> <li>zipdiff-0.2/src/</li> <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/output/Builder.class</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/TypeHandler.class</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/Options.class</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/PatternOptionBuilder.class</li> <li>zipdiff-0.2/src/main/zipdiff/Main.java</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/PosixParser.class</li> <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/ant/ZipDiffTask.class</li> <li>zipdiff-0.2/src/main/zipdiff/</li> <li>zipdiff-0.2/src/metadata/</li> <li>zipdiff-0.2/src/main/zipdiff/output/Builder.java</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/META-INF/</li> <li>zipdiff-0.2/src/main/zipdiff/Differences.java</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/CommandLineParser.class</li> <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/META-INF/MANIFEST.MF</li> <li>zipdiff-0.2/src/metadata/JAR-manifest.txt</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/OptionBuilder.class</li> <li>zipdiff-0.2/build/zipdiff.jar</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/HelpFormatter.class</li> <li>zipdiff-0.2/build/zipdiff.jar/META-INF/</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/MissingArgumentException.class</li> <li>zipdiff-0.2/src/main/zipdiff/ant/</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/GnuParser.class</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/ParseException.class</li> <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/output/HtmlBuilder.class</li> <li>zipdiff-0.2/src/main/zipdiff/output/XmlBuilder.java</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/UnrecognizedOptionException.class</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/Parser.class</li> <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/DifferenceCalculator.class</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/CommandLine.class</li> <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/output/TextBuilder.class</li> <li>zipdiff-0.2/LICENSE.txt</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar</li> <li>zipdiff-0.2/commons-cli-1.0-LICENSE</li> <li>zipdiff-0.2/src/main/zipdiff/DifferenceCalculator.java</li> <li>zipdiff-0.2/src/main/zipdiff/output/HtmlBuilder.java</li> <li>zipdiff-0.2/src/main/</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/HelpFormatter$StringBufferComparator.class</li> <li>zipdiff-0.2/readme.txt</li> <li>zipdiff-0.2/build/zipdiff.jar/META-INF/MANIFEST.MF</li> <li>zipdiff-0.2/build.xml</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/Option.class</li> <li>zipdiff-0.2/build/zipdiff.jar/zipdiff/ant/</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/BasicParser.class</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/OptionGroup.class</li> <li>zipdiff-0.2/src/main/zipdiff/output/</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/MissingOptionException.class</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/commons/cli/AlreadySelectedException.class</li> <li>zipdiff-0.2/build/commons-cli-1.0.jar/org/apache/</li> </ul> </td> </tr> </table> <TABLE CELLSPACING="1" CELLPADDING="3" WIDTH="100%" BORDER="0"> <tr> <td class="diffs" colspan="2">Changed (0 entries)</td> </tr> <tr> <td width="20"> </td> <td> </td> </tr> </table> <hr> Generated at Sun Jun 27 13:17:31 GMT-08:00 2004 </body> </html --- NEW FILE: output.xml --- <?xml version="1.0"?> <!-- $Header: /cvsroot/zipdiff/zipdiff/xdocs/output.xml,v 1.1 2004/06/27 22:02:53 sullis Exp $ --> <document> <properties> <title>Sample output</title> </properties> <body> <section name="Sample output"> <p> <li><a href="sample-output.html">HTML output</a></li> </p> </section> </body> </document> |
|
From: Sean S. <su...@us...> - 2004-06-27 21:48:50
|
Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff/ant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14435/src/main/zipdiff/ant Modified Files: ZipDiffTask.java Log Message: cleanup Index: ZipDiffTask.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/ant/ZipDiffTask.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ZipDiffTask.java 27 Jun 2004 21:45:36 -0000 1.6 --- ZipDiffTask.java 27 Jun 2004 21:48:38 -0000 1.7 *************** *** 11,16 **** import org.apache.tools.ant.Task; import org.apache.tools.ant.BuildException; - import java.io.File; - import java.io.FileOutputStream; /** --- 11,14 ---- *************** *** 82,87 **** String destfilename = getDestFile(); - FileOutputStream fos = null; - Builder builder = null; --- 80,83 ---- *************** *** 94,101 **** } - boolean bSuccessful = false; - builder.build(destfilename, d); - bSuccessful = true; } --- 90,94 ---- |
|
From: Sean S. <su...@us...> - 2004-06-27 21:46:45
|
Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff/output In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14124/src/main/zipdiff/output Modified Files: AbstractBuilder.java Log Message: added flush Index: AbstractBuilder.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/output/AbstractBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AbstractBuilder.java 27 Jun 2004 20:30:37 -0000 1.1 --- AbstractBuilder.java 27 Jun 2004 21:46:36 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- fos = new FileOutputStream(filename); build(fos, d); + fos.flush(); } |
|
From: Sean S. <su...@us...> - 2004-06-27 21:45:46
|
Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff/ant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14009/src/main/zipdiff/ant Modified Files: ZipDiffTask.java Log Message: Index: ZipDiffTask.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/ant/ZipDiffTask.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ZipDiffTask.java 27 Jun 2004 19:10:13 -0000 1.5 --- ZipDiffTask.java 27 Jun 2004 21:45:36 -0000 1.6 *************** *** 17,21 **** * * - * * @author Sean C. Sullivan * --- 17,20 ---- *************** *** 83,88 **** String destfilename = getDestFile(); - File f = new File(destfilename); - FileOutputStream fos = null; --- 82,85 ---- *************** *** 99,115 **** boolean bSuccessful = false; ! try { ! fos = new FileOutputStream(f); ! builder.build(fos, d); ! fos.flush(); ! bSuccessful = true; ! } finally { ! if (fos != null) { ! fos.close(); ! } ! if (!bSuccessful) { ! f.delete(); ! } ! } } --- 96,101 ---- boolean bSuccessful = false; ! builder.build(destfilename, d); ! bSuccessful = true; } |
|
From: Sean S. <su...@us...> - 2004-06-27 21:14:39
|
Update of /cvsroot/zipdiff/zipdiff/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9386/xdocs Modified Files: index.xml Log Message: Index: index.xml =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/xdocs/index.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** index.xml 27 Jun 2004 20:41:23 -0000 1.15 --- index.xml 27 Jun 2004 21:14:30 -0000 1.16 *************** *** 22,25 **** --- 22,28 ---- zipdiff is written in <a href="http://java.sun.com/">Java</a> </p> + <p> + The current version is 0.3 + </p> </section> |
|
From: Sean S. <su...@us...> - 2004-06-27 21:06:25
|
Update of /cvsroot/zipdiff/zipdiff/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7599/xdocs Modified Files: credits.xml Log Message: Index: credits.xml =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/xdocs/credits.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** credits.xml 12 Apr 2004 19:24:14 -0000 1.1 --- credits.xml 27 Jun 2004 21:06:14 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- <ul> <li>Sean C. Sullivan - founder of the zipdiff project</li> + <li>James Stewart - unit tests, improved command line options, documentation</li> </ul> </p> |
|
From: Sean S. <su...@us...> - 2004-06-27 20:53:34
|
Update of /cvsroot/zipdiff/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4832 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/build.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** build.xml 27 Jun 2004 20:39:51 -0000 1.12 --- build.xml 27 Jun 2004 20:53:25 -0000 1.13 *************** *** 110,113 **** --- 110,114 ---- <include name="readme.txt" /> <include name="*LICENSE*" /> + <include name="NOTICE.txt" /> </zipfileset> <zipfileset dir="${lib.dir}" prefix="${distrib.name}"> |
|
From: Sean S. <su...@us...> - 2004-06-27 20:52:49
|
Update of /cvsroot/zipdiff/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4675 Added Files: NOTICE.txt Log Message: --- NEW FILE: NOTICE.txt --- This product includes software developed by the Apache Software Foundation (http://www.apache.org/). |
|
From: Sean S. <su...@us...> - 2004-06-27 20:49:54
|
Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4159/src/main/zipdiff Modified Files: Differences.java Log Message: fixed bug in toString method Index: Differences.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/Differences.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Differences.java 9 Jun 2004 15:26:19 -0000 1.2 --- Differences.java 27 Jun 2004 20:49:46 -0000 1.3 *************** *** 125,129 **** sb.append(" )\n"); } ! int differenceCount = added.size() + changed.size() + changed.size(); sb.append("Total differences: " + differenceCount); --- 125,129 ---- sb.append(" )\n"); } ! int differenceCount = added.size() + changed.size() + removed.size(); sb.append("Total differences: " + differenceCount); |
|
From: Sean S. <su...@us...> - 2004-06-27 20:47:59
|
Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3759/src/main/zipdiff Modified Files: Main.java Log Message: Index: Main.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/Main.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Main.java 27 Jun 2004 20:31:10 -0000 1.9 --- Main.java 27 Jun 2004 20:47:50 -0000 1.10 *************** *** 31,35 **** private static final String OPTION_REGEX = "regex"; private static final String OPTION_EXIT_WITH_ERROR_ON_DIFF = "exitwitherrorondifference"; ! private static final String OPTION_DONT_SHOW_DIFFERENCES = "dontshowdifferences"; private static final Options options; --- 31,35 ---- private static final String OPTION_REGEX = "regex"; private static final String OPTION_EXIT_WITH_ERROR_ON_DIFF = "exitwitherrorondifference"; ! private static final String OPTION_VERBOSE = "verbose"; private static final Options options; *************** *** 83,92 **** "if a difference is found then exit with error " + EXITCODE_DIFF); ! Option dontShowDifferences = new Option( ! OPTION_DONT_SHOW_DIFFERENCES, ! OPTION_DONT_SHOW_DIFFERENCES, false, ! "dont show differences between zips"); options.addOption(compareTS); --- 83,92 ---- "if a difference is found then exit with error " + EXITCODE_DIFF); ! Option verboseOption = new Option( ! OPTION_VERBOSE, ! OPTION_VERBOSE, false, ! "verbose mode"); options.addOption(compareTS); *************** *** 97,101 **** options.addOption(ignoreCVSFilesOption); options.addOption(exitWithError); ! options.addOption(dontShowDifferences); options.addOption(outputFileOption); } --- 97,101 ---- options.addOption(ignoreCVSFilesOption); options.addOption(exitWithError); ! options.addOption(verboseOption); options.addOption(outputFileOption); } *************** *** 201,216 **** } ! boolean exitWithErrorOnDif = false; if (line.hasOption(OPTION_EXIT_WITH_ERROR_ON_DIFF)) { ! exitWithErrorOnDif = true; } - boolean dontShowDifferences = true; - if (line.hasOption(OPTION_DONT_SHOW_DIFFERENCES)) { - dontShowDifferences = true; - } - Differences d = calc.getDifferences(); - if (line.hasOption(OPTION_OUTPUT_FILE)) --- 201,210 ---- } ! boolean exitWithErrorOnDiff = false; if (line.hasOption(OPTION_EXIT_WITH_ERROR_ON_DIFF)) { ! exitWithErrorOnDiff = true; } Differences d = calc.getDifferences(); if (line.hasOption(OPTION_OUTPUT_FILE)) *************** *** 222,231 **** if (d.hasDifferences()) { ! if (!dontShowDifferences){ ! // bit of reverse logic so as not to break original functionality. System.out.println(d); System.out.println(d.getFilename1() + " and " + d.getFilename2() + " are different."); } ! if (exitWithErrorOnDif) { System.exit(EXITCODE_DIFF); } --- 216,224 ---- if (d.hasDifferences()) { ! if (line.hasOption(OPTION_VERBOSE)) { System.out.println(d); System.out.println(d.getFilename1() + " and " + d.getFilename2() + " are different."); } ! if (exitWithErrorOnDiff) { System.exit(EXITCODE_DIFF); } |
