DO NOT REPLY [Bug 17952] - failonerror and verbose undocumented on move
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=17952. 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=17952 failonerror and verbose undocumented on move [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED Target Milestone|--- |1.5.3 Version|1.6Alpha (nightly) |1.5.2 --- Additional Comments From [EMAIL PROTECTED] 2003-03-19 08:34 --- preservelastmodified has been missing as well.
cvs commit: ant/docs/manual/CoreTasks move.html
bodewig 2003/03/19 00:33:10 Modified:docs/manual/CoreTasks Tag: ANT_15_BRANCH move.html Log: Document some inherited attributes. PR: 17952 Revision ChangesPath No revision No revision 1.6.2.7 +21 -1 ant/docs/manual/CoreTasks/move.html Index: move.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/move.html,v retrieving revision 1.6.2.6 retrieving revision 1.6.2.7 diff -u -r1.6.2.6 -r1.6.2.7 --- move.html 4 Sep 2002 11:21:12 - 1.6.2.6 +++ move.html 19 Mar 2003 08:33:10 - 1.6.2.7 @@ -30,6 +30,13 @@ at least one nested fileset element/td /tr tr +td valign=toppreservelastmodified/td +td valign=topGive the moved files the same last modified + time as the original source files. + (emNote/em: Ignored on Java 1.1)/td +td valign=top align=centerNo; defaults to false./td + /tr + tr td valign=toptofile/td td valign=topthe file to move to/td td valign=top align=center rowspan=2With the varfile/var attribute, @@ -69,6 +76,19 @@ Defaults to quot;yesquot;./td td valign=top align=centerNo/td /tr + tr +td valign=topfailonerror/td + td valign=topLog a warning message, but do not stop the build, + when the file to move does not exist. + Only meaningful when moving a single file. + /td + td valign=top align=centerNo; defaults to true./td + /tr + tr +td valign=topverbose/td + td valign=topLog the files that are being moved./td + td valign=top align=centerNo; defaults to false./td + /tr /table h3Parameters specified as nested elements/h3 h4mapper/h4 @@ -121,7 +141,7 @@ lt;/movegt; /pre 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
cvs commit: ant/docs/manual/OptionalTasks replaceregexp.html
bodewig 2003/03/19 00:41:29
Modified:docs/manual/OptionalTasks Tag: ANT_15_BRANCH
replaceregexp.html
Log:
Add another example to replaceregexp's docs.
PR: 17660
Submitted by: Jan Matèrne jan at materne dot de
Revision ChangesPath
No revision
No revision
1.8.2.4 +21 -1 ant/docs/manual/OptionalTasks/replaceregexp.html
Index: replaceregexp.html
===
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/replaceregexp.html,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -r1.8.2.3 -r1.8.2.4
--- replaceregexp.html4 Sep 2002 11:21:14 - 1.8.2.3
+++ replaceregexp.html19 Mar 2003 08:41:29 - 1.8.2.4
@@ -123,8 +123,28 @@
with quot;NewPropertyquot; in a properties file, preserving the existing
value, in all files ending in code.properties/code in the current
directory/p
+blockquote
+prelt;replaceregexp match=\s+ replace= flags=g byline=truegt;
+lt;fileset dir=${html.dir} includes=**/*.html /gt;
+lt;/replaceregexpgt;
+/pre/blockquote
+preplaces all whitespaces (blanks, tabs, etc) by one blank remaining the
+line separator. So with input
+
+blockquote
+pre
+lt;htmllt;bodygt;
+lt;lt;TABgt;gt;lt;h1gt;T E S T lt;/h1gt; lt;lt;TABgt;gt;
+lt;lt;TABgt;gt; lt;/bodygt;lt;/htmlgt;
+/pre/blockquote
+would converted to
+pre
+lt;htmlgt; lt;bodygt;
+ lt;h1gt; T E S T lt;/h1gt; lt;/bodygt;lt;/htmlgt;
+/pre
+
hr
-p align=centerCopyright copy; 2001-2002 Apache Software Foundation. All
rights
+p align=centerCopyright copy; 2001-2003 Apache Software Foundation. All
rights
Reserved./p
/body
cvs commit: ant/docs/manual/OptionalTasks replaceregexp.html
bodewig 2003/03/19 00:42:14
Modified:docs/manual/OptionalTasks replaceregexp.html
Log:
Merge fix for bug 17660 from 1.5 branch
Revision ChangesPath
1.14 +20 -0 ant/docs/manual/OptionalTasks/replaceregexp.html
Index: replaceregexp.html
===
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/replaceregexp.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- replaceregexp.html31 Jan 2003 12:15:51 - 1.13
+++ replaceregexp.html19 Mar 2003 08:42:14 - 1.14
@@ -128,6 +128,26 @@
with quot;NewPropertyquot; in a properties file, preserving the existing
value, in all files ending in code.properties/code in the current
directory/p
+blockquote
+prelt;replaceregexp match=\s+ replace= flags=g byline=truegt;
+lt;fileset dir=${html.dir} includes=**/*.html /gt;
+lt;/replaceregexpgt;
+/pre/blockquote
+preplaces all whitespaces (blanks, tabs, etc) by one blank remaining the
+line separator. So with input
+
+blockquote
+pre
+lt;htmllt;bodygt;
+lt;lt;TABgt;gt;lt;h1gt;T E S T lt;/h1gt; lt;lt;TABgt;gt;
+lt;lt;TABgt;gt; lt;/bodygt;lt;/htmlgt;
+/pre/blockquote
+would converted to
+pre
+lt;htmlgt; lt;bodygt;
+ lt;h1gt; T E S T lt;/h1gt; lt;/bodygt;lt;/htmlgt;
+/pre
+
hr
p align=centerCopyright copy; 2001-2003 Apache Software Foundation. All
rights
Reserved./p
DO NOT REPLY [Bug 18129] - p4label hangs when setting 'locked' label state w/ JVM 1.3
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=18129. 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=18129 p4label hangs when setting 'locked' label state w/ JVM 1.3 --- Additional Comments From [EMAIL PROTECTED] 2003-03-19 08:46 --- I have tried to reproduce your bug in the following environment : ant 1.5.2 + Win2K + Perforce P4/NTX86/2000.2/19837 (2001/01/03). I have tried with JDK 1.3.0_02 and with J2SDK1.4.1_01. Perforce never hangs for me. My understanding is that Perforce tasks are executed through the Execute.java class. The blocking command in Execute.java iswaitFor(process); in line 455 of Execute.java. One difference in Perforce between ant1.5.1 and ant 1.5.2 is the class P4HandlerAdapter. see http://issues.apache.org/bugzilla/show_bug.cgi?id=16544 I submitted a patch for this class because Perforce was hanging on Win2k when Perforce would only produce output on stderr. I hope that this patch is not causing problems on Linux. I reproduced the fact that in verbose mode the label does not get locked. I also found a fix for this problem (see attached file above)
DO NOT REPLY [Bug 17552] - properties not stripped when read in from a properties file
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=17552. 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=17552 properties not stripped when read in from a properties file [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Additional Comments From [EMAIL PROTECTED] 2003-03-19 08:47 --- How would you define a property with a space at the end if Ant stripped them? Ant's behavior is consistent with the Java Properties class (actually, Ant uses Properties#load) and changing it would break a valid use case.
DO NOT REPLY [Bug 17526] - nested tag param for style task doesn't support property substitution
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=17526. 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=17526 nested tag param for style task doesn't support property substitution --- Additional Comments From [EMAIL PROTECTED] 2003-03-19 08:47 --- ping
cvs commit: ant/docs/manual/CoreTasks loadproperties.html
bodewig 2003/03/19 00:53:08 Modified:docs/manual/CoreTasks Tag: ANT_15_BRANCH loadproperties.html Log: Point to prefixlines filter. PR: 17293 Revision ChangesPath No revision No revision 1.1.2.3 +7 -3 ant/docs/manual/CoreTasks/loadproperties.html Index: loadproperties.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/loadproperties.html,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- loadproperties.html 23 Sep 2002 11:08:43 - 1.1.2.2 +++ loadproperties.html 19 Mar 2003 08:53:08 - 1.1.2.3 @@ -13,9 +13,13 @@ to lt;property file=quot;...quot;/gt; except that it supports nested lt;filterchaingt; elements and it cannot be specified outside a target. - /p +pIf you want to simulate a href=property.htmlproperty/a's +prefix attribute, please use a +href=../CoreTypes/filterchain.html#prefixlinesprefixlines/a +filter./p + h3Parameters/h3 table border=1 cellpadding=2 cellspacing=0 tr @@ -41,7 +45,7 @@ prelt;loadproperties srcFile=file.propertiesgt; lt;filterchaingt; lt;a href=../CoreTypes/filterchain.html#linecontainslinecontains/agt; - lt;contains value=import.quot;/gt; + lt;contains value=quot;import.quot;/gt; lt;/linecontainsgt; lt;/filterchaingt; lt;/loadpropertiesgt; @@ -51,7 +55,7 @@ Ant properties. hr -p align=centerCopyright copy; 2002 Apache Software Foundation. All rights +p align=centerCopyright copy; 2002-2003 Apache Software Foundation. All rights Reserved./p /body
DO NOT REPLY [Bug 17293] - Add prefix parameter to loadproperties 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=17293. 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=17293 Add prefix parameter to loadproperties task [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED Target Milestone|--- |1.5.3 --- Additional Comments From [EMAIL PROTECTED] 2003-03-19 08:56 --- Documentation now points to prefixlines filter.
cvs commit: ant/docs/manual/CoreTasks genkey.html
bodewig 2003/03/19 01:11:11 Modified:docs/manual/CoreTasks Tag: ANT_15_BRANCH genkey.html Log: Complete sentence with knowledge gained by raeding the source. PR: 14697 Revision ChangesPath No revision No revision 1.6.2.2 +7 -2 ant/docs/manual/CoreTasks/genkey.html Index: genkey.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/genkey.html,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -r1.6.2.1 -r1.6.2.2 --- genkey.html 3 May 2002 09:40:28 - 1.6.2.1 +++ genkey.html 19 Mar 2003 09:11:10 - 1.6.2.2 @@ -76,7 +76,12 @@ /tr /table -pAlternatively you can specify the distinguished name by creating a sub-element named dname and populating it with param elements that have a name and a value. When using the subelement it is automatically encoded properly and , are replace/p +pAlternatively you can specify the distinguished name by creating a +sub-element named dname and populating it with param elements that +have a name and a value. When using the subelement it is automatically +encoded properly and commas (quot;code,/codequot;) are replaced +with quot;code\,/codequot;./p + pThe following two examples are identical: /p h3Examples/h3 @@ -96,7 +101,7 @@ lt;/genkeygt;/code/pre /blockquote hr -p align=centerCopyright copy; 2000-2001 Apache Software Foundation. All rights +p align=centerCopyright copy; 2000-2001,2003 Apache Software Foundation. All rights Reserved./p /body
cvs commit: ant/docs/manual/CoreTasks genkey.html
bodewig 2003/03/19 01:11:57 Modified:docs/manual/CoreTasks genkey.html Log: Merge fix for bug 14697 from 1.5 branch Revision ChangesPath 1.8 +7 -2 ant/docs/manual/CoreTasks/genkey.html Index: genkey.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/genkey.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- genkey.html 1 Jun 2002 12:26:33 - 1.7 +++ genkey.html 19 Mar 2003 09:11:57 - 1.8 @@ -76,7 +76,12 @@ /tr /table -pAlternatively you can specify the distinguished name by creating a sub-element named dname and populating it with param elements that have a name and a value. When using the subelement it is automatically encoded properly and , are replace/p +pAlternatively you can specify the distinguished name by creating a +sub-element named dname and populating it with param elements that +have a name and a value. When using the subelement it is automatically +encoded properly and commas (quot;code,/codequot;) are replaced +with quot;code\,/codequot;./p + pThe following two examples are identical: /p h3Examples/h3 @@ -96,7 +101,7 @@ lt;/genkeygt;/code/pre /blockquote hr -p align=centerCopyright copy; 2000-2001 Apache Software Foundation. All rights +p align=centerCopyright copy; 2000-2001,2003 Apache Software Foundation. All rights Reserved./p /body
cvs commit: ant/docs/manual using.html
bodewig 2003/03/19 01:19:51 Modified:docs/manual Tag: ANT_15_BRANCH using.html Log: Add an extra note about properties values being irrelevant for if/unless. PR: 14521 Revision ChangesPath No revision No revision 1.21.2.4 +8 -8 ant/docs/manual/using.html Index: using.html === RCS file: /home/cvs/ant/docs/manual/using.html,v retrieving revision 1.21.2.3 retrieving revision 1.21.2.4 diff -u -r1.21.2.3 -r1.21.2.4 --- using.html9 Aug 2002 08:39:47 - 1.21.2.3 +++ using.html19 Mar 2003 09:19:50 - 1.21.2.4 @@ -85,7 +85,9 @@ (java version, OS, command-line property defines, etc.). To make a target isense/i this property, you should add the codeif/code (or codeunless/code) attribute with the name of the property that the target -should react to. For example:/p +should react to. strongNote:/strong Ant will only check whether +the property has been set, the value doesn't matter. A property set +to the empty string is still an existing property. For example:/p blockquote prelt;target name=quot;build-module-Aquot; if=quot;module-A-presentquot;/gt;/pre prelt;target name=quot;build-own-fake-module-Aquot; unless=quot;module-A-presentquot;/gt;/pre @@ -147,18 +149,16 @@ /table /p -A target name can be any alphanumeric string valid in the encoding of the XML +pA target name can be any alphanumeric string valid in the encoding of the XML file. The empty string quot;quot; is in this set, as is comma quot;,quot; and space quot; quot;. Please avoid using these, as they will not be supported in future Ant versions because of all the confusion they cause. IDE support of unusual target names, -or any target name containing spaces, varies with the IDE. +or any target name containing spaces, varies with the IDE./p -p - -Targets beginning with a hyphen such as codequot;-restartquot;/code +pTargets beginning with a hyphen such as codequot;-restartquot;/code are valid, and can be used -to name targets that should not be called directly from the command line. +to name targets that should not be called directly from the command line./p h3a name=tasksTasks/a/h3 pA task is a piece of code that can be executed./p @@ -529,7 +529,7 @@ structures as well./p 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
DO NOT REPLY [Bug 14521] - Clearly document that if/unless are based on existence of attr, not boolean value
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=14521. 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=14521 Clearly document that if/unless are based on existence of attr, not boolean value [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED Target Milestone|--- |1.5.3 Version|1.6Alpha (nightly) |1.5.2 --- Additional Comments From [EMAIL PROTECTED] 2003-03-19 09:23 --- Hope this is clear enough now.
cvs commit: ant/src/testcases/org/apache/tools/tar - New directory
bodewig 2003/03/19 02:01:44 ant/src/testcases/org/apache/tools/tar - New directory
cvs commit: ant/src/testcases/org/apache/tools/tar TarEntryTest.java
bodewig 2003/03/19 02:06:41
Added: src/testcases/org/apache/tools/tar TarEntryTest.java
Log:
Demonstrate bug 18105
Revision ChangesPath
1.1 ant/src/testcases/org/apache/tools/tar/TarEntryTest.java
Index: TarEntryTest.java
===
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 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]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*/
package org.apache.tools.tar;
import junit.framework.TestCase;
/**
* @since Ant 1.6
*/
public class TarEntryTest extends TestCase {
public TarEntryTest(String name) {
super(name);
}
/**
* demonstrates bug 18105 on OSes with os.name shorter than 7.
*/
public void testFileConstructor() {
new TarEntry(new java.io.File(/foo));
}
}
DO NOT REPLY [Bug 18105] - problem with TarEntry class and linux
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=18105. 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=18105 problem with TarEntry class and linux [EMAIL PROTECTED] changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution||FIXED Target Milestone|--- |1.6 --- Additional Comments From [EMAIL PROTECTED] 2003-03-19 10:10 --- Strange that I've never encountered any problem with it myself, probably Ant doesn't use this constructor. Should be fixed in CVS HEAD now.
cvs commit: ant/src/main/org/apache/tools/tar TarEntry.java
bodewig 2003/03/19 02:09:38
Modified:.WHATSNEW
src/main/org/apache/tools/tar TarEntry.java
Log:
TarEntry's File-constructor didn't work for many OSes.
PR: 18105
At the same time, make the OS check Locale independent.
Revision ChangesPath
1.367 +4 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -r1.366 -r1.367
--- WHATSNEW 14 Mar 2003 16:01:03 - 1.366
+++ WHATSNEW 19 Mar 2003 10:09:38 - 1.367
@@ -66,6 +66,10 @@
* exec output and error streams can now be redirected independently
to either a property or a file (or both)
+* TarEntry's File-arg constructor would fail with a
+ StringIndexOutOfBoundsException on all OSes where os.name is shorter
+ than seven characters. Bugzilla Report 18105.
+
Other changes:
--
* The filesetmanifest attribute of jar has been reenabled.
1.15 +5 -6 ant/src/main/org/apache/tools/tar/TarEntry.java
Index: TarEntry.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/tar/TarEntry.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TarEntry.java 10 Feb 2003 14:14:42 - 1.14
+++ TarEntry.java 19 Mar 2003 10:09:38 - 1.15
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -61,6 +61,7 @@
import java.io.File;
import java.util.Date;
+import java.util.Locale;
/**
* This class represents an entry in a Tar archive. It consists
@@ -200,16 +201,14 @@
this.file = file;
String name = file.getPath();
-String osname = System.getProperty(os.name);
+String osname = System.getProperty(os.name).toLowerCase(Locale.US);
if (osname != null) {
// Strip off drive letters!
// REVIEW Would a better check be (File.separator == '\')?
-String win32Prefix = Windows;
-String prefix = osname.substring(0, win32Prefix.length());
-if (prefix.equalsIgnoreCase(win32Prefix)) {
+if (osname.startsWith(windows)) {
if (name.length() 2) {
char ch1 = name.charAt(0);
char ch2 = name.charAt(1);
@@ -220,7 +219,7 @@
name = name.substring(2);
}
}
-} else if (osname.toLowerCase().indexOf(netware) -1) {
+} else if (osname.indexOf(netware) -1) {
int colon = name.indexOf(':');
if (colon != -1) {
name = name.substring(colon + 1);
DO NOT REPLY [Bug 18055] - javac task includes java rt.jar in classpath when using jvc compiler
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=18055. 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=18055 javac task includes java rt.jar in classpath when using jvc compiler --- Additional Comments From [EMAIL PROTECTED] 2003-03-19 10:24 --- The codesnippet actually is for the case where you are running Ant in a VM by Microsoft, not necessarily for running jvc. I'm not sure that you will always want to set includeJavaRuntime to false when running jvc and would prefer to leave that decision to the user explicitly. What is wrong with setting the attribute to false in your build files?
cvs commit: ant/docs/manual/OptionalTasks cab.html
bodewig 2003/03/19 02:39:42
Modified:docs/manual/OptionalTasks Tag: ANT_15_BRANCH cab.html
Log:
Document that cab supports nested filesets
Revision ChangesPath
No revision
No revision
1.5.2.3 +8 -1 ant/docs/manual/OptionalTasks/cab.html
Index: cab.html
===
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/cab.html,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- cab.html 20 Jun 2002 09:40:31 - 1.5.2.2
+++ cab.html 19 Mar 2003 10:39:42 - 1.5.2.3
@@ -91,6 +91,13 @@
td valign=top align=centerNo/td
/tr
/table
+h3Parameters specified as nested elements/h3
+h4fileset/h4
+
+pThe cab task supports any number of nested a
+href=../CoreTypes/fileset.htmlcodelt;filesetgt;/code/a
+elements to specify the files to be included in the archive./p
+
h3Examples/h3
blockquotepre
lt;cab cabfile=quot;${dist}/manual.cabquot;
@@ -122,7 +129,7 @@
excluded. Output from the cabarc tool is displayed in the build
output./p
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
OT: help with cvs
I'm sorry for this of-topic query, but I have a small problem which I would hope someone in here could help me with... the problem I have is that I have sofar not been able to get my own cvs to mail out commit-info.. and since I see that it works in here, could someone that hav acces to how the cvs does this in here, send me the scripts (with any sensitive information replaced with some placeholder (XYZZYX is a good one)) and a quick how to install .-) and if you could reply in private and not to the list, it would be even better ([EMAIL PROTECTED]) so that this OT query will not start some new thread... TIA Christian Andersson
Re: OT: help with cvs
I'll send you the tarball privately.. Mvgr, Martin On Wed, 2003-03-19 at 12:47, Christian Andersson wrote: I'm sorry for this of-topic query, but I have a small problem which I would hope someone in here could help me with... the problem I have is that I have sofar not been able to get my own cvs to mail out commit-info.. and since I see that it works in here, could someone that hav acces to how the cvs does this in here, send me the scripts (with any sensitive information replaced with some placeholder (XYZZYX is a good one)) and a quick how to install .-) and if you could reply in private and not to the list, it would be even better ([EMAIL PROTECTED]) so that this OT query will not start some new thread... TIA Christian Andersson - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] JDK 1.1 support
+1 On Wednesday, March 19, 2003, at 01:45 AM, Conor MacNeill wrote: Hi, This is to formalize the discussions which have gone on on the dev and user lists. Please indicate your vote. Everyone is free to vote but only committer votes are binding. Ant 1.6 will require JDK 1.2 to compile and build. Releases from the 1.5 branch will be the last to support JDK 1.1 compilation, including Ant 1.5.3 and any subsequent maintenance releases. The ability to compile/build for JDK 1.1 deployment continues to be supported in all releases. Here is my +1 -- Conor MacNeill Blog: http://codefeed.com/blog/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/OptionalTasks ejb.html
conor 2003/03/19 05:43:32
Modified:docs/manual/OptionalTasks Tag: ANT_15_BRANCH ejb.html
Log:
Fix typo in docs
PR: 18091
Revision ChangesPath
No revision
No revision
1.23.2.17 +2 -2 ant/docs/manual/OptionalTasks/ejb.html
Index: ejb.html
===
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/ejb.html,v
retrieving revision 1.23.2.16
retrieving revision 1.23.2.17
diff -u -w -u -r1.23.2.16 -r1.23.2.17
--- ejb.html 17 Feb 2003 10:27:03 - 1.23.2.16
+++ ejb.html 19 Mar 2003 13:43:32 - 1.23.2.17
@@ -1344,7 +1344,7 @@
in the descriptor dir:/p
pre
- lt;property name=quot;webpshere.homequot;
value=quot;${was4.home}quot;/gt;
+ lt;property name=quot;websphere.homequot;
value=quot;${was4.home}quot;/gt;
lt;ejbjar srcdir=${build.class} descriptordir=etc/ejbgt;
lt;include name=*-ejb-jar.xml/gt;
lt;websphere dbvendor=DB2UDBOS390_V6
cvs commit: ant/docs/manual/OptionalTasks ejb.html
conor 2003/03/19 05:49:18
Modified:docs/manual/OptionalTasks ejb.html
Log:
Missing merge from 1.5 branch :-(
Revision ChangesPath
1.33 +3 -2 ant/docs/manual/OptionalTasks/ejb.html
Index: ejb.html
===
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/ejb.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -w -u -r1.32 -r1.33
--- ejb.html 17 Feb 2003 09:07:33 - 1.32
+++ ejb.html 19 Mar 2003 13:49:18 - 1.33
@@ -1258,7 +1258,7 @@
p
For the websphere element to work, you have to provide a complete classpath,
that contains all
classes, that are required to reflect the bean classes. For ejbdeploy to
work, you must also provide
-the classpath of the ejbdeploy tool (look at the examples below).
+the classpath of the ejbdeploy tool and set the iwebsphere.home/i
property (look at the examples below).
/p
table border=1 cellpadding=2 cellspacing=0
@@ -1344,6 +1344,7 @@
in the descriptor dir:/p
pre
+ lt;property name=quot;webpshere.homequot;
value=quot;${was4.home}quot;/gt;
lt;ejbjar srcdir=${build.class} descriptordir=etc/ejbgt;
lt;include name=*-ejb-jar.xml/gt;
lt;websphere dbvendor=DB2UDBOS390_V6
DO NOT REPLY [Bug 18091] - EJB tasks: 'websphere.home' is misspelled 'webpshere.home'
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=18091. 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=18091 EJB tasks: 'websphere.home' is misspelled 'webpshere.home' [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2003-03-19 13:51 --- Fixed - thanks
Re: [VOTE] JDK 1.1 support
On Wed, 19 Mar 2003 06:13 pm, Stefan Bodewig wrote: -0 and +1 on doing it after 1.6. I think this is a majority vote, isn't it? :-). I guess so, although I'd like to see consensus anyway. Your -0 isn't a veto, in any case. Do you have some reservations? Is it just a timing issue? +1 on making 1.5.4 (if needed) support JDK 1.1. And Ant 1.5.5 :-) -- Conor MacNeill Blog: http://codefeed.com/blog/
DO NOT REPLY [Bug 18128] - Dependset srcfileset does not handle absolute path
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=18128. 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=18128 Dependset srcfileset does not handle absolute path --- Additional Comments From [EMAIL PROTECTED] 2003-03-19 14:17 --- dir=D:/ does not work either, but that wouldn't help me because I need to be able to use the build.xml file on a unix box also.
RE: [VOTE] JDK 1.1 support
+1 -Original Message- From: Conor MacNeill [mailto:[EMAIL PROTECTED] Sent: Wednesday, March 19, 2003 12:45 AM To: [EMAIL PROTECTED] Subject: [VOTE] JDK 1.1 support Hi, This is to formalize the discussions which have gone on on the dev and user lists. Please indicate your vote. Everyone is free to vote but only committer votes are binding. Ant 1.6 will require JDK 1.2 to compile and build. Releases from the 1.5 branch will be the last to support JDK 1.1 compilation, including Ant 1.5.3 and any subsequent maintenance releases. The ability to compile/build for JDK 1.1 deployment continues to be supported in all releases. Here is my +1 -- Conor MacNeill Blog: http://codefeed.com/blog/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] JDK 1.1 support
On Thu, 20 Mar 2003, Conor MacNeill [EMAIL PROTECTED] wrote: On Wed, 19 Mar 2003 06:13 pm, Stefan Bodewig wrote: -0 and +1 on doing it after 1.6. I think this is a majority vote, isn't it? Your -0 isn't a veto, in any case. I know, and I wouldn't want it to be one. Do you have some reservations? Is it just a timing issue? Mainly a timing issue, yes. I realize that the split-up optional.jar thing is almost crying for help from URLClassLoader, so I almost buy that a switch now is necessary. It just feels (to me) better to do such a move completely than doing it in an incosistent manner. Stefan
Re: [VOTE] JDK 1.1 support
+1, and about freaking time too... :) Conor MacNeill wrote: Hi, This is to formalize the discussions which have gone on on the dev and user lists. Please indicate your vote. Everyone is free to vote but only committer votes are binding. Ant 1.6 will require JDK 1.2 to compile and build. Releases from the 1.5 branch will be the last to support JDK 1.1 compilation, including Ant 1.5.3 and any subsequent maintenance releases. The ability to compile/build for JDK 1.1 deployment continues to be supported in all releases. Here is my +1
DO NOT REPLY [Bug 18128] - Dependset srcfileset does not handle absolute path
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=18128.
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=18128
Dependset srcfileset does not handle absolute path
--- Additional Comments From [EMAIL PROTECTED] 2003-03-19 17:17 ---
You may like try outofdate in ant-contrib cvs HEAD:
outofdate
sourcefiles path=${buildPropsFile}/
targetfiles path=${build.ejb}/${messageTempFile}/
sequential
delete file=${build.ejb}/${messageTempFile}/
/sequential
/outofdate
I haven't tested this on Win, but it should work.
DO NOT REPLY [Bug 18128] - Dependset srcfileset does not handle absolute path
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=18128.
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=18128
Dependset srcfileset does not handle absolute path
--- Additional Comments From [EMAIL PROTECTED] 2003-03-19 17:20 ---
Yikes!
that should be:
outofdate
sourcefiles path=${buildPropsFile}/
targetfiles path=${build.ejb}/${messageTempFile}/
sequential
delete quite=yes file=${build.ejb}/${messageTempFile}/
/sequential
/outofdate
Re: [VOTE] JDK 1.1 support
- Original Message - From: Conor MacNeill [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Tuesday, March 18, 2003 22:45 Subject: [VOTE] JDK 1.1 support Hi, This is to formalize the discussions which have gone on on the dev and user lists. Please indicate your vote. Everyone is free to vote but only committer votes are binding. Ant 1.6 will require JDK 1.2 to compile and build. Releases from the 1.5 branch will be the last to support JDK 1.1 compilation, including Ant 1.5.3 and any subsequent maintenance releases. The ability to compile/build for JDK 1.1 deployment continues to be supported in all releases. +1 At the same time, I dont see a need to run into refactoring everything we have today to move up to 1.2 support, 'just because we can'. It'll make it that much harder to back port patches to the 1.5.x codebase
DO NOT REPLY [Bug 18154] New: - P4HandlerAdapter can throw exceptions that should be build exceptions
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=18154. 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=18154 P4HandlerAdapter can throw exceptions that should be build exceptions Summary: P4HandlerAdapter can throw exceptions that should be build exceptions Product: Ant Version: 1.5.2 Platform: All OS/Version: All Status: NEW Severity: Major Priority: Other Component: Optional Tasks AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] If one runs perforce tasks against a disconnected server, the exceptions that are thrown in the thread that tries to communicate with this unavailable server throw exceptions that are not handled by Ant. This is especially painful in an integrated IDE ant feature, as the exception cannot be handled gracefully as a BuildException. The fix is simply to move the creation of the input reader in P4HandlerAdaptor into the try block just below it. Patch is forthcoming.
Re: [VOTE] JDK 1.1 support
Steve Loughran wrote: +1 At the same time, I dont see a need to run into refactoring everything we have today to move up to 1.2 support, 'just because we can'. It'll make it that much harder to back port patches to the 1.5.x codebase +1 on your comment ( and a preemptive -1 on changing any public method that uses Hashtables to use Maps - just because we can :-). Using Maps in new code or tasks should be fine. Refactoring some of the introspection code - like support for context class loader or jdk1.2 methods - is worth it ( IMO ), as it'll make the code easier to understand. Costin
DO NOT REPLY [Bug 18154] - P4HandlerAdapter can throw exceptions that should be build exceptions
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=18154. 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=18154 P4HandlerAdapter can throw exceptions that should be build exceptions --- Additional Comments From [EMAIL PROTECTED] 2003-03-19 18:27 --- Created an attachment (id=5420) Patch to fix this bug.
RE: [VOTE] JDK 1.1 support
Dominique Devienne wrote: Given the above, there are no reasons to limit the 1.6 code base from *any* change that's JDK 1.2 (Java 2) compatible. That includes moving everything to the Java 2 Collections. As long as you don't break the public API. There are quite a few places where Hashtables are used. Hashtable is still part of JDK1.2 AFAIK ( and implements Map), so we are already using Java2 Collections :-) Costin
Re: [VOTE] JDK 1.1 support
Steve Loughran wrote: I don't see reasons to try to back-port fixes made on 1.6 to the 1.5. Only bugs identified by people running JDK 1.1 should make it to the 1.5 branch. This should be the only activity going on in that 1.5 branch. to date we are putting fixes to the 1.5 branch into 1.5.x, both minor and major, the zip work being the biggest. If any of that work had been in Java1.2 style, we couldnt have back ported it. Some of the changes (I think of the weak reference stuff) did have extra work to get into 1.1 compliance, incidentally. Once 1.6 ships, then we can stop doing any work to the 1.5.x branch, so this issue of having to back port code into a java1.1. compatible branch goes away. Except for people who want to maintain 1.1 support, and they get to do the work themselves. So we should wait till after the release to refactor our code? Given the above, there are no reasons to limit the 1.6 code base from *any* change that's JDK 1.2 (Java 2) compatible. That includes moving everything to the Java 2 Collections. I dont see the java2 collections as the compelling reason for this. They are nice, I use them, but it is really things like classloader, security manager, weak references and other major system changes that are forcing the move. I also see the reflection tests for existance of 1.2 methods as adding substantial clutter to the code. I think removing these is quite valuable to people trying to understand the flow of our code. I think these should be eliminated at a rate greater than slowly but surely :). As I said before, 1.5.x is a damn good release (once 1.5.3 is out), and should more than satisfy JDK 1.1 users (wherever they're hiding). The buck has to stop somewhere, and from the votes, it's clear 1.6 should depend on JDK 1.2. This should not prevent though JDK 1.2 to be fully used everywhere it's possible. Steve and Costin might as well -1 the move to JDK 1.2 with this kind of thinking. --DD I'm very happy with the move. I just don't think we should use this as an excuse to go s/Hashtable/HashMap/ s/Vector/ArrayList/ through all the I would agree that this type of conversion is of limmited value. It should probably happen, but it would be low on the priorety list I think. Use of Iterator rather than enumeration might be of some value, again from the standpoint of code clarity. old code, of which there is a frighteningly large amount, just for the sake of it. I know this is at odds with 'refactor mercilessly', but as Conor's test coverage data shows, we dont have the test coverage to refactor mercilessly :( Perhaps, rather than saying don't refactor until 1.7, (or will it be 2.1?) we should say if you want to refactor it, and it doesn't have a test case write the testcases before refactoring it?
DO NOT REPLY [Bug 18055] - javac task includes java rt.jar in classpath when using jvc compiler
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=18055. 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=18055 javac task includes java rt.jar in classpath when using jvc compiler --- Additional Comments From [EMAIL PROTECTED] 2003-03-19 22:26 --- From http://ant.apache.org/manual/index.html: Note: The Microsoft JVM/JDK is not adequate on its own, although the MS compiler is supported. The comment is a bit vague, but I take it to mean that running Ant with a Microsoft VM is not supported. (Correct me if I am wrong.) If this is the case, then why is does Ant have code that is only going to be used if running in a Microsoft VM? Otherwise if you do actually support running in the Microsoft VM, yes, the user should be given the choice of what to set includeJavaRuntime to. But if we are compiling with jvc from Ant running in the Sun VM, the Java runtime should never be included, as including Sun's Java runtime when compiling with Microsoft's compiler is always wrong. I would argue Ant should be smart enough to work this stuff out. Finally, (and I overlooked this in my original report), we have explicitly set includeJavaRuntime to false, but kept having problems. Having another look into org.apache.tools.ant.taskdefs.compilers.JVC reveals includeJavaRuntime is set to true if I don't specify a bootclasspath. So I can get things working by setting includeJavaRuntime to false, and include a nonsense bootclasspath so includeJavaRuntime is not set to true when running Ant using Sun's VM. I am happy to set includeJavaRuntime to false, but I believe shouldn't have to include a nonsense bootclasspath for this to work.
DO NOT REPLY [Bug 18171] New: - Spelling error in manual
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=18171. 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=18171 Spelling error in manual Summary: Spelling error in manual Product: Ant Version: 1.5.2 Platform: PC URL: http://people.smartchat.net.au/~dibblego OS/Version: Other Status: NEW Severity: Minor Priority: Other Component: Documentation AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] http://ant.apache.org/manual/developlist.html Extensiton should be Extension (I assume)
