DO NOT REPLY [Bug 5035] - Patternset and fileset enhancements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=5035. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=5035 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 01:01 --- IIRC the resistance against which a virtual filesystem was met was much like what we are discussing here--a symptom of the shackles in which we often find ourselves with regard to BC and how to make things work intelligently in Ant... -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/util FileUtils.java
jkf 2005/01/06 16:14:06
Modified:src/main/org/apache/tools/ant/util FileUtils.java
Log:
PR: 32979
Modification to FileUtils to only accept : on the second position as absolute
path for dos-like os.
Revision ChangesPath
1.82 +38 -38ant/src/main/org/apache/tools/ant/util/FileUtils.java
Index: FileUtils.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/FileUtils.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- FileUtils.java6 Jan 2005 12:05:08 - 1.81
+++ FileUtils.java7 Jan 2005 00:14:06 - 1.82
@@ -66,7 +66,8 @@
+ Runtime.getRuntime().freeMemory());
private static boolean onNetWare = Os.isFamily(netware);
-
+private static boolean onDos = Os.isFamily(dos);
+
private static final int BUF_SIZE = 8192;
// for toURI
@@ -641,7 +642,7 @@
in = new FileInputStream(sourceFile);
out = new FileOutputStream(destFile);
-byte[] buffer = new byte[8 * 1024];
+byte[] buffer = new byte[BUF_SIZE];
int count = 0;
do {
out.write(buffer, 0, count);
@@ -698,22 +699,8 @@
.replace('\\', File.separatorChar);
// deal with absolute files
-if (!onNetWare) {
-if (filename.startsWith(File.separator)
-|| (filename.length() = 2
- Character.isLetter(filename.charAt(0))
- filename.charAt(1) == ':')) {
-return normalize(filename);
-}
-} else {
-// the assumption that the : will appear as the second character
in
-// the path name breaks down when NetWare is a supported
platform.
-// Netware volumes are of the pattern: data:\;
-int colon = filename.indexOf(:);
-if (filename.startsWith(File.separator)
-|| (colon -1)) {
-return normalize(filename);
-}
+if (isAbsolutePath(filename)) {
+return normalize(filename);
}
if (file == null) {
@@ -743,6 +730,30 @@
}
/**
+ * Verifies if the filename represents is an absolute path.
+ * @param filename the file name to be checked for being an absolute path
+ * @return true if the filename represents an absolute path.
+ */
+private static boolean isAbsolutePath(String filename) {
+if (filename.startsWith(File.separator)) {
+// common for all os
+return true;
+} else if (onDos
+ filename.length() = 2
+ Character.isLetter(filename.charAt(0))
+ filename.charAt(1) == ':') {
+// Actually on windows the : must be followed by a \ for
+// the path to be absolute, else the path is relative
+// to the current working directory on that drive.
+// (Every drive may have another current working directory)
+return true;
+} else if (onNetWare filename.indexOf(:) -1) {
+return true;
+}
+return false;
+}
+
+/**
* quot;normalizequot; the given absolute path.
*
* pThis includes:
@@ -771,26 +782,15 @@
// make sure we are dealing with an absolute path
int colon = path.indexOf(:);
-if (!onNetWare) {
-if (!path.startsWith(File.separator)
- !(path.length() = 2
- Character.isLetter(path.charAt(0))
- colon == 1)) {
-String msg = path + is not an absolute path;
-throw new BuildException(msg);
-}
-} else {
-if (!path.startsWith(File.separator)
- (colon == -1)) {
-String msg = path + is not an absolute path;
-throw new BuildException(msg);
-}
+if (!isAbsolutePath(path)) {
+String msg = path + is not an absolute path;
+throw new BuildException(msg);
}
boolean dosWithDrive = false;
String root = null;
// Eliminate consecutive slashes after the drive spec
-if ((!onNetWare path.length() = 2
+if ((onDos path.length() = 2
Character.isLetter(path.charAt(0))
path.charAt(1) == ':')
|| (onNetWare colon -1)) {
@@ -1267,13 +1267,13 @@
* codefrom/code, which involves deleting codefrom/code as
* well./p
*
+ * @param from the file to move
+ * @param
DO NOT REPLY [Bug 5035] - Patternset and fileset enhancements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=5035. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=5035 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 01:18 --- As for the argument over the implications of what we are talking about for javac in particular, I see none, to be honest. Javac doesn't actually deal in filesets. It composes an implicit fileset but you couldn't actually pass it a fileset. You could pass javac a dirset embedded in a src element, and the task would scan each of the directories returned from listing the Path represented by the src element.Path appears to handle file|dirsets as I stated before, so again, there should be no issue from a null directory. There may be other cases where a null directory will cause a problem, but from what I can tell so far javac isn't one of them. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 5035] - Patternset and fileset enhancements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=5035. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=5035 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 01:21 --- (In reply to comment #13) Ken, you may not see the pb since replace does not make use of the relative filenames, just the files. Try to reflect on an example with copy, and were should the files be copied to... --DD I just plucked replace randomly. The point is that what I described seems to provide a sane, describable semantic for a composite fileset. I can't see where it fails to meet the expectations for a fileset. If I was using it for javac, I would still get c/foo.java and x/bar.java and that should work, right? And for copy it would copy things to c/foo.java and x/bar.java, right? I'm not trying to sound overconfident here, but it all seems to hang together to me. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32977] - Ant handles .. in paths incorrectly
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32977. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32977 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 01:23 --- I find it very mildly disturbing :-) The chance that there would be a directory by that name in the root directory is minute. I can appreciate the intention of the way Ant is behaving. However, I think it's overstepping its boundaries. It should be up to the script developer to make sure ..'s are being used as he/she intends them to be used. Perhaps a compromise would be for Ant to print a warning message if it notices redundant ..'s, e.g.: Warning, Line 11: Path ../../../../webapps/wsrf contains redundant .. elements. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs LengthTest.java
mbenson 2005/01/06 16:36:04
Modified:src/etc/testcases/taskdefs length.xml
src/testcases/org/apache/tools/ant/taskdefs LengthTest.java
Log:
Remove order assumption from testEach.
Revision ChangesPath
1.2 +14 -6 ant/src/etc/testcases/taskdefs/length.xml
Index: length.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/length.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- length.xml4 Jan 2005 22:20:44 - 1.1
+++ length.xml7 Jan 2005 00:36:04 - 1.2
@@ -6,21 +6,29 @@
target name=init
mkdir dir=${dir.a} /
mkdir dir=${dir.b} /
-concat destfile=${dir.a}/foofoo/concat
-concat destfile=${dir.b}/barbar/concat
+property name=foo location=${dir.a}/foo /
+property name=bar location=${dir.b}/bar /
+echo file=${foo} message=foo /
+echo file=${bar} message=bar /
/target
target name=testEach depends=init
length mode=each property=length.each
fileset id=fs dir=${dir} /
/length
-pathconvert property=expected refid=fs pathsep=${line.separator}
- globmapper from=* to=* : 3 /
-/pathconvert
+length string=${length.each} property=length.length.each /
+length string=${foo}${bar}${line.separator}
+property=length.expected /
fail
+ !-- test that both files are represented, and that the
+ output is the expected length; do not assume order. --
condition
not
- equals arg1=${expected} arg2=${length.each} /
+ and
+contains string=${length.each} substring=${foo} : 3 /
+contains string=${length.each} substring=${bar} : 3 /
+equals arg1=${length.length.each} arg2=${length.expected} /
+ /and
/not
/condition
/fail
1.3 +1 -3
ant/src/testcases/org/apache/tools/ant/taskdefs/LengthTest.java
Index: LengthTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/LengthTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LengthTest.java 6 Jan 2005 15:20:10 - 1.2
+++ LengthTest.java 7 Jan 2005 00:36:04 - 1.3
@@ -34,9 +34,7 @@
}
public void testEach() {
-// Disable this test as the order of files in a fileset is
-// not specified
-// executeTarget(testEach);
+executeTarget(testEach);
}
public void testAll() {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30921] - Quotes in CLASSPATH can screw up ant.bat
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30921. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30921 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 01:55 --- There is a smarter fix to lines like IF %VARIABLE%== ... a.) do *not* use IF DEFINED, since this will break execution on Win98 which doesn't support DEFINED b.) reverse the test, using a simple uninterpreted character, eg. '_' that is unlikely to apear isolated at the start of the String. Example: IF _==%VARIABLE%_ Rationale: for command.com and its ugly brothers, there has to be something nonspacey before and after the ==. The sollution would work in all cases with just one exception: - VARIABLE=_ some other text, which should be reasonably uncommon for paths aund file names. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25777] - [PATCH] [REGRESSION] Cannot pass composite path reference between scripts
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=25777. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=25777 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 02:00 --- Re. Peter's patch, wouldn't it be better to at least deprecate getReferencedObject(Project) and remove the project parameter from all uses, as Antoine's patch did? Seems just needlessly confusing to leave the now-useless project parameter in there everywhere. I would rather suggest starting with Antoine's patch (with the minor comments I mentioned) and just making getReferencedObject(Project) behave as you have it, i.e. using the supplied project as a fallback only, but still deprecating it. As far as I can see, this would be compatible. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. You are on the CC list for the bug, or are watching someone who is. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32983] - java task: jar is not searched for relative to the dir setting
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32983. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32983 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 10:00 --- The ant way is that files are resolved relative to project directory. The class implementing the java task has a setter setJar(File jarfile) ... The Exec task is working differently : the executable attribute (which is a bit the equivalent of the jar attribute here) is a String instead of a file, so it does not get resolved automatically against base directory. Another attribute called resolveExecutable allows to resolve the executable optionally against the base directory. Now for BC reasons, and to avoid cluttering complex code, I do not think anyone among the committers would like to meet your requirement, which is difficult any way because the introspection does automatically the job of resolving the jar to a path based on the project directory, unless an absolute path is written in the build file. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
AW: [GUMP@brutus]: Project test-ant (in module ant) failed
Ok, the usual testNoFileJUnitNoFrames(org.apache.tools.ant.taskdefs.optional.junit.JUnitRe portTest) Xalan error. But there are another few ... Jan Testcase: testResolveFile(org.apache.tools.ant.ProjectTest):FAILED expected:lt;C:[\]gt; but was:lt;C:[]gt; junit.framework.ComparisonFailure: expected:lt;C:[\]gt; but was:lt;C:[]gt; at junit.framework.Assert.assertEquals(Assert.java:81) at junit.framework.Assert.assertEquals(Assert.java:87) at org.apache.tools.ant.ProjectTest.testResolveFile(ProjectTest.java:81) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39 ) Testcase: testResolveFile(org.apache.tools.ant.util.FileUtilsTest): FAILED expected:lt;C:[\]gt; but was:lt;C:[]gt; junit.framework.ComparisonFailure: expected:lt;C:[\]gt; but was:lt;C:[]gt; at junit.framework.Assert.assertEquals(Assert.java:81) at junit.framework.Assert.assertEquals(Assert.java:87) at org.apache.tools.ant.util.FileUtilsTest.testResolveFile(FileUtilsTest.java:1 16) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39 ) Testcase: testNormalize(org.apache.tools.ant.util.FileUtilsTest): Caused an ERROR C: is not an absolute path C: is not an absolute path at org.apache.tools.ant.util.FileUtils.normalize(FileUtils.java:787) at org.apache.tools.ant.util.FileUtilsTest.testNormalize(FileUtilsTest.java:198 ) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39 ) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl .java:25)
Re: AW: [GUMP@brutus]: Project test-ant (in module ant) failed
[EMAIL PROTECTED] wrote: Ok, the usual testNoFileJUnitNoFrames(org.apache.tools.ant.taskdefs.optional.junit.JUnitRe portTest) Xalan error. But there are another few ... Jan Testcase: testResolveFile(org.apache.tools.ant.ProjectTest):FAILED expected:lt;C:[\]gt; but was:lt;C:[]gt; junit.framework.ComparisonFailure: expected:lt;C:[\]gt; but was:lt;C:[]gt; at junit.framework.Assert.assertEquals(Assert.java:81) at junit.framework.Assert.assertEquals(Assert.java:87) at org.apache.tools.ant.ProjectTest.testResolveFile(ProjectTest.java:81) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39 ) Testcase: testResolveFile(org.apache.tools.ant.util.FileUtilsTest): FAILED expected:lt;C:[\]gt; but was:lt;C:[]gt; junit.framework.ComparisonFailure: expected:lt;C:[\]gt; but was:lt;C:[]gt; at junit.framework.Assert.assertEquals(Assert.java:81) at junit.framework.Assert.assertEquals(Assert.java:87) at org.apache.tools.ant.util.FileUtilsTest.testResolveFile(FileUtilsTest.java:1 16) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39 ) Testcase: testNormalize(org.apache.tools.ant.util.FileUtilsTest): Caused an ERROR C: is not an absolute path C: is not an absolute path at org.apache.tools.ant.util.FileUtils.normalize(FileUtils.java:787) at org.apache.tools.ant.util.FileUtilsTest.testNormalize(FileUtilsTest.java:198 ) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39 ) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl .java:25) my bad, I only regression tested on windows the changes I applied yesterday on the file utils for the unix problem on files with a : in the file name. The regression test on windows passed. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: AW: [GUMP@brutus]: Project test-ant (in module ant) failed
of course i will fix this before monday. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32989] New: - Reference to fileset does not work as expected
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=32989.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=32989
Summary: Reference to fileset does not work as expected
Product: Ant
Version: 1.6.2
Platform: PC
OS/Version: Windows 2000
Status: NEW
Severity: normal
Priority: P2
Component: Core
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
path id=jpf.classpath
fileset dir=${jpf.dir} id=jpf.fileset includes=lib/jpf-0.3.jar/
/path
I would expect that the jpf.classpath and jpf.fileset contain the same jar.
However, it seems that the path reference does contain the directory
information while the fileset reference seems to be only a reference to the
(implicitly nested) patternset without the directory information.
Does this mean that a reference to a fileset can not be done ?
The manual states:
'All tasks that use nested elements for PatternSets, FileSets, ZipFileSets or
path-like structures accept references to these structures as well.'
This does not seem to be correct than..
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32989] - Reference to fileset does not work as expected
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=32989.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=32989
--- Additional Comments From [EMAIL PROTECTED] 2005-01-07 11:58 ---
Could you include a small build file that shows the problem.
I did the following test:
target name=ref
path
fileset id=fileset.1 dir=/home/preilly includes=.bashrc/
/path
fileset id=fileset.2 dir=/home/preilly includes=.bashrc/
pathconvert property=path.1 refid=fileset.1 targetos=unix/
pathconvert property=path.2 refid=fileset.2 targetos=unix/
echopath.1 is ${path.1}/echo
echopath.2 is ${path.2}/echo
/target
and got the result:
ref:
[echo] path.1 is /home/preilly/.bashrc
[echo] path.2 is /home/preilly/.bashrc
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32989] - Reference to fileset does not work as expected
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32989. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32989 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 12:11 --- Use property name=cp refid=jpf.classpath/ Instead of pathconvert to convert to a printable property. That should show the problem -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32989] - Reference to fileset does not work as expected
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32989. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32989 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 12:20 --- property refid=x/ just uses the toString() on the referenced object. For filesets, toString() does not include the directory. If you need to make use of a fileset in a string, you should use pathconvert/ -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Proposal: improve 'whichresource' features
Hello,
Maybe I have not understood well what is the aim of 'whichresource' and how to
use it - but here is my problem:
To get the simple jar file name that contains a class loaded from the Ant lib/
directory, I had to do:
whichresource
class=org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner
property=ant-junit.url/
pathconvert property=ant-junit-jarfile pathSep=?
path location=${ant-junit.url}/
mapper type=glob
from=${basedir}${file.separator}jar:file:*!/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.class
to=*/
/pathconvert
It is only working on Linux...
On Windows, ant-junit-jarfile is empty.
The value of 'ant-junit.url' on Windows is
jar:file:/C:/Program%20Files/Ant/lib/ant-junit.jar!/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.class
[ The URI RFC says the ':' is a reserved character BUT it is used to express
the ugly windows drive notation... Another issue for me. Does the JDK
provide valid file: URL on Windows ? ]
Is there a portable way to get that code working ?
Isn't it simpler to add an output option to 'whichresource' ?
whichresource
class=org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner
property=ant-junit.url
output=file/
The output values may be
- 'url': complete URL,
- 'jar': if protocol is jar, only the part between jar: and !
- 'file': if protocol is file, only the file name)
and so on.
So whichresource will only write in the property the part on the URL we are
interested in. URL specification is not enough: it has to understand some
protocols to be able to remove !... part in case of jar: protocol for
instance.
What do you think about that idea ? I'm ready to work on it if ok. Or else I
will have to create my own task.
Thank you in advance for your answers
--
Yves Martin
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32989] - Reference to fileset does not work as expected
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32989. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32989 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 12:33 --- Oeps. After all, it does seem to work as expected. Sorry to have bothered you. You can close it -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25777] - [PATCH] [REGRESSION] Cannot pass composite path reference between scripts
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=25777. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=25777 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 13:08 --- I think that Antonies patch is not backward compatible. Any third party tasks that create references will not work, this can be seen from the changes that were necessary to the unit tests. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. You are on the CC list for the bug, or are watching someone who is. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32941] - [PATCH] ExecuteJava should not catch ThreadDeath
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=32941.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=32941
--- Additional Comments From [EMAIL PROTECTED] 2005-01-07 14:06 ---
well maybe we should have a static filter function that gets called on
throwables
catch(Throwable t) {
Project.rethrowNotForCatching(t);
...
}
rethrowNotForCatching would use instanceof tests to decide what to do.
This may seem somewhat bad form but with the logic in one place we can tune it.
I have used this technique in other projects.
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug, or are watching someone who is.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30921] - Quotes in CLASSPATH can screw up ant.bat
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30921. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30921 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 14:12 --- Maybe we should be ruthless and in Ant1.7 make an end-of-life declaration for Win9x support. None of the developers runs it (as far as I know), so it doesnt get tested well. It isnt a real OS, and frankly, nobody should use it as a dev platform. An EOL declaration would mean batch scripts wont support it any more (we leave the old one 'ant98' around for legacy users, and bugreps in the scripts wont get fixed. Bugs in the Java side will be addressed on case-by-case basis. The perl and python launchers will work... -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/zip AsiExtraField.java
peterreilly2005/01/07 05:13:39
Modified:src/main/org/apache/tools/zip AsiExtraField.java
Log:
stylecheck
Revision ChangesPath
1.12 +23 -18ant/src/main/org/apache/tools/zip/AsiExtraField.java
Index: AsiExtraField.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/zip/AsiExtraField.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AsiExtraField.java4 Dec 2004 00:03:50 - 1.11
+++ AsiExtraField.java7 Jan 2005 13:13:39 - 1.12
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2002,2004 The Apache Software Foundation
+ * Copyright 2001-2002,2004-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -90,12 +90,13 @@
*/
private CRC32 crc = new CRC32();
+/** Constructor for AsiExtraField. */
public AsiExtraField() {
}
/**
* The Header-ID.
- *
+ * @return the value for the header id for this extrafield
* @since 1.1
*/
public ZipShort getHeaderId() {
@@ -105,7 +106,7 @@
/**
* Length of the extra field in the local file data - without
* Header-ID or length specifier.
- *
+ * @return a codeZipShort/code for the length of the data of this
extra field
* @since 1.1
*/
public ZipShort getLocalFileDataLength() {
@@ -119,7 +120,7 @@
/**
* Delegate to local file data.
- *
+ * @return the centralDirectory length
* @since 1.1
*/
public ZipShort getCentralDirectoryLength() {
@@ -129,7 +130,7 @@
/**
* The actual data to put into local file data - without Header-ID
* or length specifier.
- *
+ * @return get the data
* @since 1.1
*/
public byte[] getLocalFileDataData() {
@@ -160,7 +161,7 @@
/**
* Delegate to local file data.
- *
+ * @return the local file data
* @since 1.1
*/
public byte[] getCentralDirectoryData() {
@@ -169,7 +170,7 @@
/**
* Set the user id.
- *
+ * @param uid the user id
* @since 1.1
*/
public void setUserId(int uid) {
@@ -178,7 +179,7 @@
/**
* Get the user id.
- *
+ * @return the user id
* @since 1.1
*/
public int getUserId() {
@@ -187,7 +188,7 @@
/**
* Set the group id.
- *
+ * @param gid the group id
* @since 1.1
*/
public void setGroupId(int gid) {
@@ -196,7 +197,7 @@
/**
* Get the group id.
- *
+ * @return the group id
* @since 1.1
*/
public int getGroupId() {
@@ -230,7 +231,7 @@
/**
* Is this entry a symbolic link?
- *
+ * @return true if this is a symbolic link
* @since 1.1
*/
public boolean isLink() {
@@ -239,7 +240,7 @@
/**
* File mode of this file.
- *
+ * @param mode the file mode
* @since 1.1
*/
public void setMode(int mode) {
@@ -248,7 +249,7 @@
/**
* File mode of this file.
- *
+ * @return the file mode
* @since 1.1
*/
public int getMode() {
@@ -257,7 +258,7 @@
/**
* Indicate whether this entry is a directory.
- *
+ * @param dirFlag if true, this entry is a directory
* @since 1.1
*/
public void setDirectory(boolean dirFlag) {
@@ -267,7 +268,7 @@
/**
* Is this entry a directory?
- *
+ * @return true if this entry is a directory
* @since 1.1
*/
public boolean isDirectory() {
@@ -276,8 +277,11 @@
/**
* Populate data from this array as if it was in local file data.
- *
+ * @param data an array of bytes
+ * @param offset the start offset
+ * @param length the number of bytes in the array from offset
* @since 1.1
+ * @throws ZipException on error
*/
public void parseFromLocalFileData(byte[] data, int offset, int length)
throws ZipException {
@@ -312,7 +316,8 @@
/**
* Get the file mode for given permissions with the correct file type.
- *
+ * @param mode the mode
+ * @return the type with the mode
* @since 1.1
*/
protected int getMode(int mode) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30921] - Quotes in CLASSPATH can screw up ant.bat
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30921. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30921 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 14:16 --- Still the space / quote problems also exist on win XP -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/zip ExtraFieldUtils.java
peterreilly2005/01/07 05:16:43
Modified:src/main/org/apache/tools/zip ExtraFieldUtils.java
Log:
javadoc
Revision ChangesPath
1.10 +14 -6 ant/src/main/org/apache/tools/zip/ExtraFieldUtils.java
Index: ExtraFieldUtils.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/zip/ExtraFieldUtils.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ExtraFieldUtils.java 9 Mar 2004 16:48:55 - 1.9
+++ ExtraFieldUtils.java 7 Jan 2005 13:16:43 - 1.10
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2002,2004 The Apache Software Foundation
+ * Copyright 2001-2002,2004-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -45,6 +45,7 @@
*
* pThe given class must have a no-arg constructor and implement
* the [EMAIL PROTECTED] ZipExtraField ZipExtraField interface}./p
+ * @param c the class to register
*
* @since 1.1
*/
@@ -64,7 +65,10 @@
/**
* Create an instance of the approriate ExtraField, falls back to
* [EMAIL PROTECTED] UnrecognizedExtraField UnrecognizedExtraField}.
- *
+ * @param headerId the header identifier
+ * @return an instance of the appropiate ExtraField
+ * @exception InstantiationException if unable to instantiate the class
+ * @exception IllegalAccessException if not allowed to instatiate the
class
* @since 1.1
*/
public static ZipExtraField createExtraField(ZipShort headerId)
@@ -81,8 +85,10 @@
/**
* Split the array into ExtraFields and populate them with the
* give data.
- *
+ * @param byte an array of bytes
+ * @return an array of ExtraFields
* @since 1.1
+ * @throws ZipException on error
*/
public static ZipExtraField[] parse(byte[] data) throws ZipException {
Vector v = new Vector();
@@ -117,7 +123,8 @@
/**
* Merges the local file data fields of the given ZipExtraFields.
- *
+ * @param data an array of ExtraFiles
+ * @return an array of bytes
* @since 1.1
*/
public static byte[] mergeLocalFileDataData(ZipExtraField[] data) {
@@ -141,7 +148,8 @@
/**
* Merges the central directory fields of the given ZipExtraFields.
- *
+ * @param data an array of ExtraFields
+ * @return an array of bytes
* @since 1.1
*/
public static byte[] mergeCentralDirectoryData(ZipExtraField[] data) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30921] - Quotes in CLASSPATH can screw up ant.bat
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30921. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30921 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 14:18 --- Depends on the objectives. Despite the lore Matt mentioned, there are people relying on setting the classpath, so the committers might want to keep this just for the sake of backward compatibility. btw.: didn't you mean to say 'true'? Extending your table: BLAH set to: | some text | some text | | not set | text | _ text | test performed | | | | | || -+---+-+---+-+---++ %BLAH%_==_ | error |false| false | true | false | error | -+---+-+---+-+---++ _==%BLAH%_ | false(*) |false| false | true | false | error | -+---+-+---+-+---++ (*) in IF _==%BLAH%_ ECHO Hi There This would be ok, since the interpreter sees: IF _==some text_ ECHO Hi There and stops interpretation after evaluating _==some to false but in IF NOT _==%BLAH%_ ECHO Hi There this breaks, because the interpreter now tries to execute text_ as a command. Only problem here is the special role of the _ here, but I trust that pathes are rarely starting with underscore + blank. Anyway, this would work the same way regardless, wether there are quotes in the content of BLAH or not. As for the classpath argument in the java commandline: There shouldn't be any problems with quotes in it, as long as there's an even count, and you don't expect the 'missquoted' entries to be found by the JVM. Brents example confirms, that there are no problems with spaces in a file name on the classpath, if properly quoted. Remember, that there might be quotes, regardless wether there are spaces to protect or not. So I would recommend: - either let it the way it is, - or fix the if the way described above. Thomas P.S.: I volonteer to do the patch, if somebody else commits. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/zip ZipEntry.java
peterreilly2005/01/07 05:21:01
Modified:src/main/org/apache/tools/zip ZipEntry.java
Log:
checkstyle
Revision ChangesPath
1.23 +47 -26ant/src/main/org/apache/tools/zip/ZipEntry.java
Index: ZipEntry.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/zip/ZipEntry.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ZipEntry.java 15 Dec 2004 08:14:08 - 1.22
+++ ZipEntry.java 7 Jan 2005 13:21:01 - 1.23
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Copyright 2001-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@
/**
* Creates a new zip entry with the specified name.
- *
+ * @param name the name of the entry
* @since 1.1
*/
public ZipEntry(String name) {
@@ -50,8 +50,9 @@
/**
* Creates a new zip entry with fields taken from the specified zip
entry.
- *
+ * @param entry the entry to get fields from
* @since 1.1
+ * @throws ZipException on error
*/
public ZipEntry(java.util.zip.ZipEntry entry) throws ZipException {
/*
@@ -88,7 +89,8 @@
/**
* Creates a new zip entry with fields taken from the specified zip
entry.
- *
+ * @param entry the entry to get fields from
+ * @throws ZipException on error
* @since 1.1
*/
public ZipEntry(ZipEntry entry) throws ZipException {
@@ -106,8 +108,8 @@
}
/**
- * Overwrite clone
- *
+ * Overwrite clone.
+ * @return a cloned copy of this ZipEntry
* @since 1.1
*/
public Object clone() {
@@ -146,7 +148,7 @@
/**
* Retrieves the internal file attributes.
- *
+ * @return the internal file attributes
* @since 1.1
*/
public int getInternalAttributes() {
@@ -155,7 +157,7 @@
/**
* Sets the internal file attributes.
- *
+ * @param value an codeint/code value
* @since 1.1
*/
public void setInternalAttributes(int value) {
@@ -164,7 +166,7 @@
/**
* Retrieves the external file attributes.
- *
+ * @return the external file attributes
* @since 1.1
*/
public long getExternalAttributes() {
@@ -173,7 +175,7 @@
/**
* Sets the external file attributes.
- *
+ * @param value an codelong/code value
* @since 1.1
*/
public void setExternalAttributes(long value) {
@@ -183,7 +185,7 @@
/**
* Sets Unix permissions in a way that is understood by Info-Zip's
* unzip command.
- *
+ * @param mode an codeint/code value
* @since Ant 1.5.2
*/
public void setUnixMode(int mode) {
@@ -197,7 +199,7 @@
/**
* Unix permission.
- *
+ * @return the unix permissions
* @since Ant 1.6
*/
public int getUnixMode() {
@@ -218,6 +220,8 @@
}
/**
+ * Set the platform (UNIX or FAT).
+ * @param platform an codeint/code value - 0 is FAT, 3 is UNIX
* @since 1.9
*/
protected void setPlatform(int platform) {
@@ -226,7 +230,7 @@
/**
* Replaces all currently attached extra fields with the new array.
- *
+ * @param fields an array of extra fields
* @since 1.1
*/
public void setExtraFields(ZipExtraField[] fields) {
@@ -239,7 +243,7 @@
/**
* Retrieves extra fields.
- *
+ * @return an array of the extra fields
* @since 1.1
*/
public ZipExtraField[] getExtraFields() {
@@ -251,7 +255,7 @@
/**
* Adds an extra fields - replacing an already present extra field
* of the same type.
- *
+ * @param ze an extra field
* @since 1.1
*/
public void addExtraField(ZipExtraField ze) {
@@ -271,7 +275,7 @@
/**
* Remove an extra fields.
- *
+ * @param type the type of extra field to remove
* @since 1.1
*/
public void removeExtraField(ZipShort type) {
@@ -290,8 +294,10 @@
/**
* Throws an Exception if extra data cannot be parsed into extra fields.
- *
+ * @param extra an array of bytes to be parsed into extra fields
+ * @throws RuntimeException if the bytes cannot be parsed
* @since 1.1
+ * @throws RuntimeException on error
*/
public void setExtra(byte[] extra) throws RuntimeException {
try {
@@ -315,7 +321,7 @@
/**
* Retrieves the extra
cvs commit: ant/src/main/org/apache/tools/zip ExtraFieldUtils.java
peterreilly2005/01/07 05:23:10 Modified:src/main/org/apache/tools/zip ExtraFieldUtils.java Log: opps Revision ChangesPath 1.11 +2 -2 ant/src/main/org/apache/tools/zip/ExtraFieldUtils.java Index: ExtraFieldUtils.java === RCS file: /home/cvs/ant/src/main/org/apache/tools/zip/ExtraFieldUtils.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ExtraFieldUtils.java 7 Jan 2005 13:16:43 - 1.10 +++ ExtraFieldUtils.java 7 Jan 2005 13:23:10 - 1.11 @@ -85,7 +85,7 @@ /** * Split the array into ExtraFields and populate them with the * give data. - * @param byte an array of bytes + * @param data an array of bytes * @return an array of ExtraFields * @since 1.1 * @throws ZipException on error - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32977] - Ant handles .. in paths incorrectly
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32977. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32977 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 14:25 --- Its an interesting problem. Your code is stepping backwards up the tree till it hits the root. What should the semantics be at that point? Unix says 'stay at /'; DOS, with its multiple roots is more convoluted. If Java and DOS behave the same way, I'd go for copying it. If we changed it, what would break? Incidentally Ian, why not do something like property file=build.properties / property name=root.dir location=../../ / property name=wsrf.dir location=webapps/wsrf / This way you get to override everything in your build.properties file. th -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30921] - Quotes in CLASSPATH can screw up ant.bat
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30921. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30921 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 14:47 --- OK, dropping Win98 means, we could go for the much safer IF DEFINED then. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30921] - Quotes in CLASSPATH can screw up ant.bat
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30921. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30921 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 15:01 --- Why is everyone reacting ignoring the suspected next problem that will be hit if the check is removed? The problem of starting java with ant call and a set classpath when the classpath contains spaces? (If the answer would be then put quotes around the classpath if it contains space, for exactly the same reason the answer could be then don't put quotes around the classpath.) As said getting rid of the check would completely do the trick, as any check either gives an error in an valid situation and returns false in all other valid cases. Currently ant always is called on windows XP with an empty classpath if the classpath is not set I have tried several patches, on the test and the line after it, the best result so far was without any test at all (as the test would either sometimes give an error, or would only return false. if %BLAH%_ == _ echo true with BLAH not set returns an emtpy line on my system, not true, at least when run from the command line. When run from an batch file it will return true argh. echo %BLAH%_ for an undefined BLAH gives %BLAH%_ as response, therefore %BLAH%_ is not equal to _ that would mean the extended table reads: BLAH set to: | some text | some text | | not set | text | _ text | test performed | | | | | || -+---+-+---+-+---++ %BLAH%_==_ | error |false| false | true | false | error | -+---+-+---+-+---++ _==%BLAH%_ | false(*) |false| false | true | false | error | -+---+-+---+-+---++ not _==%BLAH%_ | error |true | true | false | true |false(2)| -+---+-+---+-+---++ (2) should have returned true though! (3) the goal probably was to get the opposite here. so also here either error or the result is always the same, or deviates from the same only if it shouldn't have deviated. btw. is it possible to have an if defined in an batch script for win9x as long as it isn't executed? -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant ProjectTest.java
jkf 2005/01/07 06:04:41
Modified:src/testcases/org/apache/tools/ant/util FileUtilsTest.java
src/testcases/org/apache/tools/ant ProjectTest.java
Log:
Adapted the FileUtils test to show behaviour based on os type.
Revision ChangesPath
1.32 +73 -50
ant/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java
Index: FileUtilsTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- FileUtilsTest.java6 Jan 2005 12:05:07 - 1.31
+++ FileUtilsTest.java7 Jan 2005 14:04:41 - 1.32
@@ -109,37 +109,37 @@
assertEquals(File.separator,
FILE_UTILS.resolveFile(null, \\).getPath());
-/*
- * throw in drive letters
- */
-String driveSpec = C:;
-assertEquals(driveSpec + \\,
- FILE_UTILS.resolveFile(null, driveSpec +
/).getPath());
-assertEquals(driveSpec + \\,
- FILE_UTILS.resolveFile(null, driveSpec +
\\).getPath());
-String driveSpecLower = c:;
-assertEquals(driveSpec + \\,
- FILE_UTILS.resolveFile(null, driveSpecLower +
/).getPath());
-assertEquals(driveSpec + \\,
- FILE_UTILS.resolveFile(null, driveSpecLower +
\\).getPath());
-/*
- * promised to eliminate consecutive slashes after drive letter.
- */
-assertEquals(driveSpec + \\,
- FILE_UTILS.resolveFile(null, driveSpec +
/).getPath());
-assertEquals(driveSpec + \\,
- FILE_UTILS.resolveFile(null, driveSpec +
).getPath());
-
-if (Os.isFamily(netware)) {
+if (Os.isFamily(dos)) {
+/*
+ * throw in drive letters
+ */
+String driveSpec = C:;
+assertEquals(driveSpec + \\,
+ FILE_UTILS.resolveFile(null, driveSpec +
/).getPath());
+assertEquals(driveSpec + \\,
+ FILE_UTILS.resolveFile(null, driveSpec +
\\).getPath());
+String driveSpecLower = c:;
+assertEquals(driveSpec + \\,
+ FILE_UTILS.resolveFile(null, driveSpecLower +
/).getPath());
+assertEquals(driveSpec + \\,
+ FILE_UTILS.resolveFile(null, driveSpecLower +
\\).getPath());
+/*
+ * promised to eliminate consecutive slashes after drive letter.
+ */
+assertEquals(driveSpec + \\,
+ FILE_UTILS.resolveFile(null, driveSpec +
/).getPath());
+assertEquals(driveSpec + \\,
+ FILE_UTILS.resolveFile(null, driveSpec +
).getPath());
+} else if (Os.isFamily(netware)) {
/*
* throw in NetWare volume names
*/
-driveSpec = SYS:;
+String driveSpec = SYS:;
assertEquals(driveSpec,
FILE_UTILS.resolveFile(null, driveSpec +
/).getPath());
assertEquals(driveSpec,
FILE_UTILS.resolveFile(null, driveSpec +
\\).getPath());
-driveSpecLower = sys:;
+String driveSpecLower = sys:;
assertEquals(driveSpec,
FILE_UTILS.resolveFile(null, driveSpecLower +
/).getPath());
assertEquals(driveSpec,
@@ -151,6 +151,20 @@
FILE_UTILS.resolveFile(null, driveSpec +
/).getPath());
assertEquals(driveSpec,
FILE_UTILS.resolveFile(null, driveSpec +
).getPath());
+} else {
+/*
+ * drive letters must be considered just normal filenames.
+ */
+String driveSpec = C:;
+assertEquals(driveSpec,
+ FILE_UTILS.resolveFile(null, driveSpec +
/).getPath());
+assertEquals(driveSpec,
+ FILE_UTILS.resolveFile(null, driveSpec +
\\).getPath());
+String driveSpecLower = c:;
+assertEquals(driveSpecLower,
+ FILE_UTILS.resolveFile(null, driveSpecLower +
/).getPath());
+assertEquals(driveSpecLower,
+ FILE_UTILS.resolveFile(null, driveSpecLower +
\\).getPath());
}
/*
@@ -191,41 +205,41 @@
assertEquals(File.separator,
FILE_UTILS.normalize(\\).getPath());
-/*
- * throw in drive letters
- */
-String driveSpec = C:;
cvs commit: ant/src/main/org/apache/tools/zip UnrecognizedExtraField.java ZipExtraField.java
peterreilly2005/01/07 06:11:04
Modified:src/main/org/apache/tools/zip UnrecognizedExtraField.java
ZipExtraField.java
Log:
javadoc
Revision ChangesPath
1.9 +39 -2
ant/src/main/org/apache/tools/zip/UnrecognizedExtraField.java
Index: UnrecognizedExtraField.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/zip/UnrecognizedExtraField.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- UnrecognizedExtraField.java 9 Mar 2004 16:48:55 - 1.8
+++ UnrecognizedExtraField.java 7 Jan 2005 14:11:04 - 1.9
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2002,2004 The Apache Software Foundation
+ * Copyright 2001-2002,2004-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -35,10 +35,18 @@
*/
private ZipShort headerId;
+/**
+ * Set the header id.
+ * @param headerId the header id to use
+ */
public void setHeaderId(ZipShort headerId) {
this.headerId = headerId;
}
+/**
+ * Get the header id.
+ * @return the header id
+ */
public ZipShort getHeaderId() {
return headerId;
}
@@ -51,14 +59,27 @@
*/
private byte[] localData;
+/**
+ * Set the extra field data in the local file data -
+ * without Header-ID or length specifier.
+ * @param data the field data to use
+ */
public void setLocalFileDataData(byte[] data) {
localData = data;
}
+/**
+ * Get the length of the local data.
+ * @return the length of the local data
+ */
public ZipShort getLocalFileDataLength() {
return new ZipShort(localData.length);
}
+/**
+ * Get the local data.
+ * @return the local data
+ */
public byte[] getLocalFileDataData() {
return localData;
}
@@ -71,10 +92,19 @@
*/
private byte[] centralData;
+/**
+ * Set the extra field data in central directory.
+ * @param data the data to use
+ */
public void setCentralDirectoryData(byte[] data) {
centralData = data;
}
+/**
+ * Get the central data length.
+ * If there is no central data, get the local file data length.
+ * @return the central data length
+ */
public ZipShort getCentralDirectoryLength() {
if (centralData != null) {
return new ZipShort(centralData.length);
@@ -82,6 +112,10 @@
return getLocalFileDataLength();
}
+/**
+ * Get the central data.
+ * @return the central data if present, else return the local file data
+ */
public byte[] getCentralDirectoryData() {
if (centralData != null) {
return centralData;
@@ -89,6 +123,9 @@
return getLocalFileDataData();
}
+/**
+ * @see ZipExtraField#parseFromLocalFileData(data, offset, length)
+ */
public void parseFromLocalFileData(byte[] data, int offset, int length) {
byte[] tmp = new byte[length];
System.arraycopy(data, offset, tmp, 0, length);
1.10 +11 -7 ant/src/main/org/apache/tools/zip/ZipExtraField.java
Index: ZipExtraField.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/zip/ZipExtraField.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ZipExtraField.java9 Mar 2004 16:48:55 - 1.9
+++ ZipExtraField.java7 Jan 2005 14:11:04 - 1.10
@@ -1,5 +1,5 @@
/*
- * Copyright 2001,2004 The Apache Software Foundation
+ * Copyright 2001,2004-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@
/**
* The Header-ID.
- *
+ * @return the header id
* @since 1.1
*/
ZipShort getHeaderId();
@@ -42,7 +42,7 @@
/**
* Length of the extra field in the local file data - without
* Header-ID or length specifier.
- *
+ * @return the length of the field in the local file data
* @since 1.1
*/
ZipShort getLocalFileDataLength();
@@ -50,7 +50,7 @@
/**
* Length of the extra field in the central directory - without
* Header-ID or length specifier.
- *
+ * @return the length of the field in the central directory
* @since 1.1
*/
ZipShort getCentralDirectoryLength();
cvs commit: ant/src/main/org/apache/tools/ant/types Resource.java
peterreilly2005/01/07 07:00:46
Modified:src/main/org/apache/tools/ant/types Resource.java
Log:
javadoc
Revision ChangesPath
1.10 +25 -3 ant/src/main/org/apache/tools/ant/types/Resource.java
Index: Resource.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Resource.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Resource.java 9 Mar 2004 16:48:41 - 1.9
+++ Resource.java 7 Jan 2005 15:00:46 - 1.10
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
+ * Copyright 2003-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -54,6 +54,8 @@
*
* @param name relative path of the resource. Expects
* quot;/quot; to be used as the directory separator.
+ * @param exists if true, this resource exists
+ * @param lastmodified the last modification time of this resource
*/
public Resource(String name, boolean exists, long lastmodified) {
this(name, exists, lastmodified, false);
@@ -62,6 +64,9 @@
/**
* @param name relative path of the resource. Expects
* quot;/quot; to be used as the directory separator.
+ * @param exists if true the resource exists
+ * @param lastmodified the last modification time of the resource
+ * @param directoryif true, this resource is a directory
*/
public Resource(String name, boolean exists, long lastmodified,
boolean directory) {
@@ -81,6 +86,7 @@
* adm/resource.txt./p
*
* pquot;/quot; will be used as the directory separator./p
+ * @return the name of this resource
*/
public String getName() {
return name;
@@ -93,13 +99,19 @@
public void setName(String name) {
this.name = name;
}
+
/**
- * the exists attribute tells whether a file exists
+ * The exists attribute tells whether a file exists
+ * @return true if this resource exists
*/
public boolean isExists() {
return exists;
}
+/**
+ * Set the exists attribute.
+ * @param exists if true, this resource exists
+ */
public void setExists(boolean exists) {
this.exists = exists;
}
@@ -114,9 +126,14 @@
return !exists || lastmodified 0 ? 0 : lastmodified;
}
+/**
+ * Set the last modification attribute.
+ * @param lastmodified the modification time in milliseconds since
01.01.1970
+ */
public void setLastModified(long lastmodified) {
this.lastmodified = lastmodified;
}
+
/**
* tells if the resource is a directory
* @return boolean flag indicating if the resource is a directory
@@ -125,6 +142,10 @@
return directory;
}
+/**
+ * Set the directory attribute.
+ * @param directory if true, this resource is a directory
+ */
public void setDirectory(boolean directory) {
this.directory = directory;
}
@@ -143,7 +164,8 @@
/**
* delegates to a comparison of names.
- *
+ * @param other the object to compare to
+ * @return true if this object's name is the same as the other object's
name
* @since Ant 1.6
*/
public int compareTo(Object other) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30921] - Quotes in CLASSPATH can screw up ant.bat
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30921. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30921 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 16:03 --- As from batch files the check does return true the following comment is not valid. so also here either error or the result is always the same, or deviates from the same only if it shouldn't have deviated. I have instrumented ant to show what is added to the classpath if the check is removed: while giving the command ant test with the line (as present currently) %_JAVACMD% %ANT_OPTS% -classpath %ANT_HOME%\lib\ant-launcher.jar -Dant.home=%ANT_HOME% org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp %CLASSPATH% %ANT_CMD_LINE_ARGS% CLASSPATH set to | passed to ant | added to classpath by ant not set| -cp test| nothing added (not even empty dir) some path | -cp some path test | C:\ant\dist\some (1) some path| -cp some path test | C:\ant\dist\some path (1) in this case the word path is interpreted as the first target, instead of being part of the classpath. with the modified line %_JAVACMD% %ANT_OPTS% -classpath %ANT_HOME%\lib\ant-launcher.jar -Dant.home=%ANT_HOME% org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp %CLASSPATH% %ANT_CMD_LINE_ARGS% CLASSPATH set to | passed to ant | added to classpath by ant not set| -cp test | C:\ant\dist\test (2) some path | -cp some path test | C:\ant\dist\some path some path| -cp some path test | C:\ant\dist\some (3) (2) note that the check was removed test was the specified target. (3) note that path was removed from the claspath but added as target. So we can see that indeed the next problem when removing or replacing the test would be how to recognise where the classpath ends, either when are used in the CLASSPATH and the batch script adds or when no are used in the CLASSPATH and the batch script doesn't add . It currently works if the CLASSPATH does not contain even when the CLASSPATH contains spaces. Removing the quotes from the call would break this. when looking at the environment variables defined per default in windows XP none of them contain quotes especially all other paths including the normal PATH and the HOMEPATH variables are surrounded by . It may be possible to fix this by combining a solution in the ant scripts with an solution in the Launcher.java, but it wouldn't be easy. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant ProjectTest.java
jkf 2005/01/07 07:04:09 Modified:src/testcases/org/apache/tools/ant ProjectTest.java Log: forgot to update cright year Revision ChangesPath 1.27 +1 -1 ant/src/testcases/org/apache/tools/ant/ProjectTest.java Index: ProjectTest.java === RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/ProjectTest.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- ProjectTest.java 7 Jan 2005 14:04:41 - 1.26 +++ ProjectTest.java 7 Jan 2005 15:04:09 - 1.27 @@ -1,5 +1,5 @@ /* - * Copyright 2000-2004 The Apache Software Foundation + * Copyright 2000-2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the License); * you may not use this file except in compliance with the License. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32977] - Ant handles .. in paths incorrectly
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32977. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32977 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 16:07 --- DOS/Windows says stay at the root of the current drive, or the root of an optionally specified drive (i.e. cd C:\.. or cd C:..\..). build.properties is a possiblity, but the intention of the logic in the script was to use a value from build.properties if one was set but otherwise to try to figure it out by doing a series of available checks. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector ModifiedSelector.java
peterreilly2005/01/07 07:16:54
Modified:src/main/org/apache/tools/ant/types/selectors/modifiedselector
ModifiedSelector.java
Log:
javadoc
Revision ChangesPath
1.15 +48 -6
ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
Index: ModifiedSelector.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ModifiedSelector.java 22 Nov 2004 16:44:16 - 1.14
+++ ModifiedSelector.java 7 Jan 2005 15:16:54 - 1.15
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
+ * Copyright 2003-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -866,7 +866,7 @@
/**
* Signals that a target is starting.
- * @param event recieved BuildEvent
+ * @param event received BuildEvent
*/
public void targetStarted(BuildEvent event) {
// no-op
@@ -896,36 +896,78 @@
// Name-Classname mapping is done in the configure() method.
+/**
+ * Get the cache type to use.
+ * @return the enumerated cache type
+ */
public Cache getCache() { return cache; }
+
+/**
+ * Set the cache type to use.
+ * @param name an enumerated cache type.
+ */
public void setCache(CacheName name) {
cacheName = name;
}
+
+/**
+ * The enumerated type for cache.
+ * The values are propertyfile.
+ */
public static class CacheName extends EnumeratedAttribute {
+/** @see EnumeratedAttribute#getValues() */
public String[] getValues() {
return new String[] {propertyfile };
}
}
-
+/**
+ * Get the algorithm type to use.
+ * @return the enumerated algorithm type
+ */
public Algorithm getAlgorithm() { return algorithm; }
+
+/**
+ * Set the algorithm type to use.
+ * @param name an enumerated algorithm type.
+ */
public void setAlgorithm(AlgorithmName name) {
algoName = name;
}
+
+/**
+ * The enumerated type for algorithm.
+ * The values are hashValue, digest and checksum.
+ */
public static class AlgorithmName extends EnumeratedAttribute {
+/** @see EnumeratedAttribute#getValues() */
public String[] getValues() {
return new String[] {hashvalue, digest, checksum };
}
}
-
+/**
+ * Get the comparator type to use.
+ * @return the enumerated comparator type
+ */
public Comparator getComparator() { return comparator; }
+
+/**
+ * Set the comparator type to use.
+ * @param name an enumerated comparator type.
+ */
public void setComparator(ComparatorName name) {
compName = name;
}
+
+/**
+ * The enumerated type for algorithm.
+ * The values are equal and rule.
+ */
public static class ComparatorName extends EnumeratedAttribute {
+/** @see EnumeratedAttribute#getValues() */
public String[] getValues() {
return new String[] {equal, rule };
}
}
-//class-ModifiedSelector
-}
\ No newline at end of file
+}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
local properties
Does anyone recall where we left off on this discussion?I think we need these, what do we need to resolve to get them in? -Matt __ Do you Yahoo!? Yahoo! Mail - Helps protect you from nasty viruses. http://promotions.yahoo.com/new_mail - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32995] New: - StarTeam checkin doesn't add comment to new files when adduncontrolled=true
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=32995.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=32995
Summary: StarTeam checkin doesn't add comment to new files when
adduncontrolled=true
Product: Ant
Version: 1.6.2
Platform: PC
OS/Version: Windows 2000
Status: NEW
Severity: normal
Priority: P3
Component: Optional Tasks
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
Using the following target and having a new file in the local folder, the new
file is added to the repository without the specified comment text as it should
according to the documentation: Because the addUncontrolled attribute has been
set, if StarTeam does not already control this file in this location, it will
be added to the repository. Also, it will write a comment to the repository for
this version of the file.
target name=checkin
stcheckin servername=${ST_SERVER}
serverport=${ST_SERVERPORT}
projectname=${ST_PROJECT}
viewname=${ST_TARGET_VIEW}
username=${ST_USER}
password=${ST_PASSWORD}
rootstarteamfolder=${ST_ROOT_FOLDER}
rootlocalfolder=${LOCAL_FOLDER}
adduncontrolled=true
recursive=true
comment=Merged from view=${ST_SOURCE_VIEW} and
label=${ST_SOURCE_LABEL}
/
/target
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30921] - Quotes in CLASSPATH can screw up ant.bat
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30921. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30921 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 18:01 --- (In reply to comment #12) Correction: when looking at the environment variables defined per default in windows XP none of them contain quotes especially all other paths including the normal PATH and the HOMEPATH variables are NOT surrounded by . -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java
mbenson 2005/01/07 09:14:42
Modified:src/main/org/apache/tools/ant DirectoryScanner.java
Log:
Various inconsequentials
Revision ChangesPath
1.77 +35 -26ant/src/main/org/apache/tools/ant/DirectoryScanner.java
Index: DirectoryScanner.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- DirectoryScanner.java 6 Jan 2005 12:05:06 - 1.76
+++ DirectoryScanner.java 7 Jan 2005 17:14:42 - 1.77
@@ -944,9 +944,9 @@
}
}
/**
- * process included file
- * @param name path of the file relative to the directory of the fileset
- * @param file included file
+ * Process included file.
+ * @param name path of the file relative to the directory of the
FileSet.
+ * @param file included File.
*/
private void accountForIncludedFile(String name, File file) {
if (!filesIncluded.contains(name)
@@ -968,11 +968,11 @@
}
/**
- *
+ * Process included directory.
* @param name path of the directory relative to the directory of
- * the fileset
- * @param file directory as file
- * @param fast
+ * the FileSet.
+ * @param file directory as File.
+ * @param fast whether to perform fast scans.
*/
private void accountForIncludedDir(String name, File file, boolean fast)
{
if (!dirsIncluded.contains(name)
@@ -1011,11 +1011,7 @@
* include pattern, or codefalse/code otherwise.
*/
protected boolean isIncluded(String name) {
-if (!areNonPatternSetsReady) {
-includePatterns = fillNonPatternSet(includeNonPatterns,
includes);
-excludePatterns = fillNonPatternSet(excludeNonPatterns,
excludes);
-areNonPatternSetsReady = true;
-}
+ensureNonPatternSetsReady();
if ((isCaseSensitive() includeNonPatterns.contains(name))
||
@@ -1085,12 +1081,8 @@
* exclude pattern, or codefalse/code otherwise.
*/
protected boolean isExcluded(String name) {
-if (!areNonPatternSetsReady) {
-includePatterns = fillNonPatternSet(includeNonPatterns,
includes);
-excludePatterns = fillNonPatternSet(excludeNonPatterns,
excludes);
-areNonPatternSetsReady = true;
-}
-
+ensureNonPatternSetsReady();
+
if ((isCaseSensitive() excludeNonPatterns.contains(name))
||
(!isCaseSensitive()
@@ -1134,6 +1126,9 @@
* include patterns and none of the exclude patterns.
*/
public String[] getIncludedFiles() {
+if (filesIncluded == null) {
+throw new IllegalStateException();
+}
String[] files = new String[filesIncluded.size()];
filesIncluded.copyInto(files);
Arrays.sort(files);
@@ -1214,6 +1209,9 @@
* include patterns and none of the exclude patterns.
*/
public String[] getIncludedDirectories() {
+if (dirsIncluded == null) {
+throw new IllegalStateException();
+}
String[] directories = new String[dirsIncluded.size()];
dirsIncluded.copyInto(directories);
Arrays.sort(directories);
@@ -1498,7 +1496,7 @@
*
* @since Ant 1.6
*/
-private void clearCaches() {
+private synchronized void clearCaches() {
fileListMap.clear();
scannedDirs.clear();
includeNonPatterns.clear();
@@ -1508,7 +1506,21 @@
}
/**
- * Adds all patterns that are no real patterns (doesn't contain
+ * Ensure that the in|exclude quot;patternsquot;
+ * have been properly divided up.
+ *
+ * @since Ant 1.7
+ */
+private synchronized void ensureNonPatternSetsReady() {
+if (!areNonPatternSetsReady) {
+includePatterns = fillNonPatternSet(includeNonPatterns,
includes);
+excludePatterns = fillNonPatternSet(excludeNonPatterns,
excludes);
+areNonPatternSetsReady = true;
+}
+}
+
+/**
+ * Adds all patterns that are not real patterns (do not contain
* wildcards) to the set and returns the real patterns.
*
* @since Ant 1.7
@@ -1517,16 +1529,13 @@
ArrayList al = new ArrayList(patterns.length);
for (int i = 0; i patterns.length; i++) {
if (!SelectorUtils.hasWildcards(patterns[i])) {
-if (isCaseSensitive()) {
-set.add(patterns[i]);
-} else {
-
DO NOT REPLY [Bug 5035] - Patternset and fileset enhancements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=5035. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=5035 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 18:22 --- I guess I'm failing to explain the issue here, and to get my point across... Since I don't want to debate this forever, I'll just tell you guys to go ahead and implement what you say is possible, and we'll see if that passes the Ant test suite and Gump test. And if it does by some miracle, I'll specifically write a task that relies on the current style fileset, which I think would fail with the proposed modifications. --DD -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 5035] - Patternset and fileset enhancements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=5035. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=5035 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 18:30 --- You can always break it ;-). The whole point of a composite fileset that it should not have getDir() method. It should only have IteratorFSInfo list() method. Some task that require a single fileset root directory, they should use another class derived from that file set. Those tasks will not accept composite filesets. So introducing a base class (interface) for filesets and porting some of the tasks to use it will solve the problem and preserve backward compatibility. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Length.java
mbenson 2005/01/07 09:36:17
Modified:src/main/org/apache/tools/ant/taskdefs Length.java
Log:
No need to finish building up the set for uniqueness before
the handler can be invoked. Removes an import, some LOC, and
has a better chance of preserving order between eg pathconvert and length.
Revision ChangesPath
1.3 +5 -7 ant/src/main/org/apache/tools/ant/taskdefs/Length.java
Index: Length.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Length.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Length.java 6 Jan 2005 12:05:05 - 1.2
+++ Length.java 7 Jan 2005 17:36:17 - 1.3
@@ -23,7 +23,6 @@
import java.io.ByteArrayOutputStream;
import java.util.Vector;
import java.util.HashSet;
-import java.util.Iterator;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.Project;
@@ -44,8 +43,6 @@
private static final String EACH = each;
private static final String STRING = string;
-private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
-
private String property;
private String string;
private Boolean trim;
@@ -157,11 +154,12 @@
File basedir = fs.getDir(getProject());
String[] f = ds.getIncludedFiles();
for (int j = 0; j f.length; j++) {
-included.add(FILE_UTILS.resolveFile(basedir, f[j]));
+File file = FileUtils.getFileUtils().resolveFile(basedir,
f[j]);
+if (!(included.contains(file))) {
+included.add(file);
+h.handle(file);
+}
}
-}
-for (Iterator iter = included.iterator(); iter.hasNext();) {
-h.handle((File)(iter.next()));
}
included.clear();
included = null;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 5035] - Patternset and fileset enhancements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=5035. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=5035 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 18:39 --- I agree with DD. the FileSet.getDir() is the api used when a fileset is used in java code (see any task that uses fileset). One can have a differnet file container (my fav is a path), but each and every task that uses it has to be modified to do so. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 5035] - Patternset and fileset enhancements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=5035. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=5035 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 18:42 --- Yes, but not necessary at one time - tasks can be ported incrementally. Many people ask for this feature. Maybe it is worth a shot. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 5035] - Patternset and fileset enhancements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=5035. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=5035 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 18:47 --- Hold on. DD is cleary right, I think -- there are a lot of tasks that are currently working just fine with a top- level dir in the fileset. Anything you do to remove that will break those tasks. Which is why I suggest that you can provide a dir, derived from the top-level dirs of all the containing sub- filesets. Just take the longest common root. If that's too complex, at the very *least* you can let me compose filesets that all have the same dir. In my current case that would work. But I still think you can match current expectations without such a restriction. In the worse case, the root dir will be /. Although typically I suspect it will never be outside the project root. I know I'm not an insider, but I'd appreciate an indication as to why my suggestion would fail. Thanks -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 5035] - Patternset and fileset enhancements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=5035. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=5035 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 18:52 --- My argument is that outside the context of providing filesets composed of absolute paths, Ant contains all the support needed for the idea of a composite fileset, just not in such a confusing way. I never want to see one fileset element inside another, ever. If you are guaranteed a single parent directory, post the problem to the list of what you want a composite fileset for, and there will be a solution... As for the dir of a fileset, I do not find a guarantee in the API that AFS.getDir() will not return null. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 5035] - Patternset and fileset enhancements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=5035.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=5035
--- Additional Comments From [EMAIL PROTECTED] 2005-01-07 18:53 ---
proposal:
class GenericFileset {
ListFSInfo list();
}
// real file system fileset
class FileSet extends GenericFileset {
File getDir();
//
static GenericFileset applyMapper(Mapper m);
static GenericFileset join(GenericFileset fs1, GenericFileset fs2);
}
class ModernTask {
void addFileset(GenericFileset fs);
}
class OldFileset {
void addFileset(Fileset fs);
}
... and backward compatibility is preserved allowing incremental port of tasks
that can support new feature (copy, sync, replace, even javac).
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 5035] - Patternset and fileset enhancements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=5035.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=5035
--- Additional Comments From [EMAIL PROTECTED] 2005-01-07 18:54 ---
It supposed to be:
class GenericFileset {
ListFSInfo list();
static GenericFileset applyMapper(Mapper m);
static GenericFileset join(GenericFileset fs1, GenericFileset fs2);
}
// real file system fileset
class FileSet extends GenericFileset {
File getDir();
//
}
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Length.java
mbenson 2005/01/07 09:56:49
Modified:src/main/org/apache/tools/ant/taskdefs Length.java
Log:
Remove an unnecessary method call.
Revision ChangesPath
1.4 +1 -2 ant/src/main/org/apache/tools/ant/taskdefs/Length.java
Index: Length.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Length.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Length.java 7 Jan 2005 17:36:17 - 1.3
+++ Length.java 7 Jan 2005 17:56:49 - 1.4
@@ -155,8 +155,7 @@
String[] f = ds.getIncludedFiles();
for (int j = 0; j f.length; j++) {
File file = FileUtils.getFileUtils().resolveFile(basedir,
f[j]);
-if (!(included.contains(file))) {
-included.add(file);
+if (included.add(file)) {
h.handle(file);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 5035] - Patternset and fileset enhancements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=5035. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=5035 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 19:22 --- Plus filelist will be a special kind of generic fileset, so all those tasks will support filelists out of the box. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 20635] - Could the copy task use path-like structures ?
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=20635. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=20635 [EMAIL PROTECTED] changed: What|Removed |Added Priority|P3 |P2 -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 20635] - Could the copy task use path-like structures ?
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=20635. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=20635 [EMAIL PROTECTED] changed: What|Removed |Added Version|1.5.3 |1.6.2 -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 5035] - Patternset and fileset enhancements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=5035. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=5035 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 20:22 --- What you propose makes sense to me Alexey. We can't change inheritance of existing classes though, so it would have to be interface-based, but the spirit's the same. Now all that's needed are volunteers ;-) --DD -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32977] - Ant handles .. in paths incorrectly
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32977. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32977 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 20:29 --- I can live with a warning about trying to go below the root. This way one at least has a hint something could be (and probably is IMHO) amiss. You get your consistent behavior, and we keep a warning similar to the current error. Patches and tests welcome ;-) --DD -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 5035] - Patternset and fileset enhancements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=5035. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=5035 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 22:31 --- I would have to know more about what the Generic FS would do. This is going back to all the virtual filesystem discussions we had had in the past which led to all sorts of conflicts regarding FileUtils, etc. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 5035] - Patternset and fileset enhancements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=5035. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=5035 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 22:52 --- Matt, I don't think what Alexey proposes has anything to do with a Virtual FS. We're still talking only about files here, and just creating a new datatype that only means a collection of arbitrary files, which FileSet is of course, but without the common dir requirement (and the associated relative path). FileList would also fit the bill of this new interface too. --DD -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 5035] - Patternset and fileset enhancements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=5035. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=5035 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 22:53 --- Matt, I could use a reason for rejecting nested filesets. Ever since I learned about sets I learned that you can create sets from the union and intersection of other sets. So when you call something a set you create such an expectation. And the semantics I've described seem to meet all the semantics of the *existing* fileset. No need to create a new type. So I also don't see why we have to get back to the Virtual FS debates. My suggested semantics are nothing new, just a new way to express the union that's direct and simple. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32983] - java task: jar is not searched for relative to the dir setting
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32983. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32983 [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|REOPENED Component|Core tasks |Documentation Resolution|WONTFIX | --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 22:54 --- In that case I think the documentation for this task should be a little clearer in light of the different b/t the exectute task and the java task. If the documentation said for the jar argument - will be relative to build directory even when dir argument specified other location, then it would have been much clearer. And for the execute command the opposite, that the command will be executed relative to the dir value. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTasks clone.html
mbenson 2005/01/07 13:57:00
Modified:.WHATSNEW
docs/manual coretasklist.html
src/main/org/apache/tools/ant RuntimeConfigurable.java
UnknownElement.java
src/main/org/apache/tools/ant/taskdefs defaults.properties
Added: src/main/org/apache/tools/ant/taskdefs Clone.java
src/testcases/org/apache/tools/ant/taskdefs CloneTest.java
src/etc/testcases/taskdefs clone.xml
docs/manual/CoreTasks clone.html
Log:
Add clone task.
PR: 32631
Revision ChangesPath
1.705 +2 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.704
retrieving revision 1.705
diff -u -r1.704 -r1.705
--- WHATSNEW 4 Jan 2005 22:20:44 - 1.704
+++ WHATSNEW 7 Jan 2005 21:56:59 - 1.705
@@ -112,6 +112,8 @@
* Added length task to get strings' and files' lengths.
+* Added clone task.
+
Changes from Ant 1.6.2 to current Ant 1.6 CVS version
=
1.56 +1 -0 ant/docs/manual/coretasklist.html
Index: coretasklist.html
===
RCS file: /home/cvs/ant/docs/manual/coretasklist.html,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- coretasklist.html 4 Jan 2005 22:20:44 - 1.55
+++ coretasklist.html 7 Jan 2005 21:56:59 - 1.56
@@ -27,6 +27,7 @@
a href=CoreTasks/pack.htmlBZip2/abr
a href=CoreTasks/checksum.htmlChecksum/abr
a href=CoreTasks/chmod.htmlChmod/abr
+a href=CoreTasks/clone.htmlClone/abr
a href=CoreTasks/concat.htmlConcat/abr
a href=CoreTasks/condition.htmlCondition/abr
nbsp;nbsp;a href=CoreTasks/conditions.htmlSupported conditions/abr
1.59 +64 -50
ant/src/main/org/apache/tools/ant/RuntimeConfigurable.java
Index: RuntimeConfigurable.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/RuntimeConfigurable.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- RuntimeConfigurable.java 16 Dec 2004 21:10:32 - 1.58
+++ RuntimeConfigurable.java 7 Jan 2005 21:56:59 - 1.59
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation
+ * Copyright 2000-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -89,11 +89,10 @@
*
* @param proxy The element to configure. Must not be codenull/code.
* @param elementTag The tag name generating this element.
- * Should not be codenull/code.
*/
public RuntimeConfigurable(Object proxy, String elementTag) {
setProxy(proxy);
-this.elementTag = elementTag;
+setElementTag(elementTag);
// Most likely an UnknownElement
if (proxy instanceof Task) {
((Task) proxy).setRuntimeConfigurableWrapper(this);
@@ -105,7 +104,7 @@
*
* @param proxy The element to configure. Must not be codenull/code.
*/
-public void setProxy(Object proxy) {
+public synchronized void setProxy(Object proxy) {
wrappedObject = proxy;
proxyConfigured = false;
}
@@ -116,7 +115,7 @@
*
* @param creator the creator object.
*/
-void setCreator(IntrospectionHelper.Creator creator) {
+synchronized void setCreator(IntrospectionHelper.Creator creator) {
this.creator = creator;
}
@@ -126,7 +125,7 @@
*
* @return the object whose configure is held by this instance.
*/
-public Object getProxy() {
+public synchronized Object getProxy() {
return wrappedObject;
}
@@ -134,7 +133,7 @@
* Get the polymorphic type for this element.
* @return the ant component type name, null if not set.
*/
-public String getPolyType() {
+public synchronized String getPolyType() {
return polyType;
}
@@ -142,7 +141,7 @@
* Set the polymorphic type for this element.
* @param polyType the ant component type name, null if not set.
*/
-public void setPolyType(String polyType) {
+public synchronized void setPolyType(String polyType) {
this.polyType = polyType;
}
@@ -153,7 +152,7 @@
* @param attributes List of attributes defined in the XML for this
* element. May be codenull/code.
*/
-public void setAttributes(AttributeList attributes) {
+public synchronized void
cvs commit: ant WHATSNEW
mbenson 2005/01/07 13:58:23 Modified:.WHATSNEW Log: Added bugrep # to clone entry. Revision ChangesPath 1.706 +1 -1 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.705 retrieving revision 1.706 diff -u -r1.705 -r1.706 --- WHATSNEW 7 Jan 2005 21:56:59 - 1.705 +++ WHATSNEW 7 Jan 2005 21:58:23 - 1.706 @@ -112,7 +112,7 @@ * Added length task to get strings' and files' lengths. -* Added clone task. +* Added clone task. Bugzilla report 32631. Changes from Ant 1.6.2 to current Ant 1.6 CVS version = - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32631] - allow includes / excludes for fileset references
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32631. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32631 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 22:58 --- I have just added a clone task to CVS HEAD. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 5035] - Patternset and fileset enhancements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=5035. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=5035 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 23:11 --- The argument about the semantics of sets is persuasive, but I don't think it makes much sense without having filesets that can be composed of arbitrary members. To allow nested filesets, but only if their base directories match, seems like half a solution and inelegant. -$0.02 -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 5035] - Patternset and fileset enhancements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=5035. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=5035 --- Additional Comments From [EMAIL PROTECTED] 2005-01-07 23:16 --- Yes, I agree with you Matt. That's why I only suggested that as a fallback -- better than nothing. But if you can put arbitrary things into a fileset, you still can get a common root for that fileset, derived from the member sets. So I don't think that's necessary. [And thanks for answering me, Matt] -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
