cvs commit: ant/proposal/sandbox/httptasks build.xml
stevel 2003/04/13 22:26:51
Added: proposal/sandbox/httptasks build.xml
Log:
moving to httpclient, slowly
Revision ChangesPath
1.1 ant/proposal/sandbox/httptasks/build.xml
Index: build.xml
===
?xml version=1.0 ?
project name=httptasks default=all
description
Build the HTTP tasks into the main ant dir
This is not production quality
/description
property name=base location=../../.. /
property name=build.dir location=${base}/build /
property name=classes.dir location=${build.dir}/classes /
property name=src.dir location=src/main/
property name=debug value=true /
property name=deprecation value=false /
property name=optimize value=true /
target name=init
mkdir dir=${classes.dir} /
/target
target name=all depends=compile /
target name=compile depends=init
javac srcdir=${src.dir} destdir=${classes.dir}
debug=${debug}
deprecation=${deprecation}
includeantruntime=true
optimize=${optimize}
include name=**/*.java/
/javac
!--copy toDir=${classes.dir} preservelastmodified=true
fileset dir=${src.dir}
include name=**/*.xml /
/fileset
/copy--
/target
/project
DO NOT REPLY [Bug 18985] - PDFGraphicsConfiguration error on build
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=18985. 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=18985 PDFGraphicsConfiguration error on build [EMAIL PROTECTED] changed: What|Removed |Added Severity|Critical|Blocker Priority|Other |High
DO NOT REPLY [Bug 4646] - fixcrlf failing text files
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=4646. 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=4646 fixcrlf failing text files [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2003-04-14 06:51 --- *** Bug 18987 has been marked as a duplicate of this bug. ***
cvs commit: ant/src/main/org/apache/tools/ant/util ClasspathUtils.java
bodewig 2003/04/14 00:06:55
Added: src/main/org/apache/tools/ant/util ClasspathUtils.java
Log:
Utility class to centralize all classloader and instante from custom
classloader related actions.
PR: 18906
Submitted by: Marc Portier mpo at apache dot org
Revision ChangesPath
1.1
ant/src/main/org/apache/tools/ant/util/ClasspathUtils.java
Index: ClasspathUtils.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.ant.util;
import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Reference;
/**
* Offers some helper methods on the Path structure in ant.
*
* pBasic idea behind this utility class is to use it from inside the
* different ant objects (and user defined objects) that need dclassLoading
* for their operation.
* Normally those would have a setClasspathRef() {for the @@classpathref}
* and/or a createClasspath() {for the nested lt;classpathgt;}
* Typically one would have/p
*
* precode
* public void setClasspathRef(Reference r) {
* this.classpathId = r.getRefId();
* createClasspath().setRefid(r);
* }
*
* public Path createClasspath() {
* if (this.classpath == null) {
* this.classpath = new Path(getProject());
* }
* return this.classpath.createPath();
* }
*
* public void setClassname(String fqcn) {
* this.classname = fqcn;
* }
* /code/pre
*
* pwhen you actually need the classloading you can just:/p
*
* precode
* ClassLoader cl = ClasspathUtils.getClassLoaderForPath(this.classpath,
this.classpathId);
* Object o = ClasspathUtils.newInstance(this.classname, cl);
* /code/pre
*
* @since Ant 1.6
*/
public class ClasspathUtils {
private static final String LOADER_ID_PREFIX = ant.loader.;
public static final String REUSE_LOADER_REF = ant.reuse.loader;
/**
* Convenience overloaded version of [EMAIL PROTECTED]
* #getClassLoaderForPath(Project, Reference, boolean)}.
*
* pAssumes the logical 'false' for the reverseLoader./p
*
* @param path
cvs commit: ant/src/main/org/apache/tools/ant/types/selectors ContainsRegexpSelector.java BaseSelectorContainer.java SelectorContainer.java
bodewig 2003/04/14 00:53:08
Modified:.WHATSNEW
docs/manual/CoreTypes selectors.html
src/main/org/apache/tools/ant/taskdefs Delete.java
MatchingTask.java
src/main/org/apache/tools/ant/types AbstractFileSet.java
src/main/org/apache/tools/ant/types/selectors
BaseSelectorContainer.java SelectorContainer.java
Added: src/main/org/apache/tools/ant/types/selectors
ContainsRegexpSelector.java
Log:
Add a new containsregexp selector.
Submitted by: Jay van der Meer jvandermeer2 at comcast dot net
Revision ChangesPath
1.395 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- WHATSNEW 10 Apr 2003 06:49:01 - 1.394
+++ WHATSNEW 14 Apr 2003 07:53:06 - 1.395
@@ -234,6 +234,9 @@
* javah will invoke oldjavah on JDK 1.4.2. Bugzilla Report 18667.
+* A new containsregexp selector has been added, that selects files
+ if their content matches a certain regular expression.
+
Changes from Ant 1.5.2 to Ant 1.5.3
===
1.10 +35 -0 ant/docs/manual/CoreTypes/selectors.html
Index: selectors.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTypes/selectors.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- selectors.html19 Feb 2003 09:23:19 - 1.9
+++ selectors.html14 Apr 2003 07:53:07 - 1.10
@@ -56,6 +56,8 @@
the include and exclude elements of a patternset.
lia href=#presentselectlt;presentgt;/a - Select
files that either do or do not exist in some other location
+ lia href=#regexpselectlt;containsregexpgt;/a - Select
+files that match a regular expression
lia href=#sizeselectlt;sizegt;/a - Select files
that are larger or smaller than a particular number of bytes.
/ul
@@ -445,7 +447,40 @@
1.5 release.
/p
+a name=regexpselect/a
+h4Regular Expression Selector/h4
+pThe codelt;containsregexpgt;/code tag in a FileSet limits
+the files defined by that fileset to only those which contain a
+match to the regular expression specified by the codeexpression/code
attribute.
+/p
+
+table border=1 cellpadding=2 cellspacing=0
+ tr
+td valign=topbAttribute/b/td
+td valign=topbDescription/b/td
+td align=center valign=topbRequired/b/td
+ /tr
+ tr
+td valign=topexpression/td
+td valign=topSpecifies the regular expression that must
+match true in every file/td
+td valign=top align=centerYes/td
+ /tr
+/table
+
+pHere is an example of how to use the regular expression Selector:/p
+
+blockquotepre
+lt;fileset dir=quot;${doc.path}quot; includes=quot;*.txtquot;gt;
+lt;containsregexp expression=quot;[4-6]\.[0-9]quot;/gt;
+lt;/filesetgt;
+/pre/blockquote
+
+pSelects all the text files that match the regular expression
+(have a 4,5 or 6 followed by a period and a number from 0 to 9).
+
+
a name=sizeselect/a
h4Size Selector/h4
1.38 +10 -1 ant/src/main/org/apache/tools/ant/taskdefs/Delete.java
Index: Delete.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Delete.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Delete.java 10 Feb 2003 14:13:34 - 1.37
+++ Delete.java 14 Apr 2003 07:53:07 - 1.38
@@ -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
@@ -62,6 +62,7 @@
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.PatternSet;
import org.apache.tools.ant.types.selectors.AndSelector;
+import org.apache.tools.ant.types.selectors.ContainsRegexpSelector;
import org.apache.tools.ant.types.selectors.ContainsSelector;
import org.apache.tools.ant.types.selectors.DateSelector;
import org.apache.tools.ant.types.selectors.DependSelector;
@@ -409,6 +410,14 @@
public void addDepend(DependSelector selector) {
usedMatchingTask = true;
super.addDepend(selector);
+}
+
+/**
+ * add a regular expression selector entry
Javadoc in org.apache.tools.ant.taskdefs.Redirector missspelled
The javadoc comment for the complete() method has a spell error on the @throws line: 'output' instead 'outptu' Jan Matèrne
DO NOT REPLY [Bug 18956] - p4change task causes build to hang
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=18956. 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=18956 p4change task causes build to hang --- Additional Comments From [EMAIL PROTECTED] 2003-04-14 11:29 --- Created an attachment (id=5822) fixes the bug
[VOTE] Antoine Levy-Lambert as committer
Hi all, Antoine has continuously been sending in patches since months now, he's played an important role in the zip refactoring and is answering more question on the user list than most of us here. Furthermore Antoine has access to a perforce installation, so he's able to test and fix those tasks. 8-) Finally he's expressed interest in reviving the antlib proposal. I feel it is time to make him a committer and ask you to vote on this. Let me start with my +1 Stefan
DO NOT REPLY [Bug 18990] New: - defaultexcludes=no ignored by core task Tar.
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=18990. 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=18990 defaultexcludes=no ignored by core task Tar. Summary: defaultexcludes=no ignored by core task Tar. Product: Ant Version: 1.5.1 Platform: PC OS/Version: Windows NT/2K Status: UNCONFIRMED Severity: Minor Priority: Other Component: Core tasks AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] The attribute defaultexcludes=no is being ignored by core task Tar. However, it does work properly at the core task Zip, which has almost the same syntax.
DO NOT REPLY [Bug 18935] - Remove quotes
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=18935. 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=18935 Remove quotes [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2003-04-14 11:37 --- It seems that you have a customised ant.bat. The snippet -Djwsdp.home=%ANT_HOME%\.. is not part of the standard Ant distribution. Nevertheless, there were bugs in the 1.5.1 ant.bat relating to spaces, quotes, and all the other pain here. You can either stick with your changes (since they work) or try to sync up with the 1.5.3 changes. In either case, I believe this is now working OK in the standard Ant distribution.
RE: [VOTE] Antoine Levy-Lambert as committer
Hi all, Antoine has continuously been sending in patches since months now, he's played an important role in the zip refactoring and is answering more question on the user list than most of us here. Furthermore Antoine has access to a perforce installation, so he's able to test and fix those tasks. 8-) I have Perforce, too! I am using it for my private SCM, for it is free for up to two clients at one server! I'd recommend you check it out yourself! It's really nice and it it really written by programmers for programmers! Sorry for the commercial, but I am really a P4-lover :-). Finally he's expressed interest in reviving the antlib proposal. I feel it is time to make him a committer and ask you to vote on this. Let me start with my +1 +1, too! Greetings, Christoph
DO NOT REPLY [Bug 18637] - defaultexcludes not works with zip,tar,jar tasks or bag with CVS directories
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=18637. 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=18637 defaultexcludes not works with zip,tar,jar tasks or bag with CVS directories [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2003-04-14 11:42 --- *** Bug 18990 has been marked as a duplicate of this bug. ***
DO NOT REPLY [Bug 18952] - Mispelling in JavaDoc comments
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=18952. 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=18952 Mispelling in JavaDoc comments [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
bodewig 2003/04/14 04:42:14
Modified:src/main/org/apache/tools/ant/taskdefs Redirector.java
src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
Log:
Fix javadoc typos
Revision ChangesPath
1.4 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/Redirector.java
Index: Redirector.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Redirector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Redirector.java 10 Feb 2003 14:13:36 - 1.3
+++ Redirector.java 14 Apr 2003 11:42:14 - 1.4
@@ -461,7 +461,7 @@
* This opertaion will close any streams and create any specified
* property values.
*
- * @throws IOException if the outptu properties cannot be read from their
+ * @throws IOException if the output properties cannot be read from their
* output streams.
*/
public void complete() throws IOException {
1.17 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
Index: Jikes.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Jikes.java7 Mar 2003 11:23:04 - 1.16
+++ Jikes.java14 Apr 2003 11:42:14 - 1.17
@@ -74,7 +74,7 @@
public class Jikes extends DefaultCompilerAdapter {
/**
- * Performs a compile using the Jikes compiler from IBM..
+ * Performs a compile using the Jikes compiler from IBM.
* Mostly of this code is identical to doClassicCompile()
* However, it does not support all options like
* bootclasspath, extdirs, deprecation and so on, because
DO NOT REPLY [Bug 18695] - Fix ant startup script to fully suport a relative link to it.
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=18695. 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=18695 Fix ant startup script to fully suport a relative link to it. --- Additional Comments From [EMAIL PROTECTED] 2003-04-14 11:46 --- ping?
DO NOT REPLY [Bug 18786] - exec cannot execute all command lines...
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=18786. 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=18786 exec cannot execute all command lines... --- Additional Comments From [EMAIL PROTECTED] 2003-04-14 11:47 --- ping?
DO NOT REPLY [Bug 18795] - Pathconvert strange behavior
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=18795. 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=18795 Pathconvert strange behavior --- Additional Comments From [EMAIL PROTECTED] 2003-04-14 11:47 --- ping?
Re: [VOTE] Antoine Levy-Lambert as committer
On Mon, 14 Apr 2003 09:31 pm, Stefan Bodewig wrote: Let me start with my +1 +1
Re: [VOTE] Antoine Levy-Lambert as committer
On Mon, 14 Apr 2003 09:36 pm, Christoph Wilhelms wrote: I have Perforce, too! I am using it for my private SCM, for it is free for up to two clients at one server! I'd recommend you check it out yourself! It's really nice and it it really written by programmers for programmers! Sorry for the commercial, but I am really a P4-lover :-). There's plenty of bugs you could be looking at then ... :-) Conor
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Parallel.java
conor 2003/04/14 04:58:04
Modified:.check.xml
src/main/org/apache/tools/ant IntrospectionHelper.java
Project.java RuntimeConfigurable.java
src/main/org/apache/tools/ant/filters BaseFilterReader.java
EscapeUnicode.java StripLineComments.java
src/main/org/apache/tools/ant/filters/util
ChainReaderHelper.java
src/main/org/apache/tools/ant/helper ProjectHelperImpl.java
src/main/org/apache/tools/ant/taskdefs Parallel.java
Log:
style fixes
Revision ChangesPath
1.5 +7 -7 ant/check.xml
Index: check.xml
===
RCS file: /home/cvs/ant/check.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- check.xml 8 Jan 2003 08:29:10 - 1.4
+++ check.xml 14 Apr 2003 11:58:02 - 1.5
@@ -6,10 +6,10 @@
target name=checkstyle
taskdef name=checkstyle
classname=com.puppycrawl.tools.checkstyle.CheckStyleTask/
-checkstyle
- property key=checkstyle.header.file
file=src/etc/RequiredHeader.txt/
- property key=checkstyle.header.ignoreline value=4/
- property key=checkstyle.javadoc.scope value=${javadoc.scope}/
+checkstyle headerFile=src/etc/RequiredHeader.txt
+headerIgnoreLine=4
+allowProtected=true
+javadocScope=${javadoc.scope}
fileset dir=${java.dir}
include name=${tocheck}/
/fileset
1.52 +1 -2
ant/src/main/org/apache/tools/ant/IntrospectionHelper.java
Index: IntrospectionHelper.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -w -u -r1.51 -r1.52
--- IntrospectionHelper.java 6 Apr 2003 09:30:56 - 1.51
+++ IntrospectionHelper.java 14 Apr 2003 11:58:03 - 1.52
@@ -436,8 +436,7 @@
DynamicConfigurator dc = (DynamicConfigurator) element;
dc.setDynamicAttribute(attributeName, value);
return;
-}
-else {
+} else {
String msg = getElementName(p, element) +
doesn't support the \ + attributeName +
\ attribute.;
1.134 +49 -34ant/src/main/org/apache/tools/ant/Project.java
Index: Project.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Project.java,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -w -u -r1.133 -r1.134
--- Project.java 3 Apr 2003 14:44:01 - 1.133
+++ Project.java 14 Apr 2003 11:58:03 - 1.134
@@ -903,8 +903,7 @@
oldLoader instanceof AntClassLoader
newLoader instanceof AntClassLoader
((AntClassLoader) oldLoader).getClasspath()
-.equals(((AntClassLoader) newLoader).getClasspath())
-) {
+.equals(((AntClassLoader)
newLoader).getClasspath())) {
// same classname loaded from the same
// classpath components
logLevel = MSG_VERBOSE;
@@ -2171,7 +2170,7 @@
// Should move to a separate public class - and have API to add
// listeners, etc.
private static class AntRefTable extends Hashtable {
-Project project;
+private Project project;
public AntRefTable(Project project) {
super();
this.project = project;
@@ -2212,9 +2211,9 @@
}
private static class AntTaskTable extends LazyHashtable {
-Project project;
-Properties props;
-boolean tasks = false;
+private Project project;
+private Properties props;
+private boolean tasks = false;
public AntTaskTable(Project p, boolean tasks) {
this.project = p;
@@ -2226,26 +2225,33 @@
}
protected void initAll() {
-if (initAllDone ) return;
+if (initAllDone) {
+return;
+}
project.log(InitAll, Project.MSG_DEBUG);
-if (props==null ) return;
+if (props == null) {
+return;
+}
Enumeration enum = props.propertyNames();
while (enum.hasMoreElements()) {
String key = (String) enum.nextElement();
Class taskClass=getTask( key );
if (taskClass!=null )
RE: [VOTE] Antoine Levy-Lambert as committer
I have Perforce, too! I am using it for my private SCM, for it is free for up to two clients at one server! I'd recommend you check it out yourself! It's really nice and it it really written by programmers for programmers! Sorry for the commercial, but I am really a P4-lover :-). There's plenty of bugs you could be looking at then ... :-) Message understood |-). I'll do when I can find the time, of course - as well as you are free to contribute to ANTidote *g*! Greetings! Christoph
DO NOT REPLY [Bug 18543] - Cannot work with j2ee1.3.1.jar
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=18543. 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=18543 Cannot work with j2ee1.3.1.jar [EMAIL PROTECTED] changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2003-04-14 12:30 --- As Stefan has stated - forking is the answer here. If that does not work, please reopen.
Re: [VOTE] Antoine Levy-Lambert as committer
On Mon, 14 Apr 2003 10:08 pm, Christoph Wilhelms wrote: Message understood |-). I'll do when I can find the time, of course - as well as you are free to contribute to ANTidote *g*! touché. Conor
Re: [VOTE] Antoine Levy-Lambert as committer
+1 On Monday, April 14, 2003, at 07:31 AM, Stefan Bodewig wrote: Hi all, Antoine has continuously been sending in patches since months now, he's played an important role in the zip refactoring and is answering more question on the user list than most of us here. Furthermore Antoine has access to a perforce installation, so he's able to test and fix those tasks. 8-) Finally he's expressed interest in reviving the antlib proposal. I feel it is time to make him a committer and ask you to vote on this. Let me start with my +1 Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] Antoine Levy-Lambert as committer
+1 Cheers, Magesh - Original Message - From: Stefan Bodewig [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Monday, April 14, 2003 7:31 AM Subject: [VOTE] Antoine Levy-Lambert as committer Hi all, Antoine has continuously been sending in patches since months now, he's played an important role in the zip refactoring and is answering more question on the user list than most of us here. Furthermore Antoine has access to a perforce installation, so he's able to test and fix those tasks. 8-) Finally he's expressed interest in reviving the antlib proposal. I feel it is time to make him a committer and ask you to vote on this. Let me start with my +1 Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/xdocs bindownload.xml srcdownload.xml
bodewig 2003/04/14 07:30:10 Modified:docs bindownload.html srcdownload.html xdocsbindownload.xml srcdownload.xml Log: Better explain what we mean with must verify using signatures from main site. Submitted by: Matt Benson gudnabrsam at yahoo dot com Revision ChangesPath 1.28 +6 -4 ant/docs/bindownload.html Index: bindownload.html === RCS file: /home/cvs/ant/docs/bindownload.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- bindownload.html 9 Apr 2003 01:44:48 - 1.27 +++ bindownload.html 14 Apr 2003 14:30:10 - 1.28 @@ -166,10 +166,12 @@ Downloading Ant /h3 pUse the links below to download a binary distribution of Ant from -one of our mirrors. You strongmust/strong -a href=[location]#Verify Releasesverify the integrity/a of the -downloaded files using signatures downloaded from our main -distribution directory./p +one of our mirrors. It is good practice to +a href=[location]#Verify Releasesverify the integrity/a +of the distribution files, especially if you are using one of our +mirror sites. In order to do this you must use the signatures from +our a href=http://www.apache.org/dist/ant/;main distribution +directory/a./p pAnt is distributed as codezip/code, codetar.gz/code and codetar.bz2/code archives - the contents are the same. Please note that the codetar.*/code archives contain file names longer 1.27 +6 -4 ant/docs/srcdownload.html Index: srcdownload.html === RCS file: /home/cvs/ant/docs/srcdownload.html,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- srcdownload.html 9 Apr 2003 01:44:50 - 1.26 +++ srcdownload.html 14 Apr 2003 14:30:10 - 1.27 @@ -166,10 +166,12 @@ Downloading Ant /h3 pUse the links below to download a source distribution of Ant from -one of our mirrors. You strongmust/strong -a href=[location]#Verify Releasesverify the integrity/a of the -downloaded files using signatures downloaded from our main -distribution directory./p +one of our mirrors. It is good practice to +a href=[location]#Verify Releasesverify the integrity/a +of the distribution files, especially if you are using one of our +mirror sites. In order to do this you must use the signatures from +our a href=http://www.apache.org/dist/ant/;main distribution +directory/a./p pAnt is distributed as codezip/code, codetar.gz/code and codetar.bz2/code archives - the contents are the same. Please note that the codetar.*/code archives contain file names longer 1.13 +6 -4 ant/xdocs/bindownload.xml Index: bindownload.xml === RCS file: /home/cvs/ant/xdocs/bindownload.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- bindownload.xml 9 Apr 2003 01:44:53 - 1.12 +++ bindownload.xml 14 Apr 2003 14:30:10 - 1.13 @@ -11,10 +11,12 @@ section name=Downloading Ant pUse the links below to download a binary distribution of Ant from -one of our mirrors. You strongmust/strong -a href=[location]#Verify Releasesverify the integrity/a of the -downloaded files using signatures downloaded from our main -distribution directory./p +one of our mirrors. It is good practice to +a href=[location]#Verify Releasesverify the integrity/a +of the distribution files, especially if you are using one of our +mirror sites. In order to do this you must use the signatures from +our a href=http://www.apache.org/dist/ant/;main distribution +directory/a./p pAnt is distributed as codezip/code, codetar.gz/code and codetar.bz2/code archives - the contents are the same. Please 1.11 +6 -4 ant/xdocs/srcdownload.xml Index: srcdownload.xml === RCS file: /home/cvs/ant/xdocs/srcdownload.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- srcdownload.xml 9 Apr 2003 01:44:53 - 1.10 +++ srcdownload.xml 14 Apr 2003 14:30:10 - 1.11 @@ -11,10 +11,12 @@ section name=Downloading Ant pUse the links below to download a source distribution of Ant from -one of our mirrors. You strongmust/strong -a href=[location]#Verify Releasesverify the integrity/a of the -downloaded files using signatures downloaded from our main -distribution directory./p +one of our mirrors. It is good practice to +a href=[location]#Verify Releasesverify the
cvs commit: ant/xdocs contributors.xml
jesse 2003/04/14 07:37:08 Modified:xdocscontributors.xml Log: Add myself to the list as a test of write access Revision ChangesPath 1.5 +5 -0 ant/xdocs/contributors.xml Index: contributors.xml === RCS file: /home/cvs/ant/xdocs/contributors.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- contributors.xml 7 Mar 2003 11:32:20 - 1.4 +++ contributors.xml 14 Apr 2003 14:37:08 - 1.5 @@ -239,6 +239,11 @@ and EJB runtime environments -- in that order. /p +p +bJesse Stockall/bbr/ +/p + + /subsection subsection name=Emeritus Committers p
cvs commit: ant/src/main/org/apache/tools/ant Diagnostics.java DirectoryScanner.java IntrospectionHelper.java Location.java ProjectComponent.java ProjectHelper.java PropertyHelper.java Task.java UnknownElement.java XmlLogger.java
conor 2003/04/14 07:47:42
Modified:src/main/org/apache/tools/ant Diagnostics.java
DirectoryScanner.java IntrospectionHelper.java
Location.java ProjectComponent.java
ProjectHelper.java PropertyHelper.java Task.java
UnknownElement.java XmlLogger.java
Log:
More cleanup
Revision ChangesPath
1.9 +29 -22ant/src/main/org/apache/tools/ant/Diagnostics.java
Index: Diagnostics.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Diagnostics.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -u -r1.8 -r1.9
--- Diagnostics.java 31 Mar 2003 13:46:18 - 1.8
+++ Diagnostics.java 14 Apr 2003 14:47:41 - 1.9
@@ -77,6 +77,9 @@
*/
public final class Diagnostics {
+private static final String TEST_CLASS
+= org.apache.tools.ant.taskdefs.optional.Test;
+
/** utility class */
private Diagnostics(){
}
@@ -88,7 +91,7 @@
*/
public static boolean isOptionalAvailable() {
try {
-Class.forName(org.apache.tools.ant.taskdefs.optional.Test);
+Class.forName(TEST_CLASS);
} catch (ClassNotFoundException e){
return false;
}
@@ -102,13 +105,15 @@
*/
public static void validateVersion() throws BuildException {
try {
-Class optional =
Class.forName(org.apache.tools.ant.taskdefs.optional.Test);
+Class optional
+=
Class.forName(org.apache.tools.ant.taskdefs.optional.Test);
String coreVersion = getImplementationVersion(Main.class);
String optionalVersion = getImplementationVersion(optional);
if (coreVersion != null !coreVersion.equals(optionalVersion)
){
throw new BuildException(
-Invalid implementation version between Ant core and
Ant optional tasks.\n +
+Invalid implementation version between Ant core and
++ Ant optional tasks.\n +
core: + coreVersion + \n +
optional: + optionalVersion);
}
@@ -253,7 +258,8 @@
try {
optional = Class.forName(
org.apache.tools.ant.taskdefs.optional.Test);
-out.println(optional tasks : +
getImplementationVersion(optional));
+out.println(optional tasks :
++ getImplementationVersion(optional));
} catch (ClassNotFoundException e){
out.println(optional tasks : not available);
}
@@ -331,7 +337,8 @@
Throwable error = null;
try {
Class which = Class.forName(org.apache.env.Which);
-Method method = which.getMethod(main, new Class[]{
String[].class });
+Method method
+= which.getMethod(main, new Class[]{ String[].class });
method.invoke(null, new Object[]{new String[]{}});
} catch (ClassNotFoundException e) {
out.println(Not available.);
1.39 +7 -4 ant/src/main/org/apache/tools/ant/DirectoryScanner.java
Index: DirectoryScanner.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -w -u -r1.38 -r1.39
--- DirectoryScanner.java 12 Feb 2003 09:05:03 - 1.38
+++ DirectoryScanner.java 14 Apr 2003 14:47:41 - 1.39
@@ -152,7 +152,8 @@
* @author a href=mailto:[EMAIL PROTECTED]Bruce Atherton/a
* @author a href=mailto:[EMAIL PROTECTED]Antoine Levy-Lambert/a
*/
-public class DirectoryScanner implements FileScanner, SelectorScanner,
ResourceFactory {
+public class DirectoryScanner
+ implements FileScanner, SelectorScanner, ResourceFactory {
/**
* Patterns which should be excluded by default.
@@ -949,8 +950,10 @@
}
/**
+ * Get the named resource
* @param name path name of the file relative to the dir attribute.
*
+ * @return the resource with the given name.
* @since Ant 1.5.2
*/
public Resource getResource(String name) {
1.53 +2 -1
ant/src/main/org/apache/tools/ant/IntrospectionHelper.java
Index: IntrospectionHelper.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -w -u -r1.52 -r1.53
--- IntrospectionHelper.java 14 Apr 2003 11:58:03
Re: cvs commit: ant/xdocs contributors.xml
On 14 Apr 2003, [EMAIL PROTECTED] wrote: Add myself to the list as a test of write access welcome! Further commit mails should go through without delay (this one was waiting in the moderation queue). Stefan
cvs commit: ant/src/main/org/apache/tools/ant XmlLogger.java
conor 2003/04/14 08:01:10
Modified:src/main/org/apache/tools/ant XmlLogger.java
Log:
typo
Revision ChangesPath
1.36 +1 -1 ant/src/main/org/apache/tools/ant/XmlLogger.java
Index: XmlLogger.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/XmlLogger.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -w -u -r1.35 -r1.36
--- XmlLogger.java14 Apr 2003 14:47:42 - 1.35
+++ XmlLogger.java14 Apr 2003 15:01:09 - 1.36
@@ -480,7 +480,7 @@
/**
* Ignore emacs mode, as it has no meaning in XML format
*
- * @param emacsMode true if no loggher should produce emacs compatible
+ * @param emacsMode true if logger should produce emacs compatible
*output
*/
public void setEmacsMode(boolean emacsMode) {
cvs commit: ant/src/testcases/org/apache/tools/ant/filters HeadTailTest.java
umagesh 2003/04/14 08:37:48
Modified:.WHATSNEW
docs/manual/CoreTypes filterchain.html
src/main/org/apache/tools/ant/filters HeadFilter.java
TailFilter.java
Added: src/etc/testcases/filters head-tail.xml
src/etc/testcases/filters/expected head-tail.head.test
head-tail.headAllSkip.test head-tail.headLines.test
head-tail.headLinesSkip.test
head-tail.headSkip.test head-tail.headtail.test
head-tail.tail.test head-tail.tailAllSkip.test
head-tail.tailLines.test
head-tail.tailLinesSkip.test
head-tail.tailSkip.test
src/etc/testcases/filters/input head-tail.small.test
head-tail.test
src/testcases/org/apache/tools/ant/filters HeadTailTest.java
Log:
New skip attribute for HeadFilter and TailFilter
PR: 18849
Submitted by: [EMAIL PROTECTED] (Jan Matèrne)
Revision ChangesPath
1.396 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -r1.395 -r1.396
--- WHATSNEW 14 Apr 2003 07:53:06 - 1.395
+++ WHATSNEW 14 Apr 2003 15:37:42 - 1.396
@@ -32,6 +32,9 @@
Fixed bugs:
---
+* A new attribute named skip is added to the TailFilter and
+ HeadFilter filter readers.
+
* Expand tasks did not behave as expected with PatternSets.
* property environment=... / now works on OS/400.
1.6 +133 -2ant/docs/manual/CoreTypes/filterchain.html
Index: filterchain.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTypes/filterchain.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- filterchain.html 14 Mar 2003 13:45:16 - 1.5
+++ filterchain.html 14 Apr 2003 15:37:44 - 1.6
@@ -240,7 +240,14 @@
TR
TD vAlign=toplines/TD
TD vAlign=top align=centerNumber of lines to be read.
-Defaults to quot;10quot;/TD
+Defaults to quot;10quot; BR A negative value means that all lines are
+passed (useful with Iskip/I)/TD
+TD vAlign=top align=centerNo/TD
+ /TR
+ TR
+TD vAlign=topskip/TD
+TD vAlign=top align=centerNumber of lines to be skipped (from the
beginning).
+Defaults to quot;0quot;/TD
TD vAlign=top align=centerNo/TD
/TR
/TABLE
@@ -267,6 +274,19 @@
lt;/loadfilegt;
/PRE/BLOCKQUOTE
+This stores the first 15 lines, skipping the first 2 lines, of the supplied
data
+in the porperty ${src.file.head}. (Means: lines 3-17)
+BLOCKQUOTEPRE
+lt;loadfile srcfile=quot;${src.file}quot;
property=quot;${src.file.head}quot;gt;
+ lt;filterchaingt;
+lt;headfilter lines=quot;15quot; skip=quot;2quot;/gt;
+ lt;/filterchaingt;
+lt;/loadfilegt;
+/PRE/BLOCKQUOTE
+
+See the testcases for more examples
(Isrc\etc\testcases\filters\head-tail.xml/I in the
+source distribution).
+
H3a name=linecontainsLineContains/a/H3
This filter includes only those lines that contain all the user-specified
@@ -602,11 +622,110 @@
TR
TD vAlign=toplines/TD
TD vAlign=top align=centerNumber of lines to be read.
-Defaults to quot;10quot;/TD
+Defaults to quot;10quot; BR A negative value means that all lines are
+passed (useful with Iskip/I)/TD
+TD vAlign=top align=centerNo/TD
+ /TR
+ TR
+TD vAlign=topskip/TD
+TD vAlign=top align=centerNumber of lines to be skipped (from the
end).
+Defaults to quot;0quot; /TD
TD vAlign=top align=centerNo/TD
/TR
/TABLE
P
+
+H4Background:/H4
+With HeadFilter and TailFilter you can extract each part of a text file you
want.
+This graphic shows the dependencies:
+
+TABLE cellSpacing=0 cellPadding=2 border=1
+TR
+ TH Content /TH
+ TH/TH
+ TH/TH
+ TH/TH
+ TH Filter /TH
+/TR
+TR
+ TD Line 1 /TD
+ TD rowspan=2 bgcolor=#C0C0C0nbsp;/TD
+ TD rowspan=9 bgcolor=#FF00FFnbsp;/TD
+ TD rowspan=4nbsp;/TD
+ TD rowspan=11
+TABLE
+TR
+ TD bgcolor=#C0C0C0nbsp;/TD
+ TDPRElt;filterchain
+lt;headfilter lines=2/gt;
+lt;/filterchain/PRE/TD
+/TR
+TR
+ TD bgcolor=#FF00FFnbsp;/TD
+ TDPRElt;filterchain
+lt;tailfilter lines=-1 skip=2/gt;
+lt;/filterchain/PRE/TD
+/TR
+TR
+ TD bgcolor=#008000nbsp;/TD
+ TDPRElt;filterchain
+lt;headfilter lines=-1 skip=2/gt;
+lt;/filterchain/PRE/TD
+/TR
+TR
+ TD bgcolor=#FFnbsp;/TD
+ TDPRElt;filterchain
+lt;headfilter lines=-1 skip=2/
+lt;tailfilter lines=-1 skip=2/
DO NOT REPLY [Bug 18849] - New skip attribute for HeadFilter and TailFilter
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=18849. 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=18849 New skip attribute for HeadFilter and TailFilter [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2003-04-14 15:40 --- CVS HEAD Patched - Thanks!
cvs commit: ant WHATSNEW
umagesh 2003/04/14 08:41:38 Modified:.WHATSNEW Log: Adding a new attribute is not a bug... Revision ChangesPath 1.397 +3 -3 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.396 retrieving revision 1.397 diff -u -r1.396 -r1.397 --- WHATSNEW 14 Apr 2003 15:37:42 - 1.396 +++ WHATSNEW 14 Apr 2003 15:41:38 - 1.397 @@ -32,9 +32,6 @@ Fixed bugs: --- -* A new attribute named skip is added to the TailFilter and - HeadFilter filter readers. - * Expand tasks did not behave as expected with PatternSets. * property environment=... / now works on OS/400. @@ -102,6 +99,9 @@ Other changes: -- +* A new attribute named skip is added to the TailFilter and + HeadFilter filter readers. + * Shipped XML parser is now Xerces 2.4.0 * The filesetmanifest attribute of jar has been reenabled.
DO NOT REPLY [Bug 18786] - exec cannot execute all command lines...
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=18786. 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=18786 exec cannot execute all command lines... --- Additional Comments From [EMAIL PROTECTED] 2003-04-14 16:21 --- Yes, still alive - I will try it. Jeff
Re: [PATCH] add regular expression selector (re-worked)
Jay wrote: Here is the new patch to add a regular expression selector as a core task, instead of the one I submitted Wednesday that just updated ContainsSelector. I was thinking I should also do a test case. I have gotten lost trying to find what's needed. I'm sure these questions have been answered before but so far I have not had much luck finding a howto for doing a test case. I have looked at the others similar in /testcases/org/apache/tools/ant/types/selectors for example the ContainsSelector. Where is the input file for that test, how do I drive a specific test case? I have to own up by being stumped by Selector tests too, which is why the FilesMatch one doesnt have any. oops
Re: [VOTE] Antoine Levy-Lambert as committer
Stefan Bodewig wrote: Hi all, Antoine has continuously been sending in patches since months now, he's played an important role in the zip refactoring and is answering more question on the user list than most of us here. Furthermore Antoine has access to a perforce installation, so he's able to test and fix those tasks. 8-) Finally he's expressed interest in reviving the antlib proposal. I feel it is time to make him a committer and ask you to vote on this. Let me start with my +1 I celebrate new committers; it helps the project to grow and evolve: +1 -steve
DO NOT REPLY [Bug 19006] New: - Better support of the 'path' element, in particular in the 'fileset' element'
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=19006.
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=19006
Better support of the 'path' element, in particular in the 'fileset' element'
Summary: Better support of the 'path' element, in particular in
the 'fileset' element'
Product: Ant
Version: 1.5.3
Platform: All
OS/Version: All
Status: NEW
Severity: Enhancement
Priority: Other
Component: Core tasks
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
By now, most ANT tasks, elements and attributes (for example 'fileset' and
'webxml') are used easily only if all files to process are in the same
'WorkArea'.
But for big projects, the fact that each developper has all files in its own
'WorkArea' has drawbacks :
- Each WorkArea contains too many files (several thousands) to be correcly
managed by a human being.
- Whenever a developper modifies the interface of a low level API, he has to
deliver it to all other developpers, and this manual delivery process NEVER
works correctly.
So we use following concepts and methods :
- At one time, the project manager creates a 'Baseline', which is a 'WorkArea'
corresponding to a project version, containing a coherent set of versions of
all
files, builds it with classpath=Baseline, the publishes it read-only for all
developpers.
- Each developper then creates his own 'WorkArea' pointing to the common
'Baseline' :
- At the beginning, the WorkArea contains only empty folders, but NO file.
- The developper puts in his WorkArea only NEW and MODIFIED files.
- For compilation, the classpath is 'WorkArea;Baseline'.
- That permits all developpers to easily handle a sparse WorkArea with a
limited number of files, and automatically use the SAME low level APIs delived
in the Baseline.
When needed, the project manager can also create an 'Incremental Baseline' by
building it as a WorkArea pointing to an existing 'Baseline', then publishing
it
read-only.
Each developer can then create his own new WorkArea pointing to the incremental
Baseline, and the classpath is then 'WorkArea;Incremental Baseline;Full
Baseline'.
We also sometimes use more than 3 levels.
So, the (class)path to search for files can be any one of these ones:
1) 'WorkArea'
2) 'WorkArea:Full Baseline'
3) 'WorkArea;Incremental Baseline;Full Baseline
4) ...
In my wrapper script (written in perl), I follow the 'WorkArea' to 'Baseline'
links to get the full PATH, and I call ant with the corresponding options :
1) '-Dbasedir=WorkArea'
2) '-Dbasedir=WorkArea' '-Dsp1=Full Baseline'
3) '-Dbasedir=WorkArea' '-Dsp1=Incremental Baseline' '-Dsp2=Full Baseline'
4) ...
So ANT is aware of the full PATH.
But this is NOT easily handled in the 'build.xml' file, mainly because the
'fileset' element requires an EXISTING 'dir' attribute.
So, if I want to manage n levels of WorkArea, I have to n-plicate each task,
with 'if' and 'unless' attributes (see example with 3 levels at the bottom).
Below are my enhancement requests, that I hope can be implemented in ANT 1.6 :
A) fileset
---
My main enhancement request is that the 'fileset' element accepts the 'path'
and
'pathref' attributes similar respectively to the 'classpath' and 'classpathref'
attributes of the 'javac' task.
B) war
---
Similarly, the 'war' task should accept the 'webxmlpath' and 'webxmlpathref'
attributes to search for the file specified by the 'webxml' attribute.
C) property
Similarly, when the 'location' attribute is specified and the value of
'location' is NOT an absolute path, the 'property' element should accept the
'path' and 'pathref' attributes to search for the file specified by the
'location' attribute there, and NOT in the project's 'basedir'.
D) fileset
---
When the 'dir' attribute is specified, the 'fileset' element should accept the
'mandatory' attribute, with default value 'true'. When its value is 'false',
the task should NOT fail, but the 'fileset' element should be simply ignored.
?xml version=1.0 encoding=UTF-8?
project name=exampleWar default=exampleWar
descriptionANT build file for example.war/description
!--
Verify that the destination folder exists.
Define the destination file.
--
target name=init
echo level=verbose message=Project Name = ${ant.project.name}/
!-- Create the time stamp --
tstamp/
property name=webappsvalue=tomcat/webapps/
available property=webappsOK type=dir file=${webapps}/
fail unless=webappsOK
message= * Folder '${webapps}' NOT found */
echo level=verbose message=webapps
cvs commit: ant/src/testcases/org/apache/tools/ant/filters DynamicFilterTest.java TokenFilterTest.java
umagesh 2003/04/14 11:02:24
Modified:.WHATSNEW build.xml
docs/manual/CoreTypes filterchain.html
src/main/org/apache/tools/ant/types FilterChain.java
defaults.properties
Added: src/etc/testcases/filters dynamicfilter.xml tokenfilter.xml
src/main/org/apache/tools/ant/filters TokenFilter.java
src/main/org/apache/tools/ant/types/optional
ScriptFilter.java
src/testcases/org/apache/tools/ant/filters
DynamicFilterTest.java TokenFilterTest.java
Log:
New tokenfilter for filterchain
PR: 18312
Submitted by: [EMAIL PROTECTED] (peter reilly)
Revision ChangesPath
1.398 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- WHATSNEW 14 Apr 2003 15:41:38 - 1.397
+++ WHATSNEW 14 Apr 2003 18:02:23 - 1.398
@@ -99,6 +99,9 @@
Other changes:
--
+* A new filter reader namely tokenfilter has been added. Bugzilla
+ Report 18312.
+
* A new attribute named skip is added to the TailFilter and
HeadFilter filter readers.
1.364 +4 -1 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -r1.363 -r1.364
--- build.xml 10 Apr 2003 06:47:24 - 1.363
+++ build.xml 14 Apr 2003 18:02:23 - 1.364
@@ -202,7 +202,10 @@
filename name=${ant.package}/listener/CommonsLoggingListener*/
/selector
selector id=needs.bsf
-filename name=${optional.package}/Script*/
+or
+ filename name=${optional.package}/Script*/
+ filename name=${optional.type.package}/Script*/
+/or
/selector
selector id=needs.stylebook
filename name=${optional.package}/StyleBook*/
1.7 +477 -1ant/docs/manual/CoreTypes/filterchain.html
Index: filterchain.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTypes/filterchain.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- filterchain.html 14 Apr 2003 15:37:44 - 1.6
+++ filterchain.html 14 Apr 2003 18:02:23 - 1.7
@@ -101,6 +101,8 @@
a href=#striplinecommentsStripLineComments/aBR
a href=#tabstospacesTabsToSpaces/aBR
a href=#tailfilterTailFilter/aBR
+a href=#deletecharactersDeleteCharacters/aBR
+a href=#tokenfilterTokenFilter/aBR
H3a name=filterreaderFilterReader/a/H3
@@ -552,7 +554,7 @@
This removes all lines that begin with #, --, REM, rem and //
BLOCKQUOTEPRE
lt;filterreader
classname=quot;org.apache.tools.ant.filters.StripLineCommentsquot;gt;
- lt;param type=quot;commentquot; value=#quot;/gt;
+ lt;param type=quot;commentquot; value=quote;#quot;/gt;
lt;param type=quot;commentquot; value=quot;--quot;/gt;
lt;param type=quot;commentquot; value=quot;REM quot;/gt;
lt;param type=quot;commentquot; value=quot;rem quot;/gt;
@@ -785,6 +787,480 @@
lt;/filterchaingt;
lt;/loadfilegt;
/PRE/BLOCKQUOTE
+
+H3a name=deletecharactersDeleteCharacters/a/H3
+
+ pThis filter deletes specified characters./p
+ pemsince Ant 1.6/em/p
+ pThis filter is only available in the convenience form./p
+
+TABLE cellSpacing=0 cellPadding=2 border=1
+ TR
+TD vAlign=topBParameter Name/B/TD
+TD vAlign=topBParameter Value/B/TD
+TD vAlign=top align=centerBRequired/B/TD
+ /TR
+ TR
+TD vAlign=topchars/TD
+TD vAlign=top
+ The characters to delete. This attribute is
+ a href=#backslashbackslash enabled/a.
+/TD
+TD vAlign=top align=centerYes/TD
+ /TR
+/TABLE
+P
+H4Examples:/H4
+
+Delete tabs and returns from the data.
+BLOCKQUOTEPRE
+lt;deletecharacters chars=\t\r/gt;
+/PRE/BLOCKQUOTE
+
+
+H3a name=tokenfilterTokenFilter/a/H3
+This filter tokenizes the inputstream into strings and passes these
+strings to filters of strings. Unlike the other filterreaders, this does
+not support params, only convenience methods are implemented.
+The tokenizer and the string filters are defined by nested elements.
+Pemsince Ant 1.6/em/p
+P
+Only one tokenizer element may be used, the LineTokenizer is the
+default if none are specified. A tokenizer
+splits the input into token strings and trailing delimiter strings.
+P
+There may be zero or more string filters. A string filter processes
+a token and either returns a string or a null.
+It the string is not null it is passed to the next filter. This
+proceeds until all the filters are called.
cvs commit: ant/docs/manual/CoreTypes filterchain.html
umagesh 2003/04/14 11:07:31 Modified:docs/manual/CoreTypes filterchain.html Log: quote; - quot; Revision ChangesPath 1.8 +1 -1 ant/docs/manual/CoreTypes/filterchain.html Index: filterchain.html === RCS file: /home/cvs/ant/docs/manual/CoreTypes/filterchain.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- filterchain.html 14 Apr 2003 18:02:23 - 1.7 +++ filterchain.html 14 Apr 2003 18:07:31 - 1.8 @@ -554,7 +554,7 @@ This removes all lines that begin with #, --, REM, rem and // BLOCKQUOTEPRE lt;filterreader classname=quot;org.apache.tools.ant.filters.StripLineCommentsquot;gt; - lt;param type=quot;commentquot; value=quote;#quot;/gt; + lt;param type=quot;commentquot; value=quot;#quot;/gt; lt;param type=quot;commentquot; value=quot;--quot;/gt; lt;param type=quot;commentquot; value=quot;REM quot;/gt; lt;param type=quot;commentquot; value=quot;rem quot;/gt;
DO NOT REPLY [Bug 18476] - copy with filtering modifies lineendings
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=18476. 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=18476 copy with filtering modifies lineendings --- Additional Comments From [EMAIL PROTECTED] 2003-04-14 18:24 --- Peter, Please provide testcases - the tests should fail before the patch is applied and must pass afterwards.
cvs commit: ant WHATSNEW
umagesh 2003/04/14 11:43:35 Modified:.WHATSNEW Log: Note on addition of six clearcase tasks. Revision ChangesPath 1.399 +2 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.398 retrieving revision 1.399 diff -u -r1.398 -r1.399 --- WHATSNEW 14 Apr 2003 18:02:23 - 1.398 +++ WHATSNEW 14 Apr 2003 18:43:35 - 1.399 @@ -99,6 +99,8 @@ Other changes: -- +* Six new Clearcase tasks added. + * A new filter reader namely tokenfilter has been added. Bugzilla Report 18312.
Re: [VOTE] Antoine Levy-Lambert as committer
Stefan Bodewig wrote: Hi all, Antoine has continuously been sending in patches since months now, he's played an important role in the zip refactoring and is answering more question on the user list than most of us here. Furthermore Antoine has access to a perforce installation, so he's able to test and fix those tasks. 8-) Finally he's expressed interest in reviving the antlib proposal. I feel it is time to make him a committer and ask you to vote on this. Let me start with my +1 +1
cvs commit: ant/xdocs index.xml
umagesh 2003/04/14 12:17:01 Modified:docs contributors.html index.html xdocsindex.xml Log: 1.5.2 - 1.5.3 Revision ChangesPath 1.16 +3 -0 ant/docs/contributors.html Index: contributors.html === RCS file: /home/cvs/ant/docs/contributors.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- contributors.html 9 Apr 2003 01:44:48 - 1.15 +++ contributors.html 14 Apr 2003 19:16:59 - 1.16 @@ -372,6 +372,9 @@ compilers, Object Databases (SIGSEV, you da man!) for C++, Java ORB and EJB runtime environments -- in that order. /p +p +bJesse Stockall/bbr / +/p h4 class=subsection a name=Emeritus Committers/a Emeritus Committers 1.279 +1 -1 ant/docs/index.html Index: index.html === RCS file: /home/cvs/ant/docs/index.html,v retrieving revision 1.278 retrieving revision 1.279 diff -u -r1.278 -r1.279 --- index.html9 Apr 2003 03:05:26 - 1.278 +++ index.html14 Apr 2003 19:16:59 - 1.279 @@ -227,7 +227,7 @@ Documentation /h3 p -You can view the documentation for the current release (Apache Ant 1.5.2) +You can view the documentation for the current release (Apache Ant 1.5.3) a href=manual/index.htmlonline/a /p p 1.47 +1 -1 ant/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/ant/xdocs/index.xml,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- index.xml 9 Apr 2003 03:05:26 - 1.46 +++ index.xml 14 Apr 2003 19:17:00 - 1.47 @@ -76,7 +76,7 @@ section name=Documentation p -You can view the documentation for the current release (Apache Ant 1.5.2) +You can view the documentation for the current release (Apache Ant 1.5.3) a href=manual/index.htmlonline/a /p
cvs commit: ant/xdocs faq.xml
umagesh 2003/04/14 12:28:14 Modified:docs faq.html xdocsfaq.xml Log: Update Release history. Revision ChangesPath 1.69 +10 -0 ant/docs/faq.html Index: faq.html === RCS file: /home/cvs/ant/docs/faq.html,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- faq.html 9 Apr 2003 01:44:48 - 1.68 +++ faq.html 14 Apr 2003 19:28:12 - 1.69 @@ -496,6 +496,16 @@ 3 March 2003 /td /tr + tr + td colspan=1 rowspan=1 + valign=top align=left + 1.5.3 + /td + td colspan=1 rowspan=1 + valign=top align=left + 9 April 2003 + /td + /tr /table p class=faq a name=no-gnu-tar/a 1.35 +5 -0 ant/xdocs/faq.xml Index: faq.xml === RCS file: /home/cvs/ant/xdocs/faq.xml,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- faq.xml 8 Apr 2003 13:04:24 - 1.34 +++ faq.xml 14 Apr 2003 19:28:14 - 1.35 @@ -156,6 +156,11 @@ td1.5.2/td td3 March 2003/td /tr + + tr +td1.5.3/td +td9 April 2003/td + /tr /table /answer /faq
Re: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase CCLock.java CCMkbl.java CCMklabel.java CCMklbtype.java CCRmtype.java CCUnlock.java ClearCase.java
Magesh Umasankar wrote: I am sending a summary of the commit I made because ezmlm-reject said: fatal: Sorry, I don't accept messages larger than 10 bytes (#5.2.3) while I trust you etc, etc, this is the trick that would let me sneak a back door into something complex and vulnerable, like say xerces or axis. Hide the back door in 100K of changes and it'll take code review to find it. -steve
