Re: [JAKARTA NEWSLETTER DRAFT] News on 'Apache Ant' from May to June, 2003
[EMAIL PROTECTED] wrote: Dear Apache Ant Development Team, (http://ant.apache.org/) We are now preparing the 'Jakarta Newsletter Issue 9', news from May to June 2003, which would be published in the middle of July 2003. I added some blurb, but we cound list all our new committers. Whoever wants to get named, edit the wiki... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21296] New: - Some peephole optimizations
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21296. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21296 Some peephole optimizations Summary: Some peephole optimizations Product: Ant Version: 1.6Alpha (nightly) Platform: PC OS/Version: Linux Status: NEW Severity: Enhancement Priority: Other Component: Core AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] At least according to OptimizeIt, Ant doing an empty incremental build (i.e. nothing actually needs to be done but it doesn't know that yet) seems to spend a bunch of time matching paths, which is relatively concentrated code that should be optimizable. SelectorUtils methods in particular seemed to be called heavily - tokenizePath(String), and match(String,String,boolean). Try this patch; at least for me it seems to shave off a few percent from the user CPU usage. Tested on NetBeans sources, script nbbuild/build.xml, target all-web/advanced - this builds many subprojects, each of which typically runs javac and jar and a couple of other things. I tried to use Collections classes in place of Hashtable + Vector, maybe saving a little bit of useless synchronization. (If Ant sources can indeed assume JDK 1.2 now, there seems little reason to use the older and slower classes.) Ant also seems to waste a bunch of time cloning AntTypeDefinition's if you have a lot of subprojects, and generally copying every attribute and definition from the parent project to the child. Probably this kind of thing could be made lighter weight with an inheritance or copy-on-write model for the subproject, since typically the subproject will only define a few more properties and maybe a couple of tasks. But that is a potentially bigger code change that I didn't want to get into. Especially given the potential for breaking some rarely-used API contract relating to mutability or identity of some Hashtable returned from some method on Project etc. Project also wastes some time memory cloning its Vector of buildListeners every time it logs a message, which seems silly. Not even sure why any of that is synchronized at all, unless parallel relies on it. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21296] - Some peephole optimizations
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21296. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21296 Some peephole optimizations --- Additional Comments From [EMAIL PROTECTED] 2003-07-02 23:33 --- Created an attachment (id=7076) Possible patch; at least all the standard unit tests seem to pass - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21296] - Some peephole optimizations
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21296. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21296 Some peephole optimizations --- Additional Comments From [EMAIL PROTECTED] 2003-07-02 23:35 --- Oh, and heap usage was suffering from various classes creating collections (Hashtable's etc.) that they often never used. Patch simply changes some of the worst offenders to init the member only on demand. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21298] New: - Nested websphere element for ejbjar does not support spaces in file name.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21298. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21298 Nested websphere element for ejbjar does not support spaces in file name. Summary: Nested websphere element for ejbjar does not support spaces in file name. Product: Ant Version: 1.5.3 Platform: PC OS/Version: Windows NT/2K Status: NEW Severity: Normal Priority: Other Component: Optional Tasks AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] The nested websphere/ element for the ejbjar/ task does not support spaces in any of the ejbdeploy filename arguments (source, tempdir, or destination). The arguments are concatenated into a string, and the string is added in a single arguments.setLine(). [..optional.ejb.WebsphereDeploymentTool/Line 611]. A reasonable fix is to replace the line above with the following filename sensitive actions: javaTask.createArg().setValue(sourceJar.getPath()); javaTask.createArg().setValue(tempdir); javaTask.createArg().setValue(destJar.getPath()); javaTask.createArg().setLine(getOptions()); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [JAKARTA NEWSLETTER DRAFT] News on 'Apache Ant' from May to June, 2003
On Wed, 02 Jul 2003 16:26:21 -0700 (Subject: Re: [JAKARTA NEWSLETTER DRAFT] News on 'Apache Ant' from May to June, 2003) Steve Loughran [EMAIL PROTECTED] wrote: [EMAIL PROTECTED] wrote: Dear Apache Ant Development Team, (http://ant.apache.org/) We are now preparing the 'Jakarta Newsletter Issue 9', news from May to June 2003, which would be published in the middle of July 2003. I added some blurb, but we cound list all our new committers. Whoever wants to get named, edit the wiki... Very appreciative. Thank you Steve! If anyone want to add more comments, please go to http://nagoya.apache.org/wiki/apachewiki.cgi?JakartaNewsletterDrafts/Issue9 and fill in up what you want to append. Also, I really want the new committers' list to be more substantial :-) Sincerely, -- Tetsuya ([EMAIL PROTECTED]) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [JAKARTA NEWSLETTER DRAFT] News on 'Apache Ant' from May to June, 2003
On Thu, 3 Jul 2003 04:26 pm, Tetsuya Kitahata wrote: If anyone want to add more comments, please go to http://nagoya.apache.org/wiki/apachewiki.cgi?JakartaNewsletterDrafts/Issue9 and fill in up what you want to append. I've added to the general blurb. Conor - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21296] - Some peephole optimizations
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21296. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21296 Some peephole optimizations --- Additional Comments From [EMAIL PROTECTED] 2003-07-03 08:16 --- I will have a look at the copying of AntTypeDefinitions (I am guilty of this). The reason for copying the contents rather that just the pointer was to get a correct project reference. A previous version of the code used the wrong project and the solution was to copy the full definition. This is not good, I will have a look again at a different way to do this. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs UnzipTest.java
bodewig 2003/07/03 01:30:12
Modified:src/main/org/apache/tools/ant/taskdefs Expand.java
src/main/org/apache/tools/zip ZipFile.java
src/testcases/org/apache/tools/ant/taskdefs UnzipTest.java
Log:
Finish implementation of ZipFile, use it in Expand (AKA unzip).
Revision ChangesPath
1.44 +11 -41ant/src/main/org/apache/tools/ant/taskdefs/Expand.java
Index: Expand.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Expand.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Expand.java 23 Jun 2003 14:56:32 - 1.43
+++ Expand.java 3 Jul 2003 08:30:11 - 1.44
@@ -56,16 +56,13 @@
import java.io.File;
import java.io.FileInputStream;
-import java.io.RandomAccessFile;
import java.io.FileOutputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.IOException;
-import java.util.Arrays;
import java.util.Date;
+import java.util.Enumeration;
import java.util.Vector;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipEntry;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Project;
@@ -74,6 +71,8 @@
import org.apache.tools.ant.types.PatternSet;
import org.apache.tools.ant.types.selectors.SelectorUtils;
import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.zip.ZipEntry;
+import org.apache.tools.zip.ZipFile;
/**
* Unzip a file.
@@ -154,37 +153,13 @@
*/
protected void expandFile(FileUtils fileUtils, File srcF, File dir) {
log(Expanding: + srcF + into + dir, Project.MSG_INFO);
-ZipInputStream zis = null;
-FileInputStream fis = null;
-RandomAccessFile raf = null;
-byte[] buff = new byte[MARKER_SIZE];
+ZipFile zf = null;
try {
-raf = new RandomAccessFile(srcF, r);
-long offset = 0;
-int more = raf.read(buff);
-boolean foundMarker = false;
-while (more != -1 || offset MAX_LOOKAHEAD) {
-if (Arrays.equals(buff, ZIPMARKER)) {
-foundMarker = true;
-break;
-}
-raf.seek(++offset);
-more = raf.read(buff);
-}
-raf.close();
-raf = null;
-
-fis = new FileInputStream(srcF);
-if (foundMarker offset 0) {
-log(found a preamble of + offset
-+ bytes, probably a self-extracting archive);
-fis.skip(offset);
-}
-
-zis = new ZipInputStream(fis);
-ZipEntry ze = null;
-while ((ze = zis.getNextEntry()) != null) {
-extractFile(fileUtils, srcF, dir, zis,
+zf = new ZipFile(srcF, UTF8);
+Enumeration enum = zf.getEntries();
+while (enum.hasMoreElements()) {
+ZipEntry ze = (ZipEntry) enum.nextElement();
+extractFile(fileUtils, srcF, dir, zf.getInputStream(ze),
ze.getName(), new Date(ze.getTime()),
ze.isDirectory());
}
@@ -194,14 +169,9 @@
throw new BuildException(Error while expanding +
srcF.getPath(),
ioe);
} finally {
-if (raf != null) {
-try {
-raf.close();
-} catch (IOException e) {}
-}
-if (zis != null) {
+if (zf != null) {
try {
-zis.close();
+zf.close();
} catch (IOException e) {}
}
}
1.2 +87 -2 ant/src/main/org/apache/tools/zip/ZipFile.java
Index: ZipFile.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/zip/ZipFile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ZipFile.java 2 Jul 2003 14:36:14 - 1.1
+++ ZipFile.java 3 Jul 2003 08:30:11 - 1.2
@@ -63,6 +63,8 @@
import java.util.Date;
import java.util.Enumeration;
import java.util.Hashtable;
+import java.util.zip.Inflater;
+import java.util.zip.InflaterInputStream;
import java.util.zip.ZipException;
/**
@@ -202,7 +204,22 @@
*/
public InputStream getInputStream(ZipEntry ze)
throws IOException, ZipException {
-return null;
+Long start = (Long) dataOffsets.get(ze);
+if (start == null) {
+
cvs commit: ant/docs bylaws.html faq.html problems.html projects.html
bodewig 2003/07/03 01:33:54 Modified:docs bylaws.html faq.html problems.html projects.html Log: Strange whitespace changes after regenerating the site Revision ChangesPath 1.2 +3 -3 ant/docs/bylaws.html Index: bylaws.html === RCS file: /home/cvs/ant/docs/bylaws.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bylaws.html 2 Jul 2003 13:55:08 - 1.1 +++ bylaws.html 3 Jul 2003 08:33:53 - 1.2 @@ -348,7 +348,7 @@ should be clearly separated. Voting is carried out by replying to the vote mail. Voting may take four flavours /p - table class=ForrestTable cellspacing=1 cellpadding=4 + table class=ForrestTable cellspacing=1 cellpadding=4 tr td colspan=1 rowspan=1 valign=top align=left @@ -429,7 +429,7 @@ These are the types of approvals that can be sought. Different actions require different types of approvals /p - table class=ForrestTable cellspacing=1 cellpadding=4 + table class=ForrestTable cellspacing=1 cellpadding=4 tr td colspan=1 rowspan=1 valign=top align=left @@ -527,7 +527,7 @@ the project, the corresponding approval required for that action and those who have binding votes over the action. /p - table class=ForrestTable cellspacing=1 cellpadding=4 + table class=ForrestTable cellspacing=1 cellpadding=4 tr th colspan=1 rowspan=1 valign=top align=left 1.73 +2 -2 ant/docs/faq.html Index: faq.html === RCS file: /home/cvs/ant/docs/faq.html,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- faq.html 2 Jul 2003 13:55:08 - 1.72 +++ faq.html 3 Jul 2003 08:33:53 - 1.73 @@ -411,7 +411,7 @@ pThe first official release of Ant as a stand-alone product was Ant 1.1, released on 19 July 2000. The complete release history:/p - table class=ForrestTable cellspacing=1 cellpadding=4 + table class=ForrestTable cellspacing=1 cellpadding=4 tr th colspan=1 rowspan=1 valign=top align=left @@ -575,7 +575,7 @@ /p pA couple of switches are supported via magic properties:/p - table class=ForrestTable cellspacing=1 cellpadding=4 + table class=ForrestTable cellspacing=1 cellpadding=4 tr th colspan=1 rowspan=1 valign=top align=left 1.48 +2 -2 ant/docs/problems.html Index: problems.html === RCS file: /home/cvs/ant/docs/problems.html,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- problems.html 2 Jul 2003 13:55:09 - 1.47 +++ problems.html 3 Jul 2003 08:33:53 - 1.48 @@ -214,7 +214,7 @@ br /br / This will produce output that starts like the following:/p - table class=ForrestTable cellspacing=1 cellpadding=4 + table class=ForrestTable cellspacing=1 cellpadding=4 tr td colspan=1 rowspan=1 valign=top align=left @@ -263,7 +263,7 @@ arguments that will get passed to the compiler, and a list of all the class files to be compiled. /p - table class=ForrestTable cellspacing=1 cellpadding=4 + table class=ForrestTable cellspacing=1 cellpadding=4 tr td colspan=1 rowspan=1 valign=top align=left 1.44 +10 -10ant/docs/projects.html Index: projects.html === RCS file: /home/cvs/ant/docs/projects.html,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- projects.html 2 Jul 2003 13:55:09 - 1.43 +++ projects.html 3 Jul 2003 08:33:53 - 1.44 @@ -185,7 +185,7 @@ a CASE-tool and generates classes and deployable components (J2EE or other) specific for your application
DO NOT REPLY [Bug 10504] - encoding support of unzip task
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10504. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10504 encoding support of unzip task [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] AssignedTo|[EMAIL PROTECTED] |[EMAIL PROTECTED] Target Milestone|--- |1.6 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs UntarTest.java UnzipTest.java
bodewig 2003/07/03 06:02:01 Modified:.WHATSNEW docs/manual/CoreTasks unzip.html src/etc/testcases/taskdefs untar.xml unzip.xml src/main/org/apache/tools/ant/taskdefs Expand.java Untar.java src/testcases/org/apache/tools/ant/taskdefs UntarTest.java UnzipTest.java Log: Add support for filename-encodings other than UTF8 to untar. PR: 10504 Revision ChangesPath 1.450 +4 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.449 retrieving revision 1.450 diff -u -r1.449 -r1.450 --- WHATSNEW 30 Jun 2003 10:41:00 - 1.449 +++ WHATSNEW 3 Jul 2003 13:02:00 - 1.450 @@ -453,6 +453,10 @@ * FileUtils#createTempFile will now create temporary files in the directory pointed to by the property java.io.tmpdir +* unzip and friends now supports an optional encoding attribute to + enable it to expand archives created with filenames using an encoding + other than UTF8. Bugzilla Report 10504. + Changes from Ant 1.5.2 to Ant 1.5.3 === 1.12 +18 -4 ant/docs/manual/CoreTasks/unzip.html Index: unzip.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/unzip.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- unzip.html4 Sep 2002 11:05:16 - 1.11 +++ unzip.html3 Jul 2003 13:02:01 - 1.12 @@ -46,11 +46,25 @@ /tr tr td valign=topcompression/td -td valign=topcompression method for untar. Allowable values are - quot;nonequot;, quot;gzipquot; and quot;bzip2quot;. Default is - quot;nonequot;./td +td valign=topbNote:/b This attribute is only available for +the codeuntar/code task.br +compression method. Allowable values are quot;nonequot;, +quot;gzipquot; and quot;bzip2quot;. Default is +quot;nonequot;./td td valign=top align=centerNo/td /tr + tr +td valign=topencoding/td +td valign=topbNote:/b This attribute is not available for +the codeuntar/code task.br +The character encoding that has been used for filenames +inside the zip file. For a list of possible values see a + href=http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html;http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html/a.br +Defaults to quot;UTF8quot;, use the magic value +codenative-encoding/code for the platform's default character +encoding./td +td align=center valign=topNo/td + /tr /table h3Examples/h3 @@ -89,7 +103,7 @@ /pre/p /blockquote hr -p align=centerCopyright copy; 2000-2002 Apache Software Foundation. All rights +p align=centerCopyright copy; 2000-2003 Apache Software Foundation. All rights Reserved./p /body 1.4 +3 -0 ant/src/etc/testcases/taskdefs/untar.xml Index: untar.xml === RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/untar.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- untar.xml 24 Apr 2002 03:09:06 - 1.3 +++ untar.xml 3 Jul 2003 13:02:01 - 1.4 @@ -41,4 +41,7 @@ untar src=. dest=. / /target + target name=encoding +untar src=expected/asf-logo.gif.tar dest=. encoding=foo/ + /target /project 1.7 +9 -0 ant/src/etc/testcases/taskdefs/unzip.xml Index: unzip.xml === RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/unzip.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- unzip.xml 23 Jun 2003 14:47:02 - 1.6 +++ unzip.xml 3 Jul 2003 13:02:01 - 1.7 @@ -78,4 +78,13 @@ /unzip /target + !-- Bugzilla Report 10504 -- + target name=encodingTest +mkdir dir=unziptestin/ +touch file=unziptestin/foo/ +zip zipfile=unziptest.zip basedir=unziptestin encoding=UTF16/ +mkdir dir=unziptestout/ +unzip src=unziptest.zip dest=unziptestout encoding=UTF16/ + /target + /project 1.45 +20 -4 ant/src/main/org/apache/tools/ant/taskdefs/Expand.java Index: Expand.java === RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Expand.java,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- Expand.java 3 Jul 2003 08:30:11 - 1.44 +++ Expand.java 3 Jul 2003 13:02:01 - 1.45 @@
DO NOT REPLY [Bug 10504] - encoding support of unzip task
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10504. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10504 encoding support of unzip task [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2003-07-03 13:05 --- A new optional encoding attribute for unzip is available starting with nichtly build 2003-07-04. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: New Laucher
On Tue, 1 Jul 2003, Conor MacNeill [EMAIL PROTECTED] wrote: On Tue, 1 Jul 2003 10:02 pm, Stefan Bodewig wrote: The only thing I've stumbled over for now is the almost duplicate code of Locator#getClassLocationURL and oata.util.LoaderUtils#getClassSource I wanted to keep the dependencies between Ant proper and the launcher to a minimum. OK, and agreed. I don't think the current code would be good candidate for that due to its coupling to FileUtils. It's JDK 1.1 legacy as far as I'm concerned and could those be swapped against the commented Axis' code. although I'm a bit leery of the url.openConnection(). Looking at the top of JavaURLConnection's javadocs, simply stripping the leading jar: and everything after the first ! (if present) should be sufficient to replace the call to getJarFile. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21308] New: - zip looses stored permissions when you update existing archive
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21308. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21308 zip looses stored permissions when you update existing archive Summary: zip looses stored permissions when you update existing archive Product: Ant Version: 1.6Alpha (nightly) Platform: All OS/Version: All Status: NEW Severity: Normal Priority: Other Component: Core tasks AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] CC: [EMAIL PROTECTED] The following snippet target name=zip delete file=a.zip/ touch file=a/ zip zipfile=a.zip zipfileset dir=. filemode=755 includes=a/ /zip touch file=b/ zip zipfile=a.zip update=true fileset dir=. includes=b/ /zip /target will create an archive in which a has not the filemode 755 - before updating the archive it has. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/etc/checkstyle RequiredHeader.txt checkstyle-config checkstyle-frames.xsl checkstyle-text.xsl checkstyle-xdoc.xsl
conor 2003/07/03 06:59:51
Modified:.check.xml
Added: src/etc/checkstyle RequiredHeader.txt checkstyle-config
checkstyle-frames.xsl checkstyle-text.xsl
checkstyle-xdoc.xsl
Removed: src/etc RequiredHeader.txt checkstyle-frames.xsl
Log:
Checkstyle update
I've updated the checkstyle buildfile (check.xml) to the
latest version of checkstyle. I've also updated
the HTML stylesheet and created two new stylesheets to render
the checkstyle report in plain text and the xdoc format we
use for the other Ant documentation.
I've also moved the checkstyle related stuff into its own area.
Revision ChangesPath
1.6 +44 -8 ant/check.xml
Index: check.xml
===
RCS file: /home/cvs/ant/check.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -u -r1.5 -r1.6
--- check.xml 14 Apr 2003 11:58:02 - 1.5
+++ check.xml 3 Jul 2003 13:59:49 - 1.6
@@ -1,20 +1,56 @@
-project default=checkstyle name=CheckAnt
- property name=java.dir value=src/main/
+?xml version=1.0?
+project default=htmlreport name=CheckAnt
+!-- import file=build.xml/ --
+ property name=src.dir value=src/
+ property name=java.dir value=${src.dir}/main/
+ property name=etc.dir value=${src.dir}/etc/
+ property name=config.dir value=${etc.dir}/checkstyle/
+ property name=build.dir value=build/
+
+ property name=checkstyle.reportdir
value=${build.dir}/reports/checkstyle/
+ property name=checkstyle.raw value=${checkstyle.reportdir}/raw.xml/
+ property name=stylesheet.html
value=${config.dir}/checkstyle-frames.xsl/
+ property name=stylesheet.text
value=${config.dir}/checkstyle-text.xsl/
+ property name=stylesheet.xdoc
value=${config.dir}/checkstyle-xdoc.xsl/
+
+ property name=checkstyle.basedir location=${java.dir}/
+
+ !-- Ant Checkstyle report --
property name=tocheck value=**/*.java/
property name=javadoc.scope value=public/
target name=checkstyle
-taskdef name=checkstyle
- classname=com.puppycrawl.tools.checkstyle.CheckStyleTask/
-checkstyle headerFile=src/etc/RequiredHeader.txt
-headerIgnoreLine=4
-allowProtected=true
-javadocScope=${javadoc.scope}
+mkdir dir=${checkstyle.reportdir}/
+taskdef resource=checkstyletask.properties/
+checkstyle config=${config.dir}/checkstyle-config
failOnViolation=false
+ formatter type=xml toFile=${checkstyle.raw}/
fileset dir=${java.dir}
include name=${tocheck}/
/fileset
/checkstyle
/target
+
+ target name=htmlreport
+mkdir dir=${checkstyle.reportdir}/
+style in=${checkstyle.raw} style=${stylesheet.html}
+ out=${checkstyle.reportdir}/html/output.txt
+ param name=basedir expression=${checkstyle.basedir}/
+/style
+ /target
+
+ target name=textreport
+style in=${checkstyle.raw} style=${stylesheet.text}
+ out=${checkstyle.reportdir}/report.txt
+/style
+ /target
+
+ target name=xdocreport
+style in=${checkstyle.raw} style=${stylesheet.xdoc}
+ out=${checkstyle.reportdir}/xdocs/index.xml
+ param name=basedir expression=${checkstyle.basedir}/
+/style
+ /target
+
/project
1.1 ant/src/etc/checkstyle/RequiredHeader.txt
Index: RequiredHeader.txt
===
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 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 acknowlegement:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names Ant and Apache Software
*Foundation must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
Checkstyle Audit
I've done a checkstyle audit with the new xdoc generating stylesheets and uploaded this to the server http://ant.apache.org/reports/checkstyle/ It's not linked into the rest of the site (nor is it in CVS). It's mainly just for interest at the moment. It does show which files are good candidates for some cleanup action :-). BTW, this is checkstyle on maximum volume. I'll probably turn it down a bit a little later on. It is too late to fix some of our code now, for backward compatibility reasons, so I'll be trying to focus on what can be fixed. If you hover over a line in the detail report it will show which checkstyle module triggered the report. Conor - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: New Laucher
On Thu, 3 Jul 2003 11:16 pm, Stefan Bodewig wrote: It's JDK 1.1 legacy as far as I'm concerned and could those be swapped against the commented Axis' code. OK, let's do that Looking at the top of JavaURLConnection's javadocs, simply stripping the leading jar: and everything after the first ! (if present) should be sufficient to replace the call to getJarFile. +1 Conor - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/zip ZipFile.java
bodewig 2003/07/03 07:59:59 Modified:src/main/org/apache/tools/zip ZipFile.java Log: Calendar.HOUR is different from Calendar.HOUR_OF_DAY Revision ChangesPath 1.3 +2 -2 ant/src/main/org/apache/tools/zip/ZipFile.java Index: ZipFile.java === RCS file: /home/cvs/ant/src/main/org/apache/tools/zip/ZipFile.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ZipFile.java 3 Jul 2003 08:30:11 - 1.2 +++ ZipFile.java 3 Jul 2003 14:59:59 - 1.3 @@ -409,7 +409,7 @@ cal.set(Calendar.YEAR, (int) ((dosTime 25) 0x7f) + 1980); cal.set(Calendar.MONTH, (int) ((dosTime 21) 0x0f) - 1); cal.set(Calendar.DATE, (int) (dosTime 16) 0x1f); -cal.set(Calendar.HOUR, (int) (dosTime 11) 0x1f); +cal.set(Calendar.HOUR_OF_DAY, (int) (dosTime 11) 0x1f); cal.set(Calendar.MINUTE, (int) (dosTime 5) 0x3f); cal.set(Calendar.SECOND, (int) (dosTime 1) 0x3e); return cal.getTime(); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/zip ZipEntry.java
bodewig 2003/07/03 08:00:36
Modified:src/main/org/apache/tools/zip ZipEntry.java
Log:
Need to override isDirectory for situations where setName has been called
Revision ChangesPath
1.10 +17 -1 ant/src/main/org/apache/tools/zip/ZipEntry.java
Index: ZipEntry.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/zip/ZipEntry.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ZipEntry.java 2 Jul 2003 14:36:14 - 1.9
+++ ZipEntry.java 3 Jul 2003 15:00:36 - 1.10
@@ -234,6 +234,15 @@
}
/**
+ * Unix permission.
+ *
+ * @since Ant 1.6
+ */
+public int getUnixMode() {
+return (int) ((getExternalAttributes() 16) 0x);
+}
+
+/**
* Platform specification to put into the quot;version made
* byquot; part of the central file header.
*
@@ -402,6 +411,13 @@
*/
public String getName() {
return name == null ? super.getName() : name;
+}
+
+/**
+ * @since 1.10
+ */
+public boolean isDirectory() {
+ return getName().endsWith(/);
}
protected void setName(String name) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: Checkstyle Audit
Excellent work.
I have a problem with three rules:
major: The DesignForExtensionCheck seems a bit silly.
minor: The LeftCurlyCheck is against my in-house rule that
if there is a multi line condition, the { should be
on a separate line - but I can live the rule.
minor: RedundantThrowsCheck: It complains about BuildException.
Peter
On Thu, 2003-07-03 at 15:26, Conor MacNeill wrote:
I've done a checkstyle audit with the new xdoc generating stylesheets and
uploaded this to the server
http://ant.apache.org/reports/checkstyle/
It's not linked into the rest of the site (nor is it in CVS). It's mainly
just
for interest at the moment. It does show which files are good candidates for
some cleanup action :-).
BTW, this is checkstyle on maximum volume. I'll probably turn it down a bit a
little later on. It is too late to fix some of our code now, for backward
compatibility reasons, so I'll be trying to focus on what can be fixed.
If you hover over a line in the detail report it will show which checkstyle
module triggered the report.
Conor
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: Checkstyle Audit
On 03 Jul 2003, peter reilly [EMAIL PROTECTED] wrote:
minor: The LeftCurlyCheck is against my in-house rule that
if there is a multi line condition, the { should be
on a separate line - but I can live the rule.
You inhouse rule is against Ant's coding style, which comes from here
http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html 8-)
Stefan
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/zip ZipEntry.java ZipFile.java
bodewig 2003/07/03 08:38:40
Modified:src/main/org/apache/tools/zip ZipEntry.java ZipFile.java
Log:
Improve algorithm that searches for the central directory - don't get fooled
by signatures appearing inside payload.
Revision ChangesPath
1.11 +2 -2 ant/src/main/org/apache/tools/zip/ZipEntry.java
Index: ZipEntry.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/zip/ZipEntry.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ZipEntry.java 3 Jul 2003 15:00:36 - 1.10
+++ ZipEntry.java 3 Jul 2003 15:38:39 - 1.11
@@ -417,7 +417,7 @@
* @since 1.10
*/
public boolean isDirectory() {
- return getName().endsWith(/);
+return getName().endsWith(/);
}
protected void setName(String name) {
1.4 +39 -11ant/src/main/org/apache/tools/zip/ZipFile.java
Index: ZipFile.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/zip/ZipFile.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ZipFile.java 3 Jul 2003 14:59:59 - 1.3
+++ ZipFile.java 3 Jul 2003 15:38:39 - 1.4
@@ -320,15 +320,42 @@
}
}
+private static final int MIN_EOCD_SIZE =
+/* end of central dir signature*/ 4 +
+/* number of this disk */ 2 +
+/* number of the disk with the */ +
+/* start of the central directory */ 2 +
+/* total number of entries in */ +
+/* the central dir on this disk*/ 2 +
+/* total number of entries in */ +
+/* the central dir */ 2 +
+/* size of the central directory */ 4 +
+/* offset of start of central */ +
+/* directory with respect to */ +
+/* the starting disk number*/ 4 +
+/* zipfile comment length */ 2;
+
+private static final int CFD_LOCATOR_OFFSET =
+/* end of central dir signature*/ 4 +
+/* number of this disk */ 2 +
+/* number of the disk with the */ +
+/* start of the central directory */ 2 +
+/* total number of entries in */ +
+/* the central dir on this disk*/ 2 +
+/* total number of entries in */ +
+/* the central dir */ 2 +
+/* size of the central directory */ 4;
+
/**
- * Searches for the first occurence of the central file header
- * signature.
+ * Searches for the quot;End of central dir recordquot;, parses
+ * it and positions the stream at the first central directory
+ * record.
*/
private void positionAtCentralDirectory()
throws IOException, ZipException {
-archive.seek(0);
-int off = 0;
-byte[] sig = ZipOutputStream.CFH_SIG.getBytes();
+long off = archive.length() - MIN_EOCD_SIZE;
+archive.seek(off);
+byte[] sig = ZipOutputStream.EOCD_SIG.getBytes();
int curr = archive.read();
boolean found = false;
while (curr != -1) {
@@ -344,16 +371,17 @@
}
}
}
-archive.seek(++off);
-} else {
-off++;
}
+archive.seek(--off);
curr = archive.read();
}
if (!found) {
throw new ZipException(archive is not a ZIP archive);
}
-archive.seek(off);
+archive.seek(off + CFD_LOCATOR_OFFSET);
+byte[] cfdOffset = new byte[4];
+archive.readFully(cfdOffset);
+archive.seek((new ZipLong(cfdOffset)).getValue());
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/types ZipFileSet.java ZipScanner.java
bodewig 2003/07/03 08:43:09
Modified:src/main/org/apache/tools/ant/taskdefs Zip.java
src/main/org/apache/tools/ant/types ZipFileSet.java
ZipScanner.java
Log:
Base zip and zipfileset on new ZipFile code.
This happens mainly for two reasons:
* preserve stored permissions unless the user explicitly overrides them
(PR 2130). This is now fixed for stored files, but not for directories.
* deal with filename encoding of existing archives. Supposed to work
properly now.
Revision ChangesPath
1.108 +14 -6 ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- Zip.java 25 Jun 2003 11:52:46 - 1.107
+++ Zip.java 3 Jul 2003 15:43:09 - 1.108
@@ -66,7 +66,6 @@
import java.util.Stack;
import java.util.Vector;
import java.util.zip.CRC32;
-import java.util.zip.ZipFile;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
@@ -85,6 +84,7 @@
import org.apache.tools.ant.util.MergingMapper;
import org.apache.tools.ant.util.ResourceUtils;
import org.apache.tools.zip.ZipEntry;
+import org.apache.tools.zip.ZipFile;
import org.apache.tools.zip.ZipOutputStream;
/**
@@ -362,6 +362,7 @@
log(Adding file + files[j] + to fileset,
Project.MSG_VERBOSE);
ZipFileSet zf = new ZipFileSet();
+zf.setProject(getProject());
zf.setSrc(new File(basedir, files[j]));
filesets.addElement(zf);
filesetsFromGroupfilesets.addElement(zf);
@@ -439,6 +440,7 @@
if (doUpdate) {
addingNewFiles = false;
ZipFileSet oldFiles = new ZipFileSet();
+oldFiles.setProject(getProject());
oldFiles.setSrc(renamedFile);
for (int i = 0; i addedFiles.size(); i++) {
@@ -447,6 +449,7 @@
}
DirectoryScanner ds =
oldFiles.getDirectoryScanner(getProject());
+((ZipScanner) ds).setEncoding(encoding);
String[] f = ds.getIncludedFiles();
Resource[] r = new Resource[f.length];
for (int i = 0; i f.length; i++) {
@@ -575,7 +578,7 @@
dealingWithFiles = true;
base = fileset.getDir(getProject());
} else {
-zf = new ZipFile(zfs.getSrc(getProject()));
+zf = new ZipFile(zfs.getSrc(getProject()), encoding);
}
for (int i = 0; i resources.length; i++) {
@@ -595,17 +598,18 @@
}
addParentDirs(base, name, zOut, prefix, dirMode);
-
+
if (!resources[i].isDirectory() dealingWithFiles) {
File f = fileUtils.resolveFile(base,
resources[i].getName());
zipFile(f, zOut, prefix + name, fileMode);
} else if (!resources[i].isDirectory()) {
-java.util.zip.ZipEntry ze =
-zf.getEntry(resources[i].getName());
+ZipEntry ze = zf.getEntry(resources[i].getName());
if (ze != null) {
zipFile(zf.getInputStream(ze), zOut, prefix + name,
-ze.getTime(), zfs.getSrc(getProject()),
fileMode);
+ze.getTime(), zfs.getSrc(getProject()),
+zfs.hasFileModeBeenSet() ? fileMode
+ : ze.getUnixMode());
}
}
}
@@ -673,6 +677,7 @@
private synchronized ZipScanner getZipScanner() {
if (zs == null) {
zs = new ZipScanner();
+zs.setEncoding(encoding);
zs.setSrc(zipFile);
}
return zs;
@@ -849,6 +854,9 @@
for (int i = 0; i filesets.length; i++) {
DirectoryScanner rs =
filesets[i].getDirectoryScanner(getProject());
+if (rs instanceof ZipScanner) {
+((ZipScanner) rs).setEncoding(encoding);
+}
Vector resources = new Vector();
String[] directories = rs.getIncludedDirectories();
for (int j = 0; j directories.length; j++) {
1.21 +35 -4
Re: Checkstyle Audit
I know ...
Ah well,
Peter
On Thu, 2003-07-03 at 16:30, Stefan Bodewig wrote:
On 03 Jul 2003, peter reilly [EMAIL PROTECTED] wrote:
minor: The LeftCurlyCheck is against my in-house rule that
if there is a multi line condition, the { should be
on a separate line - but I can live the rule.
You inhouse rule is against Ant's coding style, which comes from here
http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html 8-)
Stefan
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: Checkstyle Audit
minor: RedundantThrowsCheck: It complains about BuildException. So is it prefered to eliminate the throws BuildException? or keep it? I'm willing to fix my code if I know what is actually desired here. Gus - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21315] New: - Jar Update Gives Error
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21315.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21315
Jar Update Gives Error
Summary: Jar Update Gives Error
Product: Ant
Version: 1.4
Platform: PC
OS/Version: Other
Status: NEW
Severity: Major
Priority: Other
Component: Core tasks
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
When I do a jar update to the existing jar, I am getting an error Unable to
rename old file to temporary file. Here is how my target looks like:
target name=Update_JAR depends=compile_java
jar jarfile=${dist.dir}/${jar.name}.jar compress=no update=true
fileset dir=${release.dir_root}/${release.dir_name}
includes=com/carreker/**/
/jar
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21316] New: - [PATCH] eliminate most checkstyle errors in symlink.java
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21316. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21316 [PATCH] eliminate most checkstyle errors in symlink.java Summary: [PATCH] eliminate most checkstyle errors in symlink.java Product: Ant Version: 1.6Alpha (nightly) Platform: Other OS/Version: Other Status: NEW Severity: Normal Priority: Other Component: Optional Tasks AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] this should fix everything but the complaints about throws BuildException, the design for extension checks. And a magic number complaint that would only confuse the issue if I changed it. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21316] - [PATCH] eliminate most checkstyle errors in symlink.java
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21316. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21316 [PATCH] eliminate most checkstyle errors in symlink.java --- Additional Comments From [EMAIL PROTECTED] 2003-07-03 16:58 --- Created an attachment (id=7087) patch with checkstyle fixes - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 19897] - Patch to implement the namespaced antlib + other changes
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19897. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19897 Patch to implement the namespaced antlib + other changes --- Additional Comments From [EMAIL PROTECTED] 2003-07-03 17:15 --- Created an attachment (id=7088) tar.gz file contains patches to implement ant-type polymorhic attribute - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 19897] - Patch to implement the namespaced antlib + other changes
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19897. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19897 Patch to implement the namespaced antlib + other changes --- Additional Comments From [EMAIL PROTECTED] 2003-07-03 17:18 --- Patch 7088 is the third step in decoupling the overall patch The patch is in tar.gz format. This patch implements: - addConfigured(Type) to introspection rules - ant-type magic polymorhic attribute - allow types that have Project as a constructor to be used in addName(Type) and addConfiguredName(Type) methods - allow addName and addConfiguredName methods to have higher presedence that createName() methods. Changed Files: the diff is contains in the file poly.diff using cvs diff -u changed files = = Changed Files = src/main/org/apache/tools/ant/IntrospectionHelper.java - combine setter and creater objects - return a creator object to create and set the object - poly type changes src/main/org/apache/tools/ant/RuntimeConfigurable.java - use ant-type attribute - use creator.store src/main/org/apache/tools/ant/UnknownElement.java - call IntrospectionHelper#getElementCreator = = New Files = src/etc/testcases/types/poly.xml test cases for ant-type polymorphic src/testcases/org/apache/tools/ant/types/PolyTest.java test cases for ant-type polymorphic - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21319] New: - [PATCH] fix checkstyle errors in chmod/chgrp and their superclass
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21319. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21319 [PATCH] fix checkstyle errors in chmod/chgrp and their superclass Summary: [PATCH] fix checkstyle errors in chmod/chgrp and their superclass Product: Ant Version: 1.6Alpha (nightly) Platform: Other OS/Version: Other Status: NEW Severity: Normal Priority: Other Component: Optional Tasks AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] More checkstyle fixes. Should fix everyting but the design for extensibility complaint. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21319] - [PATCH] fix checkstyle errors in chmod/chgrp and their superclass
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21319. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21319 [PATCH] fix checkstyle errors in chmod/chgrp and their superclass --- Additional Comments From [EMAIL PROTECTED] 2003-07-03 17:45 --- Created an attachment (id=7089) patch to fix checkstyle errors - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21315] - Jar Update Gives Error
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21315. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21315 Jar Update Gives Error [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED | --- Additional Comments From [EMAIL PROTECTED] 2003-07-03 17:57 --- Even after updating to 1.5.3, i am getting the same error. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21320] New: - Copy task ignores all but first file returned by FileNameMapper
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21320.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21320
Copy task ignores all but first file returned by FileNameMapper
Summary: Copy task ignores all but first file returned by
FileNameMapper
Product: Ant
Version: 1.5.3
Platform: All
URL: n.a.
OS/Version: All
Status: NEW
Severity: Normal
Priority: Other
Component: Core
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
The documentation for org.apache.tools.ant.util.FileNameMapper states Used to
find the name of the target file(s) corresponding to a source file. Note the
use of the word file(s).
Further the API:
java.lang.String[] mapFileName(java.lang.String sourceFileName)
shows that you can map a single file name to many.
However, the copy task ignores all but the first mapped file name. See line
489 of 1.5.3-1 source for org.apache.tools.ant.taskdefs.Copy:
for (int i = 0; i toCopy.length; i++) {
File src = new File(fromDir, toCopy[i]);
File dest = new File(toDir, mapper.mapFileName(toCopy[i])[0]);
map.put(src.getAbsolutePath(), dest.getAbsolutePath());
}
Copy and potentially other tasks that know about mappers should be fixed to
fulfill the expectations set by the FileNameMapper javadoc and API declaration.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21320] - Copy task ignores all but first file returned by FileNameMapper
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21320. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21320 Copy task ignores all but first file returned by FileNameMapper --- Additional Comments From [EMAIL PROTECTED] 2003-07-03 20:05 --- I could try to fix this problem, but I would be glad to see what other committers think about that first. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21298] - Nested websphere element for ejbjar does not support spaces in file name.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21298. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21298 Nested websphere element for ejbjar does not support spaces in file name. --- Additional Comments From [EMAIL PROTECTED] 2003-07-03 20:11 --- Created an attachment (id=7091) Corrected WebsphereDeploymentTool.java implementation. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21316] - [PATCH] eliminate most checkstyle errors in symlink.java
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21316. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21316 [PATCH] eliminate most checkstyle errors in symlink.java [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2003-07-03 20:51 --- Patch submitted, thanks. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21319] - [PATCH] fix checkstyle errors in chmod/chgrp and their superclass
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21319. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21319 [PATCH] fix checkstyle errors in chmod/chgrp and their superclass [EMAIL PROTECTED] changed: What|Removed |Added AssignedTo|[EMAIL PROTECTED] |[EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/unix Chgrp.java AbstractAccessTask.java Chown.java
antoine 2003/07/03 13:56:16
Modified:src/main/org/apache/tools/ant/taskdefs/optional/unix
Chgrp.java AbstractAccessTask.java Chown.java
Log:
checkstyle fixes
PR: 21319
Submitted by: Patrick G. Heck (gus dot heck at olin dot edu)
Revision ChangesPath
1.3 +12 -6
ant/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.java
Index: Chgrp.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Chgrp.java10 Feb 2003 14:14:28 - 1.2
+++ Chgrp.java3 Jul 2003 20:56:15 - 1.3
@@ -70,7 +70,7 @@
/**
* Chgrp equivalent for unix-like environments.
*
- * @author Patrick G. Heck
+ * @author Patrick G. Heck
* a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/a
*
* @since Ant 1.6
@@ -98,20 +98,26 @@
haveGroup = true;
}
+/**
+ * Ensure that all the required arguments and other conditions have
+ * been set.
+ */
protected void checkConfiguration() {
if (!haveGroup) {
-throw new BuildException(Required attribute group not set in +
- chgrp, getLocation());
+throw new BuildException(Required attribute group not set in
+ + chgrp, getLocation());
}
super.checkConfiguration();
}
/**
* We don't want to expose the executable atribute, so overide it.
+ *
+ * @param e User supplied executable that we won't accept.
*/
public void setExecutable(String e) {
-throw new BuildException(taskType +
- doesn\'t support the executable
attribute,
- getLocation());
+throw new BuildException(taskType
+ + doesn\'t support the executable
+ + attribute, getLocation());
}
}
1.7 +21 -4
ant/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java
Index: AbstractAccessTask.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractAccessTask.java 23 May 2003 13:40:37 - 1.6
+++ AbstractAccessTask.java 3 Jul 2003 20:56:15 - 1.7
@@ -73,12 +73,14 @@
import org.apache.tools.ant.types.FileSet;
/**
- * @author Patrick G. Heck a href=mailto:[EMAIL PROTECTED][EMAIL
PROTECTED]/a
+ * @author Patrick G. Heck
+ * a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/a
* @since Ant 1.6
*
* @ant.task category=filesystem
*/
-public abstract class AbstractAccessTask
+
+public abstract class AbstractAccessTask
extends org.apache.tools.ant.taskdefs.ExecuteOn {
/**
@@ -89,6 +91,9 @@
super.setSkipEmptyFilesets(true);
}
+/**
+ * Set the file which should have its access attributes modified.
+ */
public void setFile(File src) {
FileSet fs = new FileSet();
fs.setFile(src);
@@ -96,16 +101,22 @@
}
/**
+ * Prevent the user from specifying a different command.
+ *
* @ant.attribute ignore=true
+ * @param cmdl A user supplied command line that we won't accept.
*/
public void setCommand(Commandline cmdl) {
-throw new BuildException(taskType +
- doesn\'t support the command attribute,
+throw new BuildException(taskType
+ + doesn\'t support the command attribute,
getLocation());
}
/**
+ * Prevent the skipping of empty filesets
+ *
* @ant.attribute ignore=true
+ * @param skip A user supplied boolean we won't accept.
*/
public void setSkipEmptyFilesets(boolean skip) {
throw new BuildException(taskType + doesn\'t support the
@@ -114,13 +125,19 @@
}
/**
+ * Prevent the use of the addsourcefile atribute.
+ *
* @ant.attribute ignore=true
+ * @param b A user supplied boolean we won't accept.
*/
public void setAddsourcefile(boolean b) {
throw new BuildException(getTaskType()
+ doesn\'t support the addsourcefile attribute,
getLocation());
}
+/**
+ * Automatically approve Unix OS's.
+ */
protected boolean isValidOs() {
return Os.isFamily(unix)
DO NOT REPLY [Bug 21298] - Nested websphere element for ejbjar does not support spaces in file name.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21298. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21298 Nested websphere element for ejbjar does not support spaces in file name. [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] AssignedTo|[EMAIL PROTECTED] |[EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21316] - [PATCH] eliminate most checkstyle errors in symlink.java
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21316. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21316 [PATCH] eliminate most checkstyle errors in symlink.java [EMAIL PROTECTED] changed: What|Removed |Added Target Milestone|--- |1.6 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21320] - Copy task ignores all but first file returned by FileNameMapper
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21320. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21320 Copy task ignores all but first file returned by FileNameMapper --- Additional Comments From [EMAIL PROTECTED] 2003-07-03 21:17 --- It is a good idea that you prepare patches against HEAD. Since these patches will induce a change of behavior of the tasks, it might be good to add a new flag to the copy task called for instance ignoredoublemappings and set it to true by default. This way in the normal case only the first mapping will be used, leaving the behavior of the task intact. If you do copy ignoredoublemappings=false/ then copy/ will use all mappings. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb WebsphereDeploymentTool.java
antoine 2003/07/03 14:48:07
Modified:src/main/org/apache/tools/ant/taskdefs/optional/ejb
WebsphereDeploymentTool.java
Log:
Nested websphere element for ejbjar does not support spaces in file name.
This commit addresses this issue
PR: 21298
Submitted by: Lee Carver (leeca at pnambic dot com)
Revision ChangesPath
1.22 +8 -16
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
Index: WebsphereDeploymentTool.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- WebsphereDeploymentTool.java 25 Jun 2003 11:52:47 - 1.21
+++ WebsphereDeploymentTool.java 3 Jul 2003 21:48:06 - 1.22
@@ -573,19 +573,6 @@
private void buildWebsphereJar(File sourceJar, File destJar) {
try {
if (ejbdeploy) {
-String args =
- + sourceJar.getPath() +
- + tempdir +
- + destJar.getPath() +
- + getOptions();
-
-if (getCombinedClasspath() != null
getCombinedClasspath().toString().length() 0) {
-args += -cp + getCombinedClasspath();
-}
-
-// Why do my 's get stripped away???
-log(EJB Deploy Options: + args, Project.MSG_VERBOSE);
-
Java javaTask = (Java)
getTask().getProject().createTask(java);
// Set the JvmArgs
javaTask.createJvmarg().setValue(-Xms64m);
@@ -606,9 +593,14 @@
javaTask.setTaskName(ejbdeploy);
javaTask.setClassname(com.ibm.etools.ejbdeploy.EJBDeploy);
-Commandline.Argument arguments = javaTask.createArg();
-
-arguments.setLine(args);
+javaTask.createArg().setValue(sourceJar.getPath());
+javaTask.createArg().setValue(tempdir);
+javaTask.createArg().setValue(destJar.getPath());
+javaTask.createArg().setLine(getOptions());
+if (getCombinedClasspath() != null
getCombinedClasspath().toString().length() 0) {
+javaTask.createArg().setValue(-cp);
+
javaTask.createArg().setValue(getCombinedClasspath().toString());
+}
Path classpath = wasClasspath;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant WHATSNEW
antoine 2003/07/03 14:48:43 Modified:.WHATSNEW Log: Add solution of PR 21298 PR: 21298 Revision ChangesPath 1.451 +3 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.450 retrieving revision 1.451 diff -u -r1.450 -r1.451 --- WHATSNEW 3 Jul 2003 13:02:00 - 1.450 +++ WHATSNEW 3 Jul 2003 21:48:43 - 1.451 @@ -179,6 +179,9 @@ * translate now translate tokens that are placed close together. Bugzilla Report 17297 +* Nested websphere element for ejbjar does not support spaces in file name. + Bugzilla Report 21298 + Other changes: -- * Six new Clearcase tasks added. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21298] - Nested websphere element for ejbjar does not support spaces in file name.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21298. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21298 Nested websphere element for ejbjar does not support spaces in file name. [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED Target Milestone|--- |1.6 --- Additional Comments From [EMAIL PROTECTED] 2003-07-03 21:54 --- Changes submitted, thanks. Since I do not have Websphere, can you download the next nightly build (dated 2003-07-04 or later) from http://cvs.apache.org/builds/ant/nightly and check that it works to your satisfaction. Antoine - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
CVS Problem failed to create lock directory for `/home/cvs' (/home/cvs/#cvs.lock)
I am experiencing the following : $ nohup cvs update -dP . Sending output to nohup.out $ tail -f nohup.out cvs server: Updating . cvs server: failed to create lock directory for `/home/cvs' (/home/cvs/#cvs.lock): Permission denied cvs server: failed to obtain dir lock in repository `/home/cvs' cvs [server aborted]: read lock failed - giving up Anything wrong tonight ? Antoine
RE: CVS Problem failed to create lock directory for `/home/cvs' ( /home/cvs/#cvs.lock)
Check the permission on /home/cvs. You will need write access to that directory on the server. -Rob Anderson -Original Message- From: Antoine Levy-Lambert [mailto:[EMAIL PROTECTED] Sent: Thursday, July 03, 2003 3:06 PM To: Ant Developers List Subject: CVS Problem failed to create lock directory for `/home/cvs' (/home/cvs/#cvs.lock) I am experiencing the following : $ nohup cvs update -dP . Sending output to nohup.out $ tail -f nohup.out cvs server: Updating . cvs server: failed to create lock directory for `/home/cvs' (/home/cvs/#cvs.lock): Permission denied cvs server: failed to obtain dir lock in repository `/home/cvs' cvs [server aborted]: read lock failed - giving up Anything wrong tonight ? Antoine - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
