Re: Ant 1.6
On Tue, 23 Sep 2003 12:40 am, Stefan Bodewig wrote: On Mon, 22 Sep 2003, Antoine Lévy-Lambert [EMAIL PROTECTED] wrote: - sort out if possible the CLASSPATH issue by : What you propose would probably work. On the other hand, Launcher could give us a chance to break away from the everything is on a single classpath, which is as good as the system classpath architecture of Main that, I fear, won't scale. Add -lib will solve some problem, the same sort of problems that can be solved by not using Launcher but Main. I'm not sure whether it would prevent us from solving a different set of problems. All in all, I'm a bit neutral here as I fail to see all consequences. I don't know if this will help with the CLASSPATH related issues but a -lib option is a good idea, anyway. It allows you to use one or more library directories without modifying the main Ant installation. Conor - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Ant 1.6
On Mon, 22 Sep 2003 08:11 pm, Antoine Lévy-Lambert wrote: I have tagged the ANT_16_BRANCH (actually 2 hours before schedule, hope it does not disturb anyone). The fact that every commit now involves a merge to 1.6 or vice versa would indicate to me that this branch is too early. IMHO, If we are going to branch then let's fix everything on the branch and focus on getting 1.6 out the door. We then do one merge. The piecemeal merges will make it hardder to do a single merge and also make it more likely than something will be committed in one tree and not the other. Just MHO. Conor - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 23339] - Core Task War, Ear, Jar should have the M feature available
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=23339. 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=23339 Core Task War, Ear, Jar should have the M feature available [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2003-09-23 00:39 --- If you don't want to create a manifest, use the zip task. Your statement Because of this, if the Class-Path value is longer than 71 characters a hard line is used and the filenames are broken up. This makes the Class-Path entry invalid for any listings after the end of the first line (including a separated file on the first line) is incorrect. Class-Path entries greater than 72 chars are not valid according to the jar specification and must be broken up into separate lines, using continuations (lines starting with a space). Such an entry is not only not invalid, it is required. If Class-Path entries with continuations cause some systems to have problems, then unfortunately, the problems lie with those systems and should be reported to their developers. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 23322] - VAJ task run fail if VAJ's project name has some space character
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=23322. 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=23322 VAJ task run fail if VAJ's project name has some space character --- Additional Comments From [EMAIL PROTECTED] 2003-09-23 03:53 --- Hi Stefan, I compare my org.apache.tools.ant.taskdefs.optional.ide package with package in Ant 1.5.4, I found only 2 difference point (my package was corrected base on some guide in some Bugzilla, I am not remember exactly): In VAJImportServlet and VAJExportServlet, in executeRequest method, I use new File(URLDecoder.decode(getFirstParamValueString(DIR_PARAM))) instead of new File(getFirstParamValueString(DIR_PARAM)) I have just change to: new File(getFirstParamValueString(DIR_PARAM)), but it still error I think in VAJRemoteUtil, when sending an request to Remote Access To Tool API, we need to do some thing with request. I run Ant with -debug option then get java.lang.NullPointerException error, I get a debug message Request:http://localhost:32767/servlet/vajimport?project=NCM NCMdir=D%3A% 5CHitachi%5CPrototype%5CSIAT%5CTCC%5Cgetcls=falseres=falsesrc=truedex So if I config my VAJ project name is NCM+NCM, it work correctly - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/etc/testcases/types/assertions - New directory
stevel 2003/09/22 22:48:11 ant/src/etc/testcases/types/assertions - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs PreSetDef.java
bodewig 2003/09/22 22:59:04
Modified:src/main/org/apache/tools/ant/taskdefs PreSetDef.java
Log:
Make PreSetDef compile
Revision ChangesPath
1.8 +2 -26 ant/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java
Index: PreSetDef.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PreSetDef.java15 Sep 2003 16:55:01 - 1.7
+++ PreSetDef.java23 Sep 2003 05:59:04 - 1.8
@@ -77,10 +77,9 @@
* @author Peter Reilly
* @since Ant 1.6
*/
-public class PreSetDef extends Task implements AntlibInterface,
TaskContainer {
+public class PreSetDef extends AntlibDefinition implements TaskContainer {
private UnknownElement nestedTask;
private String name;
-private String uri;
/**
* Name of the definition
@@ -89,29 +88,6 @@
public void setName(String name) {
this.name = name;
}
-/**
- * The URI for this definition.
- * @param uri the namespace URI
- * @throws BuildException if uri is not allowed
- */
-public void setURI(String uri) throws BuildException {
-if (uri.equals(ProjectHelper.ANT_CORE_URI)) {
-uri = ;
-}
-if (uri.startsWith(ant:)) {
-throw new BuildException(Attempt to use a reserved URI + uri);
-}
-this.uri = uri;
-}
-/**
- * Set the class loader.
- * Not used
- * @param classLoader a codeClassLoader/code value
- */
-public void setAntlibClassLoader(ClassLoader classLoader) {
-// Ignore
-}
-
/**
* Add a nested task to predefine attributes and elements on
@@ -140,7 +116,7 @@
throw new BuildException(Name not specified);
}
-name = ProjectHelper.genComponentName(uri, name);
+name = ProjectHelper.genComponentName(getURI(), name);
ComponentHelper helper = ComponentHelper.getComponentHelper(
getProject());
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs PreSetDef.java
bodewig 2003/09/22 23:00:00
Modified:src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
PreSetDef.java
Log:
Make PreSetDef compile
Revision ChangesPath
No revision
No revision
1.7.2.1 +2 -26 ant/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java
Index: PreSetDef.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- PreSetDef.java15 Sep 2003 16:55:01 - 1.7
+++ PreSetDef.java23 Sep 2003 06:00:00 - 1.7.2.1
@@ -77,10 +77,9 @@
* @author Peter Reilly
* @since Ant 1.6
*/
-public class PreSetDef extends Task implements AntlibInterface,
TaskContainer {
+public class PreSetDef extends AntlibDefinition implements TaskContainer {
private UnknownElement nestedTask;
private String name;
-private String uri;
/**
* Name of the definition
@@ -89,29 +88,6 @@
public void setName(String name) {
this.name = name;
}
-/**
- * The URI for this definition.
- * @param uri the namespace URI
- * @throws BuildException if uri is not allowed
- */
-public void setURI(String uri) throws BuildException {
-if (uri.equals(ProjectHelper.ANT_CORE_URI)) {
-uri = ;
-}
-if (uri.startsWith(ant:)) {
-throw new BuildException(Attempt to use a reserved URI + uri);
-}
-this.uri = uri;
-}
-/**
- * Set the class loader.
- * Not used
- * @param classLoader a codeClassLoader/code value
- */
-public void setAntlibClassLoader(ClassLoader classLoader) {
-// Ignore
-}
-
/**
* Add a nested task to predefine attributes and elements on
@@ -140,7 +116,7 @@
throw new BuildException(Name not specified);
}
-name = ProjectHelper.genComponentName(uri, name);
+name = ProjectHelper.genComponentName(getURI(), name);
ComponentHelper helper = ComponentHelper.getComponentHelper(
getProject());
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: Ant 1.6
On Tue, 23 Sep 2003, Conor MacNeill [EMAIL PROTECTED] wrote: IMHO, If we are going to branch then let's fix everything on the branch and focus on getting 1.6 out the door. We then do one merge. I remeber you've told me the same at least once in the past 8-) I'll stay away from HEAD for things that should go into 1.6 and let Antoine merge it later. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/etc/testcases/taskdefs/optional/junit - New directory
bodewig 2003/09/22 23:26:25 ant/src/etc/testcases/taskdefs/optional/junit - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet DotnetCompile.java Ilasm.java Ildasm.java JSharp.java WsdlToDotnet.java
stevel 2003/09/22 23:28:33
Modified:src/main/org/apache/tools/ant/taskdefs/optional/dotnet
DotnetCompile.java Ilasm.java Ildasm.java
JSharp.java WsdlToDotnet.java
Log:
minor cleanups; no code changes
Revision ChangesPath
1.18 +0 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java
Index: DotnetCompile.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DotnetCompile.java21 Sep 2003 22:29:54 - 1.17
+++ DotnetCompile.java23 Sep 2003 06:28:33 - 1.18
@@ -642,8 +642,6 @@
}
-
-
/**
* add a define to the list of definitions
* @param define
1.31 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java
Index: Ilasm.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Ilasm.java6 Sep 2003 07:09:59 - 1.30
+++ Ilasm.java23 Sep 2003 06:28:33 - 1.31
@@ -82,7 +82,7 @@
* /out:file ... /verbose is used some places; /quiet here in ildasm...
etc.]
* It would be nice if someone made all the command line tools consistent
(and
* not as brittle as the java cmdline tools) p
- *
+ * p
* The task is a directory based task, so attributes like bincludes=*.il
* /b and bexcludes=broken.il/b can be used to control the files
pulled
* in. You can also use nested lt;srcgt filesets to refer to source.
1.4 +4 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java
Index: Ildasm.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Ildasm.java 21 Sep 2003 20:20:03 - 1.3
+++ Ildasm.java 23 Sep 2003 06:28:33 - 1.4
@@ -65,7 +65,7 @@
* into ILASM assembly code. Useful when converting imported typelibs into
* assembler before patching and recompiling, as one has to do when doing
* advanced typelib work.
- *
+ * p
* As well as generating the named output file, the ildasm program
* will also generate resource files codeIcons.resources/code
* codeMessage.resources/code and a .res file whose filename stub is
derived
@@ -76,13 +76,13 @@
* creates the resources in the directory specified by
coderesourceDir/code if
* set, else in the same directory as the codedestFile/code.
*
- *
+ * p
* This task requires the .NET SDK installed and ildasm on the path.
* To disassemble using alternate CLR systems, set the executable attribute
* to the name/path of the alternate implementation -one that must
* support all the classic ildasm commands.
*
- *
+ * p
* Dependency logic: the task executes the command if the output file is
missing
* or older than the source file. It does not take into account changes
* in the options of the task, or timestamp differences in resource files.
@@ -90,6 +90,7 @@
* .il file in place with some error message. To prevent this from confusing
* the dependency logic, the file specified by the codedest/code
* attribute is ialways/i deleted after an unsuccessful build.
+ * @ant.task category=dotnet
*/
public class Ildasm extends Task {
1.6 +2 -0
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.java
Index: JSharp.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JSharp.java 21 Sep 2003 22:29:54 - 1.5
+++ JSharp.java 23 Sep 2003 06:28:33 - 1.6
@@ -58,9 +58,11 @@
/**
* Compile J# source down to a managed .NET application.
+ * p
* J# is not Java. But it is the language closest to Java in the .NET
framework.
* This task compiles jsharp source (assumes a .jsl extension,
incidentally), and
* generates a .NET managed exe or dll.
+ * p
* See
http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dv_vjsharp/html/vjoriMicrosoftVisualJ.asp
* for vjc command options in glory detail.
* @author Steve Loughran
1.16 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java
Index:
cvs commit: ant/src/etc/testcases/taskdefs/optional WsdlToDotnet.xml
stevel 2003/09/22 23:29:20
Modified:src/etc/testcases/taskdefs/optional WsdlToDotnet.xml
Log:
the fix to DotnetCompile forced vbc to explicitly reference things. hmm.
Revision ChangesPath
1.5 +8 -1 ant/src/etc/testcases/taskdefs/optional/WsdlToDotnet.xml
Index: WsdlToDotnet.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/optional/WsdlToDotnet.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WsdlToDotnet.xml 8 Oct 2002 05:54:59 - 1.4
+++ WsdlToDotnet.xml 23 Sep 2003 06:29:20 - 1.5
@@ -19,6 +19,9 @@
property name=endpoint.wsdl
value=http://nagoya.apache.org:5049/Axis/StockQuoteService.jws?wsdl; /
+ property name=vb.references
+
value=System.Web.dll,System.xml.dll,System.dll,System.Web.Services.dll/
+
target name=init depends=validate
mkdir dir=${build.dir}/
mkdir dir=${cache.dir}/
@@ -148,7 +151,10 @@
srcDir=${src.dir}
destFile=${out.app}
targetType=${out.type}
- /
+ references=${vb.references}
+
+
+ /vbc
available property=app.created file=${out.app}/
fail unless=app.createdNo app created/fail
/target
@@ -167,6 +173,7 @@
optionExplicit=true
optionStrict=false
optionCompare=text
+ references=${vb.references}
/
available property=app.created file=${out.app}/
fail unless=app.createdNo app created/fail
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs/optional/junit XMLFormatterWithCDATAOnSystemOut.java
bodewig 2003/09/22 23:30:24
Added: src/etc/testcases/taskdefs/optional/junit cdataoutput.xml
src/testcases/org/apache/tools/ant/taskdefs/optional/junit
XMLFormatterWithCDATAOnSystemOut.java
Log:
Add test for PR 21037
Revision ChangesPath
1.1
ant/src/etc/testcases/taskdefs/optional/junit/cdataoutput.xml
Index: cdataoutput.xml
===
project basedir=.
target name=run-junit
junit fork=true
classpath path=${tests-classpath.value}/
sysproperty key=cdata.inner value=true/
test
name=org.apache.tools.ant.taskdefs.optional.junit.XMLFormatterWithCDATAOnSystemOut/
formatter type=xml/
/junit
/target
/project
1.1
ant/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/XMLFormatterWithCDATAOnSystemOut.java
Index: XMLFormatterWithCDATAOnSystemOut.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.taskdefs.optional.junit;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.util.FileUtils;
public class XMLFormatterWithCDATAOnSystemOut extends BuildFileTest {
private static String DIR = src/etc/testcases/taskdefs/optional/junit;
private static String REPORT =
TEST- + XMLFormatterWithCDATAOnSystemOut.class.getName() + .xml;
private static String TESTDATA =
ERROR +
![CDATA[?xml version=\1.0\ encoding=\UTF-8\? +
RESPONSE +
GDS/ +
ERROR +
ID/ +
MESSAGE/ +
REQUEST_TYPE/ +
RESEND/ +
RAW_RESPONSE/ +
/ERROR +
/RESPONSE +
]] +
/ERROR;
public XMLFormatterWithCDATAOnSystemOut(String name) {
super(name);
}
public void testOutput() {
System.out.println(TESTDATA);
}
public void testBuildfile() throws IOException {
configureProject(DIR + /cdataoutput.xml);
if (getProject().getProperty(cdata.inner) == null) {
// avoid
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/junit JUnitTask.java
stevel 2003/09/22 23:31:46
Modified:src/main/org/apache/tools/ant/types Assertions.java
defaults.properties
src/main/org/apache/tools/ant/taskdefs/optional/jsp
Jasper41Mangler.java
src/main/org/apache/tools/ant/taskdefs Java.java
src/main/org/apache/tools/ant/taskdefs/optional/junit
JUnitTask.java
Added: src/etc/testcases/types assertions.xml
src/testcases/org/apache/tools/ant/types AssertionsTest.java
src/etc/testcases/types/assertions AssertionTest.java
Log:
With these changes assertions now work, at least as far as the java tests are
concerned...not tested junit
Revision ChangesPath
1.7 +8 -3 ant/src/main/org/apache/tools/ant/types/Assertions.java
Index: Assertions.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Assertions.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Assertions.java 21 Sep 2003 20:20:02 - 1.6
+++ Assertions.java 23 Sep 2003 06:31:46 - 1.7
@@ -55,14 +55,15 @@
package org.apache.tools.ant.types;
import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
/**
- * implement the assertion datatype. This type describes
- * assertion settings for the lt;javagt; task and derivatives.
+ * The assertion datatype. This type describes
+ * assertion settings for the lt;javagt; task and others.
* One can set the system assertions, and enable/disable those in
* packages classes.
* Assertions can only be enabled or disabled when forking Java.
@@ -127,7 +128,7 @@
* disable assertions
* @param assertion
*/
-public void addDisable(EnabledAssertion assertion) {
+public void addDisable(DisabledAssertion assertion) {
checkChildrenAllowed();
assertionList.add(assertion);
}
@@ -196,11 +197,14 @@
* @param commandList
*/
public void applyAssertions(List commandList) {
+getProject().log(Applying assertions,Project.MSG_DEBUG);
Assertions clause = getFinalReference();
//do the system assertions
if (Boolean.TRUE.equals(clause.enableSystemAssertions)) {
+getProject().log(Enabling system assertions,
Project.MSG_DEBUG);
commandList.add(-enablesystemassertions);
} else if (Boolean.FALSE.equals(clause.enableSystemAssertions)) {
+getProject().log(disabling system assertions,
Project.MSG_DEBUG);
commandList.add(-disablesystemassertions);
}
@@ -209,6 +213,7 @@
while (it.hasNext()) {
BaseAssertion assertion = (BaseAssertion) it.next();
String arg = assertion.toCommand();
+getProject().log(adding assertion +arg, Project.MSG_DEBUG);
commandList.add(arg);
}
}
1.20 +1 -1
ant/src/main/org/apache/tools/ant/types/defaults.properties
Index: defaults.properties
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/defaults.properties,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- defaults.properties 21 Sep 2003 22:30:44 - 1.19
+++ defaults.properties 23 Sep 2003 06:31:46 - 1.20
@@ -19,4 +19,4 @@
zipfileset=org.apache.tools.ant.types.ZipFileSet
scriptfilter=org.apache.tools.ant.types.optional.ScriptFilter
propertyset=org.apache.tools.ant.types.PropertySet
-assertion=org.apache.tools.ant.types.Assertion
\ No newline at end of file
+assertions=org.apache.tools.ant.types.Assertions
1.1 ant/src/etc/testcases/types/assertions.xml
Index: assertions.xml
===
?xml version=1.0?
project name=assertions basedir=. default=init
property name=build.dir location=assertions/build/
property name=src.dir location=assertions/
property name=classname value=AssertionTest/
path id=assert.classpath
pathelement location=${build.dir}/
/path
target name=setup
mkdir dir=${build.dir}/
javac srcdir=${src.dir}
includes=*.java
source=1.4
debug=true
destdir=${build.dir}
/
/target
target name=teardown
delete dir=${build.dir}/
/target
!-- if per-class assertions work, this run asserts --
target name=test-classname depends=setup
java fork=true failonerror=true
classname=${classname}
classpathref=assert.classpath
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp Jasper41Mangler.java
stevel 2003/09/22 23:36:22 Modified:src/main/org/apache/tools/ant/taskdefs/optional/jsp Jasper41Mangler.java Log: oops. didnt mean to commit that a- relic of someones patch to jspc that I wasnt happy with. Revision ChangesPath 1.6 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java Index: Jasper41Mangler.java === RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Jasper41Mangler.java 23 Sep 2003 06:31:46 - 1.5 +++ Jasper41Mangler.java 23 Sep 2003 06:36:22 - 1.6 @@ -97,7 +97,7 @@ modifiedClassName.append(mangleChar(ch)); } } -return modifiedClassName.toString()+.java; +return modifiedClassName.toString(); } /** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
things that break
The late fix to DotnetCompile doesnt seem to break C# apps. But it does stamp on vbc, which clearly does not have the autoreferencing feature of C#. Which makes me feel midly guilty, though of course we havent shipped vbc, so havent broken shipping product. I've patched the test that catches it, wsdltodotnet, with reference parameters -interesting that you need to put ',' as the seperator in VB; but ';' in C#...we could do something to fix that if we cared. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Ant 1.6
Stefan Bodewig wrote: On Tue, 23 Sep 2003, Conor MacNeill [EMAIL PROTECTED] wrote: IMHO, If we are going to branch then let's fix everything on the branch and focus on getting 1.6 out the door. We then do one merge. I remeber you've told me the same at least once in the past 8-) I'll stay away from HEAD for things that should go into 1.6 and let Antoine merge it later. I am working the other way -against HEAD and then hoping on getting clearance from antoine before moving stuff into 1.6 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 23341] New: - copy filtering=true breaks binary 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=23341. 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=23341 copy filtering=true breaks binary files Summary: copy filtering=true breaks binary files Product: Ant Version: 1.5.4 Platform: All URL: http://www.xdweb.net/~dibblego/resume OS/Version: Other Status: NEW Severity: Normal Priority: Other Component: Core tasks AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] I haven't checked the source but I'm gussing that the copy task uses some sort of java.io.Reader when performing filtering. The problem arises when I have, let's say a javadoc directory that contains a zillion ASCII files and one .gif file - the .gif file will get all screwed up by the filtering. I'd prefer not to have to exclude name=**/*.gif/ as this leaves the build open to problems when, for example some other binary file type is placed into the directory to copy. For example, a userguide directory that contains ASCII files plus a few .gif files, I use the exclude on the .gif files and then I introduce a .jpg file - I'd have to remember to exclude that file as well. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Ant 1.6
On Mon, 22 Sep 2003, Steve Loughran [EMAIL PROTECTED] wrote: Stefan Bodewig wrote: I'll stay away from HEAD for things that should go into 1.6 and let Antoine merge it later. I am working the other way -against HEAD and then hoping on getting clearance from antoine before moving stuff into 1.6 Both approaches seem reasonable (mine probably only is for easy bugfixes). Antoine, what would you prefer us to do? Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: concat teardown failing
And I thought that´s only on my machine ... (that´s why I put that into a try-catch block in the tearDown() - the _real_ test shouldn´t fail only because the cleanup fails ...) task not closing things - I will take a look into that. While programming I use java.io.FileReader without a close (I have tried that - without success). And the other filters doesn´t close the Reader either. More hints are welcome :-) Jan -Original Message- From: Steve Loughran [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 23, 2003 8:23 AM To: Ant Developers List Subject: concat teardown failing the cleanup script in concat.xml is failing. Looks to me like the files are still open when the delete task takes action. Could set failonerror flags to ignore it, but it may be a symptom of the task not closing things. platform: winxp, java1.4.2 [junit] - Standard Error - [junit] C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13: Unable to delete file C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\co ncat.filterReaderPrepend.test [junit] at org.apache.tools.ant.taskdefs.Delete.removeDir(Delete.java:612) [junit] at org.apache.tools.ant.taskdefs.Delete.execute(Delete.java:530) [junit] at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:303) [junit] at org.apache.tools.ant.Task.perform(Task.java:401) [junit] at org.apache.tools.ant.Target.execute(Target.java:338) [junit] at org.apache.tools.ant.Target.performTasks(Target.java:365) [junit] at org.apache.tools.ant.Project.executeTarget(Project.java:1237) [junit] at org.apache.tools.ant.BuildFileTest.executeTarget(BuildFileTest .java:273) [junit] at org.apache.tools.ant.filters.ConcatFilterTest.tearDown(ConcatF ilterTest.java:126) ... [junit] C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13: Unable to delete file C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\append.txt [junit] C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13: Unable to delete file C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\co ncat.concatfilter.test ... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: things that break
On Mon, 22 Sep 2003, Steve Loughran [EMAIL PROTECTED] wrote: The late fix to DotnetCompile doesnt seem to break C# apps. They've broken Mono: testCSC-Mono: [csc] compiling 2 files [csc] error CS0518: The predefined type `System.Object' is not defined ... I'll look into it today. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: things that break
On 23 Sep 2003, Stefan Bodewig [EMAIL PROTECTED] wrote: On Mon, 22 Sep 2003, Steve Loughran [EMAIL PROTECTED] wrote: The late fix to DotnetCompile doesnt seem to break C# apps. They've broken Mono: Things go back to the point where we've been a few days ago (i.e. all csc tests pass, the ilasm tests fail) if I change includedefaultreferences to use true instead of false. We need to adapt the documentation of this attribute and make clear that it now only toggles the /nostdlib flag (and remove any reference to mscore.dll). Mono status: testCSC testCSCintrinsicFileset testCSCdll testCscReferences testILDASM_empty testJsharp pass for a self-compiled Mono 0.26 on Linux and a fink installed Mono 0.23 on Mac OS X (one day I'll figure out how to compile Mono 0.26 without a JIT and can upgrade my Mac installation). Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/etc/testcases/taskdefs/optional dotnet.xml
bodewig 2003/09/23 00:23:01
Modified:src/etc/testcases/taskdefs/optional dotnet.xml
Log:
Make CSC tests pass on Mono again
Revision ChangesPath
1.14 +4 -4 ant/src/etc/testcases/taskdefs/optional/dotnet.xml
Index: dotnet.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/optional/dotnet.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dotnet.xml21 Sep 2003 22:29:54 - 1.13
+++ dotnet.xml23 Sep 2003 07:23:01 - 1.14
@@ -142,7 +142,7 @@
destFile=${testCSC.exe}
targetType=exe
executable=mcs
- includedefaultreferences=false
+ includedefaultreferences=true
/csc
available property=app.created file=${testCSC.exe}/
@@ -179,7 +179,7 @@
targetType=exe
srcDir=.
executable=mcs
- includedefaultreferences=false
+ includedefaultreferences=true
/csc
available property=app.created file=${testCSC.exe}/
@@ -213,7 +213,7 @@
destFile=${testCSC.dll}
targetType=library
executable=mcs
- includedefaultreferences=false
+ includedefaultreferences=true
src dir=${src.dir} includes=example2.cs/
/csc
@@ -251,7 +251,7 @@
destFile=${testCscReferences.exe}
targetType=exe
executable=mcs
- includedefaultreferences=false
+ includedefaultreferences=true
src file=${src.dir}/example.cs/
reference file=${testCSC.dll} /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet DotnetCompile.java
bodewig 2003/09/23 00:29:28 Modified:docs/manual/OptionalTasks dotnet.html src/main/org/apache/tools/ant/taskdefs/optional/dotnet DotnetCompile.java Log: Fix docs of csc's includeDefaultReference attribute, fix its default value to match the documentation Revision ChangesPath 1.11 +2 -3 ant/docs/manual/OptionalTasks/dotnet.html Index: dotnet.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/dotnet.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- dotnet.html 1 Dec 2002 01:31:05 - 1.10 +++ dotnet.html 23 Sep 2003 07:29:28 - 1.11 @@ -117,9 +117,8 @@ /tr tr td valign=topincludeDefaultReferences/td -td valign=topFlag which when true automatically includes -the common assemblies in dotnet, and tells the compiler to link in -mscore.dll +td valign=topControls csc's /nostdlib argument, +quot;truequot;(default) implies /nostdlib-. /td td valign=topquot;truequot;(default) or quot;falsequot;/td /tr 1.19 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java Index: DotnetCompile.java === RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- DotnetCompile.java23 Sep 2003 06:28:33 - 1.18 +++ DotnetCompile.java23 Sep 2003 07:29:28 - 1.19 @@ -115,7 +115,7 @@ /** * flag to enable automatic reference inclusion */ -private boolean includeDefaultReferences; +private boolean includeDefaultReferences = true; /** * icon for incorporation into apps @@ -313,7 +313,7 @@ * in dotnet, and tells the compiler to link in mscore.dll. * * set the automatic reference inclusion flag on or off this flag controls - * the string of references and the /nostdlib option in CSC + * the /nostdlib option in CSC * [EMAIL PROTECTED] f on/off flag */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/main/org/apache/tools/ant Main.java
Antoine, I noticed that the runant.py wasn't updated in the same run. Do you want me to write a patch for this? --knut antoine 2003/09/22 14:10:10 Modified:src/script ant ant.bat runant.pl src/main/org/apache/tools/ant/launch Launcher.java src/main/org/apache/tools/ant Main.java Log: adding a new supported command line argument -lib this command line argument is eaten by Launcher shell scripts reworked to pass the classpath in the right location - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
AW: Ant 1.6
I would like to release ant 1.6 beta on tuesday next week (September 30th). Can you all have your changes ready by then ? Really what I would prefer is that all changes which should go into both 1.6 and HEAD get merged by the committer who does the change, so that I do not have to do it myself. I would like to have a serious look at 3 test cases which fail in my environment Win2000/cygwin : 1) ReplaceTest : failing because cygwin cvs checks out the files with a \n separator, but the multiline replacement introduces \r\n (just in the replaced part, the rest of the file stays unchanged). 2) ModifiedSelectorTest : fails for me under cygwin, no idea yet why 3) ConcatTest : I also have the problem Antoine -Ursprungliche Nachricht- Von: Stefan Bodewig [mailto:[EMAIL PROTECTED] Gesendet: Dienstag, 23. September 2003 08:51 An: [EMAIL PROTECTED] Betreff: Re: Ant 1.6 On Mon, 22 Sep 2003, Steve Loughran [EMAIL PROTECTED] wrote: Stefan Bodewig wrote: I'll stay away from HEAD for things that should go into 1.6 and let Antoine merge it later. I am working the other way -against HEAD and then hoping on getting clearance from antoine before moving stuff into 1.6 Both approaches seem reasonable (mine probably only is for easy bugfixes). Antoine, what would you prefer us to do? Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet DotnetCompile.java
bodewig 2003/09/23 01:29:07
Modified:docs/manual/OptionalTasks Tag: ANT_16_BRANCH dotnet.html
src/etc/testcases/taskdefs/optional Tag: ANT_16_BRANCH
dotnet.xml
src/main/org/apache/tools/ant/taskdefs/optional/dotnet Tag:
ANT_16_BRANCH DotnetCompile.java
Log:
Merge Mono and doc fixes for csc from HEAD
Revision ChangesPath
No revision
No revision
1.10.2.1 +2 -3 ant/docs/manual/OptionalTasks/dotnet.html
Index: dotnet.html
===
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/dotnet.html,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- dotnet.html 1 Dec 2002 01:31:05 - 1.10
+++ dotnet.html 23 Sep 2003 08:29:07 - 1.10.2.1
@@ -117,9 +117,8 @@
/tr
tr
td valign=topincludeDefaultReferences/td
-td valign=topFlag which when true automatically includes
-the common assemblies in dotnet, and tells the compiler to link in
-mscore.dll
+td valign=topControls csc's /nostdlib argument,
+quot;truequot;(default) implies /nostdlib-.
/td
td valign=topquot;truequot;(default) or quot;falsequot;/td
/tr
No revision
No revision
1.13.2.1 +4 -4 ant/src/etc/testcases/taskdefs/optional/dotnet.xml
Index: dotnet.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/optional/dotnet.xml,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- dotnet.xml21 Sep 2003 22:29:54 - 1.13
+++ dotnet.xml23 Sep 2003 08:29:07 - 1.13.2.1
@@ -142,7 +142,7 @@
destFile=${testCSC.exe}
targetType=exe
executable=mcs
- includedefaultreferences=false
+ includedefaultreferences=true
/csc
available property=app.created file=${testCSC.exe}/
@@ -179,7 +179,7 @@
targetType=exe
srcDir=.
executable=mcs
- includedefaultreferences=false
+ includedefaultreferences=true
/csc
available property=app.created file=${testCSC.exe}/
@@ -213,7 +213,7 @@
destFile=${testCSC.dll}
targetType=library
executable=mcs
- includedefaultreferences=false
+ includedefaultreferences=true
src dir=${src.dir} includes=example2.cs/
/csc
@@ -251,7 +251,7 @@
destFile=${testCscReferences.exe}
targetType=exe
executable=mcs
- includedefaultreferences=false
+ includedefaultreferences=true
src file=${src.dir}/example.cs/
reference file=${testCSC.dll} /
No revision
No revision
1.17.2.1 +2 -4
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java
Index: DotnetCompile.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -r1.17 -r1.17.2.1
--- DotnetCompile.java21 Sep 2003 22:29:54 - 1.17
+++ DotnetCompile.java23 Sep 2003 08:29:07 - 1.17.2.1
@@ -115,7 +115,7 @@
/**
* flag to enable automatic reference inclusion
*/
-private boolean includeDefaultReferences;
+private boolean includeDefaultReferences = true;
/**
* icon for incorporation into apps
@@ -313,7 +313,7 @@
* in dotnet, and tells the compiler to link in mscore.dll.
*
* set the automatic reference inclusion flag on or off this flag
controls
- * the string of references and the /nostdlib option in CSC
+ * the /nostdlib option in CSC
*
[EMAIL PROTECTED] f on/off flag
*/
@@ -640,8 +640,6 @@
protected String getUtf8OutputParameter() {
return utf8output ? /utf8output : null;
}
-
-
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
AW: cvs commit: ant/src/main/org/apache/tools/ant Main.java
Yes, I do not know python, so please do !!! I did not change the os/2 script either. Cheers, Antoine -Ursprüngliche Nachricht- Von: news [mailto:[EMAIL PROTECTED] Auftrag von Knut Wannheden Gesendet: Dienstag, 23. September 2003 10:04 An: [EMAIL PROTECTED] Betreff: Re: cvs commit: ant/src/main/org/apache/tools/ant Main.java Antoine, I noticed that the runant.py wasn't updated in the same run. Do you want me to write a patch for this? --knut antoine 2003/09/22 14:10:10 Modified:src/script ant ant.bat runant.pl src/main/org/apache/tools/ant/launch Launcher.java src/main/org/apache/tools/ant Main.java Log: adding a new supported command line argument -lib this command line argument is eaten by Launcher shell scripts reworked to pass the classpath in the right location - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: Ant 1.6
I would like to release ant 1.6 beta on tuesday next week (September 30th). Can you all have your changes ready by then ? Really what I would prefer is that all changes which should go into both 1.6 and HEAD get merged by the committer who does the change, so that I do not have to do it myself. I would like to have a serious look at 3 test cases which fail in my environment Win2000/cygwin : 1) ReplaceTest : failing because cygwin cvs checks out the files with a \n separator, but the multiline replacement introduces \r\n (just in the replaced part, the rest of the file stays unchanged). 2) ModifiedSelectorTest : fails for me under cygwin, no idea yet why works on my machine (Win2K, JDK 1.4.1), so I haven´t any idea, either. 3) ConcatTest : I also have the problem I am searching ... Jan
RE: concat teardown failing
I need help ... I have inserted some debug statements in FileUtils.copyFile() (line up 531). And the result: FileUtils:538 - start FileUtils: 542 FileUtils: 559 filterSetsAvailable=false FileUtils:623 sourceFile=C:\seu\cvs-downloads\ant\ant\src\etc\testcases\filters\input\conc atfilter.test destFile=C:\seu\cvs-downloads\ant\ant\src\etc\testcases\filters\result\conca t.filterReaderPrepend.test FileUtils:667 FileUtils:669: close [EMAIL PROTECTED] FileUtils:671: close [EMAIL PROTECTED] FileUtils:705 - ende execute Target: cleanup Unable to delete file C:\seu\cvs-downloads\ant\ant\src\etc\testcases\filters\result\concat.filterR eaderPrepend.test The concat.filterReaderPrepend.test can´t be deleted but it´s closed in line 669. Any ideas? Jan -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 23, 2003 9:05 AM To: [EMAIL PROTECTED] Subject: RE: concat teardown failing And I thought that´s only on my machine ... (that´s why I put that into a try-catch block in the tearDown() - the _real_ test shouldn´t fail only because the cleanup fails ...) task not closing things - I will take a look into that. While programming I use java.io.FileReader without a close (I have tried that - without success). And the other filters doesn´t close the Reader either. More hints are welcome :-) Jan -Original Message- From: Steve Loughran [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 23, 2003 8:23 AM To: Ant Developers List Subject: concat teardown failing the cleanup script in concat.xml is failing. Looks to me like the files are still open when the delete task takes action. Could set failonerror flags to ignore it, but it may be a symptom of the task not closing things. platform: winxp, java1.4.2 [junit] - Standard Error - [junit] C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13: Unable to delete file C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\co ncat.filterReaderPrepend.test [junit]at org.apache.tools.ant.taskdefs.Delete.removeDir(Delete.java:612) [junit]at org.apache.tools.ant.taskdefs.Delete.execute(Delete.java:530) [junit]at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:303) [junit]at org.apache.tools.ant.Task.perform(Task.java:401) [junit]at org.apache.tools.ant.Target.execute(Target.java:338) [junit]at org.apache.tools.ant.Target.performTasks(Target.java:365) [junit]at org.apache.tools.ant.Project.executeTarget(Project.java:1237) [junit]at org.apache.tools.ant.BuildFileTest.executeTarget(BuildFileTest .java:273) [junit]at org.apache.tools.ant.filters.ConcatFilterTest.tearDown(ConcatF ilterTest.java:126) ... [junit] C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13: Unable to delete file C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\append.txt [junit] C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13: Unable to delete file C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\co ncat.concatfilter.test ... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/OptionalTasks scp.html sshexec.html
bodewig 2003/09/23 02:32:48 Modified:docs/manual/OptionalTasks scp.html sshexec.html Log: tested jsch-0.1.8 Revision ChangesPath 1.8 +1 -1 ant/docs/manual/OptionalTasks/scp.html Index: scp.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/scp.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- scp.html 28 Aug 2003 07:10:39 - 1.7 +++ scp.html 23 Sep 2003 09:32:48 - 1.8 @@ -20,7 +20,7 @@ in the Ant distribution. See a href=../install.html#librarydependenciesLibrary Dependencies/a for more information. This task has been tested with jsch-0.1.2 to -jsch-0.1.7./p +jsch-0.1.8./p h3Parameters/h3 table border=1 cellpadding=2 cellspacing=0 1.6 +3 -2 ant/docs/manual/OptionalTasks/sshexec.html Index: sshexec.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/sshexec.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sshexec.html 28 Aug 2003 07:10:39 - 1.5 +++ sshexec.html 23 Sep 2003 09:32:48 - 1.6 @@ -18,8 +18,9 @@ pbNote:/b This task depends on external libraries not included in the Ant distribution. See a href=../install.html#librarydependenciesLibrary Dependencies/a -for more information. This task has been tested with jsch-0.1.7 and -won't work with earlier versions of jsch../p +for more information. This task has been tested with jsch-0.1.7 to +jsch-0.1.8 and won't work with versions of jsch earlier than +0.1.7./p h3Parameters/h3 table border=1 cellpadding=2 cellspacing=0 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/OptionalTasks scp.html sshexec.html
bodewig 2003/09/23 02:34:50 Modified:docs/manual/OptionalTasks Tag: ANT_16_BRANCH scp.html sshexec.html Log: tested jsch-0.1.8 Revision ChangesPath No revision No revision 1.7.2.1 +1 -1 ant/docs/manual/OptionalTasks/scp.html Index: scp.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/scp.html,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -r1.7 -r1.7.2.1 --- scp.html 28 Aug 2003 07:10:39 - 1.7 +++ scp.html 23 Sep 2003 09:34:50 - 1.7.2.1 @@ -20,7 +20,7 @@ in the Ant distribution. See a href=../install.html#librarydependenciesLibrary Dependencies/a for more information. This task has been tested with jsch-0.1.2 to -jsch-0.1.7./p +jsch-0.1.8./p h3Parameters/h3 table border=1 cellpadding=2 cellspacing=0 1.5.2.1 +3 -2 ant/docs/manual/OptionalTasks/sshexec.html Index: sshexec.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/sshexec.html,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -r1.5 -r1.5.2.1 --- sshexec.html 28 Aug 2003 07:10:39 - 1.5 +++ sshexec.html 23 Sep 2003 09:34:50 - 1.5.2.1 @@ -18,8 +18,9 @@ pbNote:/b This task depends on external libraries not included in the Ant distribution. See a href=../install.html#librarydependenciesLibrary Dependencies/a -for more information. This task has been tested with jsch-0.1.7 and -won't work with earlier versions of jsch../p +for more information. This task has been tested with jsch-0.1.7 to +jsch-0.1.8 and won't work with versions of jsch earlier than +0.1.7./p h3Parameters/h3 table border=1 cellpadding=2 cellspacing=0 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: concat teardown failing
I think the problem is in o.a.t.a.filters.ConcatFilter The code opens the prepend and append files but does not close them. I have code that closes the files and passes the tests on linux, but do not have windows to test on. Peter On Tuesday 23 September 2003 10:17, [EMAIL PROTECTED] wrote: I need help ... I have inserted some debug statements in FileUtils.copyFile() (line up 531). And the result: FileUtils:538 - start FileUtils: 542 FileUtils: 559 filterSetsAvailable=false FileUtils:623 sourceFile=C:\seu\cvs-downloads\ant\ant\src\etc\testcases\filters\input\con c atfilter.test destFile=C:\seu\cvs-downloads\ant\ant\src\etc\testcases\filters\result\conc a t.filterReaderPrepend.test FileUtils:667 FileUtils:669: close [EMAIL PROTECTED] FileUtils:671: close [EMAIL PROTECTED] FileUtils:705 - ende execute Target: cleanup Unable to delete file C:\seu\cvs-downloads\ant\ant\src\etc\testcases\filters\result\concat.filter R eaderPrepend.test The concat.filterReaderPrepend.test can´t be deleted but it´s closed in line 669. Any ideas? Jan -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 23, 2003 9:05 AM To: [EMAIL PROTECTED] Subject: RE: concat teardown failing And I thought that´s only on my machine ... (that´s why I put that into a try-catch block in the tearDown() - the _real_ test shouldn´t fail only because the cleanup fails ...) task not closing things - I will take a look into that. While programming I use java.io.FileReader without a close (I have tried that - without success). And the other filters doesn´t close the Reader either. More hints are welcome :-) Jan -Original Message- From: Steve Loughran [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 23, 2003 8:23 AM To: Ant Developers List Subject: concat teardown failing the cleanup script in concat.xml is failing. Looks to me like the files are still open when the delete task takes action. Could set failonerror flags to ignore it, but it may be a symptom of the task not closing things. platform: winxp, java1.4.2 [junit] - Standard Error - [junit] C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13: Unable to delete file C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\co ncat.filterReaderPrepend.test [junit] at org.apache.tools.ant.taskdefs.Delete.removeDir(Delete.java:612) [junit] at org.apache.tools.ant.taskdefs.Delete.execute(Delete.java:530) [junit] at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:303) [junit] at org.apache.tools.ant.Task.perform(Task.java:401) [junit] at org.apache.tools.ant.Target.execute(Target.java:338) [junit] at org.apache.tools.ant.Target.performTasks(Target.java:365) [junit] at org.apache.tools.ant.Project.executeTarget(Project.java:1237) [junit] at org.apache.tools.ant.BuildFileTest.executeTarget(BuildFileTest .java:273) [junit] at org.apache.tools.ant.filters.ConcatFilterTest.tearDown(ConcatF ilterTest.java:126) ... [junit] C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13: Unable to delete file C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\append.txt [junit] C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13: Unable to delete file C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\co ncat.concatfilter.test ... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: concat teardown failing
I have tried with closing them, but it doesn´t work. But send me your code please. Maybe you have done some different :-) Jan -Original Message- From: peter reilly [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 23, 2003 12:04 PM To: Ant Developers List Subject: Re: concat teardown failing I think the problem is in o.a.t.a.filters.ConcatFilter The code opens the prepend and append files but does not close them. I have code that closes the files and passes the tests on linux, but do not have windows to test on. Peter On Tuesday 23 September 2003 10:17, [EMAIL PROTECTED] wrote: I need help ... I have inserted some debug statements in FileUtils.copyFile() (line up 531). And the result: FileUtils:538 - start FileUtils: 542 FileUtils: 559 filterSetsAvailable=false FileUtils:623 sourceFile=C:\seu\cvs-downloads\ant\ant\src\etc\testcases\filt ers\input\con c atfilter.test destFile=C:\seu\cvs-downloads\ant\ant\src\etc\testcases\filter s\result\conc a t.filterReaderPrepend.test FileUtils:667 FileUtils:669: close [EMAIL PROTECTED] FileUtils:671: close [EMAIL PROTECTED] FileUtils:705 - ende execute Target: cleanup Unable to delete file C:\seu\cvs-downloads\ant\ant\src\etc\testcases\filters\result\ concat.filter R eaderPrepend.test The concat.filterReaderPrepend.test can´t be deleted but it´s closed in line 669. Any ideas? Jan -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 23, 2003 9:05 AM To: [EMAIL PROTECTED] Subject: RE: concat teardown failing And I thought that´s only on my machine ... (that´s why I put that into a try-catch block in the tearDown() - the _real_ test shouldn´t fail only because the cleanup fails ...) task not closing things - I will take a look into that. While programming I use java.io.FileReader without a close (I have tried that - without success). And the other filters doesn´t close the Reader either. More hints are welcome :-) Jan -Original Message- From: Steve Loughran [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 23, 2003 8:23 AM To: Ant Developers List Subject: concat teardown failing the cleanup script in concat.xml is failing. Looks to me like the files are still open when the delete task takes action. Could set failonerror flags to ignore it, but it may be a symptom of the task not closing things. platform: winxp, java1.4.2 [junit] - Standard Error - [junit] C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13: Unable to delete file C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\co ncat.filterReaderPrepend.test [junit]at org.apache.tools.ant.taskdefs.Delete.removeDir(Delete.java:612) [junit]at org.apache.tools.ant.taskdefs.Delete.execute(Delete.java:530) [junit]at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:303) [junit]at org.apache.tools.ant.Task.perform(Task.java:401) [junit]at org.apache.tools.ant.Target.execute(Target.java:338) [junit]at org.apache.tools.ant.Target.performTasks(Target.java:365) [junit]at org.apache.tools.ant.Project.executeTarget(Project.java:1237) [junit]at org.apache.tools.ant.BuildFileTest.executeTarget(BuildFileTest .java:273) [junit]at org.apache.tools.ant.filters.ConcatFilterTest.tearDown(ConcatF ilterTest.java:126) ... [junit] C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13: Unable to delete file C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\append.txt [junit] C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\concat.xml:13: Unable to delete file C:\Java\Apache\jakarta-ant\src\etc\testcases\filters\result\co ncat.concatfilter.test ... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: concat teardown failing
On Tuesday 23 September 2003 11:10, [EMAIL PROTECTED] wrote:
I have tried with closing them, but it doesn´t work.
But send me your code please. Maybe you have done some different :-)
Attached.
PeterIndex: ConcatFilter.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/filters/ConcatFilter.java,v
retrieving revision 1.2
diff -u -r1.2 ConcatFilter.java
--- ConcatFilter.java 19 Sep 2003 09:24:13 - 1.2
+++ ConcatFilter.java 23 Sep 2003 10:12:46 -
@@ -89,10 +89,10 @@
private File append;
/** Reader for prepend-file. */
-private Reader prependReader = new EmptyReader();
+private Reader prependReader = null;
/** Reader for append-file. */
-private Reader appendReader = new EmptyReader();
+private Reader appendReader = null;
/**
* Constructor for dummy instances.
@@ -136,12 +136,24 @@
// The readers return -1 if they end. So simply read the prepend
// after that the content and at the end the append file.
-ch = prependReader.read();
+if (prependReader != null) {
+ch = prependReader.read();
+if (ch == -1) {
+prependReader.close();
+prependReader = null;
+}
+}
if (ch == -1) {
ch = super.read();
}
if (ch == -1) {
-ch = appendReader.read();
+if (appendReader != null) {
+ch = appendReader.read();
+if (ch == -1) {
+appendReader.close();
+appendReader = null;
+}
+}
}
return ch;
@@ -234,13 +246,4 @@
}
}
- /**
-* Reader which is always at the end of file.
-* Used for easier algorithm (polymorphism instead if-cascades).
-*/
- private class EmptyReader extends Reader {
- public int read(char[] ch, int i1, int i2) { return -1; }
- public void close() { }
- }
-
-}
\ No newline at end of file
+}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
ReplaceTest failing under cygwin
ReplaceTest fails under cygwin. [junit] Testcase: test9 took 0,13 sec [junit]FAILED [junit] expected:10 but was:13 [junit] junit.framework.AssertionFailedError: expected:10 but was:13 This has to do with the fact that the Replace task changes the line endings of tokens and values to System.getProperty(line.separator), but that the files used for the tests are terminated with \n only when one uses the cvs.exe of cygwin. I can think of several ways of fixing this : - the easiest would be to change the Replace task, not to touch the line endings of tokens and values at all. After all, I do not know why they get such a special treatment. But this would also be a backward incompatible change, - adding an enumerated attribute eol (like in the fixcrlf task) to the nested elements replacetoken/, replacevalue/, replacefilter/. Like in the fixcrlf task, the platform's line separator would be the default there, and asis would be used to run the test(s) with predictable results. Is the reason why line endings of tokens and values in replace/ are manipulated that, when they are read from ![CDATA[, the xml parser sends to ant \n as line separator also on Windows, which is generally not what is desired ? When on the contrary the replacetoken or replacevalue come from a property, the build file writer is fully in control of the flavour of the line endings of the tokens and values and would not need any special manipulation. Cheers, Antoine - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Ant 1.6
On Tue, 23 Sep 2003 04:13 pm, Stefan Bodewig wrote: I remeber you've told me the same at least once in the past 8-) Well, I don't like the inefficiency :-). It doesn't make sense to me to branch and then do a whole lot of work to keep the branches in sync :-( Anyway, I'll be merging across any changes. I want to change the -lib handling a little. Conor - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
AW: Ant 1.6
-Ursprüngliche Nachricht- Von: Conor MacNeill [mailto:[EMAIL PROTECTED] Gesendet: Dienstag, 23. September 2003 12:42 An: Ant Developers List Betreff: Re: Ant 1.6 On Tue, 23 Sep 2003 04:13 pm, Stefan Bodewig wrote: I remeber you've told me the same at least once in the past 8-) Well, I don't like the inefficiency :-). It doesn't make sense to me to branch and then do a whole lot of work to keep the branches in sync :-( Anyway, I'll be merging across any changes. I also think that branches add extra work, but sooner or later someone will have a new feature which can only go into 1.7 and not in 1.6. There is already classloader/ which I have got to remove from the ANT_16_BRANCH. Cheers, Antoine - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: ReplaceTest failing under cygwin
On Tuesday 23 September 2003 11:23, Antoine Lévy-Lambert wrote: ReplaceTest fails under cygwin. [junit] Testcase: test9 took 0,13 sec [junit]FAILED [junit] expected:10 but was:13 [junit] junit.framework.AssertionFailedError: expected:10 but was:13 This has to do with the fact that the Replace task changes the line endings of tokens and values to System.getProperty(line.separator), but that the files used for the tests are terminated with \n only when one uses the cvs.exe of cygwin. I can think of several ways of fixing this : - the easiest would be to change the Replace task, not to touch the line endings of tokens and values at all. After all, I do not know why they get such a special treatment. But this would also be a backward incompatible change, - adding an enumerated attribute eol (like in the fixcrlf task) to the nested elements replacetoken/, replacevalue/, replacefilter/. Like in the fixcrlf task, the platform's line separator would be the default there, and asis would be used to run the test(s) with predictable results. - Change the test... or declare the failure invalid. The test checks line ending without having control of the lineendings as on windows, the cvs client may or may not add cr's to files. For text files it should, but cygwin's cvs client does not do this. A simple fix is to use a cvs client that respects crazy windows/dos behaviour (cvsnt is the one I used when I was on NT). The test could write the expected result instead of using expected files in cvs. Peter I think changing the test would be good. But why don´t add a fixcrlf/ before the tests? Jan
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs defaults.properties Classloader.java
antoine 2003/09/23 03:45:15 Modified:src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH defaults.properties Removed: src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH Classloader.java Log: Remove ClassLoader from the ant 1.6 branch Revision ChangesPath No revision No revision 1.153.2.1 +0 -1 ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties Index: defaults.properties === RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties,v retrieving revision 1.153 retrieving revision 1.153.2.1 diff -u -r1.153 -r1.153.2.1 --- defaults.properties 6 Sep 2003 07:09:59 - 1.153 +++ defaults.properties 23 Sep 2003 10:45:15 - 1.153.2.1 @@ -70,7 +70,6 @@ concat=org.apache.tools.ant.taskdefs.Concat cvstagdiff=org.apache.tools.ant.taskdefs.cvslib.CvsTagDiff tempfile=org.apache.tools.ant.taskdefs.TempFile -classloader=org.apache.tools.ant.taskdefs.Classloader import=org.apache.tools.ant.taskdefs.ImportTask whichresource=org.apache.tools.ant.taskdefs.WhichResource subant=org.apache.tools.ant.taskdefs.SubAnt - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
AW: ReplaceTest failing under cygwin
I am going to change the test. Probably running all input and expected files through fixcrlf/ should do it. I will need to copy everything first to a tmp directory though. Cheers, Antoine -Ursprüngliche Nachricht- Von: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Gesendet: Dienstag, 23. September 2003 12:45 An: [EMAIL PROTECTED] Betreff: RE: ReplaceTest failing under cygwin - Change the test... or declare the failure invalid. The test checks line ending without having control of the lineendings as on windows, the cvs client may or may not add cr's to files. For text files it should, but cygwin's cvs client does not do this. A simple fix is to use a cvs client that respects crazy windows/dos behaviour (cvsnt is the one I used when I was on NT). The test could write the expected result instead of using expected files in cvs. Peter I think changing the test would be good. But why don´t add a fixcrlf/ before the tests? Jan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: concat teardown failing
Difference to my solution is only that you´re setting the append- and prepend reader to null. But that don´t work on my machine :-( But I don´t get the error while deleting the append- or prepend file. I get the error while deleting the resulting file. But if I add a super.close() I´ll get other errors ... But I have changed the code according to your modifications. So it should pass on linux (a little progress). Jan -Original Message- I have tried with closing them, but it doesn´t work. But send me your code please. Maybe you have done some different :-) Attached. Peter
cvs commit: ant/xdocs/stylesheets templates.vm
bodewig 2003/09/23 04:04:10 Modified:docs antnews.html bindownload.html bylaws.html contributors.html cvs.html external.html faq.html index.html legal.html license.html mail.html mission.html problems.html projects.html resources.html srcdownload.html docs/projects index.html docs/projects/antidote design.html index.html module.html xdocsindex.xml xdocs/stylesheets templates.vm Log: Add AC logo on all pages. This solution is ugly, ugly and ugly. Feel free to improve upon it Revision ChangesPath 1.78 +4 -0 ant/docs/antnews.html Index: antnews.html === RCS file: /home/cvs/ant/docs/antnews.html,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- antnews.html 20 Aug 2003 23:28:59 - 1.77 +++ antnews.html 23 Sep 2003 11:04:09 - 1.78 @@ -79,6 +79,10 @@ div class=bluebar/div div class=menucontainer + a href=http://apachecon.com/2003/US/index.html; +img width=150 height=86 + border=0 src=http://jakarta.apache.org/images/logos/ac2003-150.gif/ + /a div class=menu ul li class=menuheaderApache Ant 1.37 +4 -0 ant/docs/bindownload.html Index: bindownload.html === RCS file: /home/cvs/ant/docs/bindownload.html,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- bindownload.html 18 Aug 2003 09:58:27 - 1.36 +++ bindownload.html 23 Sep 2003 11:04:09 - 1.37 @@ -73,6 +73,10 @@ div class=bluebar/div div class=menucontainer + a href=http://apachecon.com/2003/US/index.html; +img width=150 height=86 + border=0 src=http://jakarta.apache.org/images/logos/ac2003-150.gif/ + /a div class=menu ul li class=menuheaderApache Ant 1.4 +4 -0 ant/docs/bylaws.html Index: bylaws.html === RCS file: /home/cvs/ant/docs/bylaws.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bylaws.html 3 Jul 2003 08:37:17 - 1.3 +++ bylaws.html 23 Sep 2003 11:04:09 - 1.4 @@ -73,6 +73,10 @@ div class=bluebar/div div class=menucontainer + a href=http://apachecon.com/2003/US/index.html; +img width=150 height=86 + border=0 src=http://jakarta.apache.org/images/logos/ac2003-150.gif/ + /a div class=menu ul li class=menuheaderApache Ant 1.30 +4 -0 ant/docs/contributors.html Index: contributors.html === RCS file: /home/cvs/ant/docs/contributors.html,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- contributors.html 2 Sep 2003 16:17:40 - 1.29 +++ contributors.html 23 Sep 2003 11:04:09 - 1.30 @@ -73,6 +73,10 @@ div class=bluebar/div div class=menucontainer + a href=http://apachecon.com/2003/US/index.html; +img width=150 height=86 + border=0 src=http://jakarta.apache.org/images/logos/ac2003-150.gif/ + /a div class=menu ul li class=menuheaderApache Ant 1.21 +4 -0 ant/docs/cvs.html Index: cvs.html === RCS file: /home/cvs/ant/docs/cvs.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- cvs.html 3 Jul 2003 08:37:17 - 1.20 +++ cvs.html 23 Sep 2003 11:04:09 - 1.21 @@ -73,6 +73,10 @@ div class=bluebar/div div class=menucontainer + a href=http://apachecon.com/2003/US/index.html; +img width=150 height=86 + border=0 src=http://jakarta.apache.org/images/logos/ac2003-150.gif/ + /a div class=menu ul li class=menuheaderApache Ant 1.137 +4 -0 ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- external.html 19 Sep 2003 12:44:15 - 1.136 +++ external.html 23 Sep 2003 11:04:09 - 1.137 @@ -75,6 +75,10 @@ div class=bluebar/div div class=menucontainer + a
DO NOT REPLY [Bug 23341] - copy filtering=true breaks binary 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=23341. 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=23341 copy filtering=true breaks binary files [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2003-09-23 11:28 --- It does and it is documented that way. From copy's manual page Note: If you employ filters in your copy operation, you should limit the copy to text files. Binary files will be corrupted by the copy operation. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTypes custom-programming.html
antoine 2003/09/23 04:35:53
Modified:docs/manual/CoreTypes custom-programming.html
Log:
replacing of with quot; there was also a paragraph which was closed
twice with /p
Submitted by: Larry Shatzer (larry dot shatzer at spirent dot com)
Revision ChangesPath
1.3 +30 -31ant/docs/manual/CoreTypes/custom-programming.html
Index: custom-programming.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTypes/custom-programming.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- custom-programming.html 13 Aug 2003 09:05:22 - 1.2
+++ custom-programming.html 23 Sep 2003 11:35:53 - 1.3
@@ -1,9 +1,8 @@
html
head
meta http-equiv=Content-Language content=en-us/meta
-titleCustom Components/title
+titleCustom Components/title
/head
-
body
h2Custom Components/h2
h3Overview/h3
@@ -66,10 +65,10 @@
// This method evaluates the condition
public boolean eval() {
if (value == null) {
-throw new BuildException(value attribute is not set);
+throw new BuildException(quot;value attribute is not setquot;);
}
return value.toUpperCase().equals(value);
- }
+ }
}
/pre
/blockquote
@@ -80,9 +79,9 @@
blockquote
pre
lt;typedef
-name=alluppercase
-classname=com.mydomain.AllUpperCaseCondition
-classpath=${mydomain.classes/gt;
+name=quot;alluppercasequot;
+classname=quot;com.mydomain.AllUpperCaseConditionquot;
+classpath=quot;${mydomain.classes}quot;/gt;
/pre
/blockquote
p
@@ -91,8 +90,8 @@
/p
blockquote
pre
-lt;condition property=alluppergt;
- lt;alluppercase value=THIS IS ALL UPPER CASE/gt;
+lt;condition property=quot;allupperquot;gt;
+ lt;alluppercase value=quot;THIS IS ALL UPPER CASEquot;/gt;
lt;/conditiongt;
/pre
/blockquote
@@ -110,7 +109,7 @@
/p
p
An example of a custom selection that selects filenames ending
- in .java would be:
+ in quot;.javaquot; would be:
/p
blockquote
pre
@@ -119,7 +118,7 @@
import org.apache.tools.ant.types.selectors.FileSelector;
public class JavaSelector implements FileSelector {
public boolean isSelected(File b, String filename, File f) {
- return filename.toLowerCase().endsWith(.java);
+ return filename.toLowerCase().endsWith(quot;.javaquot;);
}
}
/pre
@@ -130,9 +129,9 @@
blockquote
pre
lt;typedef
-name=javaselector
-classname=com.mydomain.JavaSelector
-classpath=${mydomain.classes/gt;
+name=quot;javaselectorquot;
+classname=quot;com.mydomain.JavaSelectorquot;
+classpath=quot;${mydomain.classes}quot;/gt;
/pre
/blockquote
p
@@ -141,14 +140,14 @@
/p
blockquote
pre
-lt;copy todir=togt;
- lt;fileset dir=srcgt;
+lt;copy todir=quot;toquot;gt;
+ lt;fileset dir=quot;srcquot;gt;
lt;javaselector/gt;
lt;/filesetgt;
lt;/copygt;
/pre
/blockquote
-
+
p
One may use
codeorg.apache.tools.ant.types.selectors.BaseSelector/code,
@@ -164,7 +163,7 @@
last chance to check your settings for consistency because it
calls codeverifySettings()/code. Override this method and
call codesetError()/code within it if you detect any
-problems in how your selector is set up./p
+problems in how your selector is set up.
/p
p
To write custom selector containers one should extend
@@ -190,7 +189,7 @@
}
public void verifySettings() {
if (number lt; 0) {
- throw new BuildException(Number attribute should be set);
+ throw new BuildException(quot;Number attribute should be
setquot;);
}
}
public boolean isSelected(File baseDir, String filename, File file) {
@@ -212,13 +211,13 @@
/p
blockquote
pre
-lt;typedef name=numberselected
- classname=com.mydomain.MatchNumberSelectors/gt;
+lt;typedef name=quot;numberselectedquot;
+ classname=quot;com.mydomain.MatchNumberSelectorsquot;/gt;
...
-lt;fileset dir=${src.path}gt;
- lt;numberselected number=2gt;
- lt;contains text=script casesensitive=no/gt;
- lt;size value=4 units=Ki when=more/gt;
+lt;fileset dir=quot;${src.path}quot;gt;
+ lt;numberselected number=quot;2quot;gt;
+ lt;contains text=quot;scriptquot; casesensitive=quot;noquot;/gt;
+ lt;size value=quot;4quot; units=quot;Kiquot;
when=quot;morequot;/gt;
lt;javaselector/gt;
lt;/numberselectedgt;
lt;/filesetgt;
@@ -229,7 +228,7 @@
/p
AW: [PATCH] and problem with patch.xml
Patch submitted, thanks
Antoine
-Ursprüngliche Nachricht-
Von: Shatzer, Larry [mailto:[EMAIL PROTECTED]
Gesendet: Dienstag, 23. September 2003 00:00
An: '[EMAIL PROTECTED]'
Betreff: [PATCH] and problem with patch.xml
While making changes to custom-programing.html, I found an invalid property
in the documentation.
${mydomain.classes which should be ${mydomain.classes}.
When running patch.xml, it has a problem:
Caught exception (org.apache.tools.ant.BuildException) while expanding
no.copyright.set: Syntax error in property:
classpath=${mydomain.classes/gt;
Since patch.txt.tmp has both properties showing (invalid and valid), it
tries to expand them both, and fails.
I'm not quite sure how to fix this in patch.xml for future problems with
this. In the short term I've attached a patch to fix custom-programing.html
(along with a few other changes like use of to quot; to be more
consistent, and spelling).
-- Larry
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: AW: [PATCH] and problem with patch.xml
Is there any reason quot; is preferred to in
html files ?
It makes reading the html source containg
build script examples quite difficult
Peter
On Tuesday 23 September 2003 12:39, Antoine Lévy-Lambert wrote:
Patch submitted, thanks
Antoine
-Ursprüngliche Nachricht-
Von: Shatzer, Larry [mailto:[EMAIL PROTECTED]
Gesendet: Dienstag, 23. September 2003 00:00
An: '[EMAIL PROTECTED]'
Betreff: [PATCH] and problem with patch.xml
While making changes to custom-programing.html, I found an invalid property
in the documentation.
${mydomain.classes which should be ${mydomain.classes}.
When running patch.xml, it has a problem:
Caught exception (org.apache.tools.ant.BuildException) while expanding
no.copyright.set: Syntax error in property:
classpath=${mydomain.classes/gt;
Since patch.txt.tmp has both properties showing (invalid and valid), it
tries to expand them both, and fails.
I'm not quite sure how to fix this in patch.xml for future problems with
this. In the short term I've attached a patch to fix custom-programing.html
(along with a few other changes like use of to quot; to be more
consistent, and spelling).
-- Larry
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTypes custom-programming.html
antoine 2003/09/23 04:49:42
Modified:docs/manual/CoreTypes Tag: ANT_16_BRANCH
custom-programming.html
Log:
merging last change from head
Submitted by: Larry Shatzer (larry dot shatzer at spirent dot com)
Revision ChangesPath
No revision
No revision
1.2.2.1 +30 -31ant/docs/manual/CoreTypes/custom-programming.html
Index: custom-programming.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTypes/custom-programming.html,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- custom-programming.html 13 Aug 2003 09:05:22 - 1.2
+++ custom-programming.html 23 Sep 2003 11:49:42 - 1.2.2.1
@@ -1,9 +1,8 @@
html
head
meta http-equiv=Content-Language content=en-us/meta
-titleCustom Components/title
+titleCustom Components/title
/head
-
body
h2Custom Components/h2
h3Overview/h3
@@ -66,10 +65,10 @@
// This method evaluates the condition
public boolean eval() {
if (value == null) {
-throw new BuildException(value attribute is not set);
+throw new BuildException(quot;value attribute is not setquot;);
}
return value.toUpperCase().equals(value);
- }
+ }
}
/pre
/blockquote
@@ -80,9 +79,9 @@
blockquote
pre
lt;typedef
-name=alluppercase
-classname=com.mydomain.AllUpperCaseCondition
-classpath=${mydomain.classes/gt;
+name=quot;alluppercasequot;
+classname=quot;com.mydomain.AllUpperCaseConditionquot;
+classpath=quot;${mydomain.classes}quot;/gt;
/pre
/blockquote
p
@@ -91,8 +90,8 @@
/p
blockquote
pre
-lt;condition property=alluppergt;
- lt;alluppercase value=THIS IS ALL UPPER CASE/gt;
+lt;condition property=quot;allupperquot;gt;
+ lt;alluppercase value=quot;THIS IS ALL UPPER CASEquot;/gt;
lt;/conditiongt;
/pre
/blockquote
@@ -110,7 +109,7 @@
/p
p
An example of a custom selection that selects filenames ending
- in .java would be:
+ in quot;.javaquot; would be:
/p
blockquote
pre
@@ -119,7 +118,7 @@
import org.apache.tools.ant.types.selectors.FileSelector;
public class JavaSelector implements FileSelector {
public boolean isSelected(File b, String filename, File f) {
- return filename.toLowerCase().endsWith(.java);
+ return filename.toLowerCase().endsWith(quot;.javaquot;);
}
}
/pre
@@ -130,9 +129,9 @@
blockquote
pre
lt;typedef
-name=javaselector
-classname=com.mydomain.JavaSelector
-classpath=${mydomain.classes/gt;
+name=quot;javaselectorquot;
+classname=quot;com.mydomain.JavaSelectorquot;
+classpath=quot;${mydomain.classes}quot;/gt;
/pre
/blockquote
p
@@ -141,14 +140,14 @@
/p
blockquote
pre
-lt;copy todir=togt;
- lt;fileset dir=srcgt;
+lt;copy todir=quot;toquot;gt;
+ lt;fileset dir=quot;srcquot;gt;
lt;javaselector/gt;
lt;/filesetgt;
lt;/copygt;
/pre
/blockquote
-
+
p
One may use
codeorg.apache.tools.ant.types.selectors.BaseSelector/code,
@@ -164,7 +163,7 @@
last chance to check your settings for consistency because it
calls codeverifySettings()/code. Override this method and
call codesetError()/code within it if you detect any
-problems in how your selector is set up./p
+problems in how your selector is set up.
/p
p
To write custom selector containers one should extend
@@ -190,7 +189,7 @@
}
public void verifySettings() {
if (number lt; 0) {
- throw new BuildException(Number attribute should be set);
+ throw new BuildException(quot;Number attribute should be
setquot;);
}
}
public boolean isSelected(File baseDir, String filename, File file) {
@@ -212,13 +211,13 @@
/p
blockquote
pre
-lt;typedef name=numberselected
- classname=com.mydomain.MatchNumberSelectors/gt;
+lt;typedef name=quot;numberselectedquot;
+ classname=quot;com.mydomain.MatchNumberSelectorsquot;/gt;
...
-lt;fileset dir=${src.path}gt;
- lt;numberselected number=2gt;
- lt;contains text=script casesensitive=no/gt;
- lt;size value=4 units=Ki when=more/gt;
+lt;fileset dir=quot;${src.path}quot;gt;
+ lt;numberselected number=quot;2quot;gt;
+ lt;contains text=quot;scriptquot; casesensitive=quot;noquot;/gt;
+ lt;size value=quot;4quot; units=quot;Kiquot;
when=quot;morequot;/gt;
lt;javaselector/gt;
DO NOT REPLY [Bug 22888] - using regex package when optional.jar is not on classpath
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=22888. 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=22888 using regex package when optional.jar is not on classpath [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2003-09-23 11:54 --- Ant 1.6 is going to have this kind of sorted out. The JDK 1.4 implementation will be in nodeps.jar, the one for ORO in ant-oro.jar and the jakarta-regexp implementation in ant-jakarta-regexp.jar. There'll be no monolithic optional.jar. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: concat teardown failing
I give up ... Same on JDK 1.2.1 and 1.4.1. - I tried changing Delete.DELETE_RETRY_SLEEP_MILLIS to 1 (10 seconds) without success. - closing the in reader of ConcatFilter would cause an error in FilterReader.ready() - setting the in to null would cause an NPE in BufferedReader (somewhere) - the file which can´t be deleted is read and write enabled - Peters patch has solved the problem with the append and prepend files - the problem with the resulting file is still open but can´t be solved in the same manner (I think) More ideas? Jan -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 23, 2003 12:50 PM To: [EMAIL PROTECTED] Subject: RE: concat teardown failing Difference to my solution is only that you´re setting the append- and prepend reader to null. But that don´t work on my machine :-( But I don´t get the error while deleting the append- or prepend file. I get the error while deleting the resulting file. But if I add a super.close() I´ll get other errors ... But I have changed the code according to your modifications. So it should pass on linux (a little progress). Jan -Original Message- I have tried with closing them, but it doesn´t work. But send me your code please. Maybe you have done some different :-) Attached. Peter
AW: AW: [PATCH] and problem with patch.xml
Actually I don't know for sure why quot; should be preferred to . I can revert this part of the change if this is causing an outcry. Antoine -Ursprüngliche Nachricht- Von: peter reilly [mailto:[EMAIL PROTECTED] Gesendet: Dienstag, 23. September 2003 13:44 An: Ant Developers List Betreff: Re: AW: [PATCH] and problem with patch.xml Is there any reason quot; is preferred to in html files ? It makes reading the html source containg build script examples quite difficult Peter - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: AW: [PATCH] and problem with patch.xml
HTML is not XML. And while writing example is much easier to work with than with quot;. Maybe that´s a default setting in the html checker :-) Jan -Original Message- From: Antoine Lévy-Lambert [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 23, 2003 2:02 PM To: Ant Developers List Subject: AW: AW: [PATCH] and problem with patch.xml Actually I don't know for sure why quot; should be preferred to . I can revert this part of the change if this is causing an outcry. Antoine -Ursprüngliche Nachricht- Von: peter reilly [mailto:[EMAIL PROTECTED] Gesendet: Dienstag, 23. September 2003 13:44 An: Ant Developers List Betreff: Re: AW: [PATCH] and problem with patch.xml Is there any reason quot; is preferred to in html files ? It makes reading the html source containg build script examples quite difficult Peter - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: concat teardown failing
Bingo, I think. The tests in ConcatFilterTest do this: String resultContent = fu.readFully( new java.io.FileReader(resultFile)); so nothing closes the resultfile. Peter On Tuesday 23 September 2003 10:17, [EMAIL PROTECTED] wrote: co ncat.filterReaderPrepend.tes - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: Ant 1.6
IMHO there's 2 possible triggers for branching off: - it's time to run the build/release and you want to make sure you capture the point at which this was done - a critical piece of work that should not go into the build/release absolutely has to go into CVS so for practical reasons (i.e. having to double-commit a bunch of stuff) you probably want to wait as long as possible from now on ... might even want to consider hanging on to post-next-release patches until after the branch has been created. On the other hand, double maintenance doesn't need to be all that painful. Since everybody's used to using patchfiles anyway, why not keep 2 checked out versions of Ant around (one on the branch, one on the HEAD). Apply a patch to both and do a commit on both. I betcha it's every so slightly quicker than the whole cvs merge thing. just my CAD$ .02 Rob -Original Message- From: Antoine Lévy-Lambert [mailto:[EMAIL PROTECTED] Sent: September 23, 2003 6:35 AM To: Ant Developers List Subject: AW: Ant 1.6 [...] I also think that branches add extra work, but sooner or later someone will have a new feature which can only go into 1.7 and not in 1.6. There is already classloader/ which I have got to remove from the ANT_16_BRANCH. Cheers, Antoine - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/OptionalTasks dotnet.html
bodewig 2003/09/23 06:06:48 Modified:docs/manual/OptionalTasks dotnet.html Log: 2003 Revision ChangesPath 1.12 +1 -1 ant/docs/manual/OptionalTasks/dotnet.html Index: dotnet.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/dotnet.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- dotnet.html 23 Sep 2003 07:29:28 - 1.11 +++ dotnet.html 23 Sep 2003 13:06:48 - 1.12 @@ -681,7 +681,7 @@ Initial proof of concept; very rudimentary support for CSC only. -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 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/OptionalTasks dotnet.html
bodewig 2003/09/23 06:07:10 Modified:docs/manual/OptionalTasks Tag: ANT_16_BRANCH dotnet.html Log: 2003 Revision ChangesPath No revision No revision 1.10.2.2 +1 -1 ant/docs/manual/OptionalTasks/dotnet.html Index: dotnet.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/dotnet.html,v retrieving revision 1.10.2.1 retrieving revision 1.10.2.2 diff -u -r1.10.2.1 -r1.10.2.2 --- dotnet.html 23 Sep 2003 08:29:07 - 1.10.2.1 +++ dotnet.html 23 Sep 2003 13:07:10 - 1.10.2.2 @@ -681,7 +681,7 @@ Initial proof of concept; very rudimentary support for CSC only. -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 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
bodewig 2003/09/23 06:14:41
Modified:.build.xml
Log:
AssertionsTest needs a javac that supports assert
Revision ChangesPath
1.394 +1 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- build.xml 22 Sep 2003 15:05:21 - 1.393
+++ build.xml 23 Sep 2003 13:14:41 - 1.394
@@ -144,6 +144,7 @@
selector id=needs.jdk1.4+
or
filename name=${regexp.package}/Jdk14Regexp*/
+ filename name=${ant.package}/types/AssertionsTest.java/
/or
/selector
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: concat teardown failing
Yeah ! I have modified the FileUtils.readFully(Reader rdr, int bufferSize) so that it closes the reader and all works. Now the retest of ants whole test suite ... if there are no problems I will commit that. Ups - some other tests failed because of the closed reader. So I close the reader in the ConcatFilterTest. Yes, only the org.apache.tools.ant.taskdefs.ReplaceTest.test9() fails (like before). Thanks Peter. Jan -Original Message- From: peter reilly [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 23, 2003 2:35 PM To: Ant Developers List Subject: Re: concat teardown failing Bingo, I think. The tests in ConcatFilterTest do this: String resultContent = fu.readFully( new java.io.FileReader(resultFile)); so nothing closes the resultfile. Peter On Tuesday 23 September 2003 10:17, [EMAIL PROTECTED] wrote: co ncat.filterReaderPrepend.tes - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/util ResourceUtils.java SourceFileScanner.java
bodewig 2003/09/23 06:16:05
Modified:docs/manual/CoreTasks copy.html move.html sync.html
src/main/org/apache/tools/ant/taskdefs Copy.java Sync.java
src/main/org/apache/tools/ant/util ResourceUtils.java
SourceFileScanner.java
Log:
Add a granularity attribute to copy, move and sync that works
the same way as the attribute of the depend selector.
PR: 22150
Revision ChangesPath
1.20 +10 -0 ant/docs/manual/CoreTasks/copy.html
Index: copy.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/copy.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- copy.html 24 Jul 2003 13:14:20 - 1.19
+++ copy.html 23 Sep 2003 13:16:04 - 1.20
@@ -135,6 +135,16 @@
emsince Ant 1.6/em./td
td align=centerNo - defaults to false./td
/tr
+ tr
+td valign=topgranularity/td
+td valign=topThe number of milliseconds leeway to give before
+deciding a file is out of date. This is needed because not every
+file system supports tracking the last modified time to the
+millisecond level. Default is 0 milliseconds, or 2 seconds on DOS
+systems. This can also be useful if source and target files live
+on separate machines with clocks being out of sync. emsince Ant
+1.6/em./td
+ /tr
/table
h3Parameters specified as nested elements/h3
1.15 +10 -0 ant/docs/manual/CoreTasks/move.html
Index: move.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/move.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- move.html 24 Jul 2003 13:14:20 - 1.14
+++ move.html 23 Sep 2003 13:16:04 - 1.15
@@ -113,6 +113,16 @@
emsince Ant 1.6/em./td
td align=centerNo - defaults to false./td
/tr
+ tr
+td valign=topgranularity/td
+td valign=topThe number of milliseconds leeway to give before
+deciding a file is out of date. This is needed because not every
+file system supports tracking the last modified time to the
+millisecond level. Default is 0 milliseconds, or 2 seconds on DOS
+systems. This can also be useful if source and target files live
+on separate machines with clocks being out of sync. emsince Ant
+1.6/em./td
+ /tr
/table
h3Parameters specified as nested elements/h3
h4mapper/h4
1.4 +10 -0 ant/docs/manual/CoreTasks/sync.html
Index: sync.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/sync.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sync.html 14 May 2003 11:58:18 - 1.3
+++ sync.html 23 Sep 2003 13:16:04 - 1.4
@@ -51,6 +51,16 @@
td valign=topLog the files that are being copied./td
td valign=top align=centerNo; defaults to false./td
/tr
+ tr
+td valign=topgranularity/td
+td valign=topThe number of milliseconds leeway to give before
+deciding a file is out of date. This is needed because not every
+file system supports tracking the last modified time to the
+millisecond level. Default is 0 milliseconds, or 2 seconds on DOS
+systems. This can also be useful if source and target files live
+on separate machines with clocks being out of sync. emsince Ant
+1.6/em./td
+ /tr
/table
h3Parameters specified as nested elements/h3
1.67 +18 -3 ant/src/main/org/apache/tools/ant/taskdefs/Copy.java
Index: Copy.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Copy.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- Copy.java 16 Sep 2003 09:08:55 - 1.66
+++ Copy.java 23 Sep 2003 13:16:04 - 1.67
@@ -121,12 +121,14 @@
private FileUtils fileUtils;
private String inputEncoding = null;
private String outputEncoding = null;
+private long granularity = 0;
/**
* Copy task constructor.
*/
public Copy() {
fileUtils = FileUtils.newFileUtils();
+granularity = fileUtils.getFileTimestampGranularity();
}
/**
@@ -371,6 +373,18 @@
}
/**
+ * The number of milliseconds leeway to give before deciding a
+ * target is out of date.
+ *
+ * pDefault is 0 milliseconds, or 2 seconds on DOS systems./p
+ *
+ * @since Ant 1.6
+ */
+public void setGranularity(long granularity) {
+this.granularity = granularity;
+}
+
+/**
* Performs the copy
Re: concat teardown failing
On Tue, 23 Sep 2003, Jan Materne [EMAIL PROTECTED] wrote: I have modified the FileUtils.readFully(Reader rdr, int bufferSize) so that it closes the reader and all works. I think that would be the wrong place. It may be my old C thinking coming from explicit memory managment, but I think that the code that aquires a resource should be responsible of releasing it as well. Ups - some other tests failed because of the closed reader. So I close the reader in the ConcatFilterTest. You see 8-) Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: concat teardown failing
Thats the advantage of automated unit tests :-) Ok, I refactor the test suite a little bit. Because we have a 1.6 version and a head version on cvs. How should I commit the changes? Jan -Original Message- From: Stefan Bodewig [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 23, 2003 3:24 PM To: [EMAIL PROTECTED] Subject: Re: concat teardown failing On Tue, 23 Sep 2003, Jan Materne [EMAIL PROTECTED] wrote: I have modified the FileUtils.readFully(Reader rdr, int bufferSize) so that it closes the reader and all works. I think that would be the wrong place. It may be my old C thinking coming from explicit memory managment, but I think that the code that aquires a resource should be responsible of releasing it as well. Ups - some other tests failed because of the closed reader. So I close the reader in the ConcatFilterTest. You see 8-) Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: concat teardown failing
On Tuesday 23 September 2003 14:25, [EMAIL PROTECTED] wrote: Thats the advantage of automated unit tests :-) Ok, I refactor the test suite a little bit. Because we have a 1.6 version and a head version on cvs. How should I commit the changes? On both versions. The easiest is to make the changes on HEAD, make a diff file (before the commit on HEAD), and apply the changes to 1.6, and then commit in both. Peter Jan -Original Message- From: Stefan Bodewig [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 23, 2003 3:24 PM To: [EMAIL PROTECTED] Subject: Re: concat teardown failing On Tue, 23 Sep 2003, Jan Materne [EMAIL PROTECTED] wrote: I have modified the FileUtils.readFully(Reader rdr, int bufferSize) so that it closes the reader and all works. I think that would be the wrong place. It may be my old C thinking coming from explicit memory managment, but I think that the code that aquires a resource should be responsible of releasing it as well. Ups - some other tests failed because of the closed reader. So I close the reader in the ConcatFilterTest. You see 8-) Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/main/org/apache/tools/ant/util ResourceUtils.java SourceFileScanner.java
On 23 Sep 2003, [EMAIL PROTECTED] wrote: Add a granularity attribute to copy, move and sync that works the same way as the attribute of the depend selector. the original problem is that source and target directories live on different machines with clocks being slightly (but for a well known amount) out of sync. You can deal with it in copy by explicitly using a depend selector, but selectors are not available in sync. I have not merged it into the 1.6 branch for two reasons: (1) I'm not sure whether we should add it to copy and move at all or rather require the explicit usage of depend. This would of course lead to a lot of duplication. Compare copy todir=/target granularity=5000 fileset dir=/source1/ fileset dir=/source2/ mapper type=glob from=* to=*.bak/ /copy to copy todir=/target fileset dir=/source1 depend granularity=5000 targetdir=/target mapper type=glob from=* to=*.bak/ /depend /fileset fileset dir=/source2 depend granularity=5000 targetdir=/target mapper type=glob from=* to=*.bak/ /depend /fileset mapper type=glob from=* to=*.bak/ /copy the same mapper three times, definition of targetdir in three places. (2) The changes to SourceFileScanner and ResourceUtils will have an impact on Windows. As I'm unable to test anything there, I'd rather wait for failure reports before I go and merge things. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: concat teardown failing
On Tue, 23 Sep 2003, Jan Materne [EMAIL PROTECTED] wrote: Because we have a 1.6 version and a head version on cvs. How should I commit the changes? Twice. The easiest way for you probably is to copy your ant workspace and inside your copy run cvs up -r ANT_16_BRANCH. After that the copy will be working on the branch while your old copy points to CVS HEAD. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: concat teardown failing
Because we have a 1.6 version and a head version on cvs. How should I commit the changes? On both versions. The easiest is to make the changes on HEAD, make a diff file (before the commit on HEAD), and apply the changes to 1.6, and then commit in both. - changes on HEAD: ok, that´s what I do normally (so I know that :-) - make a diff file: should be possible ... - commit to HEAD: yep - apply to 1.6: do I have to checkout the 1.6 before that? Jan
RE: concat teardown failing
Because we have a 1.6 version and a head version on cvs. How should I commit the changes? Twice. The easiest way for you probably is to copy your ant workspace and inside your copy run cvs up -r ANT_16_BRANCH. After that the copy will be working on the branch while your old copy points to CVS HEAD. Stefan That sound doable :-) Jan
DO NOT REPLY [Bug 21083] - exec cvs commit doesn't work for sudo
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=21083. 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=21083 exec cvs commit doesn't work for sudo [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2003-09-23 13:54 --- I agree with Gus, this is a CVS setup problem, not an Ant problem (and nothing Ant could solve IMHO). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs MacroDefTest.java
peterreilly2003/09/23 06:55:52
Modified:docs/manual/CoreTasks macrodef.html
src/etc/testcases/taskdefs macrodef.xml
src/main/org/apache/tools/ant/taskdefs MacroDef.java
MacroInstance.java
src/testcases/org/apache/tools/ant/taskdefs
MacroDefTest.java
Log:
remove attributestyle attribute from macrodef
Revision ChangesPath
1.3 +0 -33 ant/docs/manual/CoreTasks/macrodef.html
Index: macrodef.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- macrodef.html 15 Aug 2003 09:33:45 - 1.2
+++ macrodef.html 23 Sep 2003 13:55:52 - 1.3
@@ -38,17 +38,6 @@
/td
td valign=top align=centerNo/td
/tr
- tr
-td valign=topattributestyle/td
-td valign=top
- emTemporary/em
- this attribute specifies if the attribute is in ant style
- (i.e. ${attributeName}) or xpath style (i.e @attributeName).
- Valid values are ant and xpath. The default value
- is ant.
-/td
-td valign=top align=centerNo/td
- /tr
/table
h3Parameters specified as nested elements/h3
h4attribute/h4
@@ -63,11 +52,6 @@
task using the ant property notation - ${attribute name}.
Note that is not an actual ant property.
/p
-p
- If the attribute style is set to xpath, the attribute is
- specified in the body of the template task by prefixing the
- name with a @.
-/p
h3Parameters/h3
table border=1 cellpadding=2 cellspacing=0
tr
@@ -138,23 +122,6 @@
lt;echogt;this is a testlt;/echogt;
lt;/some-tasksgt;
lt;/testinggt;
- /pre
-/blockquote
-p
- The following fragment sets the attribute style to xpath
- for the macro definition lt;testinggt; and calls the
- macro. The fragment should output attribute is this is a test.
-/p
-blockquote
- pre
-lt;macrodef name=testing attributestyle=xpathgt;
- lt;attribute name=abc/gt;
- lt;sequentialgt;
- lt;echogt;attribute is @abclt;/echogt;
- lt;/sequentialgt;
-lt;/macrodefgt;
-
-lt;testing abc=this is a test/gt;
/pre
/blockquote
p
1.3 +0 -10 ant/src/etc/testcases/taskdefs/macrodef.xml
Index: macrodef.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/macrodef.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- macrodef.xml 15 Aug 2003 09:33:45 - 1.2
+++ macrodef.xml 23 Sep 2003 13:55:52 - 1.3
@@ -45,14 +45,4 @@
/nested
/target
- target name=xpathstyle
-macrodef name=testing attributestyle=xpath
- attribute name=abc/
- sequential
-echoattribute is @[EMAIL PROTECTED]/echo
- /sequential
-/macrodef
-
-testing abc=this is a test/
- /target
/project
1.8 +0 -44 ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
Index: MacroDef.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MacroDef.java 22 Sep 2003 08:58:58 - 1.7
+++ MacroDef.java 23 Sep 2003 13:55:52 - 1.8
@@ -81,7 +81,6 @@
private String name;
private List attributes = new ArrayList();
private Mapelements = new HashMap();
-private intattributeStyle = AttributeStyle.ANT;
/**
* Name of the definition
@@ -92,46 +91,6 @@
}
/**
- * Enumerated type for attributeStyle attribute
- *
- * @see EnumeratedAttribute
- */
-public static class AttributeStyle extends EnumeratedAttribute {
-/** Enumerated values */
-public static final int ANT = 0, XPATH = 1;
-
-/**
- * get the values
- * @return an array of the allowed values for this attribute.
- */
-public String[] getValues() {
-return new String[] {ant, xpath};
-}
-}
-
-/**
- * emExperimental/em
- * I am uncertain at the moment how to encode attributes
- * using ant style ${attribute} or xpath style @attribute.
- * The first may get mixed up with ant properties and
- * the second may get mixed up with xpath.
- * The default at the moment is ant s
- *
- * @param style an codeAttributeStyle/code value
-
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs MacroDefTest.java
peterreilly2003/09/23 06:56:44
Modified:docs/manual/CoreTasks Tag: ANT_16_BRANCH macrodef.html
src/etc/testcases/taskdefs Tag: ANT_16_BRANCH macrodef.xml
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
MacroDef.java MacroInstance.java
src/testcases/org/apache/tools/ant/taskdefs Tag:
ANT_16_BRANCH MacroDefTest.java
Log:
remove attributestyle attribute from macrodef
Revision ChangesPath
No revision
No revision
1.2.2.1 +0 -33 ant/docs/manual/CoreTasks/macrodef.html
Index: macrodef.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- macrodef.html 15 Aug 2003 09:33:45 - 1.2
+++ macrodef.html 23 Sep 2003 13:56:44 - 1.2.2.1
@@ -38,17 +38,6 @@
/td
td valign=top align=centerNo/td
/tr
- tr
-td valign=topattributestyle/td
-td valign=top
- emTemporary/em
- this attribute specifies if the attribute is in ant style
- (i.e. ${attributeName}) or xpath style (i.e @attributeName).
- Valid values are ant and xpath. The default value
- is ant.
-/td
-td valign=top align=centerNo/td
- /tr
/table
h3Parameters specified as nested elements/h3
h4attribute/h4
@@ -63,11 +52,6 @@
task using the ant property notation - ${attribute name}.
Note that is not an actual ant property.
/p
-p
- If the attribute style is set to xpath, the attribute is
- specified in the body of the template task by prefixing the
- name with a @.
-/p
h3Parameters/h3
table border=1 cellpadding=2 cellspacing=0
tr
@@ -138,23 +122,6 @@
lt;echogt;this is a testlt;/echogt;
lt;/some-tasksgt;
lt;/testinggt;
- /pre
-/blockquote
-p
- The following fragment sets the attribute style to xpath
- for the macro definition lt;testinggt; and calls the
- macro. The fragment should output attribute is this is a test.
-/p
-blockquote
- pre
-lt;macrodef name=testing attributestyle=xpathgt;
- lt;attribute name=abc/gt;
- lt;sequentialgt;
- lt;echogt;attribute is @abclt;/echogt;
- lt;/sequentialgt;
-lt;/macrodefgt;
-
-lt;testing abc=this is a test/gt;
/pre
/blockquote
p
No revision
No revision
1.2.2.1 +0 -10 ant/src/etc/testcases/taskdefs/macrodef.xml
Index: macrodef.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/macrodef.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- macrodef.xml 15 Aug 2003 09:33:45 - 1.2
+++ macrodef.xml 23 Sep 2003 13:56:44 - 1.2.2.1
@@ -45,14 +45,4 @@
/nested
/target
- target name=xpathstyle
-macrodef name=testing attributestyle=xpath
- attribute name=abc/
- sequential
-echoattribute is @[EMAIL PROTECTED]/echo
- /sequential
-/macrodef
-
-testing abc=this is a test/
- /target
/project
No revision
No revision
1.7.2.1 +0 -44 ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
Index: MacroDef.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- MacroDef.java 22 Sep 2003 08:58:58 - 1.7
+++ MacroDef.java 23 Sep 2003 13:56:44 - 1.7.2.1
@@ -81,7 +81,6 @@
private String name;
private List attributes = new ArrayList();
private Mapelements = new HashMap();
-private intattributeStyle = AttributeStyle.ANT;
/**
* Name of the definition
@@ -92,46 +91,6 @@
}
/**
- * Enumerated type for attributeStyle attribute
- *
- * @see EnumeratedAttribute
- */
-public static class AttributeStyle extends EnumeratedAttribute {
-/** Enumerated values */
-public static final int ANT = 0, XPATH = 1;
-
-/**
- * get the values
- * @return an array of the allowed values for this attribute.
- */
-public String[] getValues() {
-return new String[] {ant, xpath};
-}
-}
-
-/**
- * emExperimental/em
- * I am uncertain at the moment how to encode
DO NOT REPLY [Bug 22834] - XSLT fails transforming file with doctype
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=22834. 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=22834 XSLT fails transforming file with doctype --- Additional Comments From [EMAIL PROTECTED] 2003-09-23 14:05 --- Are you defining your xmlcatalog outside of the task? Sounds like a duplicate of bug 20965 that I've just been able to confirm in my environment. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18438] - Referenced xmlcatalog does not include the classpath
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=18438. 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=18438 Referenced xmlcatalog does not include the classpath [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2003-09-23 14:06 --- Collecting the related bugs, even if this one has been reported first. *** This bug has been marked as a duplicate of 20965 *** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 20965] - xmlvalidatexmlcatalog refid=...// does not work - ignores nested catalogpath items
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=20965. 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=20965 xmlvalidatexmlcatalog refid=...// does not work - ignores nested catalogpath items [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] ||international.com --- Additional Comments From [EMAIL PROTECTED] 2003-09-23 14:06 --- *** Bug 18438 has been marked as a duplicate of this bug. *** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs MacroDef.java
peterreilly2003/09/23 07:04:05
Modified:src/main/org/apache/tools/ant/taskdefs MacroDef.java
Log:
remove method implemented in superclass
Revision ChangesPath
1.9 +0 -9 ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
Index: MacroDef.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MacroDef.java 23 Sep 2003 13:55:52 - 1.8
+++ MacroDef.java 23 Sep 2003 14:04:05 - 1.9
@@ -91,15 +91,6 @@
}
/**
- * Set the class loader.
- * Not used
- * @param classLoader a codeClassLoader/code value
- */
-public void setAntlibClassLoader(ClassLoader classLoader) {
-// Ignore
-}
-
-/**
* Add a nested task to ExtendType
* @param nestedTask Nested task/type to extend
*/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs MacroDef.java
peterreilly2003/09/23 07:04:36
Modified:src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
MacroDef.java
Log:
remove method implemented in superclass
Revision ChangesPath
No revision
No revision
1.7.2.2 +0 -9 ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
Index: MacroDef.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- MacroDef.java 23 Sep 2003 13:56:44 - 1.7.2.1
+++ MacroDef.java 23 Sep 2003 14:04:36 - 1.7.2.2
@@ -91,15 +91,6 @@
}
/**
- * Set the class loader.
- * Not used
- * @param classLoader a codeClassLoader/code value
- */
-public void setAntlibClassLoader(ClassLoader classLoader) {
-// Ignore
-}
-
-/**
* Add a nested task to ExtendType
* @param nestedTask Nested task/type to extend
*/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 10857] - xmlcatalog does not work as project-child, only as target-child
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=10857. 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=10857 xmlcatalog does not work as project-child, only as target-child [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID | --- Additional Comments From [EMAIL PROTECTED] 2003-09-23 14:08 --- Don't know why this has been closed as invalid as I can reproduce it. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 10857] - xmlcatalog does not work as project-child, only as target-child
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=10857. 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=10857 xmlcatalog does not work as project-child, only as target-child [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2003-09-23 14:08 --- Collecting the related bugs, even if this one has been reported first. *** This bug has been marked as a duplicate of 20965 *** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 20965] - xmlvalidatexmlcatalog refid=...// does not work - ignores nested catalogpath items
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=20965. 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=20965 xmlvalidatexmlcatalog refid=...// does not work - ignores nested catalogpath items [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2003-09-23 14:08 --- *** Bug 10857 has been marked as a duplicate of this bug. *** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 20965] - xmlvalidatexmlcatalog refid=...// does not work - ignores nested catalogpath items
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=20965. 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=20965 xmlvalidatexmlcatalog refid=...// does not work - ignores nested catalogpath items [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] AssignedTo|[EMAIL PROTECTED] |[EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs/optional XmlValidateTest.java
bodewig 2003/09/23 07:33:43
Modified:.WHATSNEW
src/etc/testcases/taskdefs/optional xmlvalidate.xml
src/main/org/apache/tools/ant/types XMLCatalog.java
src/testcases/org/apache/tools/ant/taskdefs/optional
XmlValidateTest.java
Log:
Defer expansion of reference until the catalog gets used.
PR: 20965
Revision ChangesPath
1.505 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -r1.504 -r1.505
--- WHATSNEW 22 Sep 2003 15:05:21 - 1.504
+++ WHATSNEW 23 Sep 2003 14:33:43 - 1.505
@@ -248,6 +248,9 @@
* splash could fail on JVMs that use null to indicate the system
classloader.
Bugzilla Report 23320.
+* xmlcatalogs only worked when defined inside of tasks. Bugzilla
+ Report 20965.
+
Other changes:
--
* All tasks can be used outside of targets. Note that some tasks
1.12 +10 -0 ant/src/etc/testcases/taskdefs/optional/xmlvalidate.xml
Index: xmlvalidate.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/optional/xmlvalidate.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xmlvalidate.xml 10 Dec 2002 07:39:22 - 1.11
+++ xmlvalidate.xml 23 Sep 2003 14:33:43 - 1.12
@@ -25,6 +25,16 @@
/xmlvalidate
/target
+ target name=xmlcatalogViaRefid
+xmlcatalog classpath=xml id=cat
+ dtd publicID=-//stevo//DTD doc 1.0//EN location=doc.dtd/
+/xmlcatalog
+xmlvalidate warn=false
+ xmlcatalog refid=cat/
+ fileset dir=xml includes=**/about.xml/
+/xmlvalidate
+ /target
+
target name=xmlcatalognested
xmlvalidate warn=false
fileset dir=xml includes=**/about.xml/
1.33 +23 -17ant/src/main/org/apache/tools/ant/types/XMLCatalog.java
Index: XMLCatalog.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/XMLCatalog.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- XMLCatalog.java 13 Aug 2003 15:14:31 - 1.32
+++ XMLCatalog.java 23 Sep 2003 14:33:43 - 1.33
@@ -208,7 +208,7 @@
* @return the elements of the catalog - ResourceLocation objects
*/
private Vector getElements() {
-return elements;
+return getRef().elements;
}
/**
@@ -217,7 +217,7 @@
* @return the classpath
*/
private Path getClasspath() {
-return classpath;
+return getRef().classpath;
}
/**
@@ -335,7 +335,7 @@
* @return the catalog path
*/
public Path getCatalogPath() {
-return this.catalogPath;
+return getRef().catalogPath;
}
@@ -421,17 +421,6 @@
if (!elements.isEmpty()) {
throw tooManyAttributes();
}
-// change this to get the objects from the other reference
-Object o = r.getReferencedObject(getProject());
-// we only support references to other XMLCatalogs
-if (o instanceof XMLCatalog) {
-// set all elements from referenced catalog to this one
-XMLCatalog catalog = (XMLCatalog) o;
-setElements(catalog.getElements());
-} else {
-String msg = r.getRefId() + does not refer to an XMLCatalog;
-throw new BuildException(msg);
-}
super.setRefid(r);
}
@@ -443,6 +432,10 @@
public InputSource resolveEntity(String publicId, String systemId)
throws SAXException, IOException {
+if (isReference()) {
+return getRef().resolveEntity(publicId, systemId);
+}
+
if (!isChecked()) {
// make sure we don't have a circular reference here
Stack stk = new Stack();
@@ -472,6 +465,10 @@
public Source resolve(String href, String base)
throws TransformerException {
+if (isReference()) {
+return getRef().resolve(href, base);
+}
+
if (!isChecked()) {
// make sure we don't have a circular reference here
Stack stk = new Stack();
@@ -516,6 +513,16 @@
}
/**
+ * @since Ant 1.6
+ */
+private XMLCatalog getRef() {
+if (!isReference()) {
+return this;
+}
+return (XMLCatalog) getCheckedRef(XMLCatalog.class, xmlcatalog);
+}
+
+/**
* The instance of the CatalogResolver strategy to use.
cvs commit: ant/src/testcases/org/apache/tools/ant/types XMLCatalogTest.java
bodewig 2003/09/23 07:43:31
Modified:src/testcases/org/apache/tools/ant/types XMLCatalogTest.java
Log:
forgot to commit file
Revision ChangesPath
1.5 +1 -9
ant/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java
Index: XMLCatalogTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLCatalogTest.java 10 Feb 2003 14:14:55 - 1.4
+++ XMLCatalogTest.java 23 Sep 2003 14:43:31 - 1.5
@@ -172,14 +172,6 @@
}
public void testEmptyElementIfIsReference() {
-try {
-catalog.setRefid(new Reference(dummyref));
-fail(Can add reference to nonexistent XMLCatalog);
-} catch (BuildException be) {
-assertEquals(Reference dummyref not found.,
- be.getMessage());
-}
-
ResourceLocation dtd = new ResourceLocation();
dtd.setPublicId(PUBLIC ID ONE);
dtd.setLocation(i/dont/exist.dtd);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: AW: [PATCH] and problem with patch.xml
My only reason for doing it was to make it consistent, since we had a bit of both. I figured since we were going to move these html documents to XML at some point, make the migration easier. Either way works for me. -- Larry -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 23, 2003 5:05 AM To: [EMAIL PROTECTED] Subject: RE: AW: [PATCH] and problem with patch.xml HTML is not XML. And while writing example is much easier to work with than with quot;. Maybe that´s a default setting in the html checker :-) Jan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: AW: [PATCH] and problem with patch.xml
I think an that time (whenever :-) we should write a transformer. Maybe on top of the chaperon parser. (Forrest uses that, too). There are so many documents that the checks by hand are to much work, I think. Jan -Original Message- From: Shatzer, Larry [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 23, 2003 4:53 PM To: 'Ant Developers List' Subject: RE: AW: [PATCH] and problem with patch.xml My only reason for doing it was to make it consistent, since we had a bit of both. I figured since we were going to move these html documents to XML at some point, make the migration easier. Either way works for me. -- Larry -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 23, 2003 5:05 AM To: [EMAIL PROTECTED] Subject: RE: AW: [PATCH] and problem with patch.xml HTML is not XML. And while writing example is much easier to work with than with quot;. Maybe that´s a default setting in the html checker :-) Jan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 20965] - xmlvalidatexmlcatalog refid=...// does not work - ignores nested catalogpath items
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=20965. 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=20965 xmlvalidatexmlcatalog refid=...// does not work - ignores nested catalogpath items [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED Target Milestone|--- |1.6 --- Additional Comments From [EMAIL PROTECTED] 2003-09-23 15:04 --- Should be fixed with nightly build 2003-09-24. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 20939] - BuildExcpetion being logged when a path does not exist.
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=20939. 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=20939 BuildExcpetion being logged when a path does not exist. --- Additional Comments From [EMAIL PROTECTED] 2003-09-23 15:10 --- Sorry, I didn't see that you explicitly asked whether you should submit a patch. Of course! Patches are always welcome. I'm just afraid that you'll find that it is harder than you think. The code generating the warning is the exception handler in Project#addReference - around line 1755 in CVS HEAD. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 20699] - rmic and seaprate input/output 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=20699. 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=20699 rmic and seaprate input/output directories [EMAIL PROTECTED] changed: What|Removed |Added Severity|Major |Enhancement - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 20618] - class org.apache.tools.ant.util.regexp.Jdk14RegexpMatcher
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=20618. 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=20618 class org.apache.tools.ant.util.regexp.Jdk14RegexpMatcher [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Additional Comments From [EMAIL PROTECTED] 2003-09-23 15:16 --- I've always been bad with names and Ant's sources tell a lot of stories about this (even Erik and Steve tell them in their book, thankfully without pointing fingers). I admit, I've been the one who called the method match and used a misleading name. The behavior we have is more a partialMatch or something - and is the behavior most of the applications of that method inside Ant need. So yes, the name is wrong and we can't change for backwards compatibility. If you need exact matching, anchoring your pattern with ^ and $ is the way to go. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 20366] - ANT zip target does not include empty 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=20366. 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=20366 ANT zip target does not include empty directories [EMAIL PROTECTED] changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution||WORKSFORME - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Tasks, Taskdefs, classpaths, and ClassNotFound...
Hi everybody. I'm posting this to the lists in the hopes that the search engines will pick it up and provide more help than I got. When I looked, I saw lots of messages along the lines of Help! Can't Define/change the classpath within the ant build file... but no good answers. It seems some people were using or even defining their own custom Tasks, only to find that ClassNotFoundErrors or ClassCastExceptions were popping up as a result. If their experience was anything like mine, they found that they could certainly define the classpath used to load their custom task, but that once that task was loaded, it had problems finding other classes it needed - even if they were within the classpath given in the taskdef. A perplexing and frustruating problem. The ugly solutions are obvious: 1) Using a script (or abusing your wrists) to specify a system classpath for all of ant that includes the classes that your task can't find. This is ugly, especially when not only is it unnecessary, but you're so close to not needing to do it. 2) Putting all of the jars/classes that your task can't find into ANT_HOME/lib. So now installation/transport of whatever you're doing is a pain, and you've crudded up the ant namespace for every user of ant on that system, potentially causing other problems. I scoured google finding nothing of any substance about what exactly caused this problem, or how it might be fixed. There were, however, a few clues that led me to examine Cactus and JUnit, which have, in various ways, dealt with issues of loading arbitrary classes in ant. Ordinary Java operations like new, casting literals, variable declarations, and other conventional language features will operate via the ClassLoader that loaded the Object they're running in. Even the Reflection APIs appear to attempt to use the ClassLoader of the calling Object. This, at least, makes some sense to me. The problem comes with the way some Factory bootstrappers use reflection. In these bad implementations, reflection will be used to find and instantiate Factories, but with a default ClassLoader, rather than the ClassLoader of the calling Object. I encountered this in code from Sun, in the the JDOHelper class, which is used to bootstrap JDO PersistenceManagerFactories. That method (by default) used the ClassLoader of the current thread (Thread.currentThread().getContextClassLoader()). Judging by other messages I found hunting around the net, this kind of thing comes up in other situations as well. If you defined a classpath for your taskdef, a special AntClassLoader was created, configured with this classpath, and used to load your Task. But inside your Task, when you, or anything you call, uses these sloppy bootstrap routines, they can lose that ClassLoader (picking up ant's instead), and that means that the custom classpath in your taskdef isn't used. Who knows what's affected. This may be rare, and I may be unlucky, but bean stuff, factory stuff, database stuff, testing stuff, or anything else that uses reflection internally could potentially have a problem. Not many people write custom tasks that do these sorts of things, but it does come up, and when it does, it seems to have left a trail of agony. I found two ways to deal with this problem while making JDO work inside an ant Task. The sloppy way is to grab the right ClassLoader - the one you creataed by giving a custom classpath in your taskdef - and shove it into the current Thread. Yes, you can do that. FYI, these code examples have not been compiled - they're just to give a general idea. So anywhere in the Task (init(), execute()), but ideally right before the problem occurs: // Get the task class loader we used to load this tag. AntClassLoader taskloader = (AntClassLoader) this.getClass().getClassLoader(); // Shove it into the Thread, replacing the thread's ClassLoader: taskloader.setThreadContextLoader(); Then you do what you have to do. When your done, I highly advise doing a: // Reset the Thread's original ClassLoader. taskloader.resetThreadContextLoader(); Yes, taskloader remembers the original for later reset. This puts the right ClassLoader where JDOHelper wants to look for it by default. I tested this way cursorily and it seemed to work. I think it could be useful if you're dealing with a series of similar problems rather than just one instance. However, it is messy. You don't want to change the ClassLoader except where you need to. I don't know what else looks at the Thread's ClassLoader... It might affect ant, it might affect other tasks, who knows. However, if you're in a bind, you can try it - you might get away with it. You do get some additional control with the AntClassLoader, which can be useful for forcing a solution like this to work, via methods that allow you to control which classes, or whole package roots, are handled by the child and which are immediately delegated to the parent (system)... Anyway, another small indication of why going this
DO NOT REPLY [Bug 20207] - enhance telnet task to be able to gather read outputs into a property
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=20207. 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=20207 enhance telnet task to be able to gather read outputs into a property [EMAIL PROTECTED] changed: What|Removed |Added Severity|Normal |Enhancement - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/junit PlainJUnitResultFormatter.java
bodewig 2003/09/23 08:31:49
Modified:src/main/org/apache/tools/ant/taskdefs/optional/junit
PlainJUnitResultFormatter.java
Log:
Remove redundant output, PR 20194
Revision ChangesPath
1.20 +4 -4
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
Index: PlainJUnitResultFormatter.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- PlainJUnitResultFormatter.java19 Jul 2003 08:11:05 - 1.19
+++ PlainJUnitResultFormatter.java23 Sep 2003 15:31:48 - 1.20
@@ -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
@@ -198,12 +198,12 @@
* pA Test is finished.
*/
public void endTest(Test test) {
+if (Boolean.TRUE.equals(failed.get(test))) {
+return;
+}
synchronized (wri) {
wri.print(Testcase:
+ JUnitVersionHelper.getTestCaseName(test));
-if (Boolean.TRUE.equals(failed.get(test))) {
-return;
-}
Long l = (Long) testStarts.get(test);
double seconds = 0;
// can be null if an error occured in setUp
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 20194] - PlainJUnitResultFormatter produces poor output
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=20194. 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=20194 PlainJUnitResultFormatter produces poor output [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED Target Milestone|--- |1.6 --- Additional Comments From [EMAIL PROTECTED] 2003-09-23 15:34 --- Actually it is not missing a newline, there is a Testcase: testAccessibleComponent3 too much. Should be fixed with nightly build 2003-09-24. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/junit PlainJUnitResultFormatter.java
bodewig 2003/09/23 08:32:18
Modified:src/main/org/apache/tools/ant/taskdefs/optional/junit Tag:
ANT_16_BRANCH PlainJUnitResultFormatter.java
Log:
Remove redundant output, PR 20194
Revision ChangesPath
No revision
No revision
1.19.2.1 +4 -4
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
Index: PlainJUnitResultFormatter.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -r1.19 -r1.19.2.1
--- PlainJUnitResultFormatter.java19 Jul 2003 08:11:05 - 1.19
+++ PlainJUnitResultFormatter.java23 Sep 2003 15:32:18 - 1.19.2.1
@@ -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
@@ -198,12 +198,12 @@
* pA Test is finished.
*/
public void endTest(Test test) {
+if (Boolean.TRUE.equals(failed.get(test))) {
+return;
+}
synchronized (wri) {
wri.print(Testcase:
+ JUnitVersionHelper.getTestCaseName(test));
-if (Boolean.TRUE.equals(failed.get(test))) {
-return;
-}
Long l = (Long) testStarts.get(test);
double seconds = 0;
// can be null if an error occured in setUp
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 20053] - Method required to clear down the recorderEntries Hashtable in the ANT 1.5.3 Recorder Class
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=20053. 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=20053 Method required to clear down the recorderEntries Hashtable in the ANT 1.5.3 Recorder Class [EMAIL PROTECTED] changed: What|Removed |Added Severity|Normal |Enhancement --- Additional Comments From [EMAIL PROTECTED] 2003-09-23 15:42 --- I'll mark this as an enhancement request. The most logical thing to me (and I think it would help your GUI app) would be to auto-clear the cache on the buildFinished event as the RecorderEntry instances will close their output files there as well. Would that be enough for your case? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/script ant
conor 2003/09/23 08:40:36
Modified:.Tag: ANT_16_BRANCH build.sh
src/main/org/apache/tools/ant/launch Tag: ANT_16_BRANCH
Launcher.java
src/script Tag: ANT_16_BRANCH ant
Log:
Add support for multiple -lib options. Also allow -lib to specify
a directory of jars rather than just the directory itself. Update
build.sh to use this. Unix only for now. Windows later.
Revision ChangesPath
No revision
No revision
1.35.2.1 +1 -26 ant/build.sh
Index: build.sh
===
RCS file: /home/cvs/ant/build.sh,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -u -w -u -r1.35 -r1.35.2.1
--- build.sh 11 Aug 2003 13:18:19 - 1.35
+++ build.sh 23 Sep 2003 15:40:36 - 1.35.2.1
@@ -28,31 +28,6 @@
exit
fi
-LOCALCLASSPATH=
-# add in the dependency .jar files
-DIRLIBS=lib/optional/*.jar
-for i in ${DIRLIBS}
-do
-if [ $i != ${DIRLIBS} ] ; then
-LOCALCLASSPATH=$LOCALCLASSPATH:$i
-fi
-done
-
-# make sure the classpath is in unix format
-if $cygwin ; then
-CLASSPATH=`cygpath --path --unix $CLASSPATH`
-fi
-
-CLASSPATH=$LOCALCLASSPATH:$CLASSPATH
-
-# switch back to Windows format
-if $cygwin ; then
-CLASSPATH=`cygpath --path --windows $CLASSPATH`
-fi
-
-export CLASSPATH
-
-
if [ $REALANTHOME != ] ; then
if $cygwin; then
REALANTHOME=`cygpath --path --windows $REALANTHOME`
@@ -62,5 +37,5 @@
ANT_INSTALL=-emacs
fi
-bootstrap/bin/ant $ANT_INSTALL $*
+bootstrap/bin/ant -lib lib/optional $ANT_INSTALL $*
No revision
No revision
1.5.2.2 +45 -30ant/src/main/org/apache/tools/ant/launch/Launcher.java
Index: Launcher.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/launch/Launcher.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -w -u -r1.5.2.1 -r1.5.2.2
--- Launcher.java 22 Sep 2003 21:15:41 - 1.5.2.1
+++ Launcher.java 23 Sep 2003 15:40:36 - 1.5.2.2
@@ -58,6 +58,10 @@
import java.net.MalformedURLException;
import java.io.File;
import java.util.StringTokenizer;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+
/**
* This is a launcher for Ant.
@@ -118,37 +122,48 @@
throw new IllegalStateException(Ant home is set incorrectly or
+ ant could not be located);
}
-String libPath = ;
-String[] newargs = null;
-int argcount = -1;
-for (argcount = 0; argcount args.length -1; argcount++) {
-if (args[argcount].equals(-lib)) {
-libPath = args[argcount + 1];
-break;
-}
+
+List libPaths = new ArrayList();
+List argList = new ArrayList();
+String[] newArgs;
+
+for (int i = 0; i args.length; ++i) {
+if (args[i].equals(-lib)) {
+if (i == args.length - 1) {
+throw new IllegalStateException(The -lib argument must
++ be followed by a library location);
}
-if (libPath.equals()) {
- newargs = new String[args.length];
- System.arraycopy(args, 0, newargs, 0, args.length);
+libPaths.add(args[++i]);
} else {
-newargs = new String[args.length - 2];
-// copy the beginning of the args array
-if (argcount 0 ) {
-System.arraycopy(args, 0, newargs, 0 ,argcount);
-}
-// copy the end of the args array
-if ((argcount + 2 args.length) argcount 0) {
-System.arraycopy(args, argcount + 2, newargs, argcount,
args.length - (argcount + 2));
+argList.add(args[i]);
}
}
-StringTokenizer myTokenizer = new StringTokenizer(libPath,
System.getProperty(path.separator));
-URL[] classPathJars = new URL[myTokenizer.countTokens()];
-int classPathJarCount = 0;
+
+if (libPaths.size() == 0) {
+newArgs = args;
+} else {
+newArgs = (String[]) argList.toArray(new String[0]);
+}
+
+List libPathURLs = new ArrayList();
+for (Iterator i = libPaths.iterator(); i.hasNext();) {
+String libPath = (String) i.next();
+StringTokenizer myTokenizer
+= new StringTokenizer(libPath,
System.getProperty(path.separator));
while (myTokenizer.hasMoreElements()) {
-String token = myTokenizer.nextToken();
-
DO NOT REPLY [Bug 23339] - Core Task War, Ear, Jar should have the M feature available
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=23339. 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=23339 Core Task War, Ear, Jar should have the M feature available --- Additional Comments From [EMAIL PROTECTED] 2003-09-23 15:44 --- Thank you for the clarification. I will see what happens when that occurs and contact the appropriate development group if the jar spec is not followed. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 20576] - STlabel doesn't create Build labels.
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=20576. 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=20576 STlabel doesn't create Build labels. --- Additional Comments From [EMAIL PROTECTED] 2003-09-23 15:45 --- Steve, any problem with making the docs match the code? Doing it the other way around could be backwards incompatible. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 19877] - prefix attribute of webinf sub-task of war core task no longer relative to WEB-INF
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=19877. 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=19877 prefix attribute of webinf sub-task of war core task no longer relative to WEB-INF [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] AssignedTo|[EMAIL PROTECTED] |[EMAIL PROTECTED] Severity|Normal |Minor --- Additional Comments From [EMAIL PROTECTED] 2003-09-23 15:49 --- I'll try that with 1.4 when I find time - as I can't believe it has worked that way. 8-) OK, the way it works in 1.5.x is what it was intended to be. If you need to place things into a prefixed dir inside WEB-INF, use a zipfileset and specify the full prefix. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 20576] - STlabel doesn't create Build labels.
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=20576. 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=20576 STlabel doesn't create Build labels. --- Additional Comments From [EMAIL PROTECTED] 2003-09-23 16:05 --- I see no problem with making the docs match the code. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/script ant
On Wed, 24 Sep 2003 01:40 am, [EMAIL PROTECTED] wrote: conor 2003/09/23 08:40:36 Modified:.Tag: ANT_16_BRANCH build.sh src/main/org/apache/tools/ant/launch Tag: ANT_16_BRANCH Launcher.java src/script Tag: ANT_16_BRANCH ant Log: Add support for multiple -lib options. Also allow -lib to specify a directory of jars rather than just the directory itself. Update build.sh to use this. Unix only for now. Windows later. These changes expand on Antoine's -lib code to support multiple -lib options. In addition, the -lib option can now name a directory containing jars and all jars in that directory will be added to Ant's launch classpath. I've made these changes to the Unix side of things for now. I'll be on a Windows box tomorrow to make the appropriate changes there. I moved the -lib $CLASSPATH behind the main arguments ($@) to catch things like incomplete argument specifications such as ant -lib The build.sh file has been updated to use these new features to pick up lib/optional as a -lib directory. You'll need to bootstrap to pick up these features and have the build.sh file work. I'll merge across when I've done the Windows changes. Conor - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: things that break
Stefan Bodewig wrote: On 23 Sep 2003, Stefan Bodewig [EMAIL PROTECTED] wrote: On Mon, 22 Sep 2003, Steve Loughran [EMAIL PROTECTED] wrote: The late fix to DotnetCompile doesnt seem to break C# apps. They've broken Mono: Things go back to the point where we've been a few days ago (i.e. all csc tests pass, the ilasm tests fail) if I change includedefaultreferences to use true instead of false. We need to adapt the documentation of this attribute and make clear that it now only toggles the /nostdlib flag (and remove any reference to mscore.dll). yes, I need to update all the .net docs, and should have caught that extra fix to the mono tests. I think now all you need to change between mono and csc is the name of the executable Mono status: testCSC testCSCintrinsicFileset testCSCdll testCscReferences testILDASM_empty testJsharp this is a noop without vjc on the path pass for a self-compiled Mono 0.26 on Linux and a fink installed Mono 0.23 on Mac OS X (one day I'll figure out how to compile Mono 0.26 without a JIT and can upgrade my Mac installation). do you cross compile it? -steve - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant build.xml
[EMAIL PROTECTED] wrote:
bodewig 2003/09/23 06:14:41
Modified:.build.xml
Log:
AssertionsTest needs a javac that supports assert
Revision ChangesPath
1.394 +1 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- build.xml 22 Sep 2003 15:05:21 - 1.393
+++ build.xml 23 Sep 2003 13:14:41 - 1.394
@@ -144,6 +144,7 @@
selector id=needs.jdk1.4+
or
filename name=${regexp.package}/Jdk14Regexp*/
+ filename name=${ant.package}/types/AssertionsTest.java/
/or
/selector
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
