DO NOT REPLY [Bug 33943] New: - ReplaceCopy task throws ClassCastException
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=33943. 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=33943 Summary: ReplaceCopy task throws ClassCastException Product: Ant Version: 1.6.2 Platform: PC OS/Version: Windows XP Status: NEW Severity: major Priority: P1 Component: Core tasks AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Use ReplaceCopy task to generate application.xml for j2ee application. ReplaceCopy fails with ClassCastException. After looking at the code, ReplaceCopy task expects toFile from fileCopyMap to be String, while Copy task put String[] in the fileCopyTask map. -- 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 33882] - Apt task with fork=false and factory tag
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=33882. 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=33882 --- Additional Comments From [EMAIL PROTECTED] 2005-03-10 05:13 --- Fisrtly it is (In reply to comment #1) Without knowing much about this particular task, this sounds like typical Ant compilation-related-task behavior to me. If this is not fixable then the fork option should not be available and it should always fork. -- 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 33882] - Apt task with fork=false and factory tag
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=33882. 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=33882 --- Additional Comments From [EMAIL PROTECTED] 2005-03-10 05:15 --- (In reply to comment #2) Have you tried factoryclasspath Firstly it is factoryPathRef so .. path id=factory.path fileset dir=../ejb3/dest/ include name=ejbFactory.jar/ /fileset /path apt fork=no srcdir=. destdir=build classpath=/home/newdave/jboss/ejb3x/output/lib/jboss-ejb3x.jar:/home/newdave/jboss/j2ee/output/lib/jboss-j2ee.jar factory=com.theappman.annotation.BusinessMethodFactory factoryPathRef=factory.path include name=com/theappman/followup/**/ /apt Output .. [apt] An exception has occurred in apt (1.5.0_01). Please file a bug at the Java Deve loper Connection (http://java.sun.com/webapps/bugreport) after checking the Bug Parade for duplicates. Include your program and the following diagnostic in your report. Thank you. [apt] java.lang.NoClassDefFoundError: com/sun/mirror/apt/AnnotationProcessorFactory [apt] at java.lang.ClassLoader.defineClass1(Native Method) [apt] at java.lang.ClassLoader.defineClass(ClassLoader.java:620) [apt] at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:124) [apt] at java.net.URLClassLoader.defineClass(URLClassLoader.java:260) [apt] at java.net.URLClassLoader.access$100(URLClassLoader.java:56) [apt] at java.net.URLClassLoader$1.run(URLClassLoader.java:195) [apt] at java.security.AccessController.doPrivileged(Native Method) [apt] at java.net.URLClassLoader.findClass(URLClassLoader.java:188) [apt] at java.lang.ClassLoader.loadClass(ClassLoader.java:306) [apt] at java.lang.ClassLoader.loadClass(ClassLoader.java:251) [apt] at com.sun.tools.apt.comp.Apt.main(Apt.java:287) [apt] at com.sun.tools.apt.main.JavaCompiler.compile(JavaCompiler.java:458) [apt] at com.sun.tools.apt.main.Main.compile(Main.java:1075) [apt] at com.sun.tools.apt.main.Main.compile(Main.java:938) [apt] at com.sun.tools.apt.Main.processing(Main.java:95) [apt] at com.sun.tools.apt.Main.process(Main.java:43) [apt] at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [apt] at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.jav a:39) [apt] at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessor Impl.java:25) [apt] at java.lang.reflect.Method.invoke(Method.java:585) [apt] at org.apache.tools.ant.taskdefs.compilers.AptCompilerAdapter.execute(AptCo mpilerAdapter.java:114) [apt] at org.apache.tools.ant.taskdefs.Javac.compile(Javac.java:932) [apt] at org.apache.tools.ant.taskdefs.Javac.execute(Javac.java:758) [apt] at org.apache.tools.ant.taskdefs.Apt.execute(Apt.java:261) [apt] at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:275) [apt] at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [apt] at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.jav a:39) [apt] at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessor Impl.java:25) [apt] at java.lang.reflect.Method.invoke(Method.java:585) [apt] at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:1 04) [apt] at org.apache.tools.ant.Task.perform(Task.java:365) [apt] at org.apache.tools.ant.Target.execute(Target.java:341) [apt] at org.apache.tools.ant.Target.performTasks(Target.java:369) [apt] at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1207) [apt] at org.apache.tools.ant.Project.executeTarget(Project.java:1176) [apt] at org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExecut or.java:37) [apt] at org.apache.tools.ant.Project.executeTargets(Project.java:1059) [apt] at org.apache.tools.ant.Main.runBuild(Main.java:668) [apt] at org.apache.tools.ant.Main.startAnt(Main.java:187) [apt] at org.apache.tools.ant.launch.Launcher.run(Launcher.java:245) [apt] at org.apache.tools.ant.launch.Launcher.main(Launcher.java:66) -- 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]
Vote passes (was Re: [VOTE] Start a subproject for Ant libraries)
With +1s from Stefan Bodewig Peter Reilly Steve Loughran Conor MacNeill Martijn Kruithof Matt Benson Bruce Atherton Antoine Levy-Lambert Jesse Glick Jan Materne Jose Alberto Fernandez Dominique Devienne the vote has passed. I'll spawn of new threads to resolve the issues raised during the vote and to amend the proposal later todays (so please don't discuss it in this thread 8-). From my understanding we have three open issues that we need to address, two of which are pure infrastructure decisions: (1) Structure of svn repo - and should we move Ant itself to svn at the same time. (2) JIRA or Bugzilla. (3) One Antlib project with a common set of committers or fine grained units of managment with one set of committers per Antlib. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/xdocs contributors.xml
bodewig 2005/03/10 00:05:21 Modified:docs contributors.html xdocscontributors.xml Log: Some house-keeping Revision ChangesPath 1.58 +6 -3 ant/docs/contributors.html Index: contributors.html === RCS file: /home/cvs/ant/docs/contributors.html,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- contributors.html 8 Mar 2005 18:41:17 - 1.57 +++ contributors.html 10 Mar 2005 08:05:21 - 1.58 @@ -239,9 +239,6 @@ that OOAD-tool. /p p -bCostin Monolache/bbr / -/p -p bPeter Reilly/bbr / /p p @@ -294,6 +291,9 @@ bDonald Leslie/bbr / /p p +bCostin Monolache/bbr / +/p +p bJon Skeet/bbr / /p h3 class=section @@ -314,6 +314,9 @@ currently works for a href=http://www.lgc.com;Landmark Graphics/a. /p p +bJose Alberto Fernandez/b +/p +p bJesse Glick/b (jesse dot glick at sun dot com) br / Jesse has been using Java since 1998 and joined Sun Microsystems as 1.36 +8 -4 ant/xdocs/contributors.xml Index: contributors.xml === RCS file: /home/cvs/ant/xdocs/contributors.xml,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- contributors.xml 8 Mar 2005 18:41:16 - 1.35 +++ contributors.xml 10 Mar 2005 08:05:21 - 1.36 @@ -95,10 +95,6 @@ /p p -bCostin Monolache/bbr/ -/p - -p bPeter Reilly/bbr/ /p @@ -157,6 +153,10 @@ /p p +bCostin Monolache/bbr/ +/p + +p bJon Skeet/bbr/ /p @@ -178,6 +178,10 @@ /p p +bJose Alberto Fernandez/b +/p + +p bJesse Glick/b (jesse dot glick at sun dot com) br/ Jesse has been using Java since 1998 and joined Sun Microsystems as - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/rmic KaffeRmic.java
bodewig 2005/03/10 00:17:55
Modified:src/main/org/apache/tools/ant/taskdefs/rmic KaffeRmic.java
Log:
Kaffe keeps moving things, adapt
Revision ChangesPath
1.25 +26 -18
ant/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java
Index: KaffeRmic.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- KaffeRmic.java2 Feb 2005 13:01:52 - 1.24
+++ KaffeRmic.java10 Mar 2005 08:17:55 - 1.25
@@ -28,9 +28,14 @@
* @since Ant 1.4
*/
public class KaffeRmic extends DefaultRmicAdapter {
-public static final String RMIC_CLASSNAME = gnu.java.rmi.rmic.RMIC;
-// pre Kaffe 1.1.2
-private static final String OLD_RMIC_CLASSNAME = kaffe.rmi.rmic.RMIC;
+// sorted by newest Kaffe version first
+private static final String[] RMIC_CLASSNAMES = new String[] {
+gnu.classpath.tools.rmi.rmic.RMIC,
+// pre Kaffe 1.1.5
+gnu.java.rmi.rmic.RMIC,
+// pre Kaffe 1.1.2
+kaffe.rmi.rmic.RMIC,
+};
/**
* the name of this adapter for users to select
@@ -44,20 +49,25 @@
Class c = getRmicClass();
if (c == null) {
-throw new BuildException(Cannot use Kaffe rmic, as it is not
- + available. Neither
- + RMIC_CLASSNAME
- + nor
- + OLD_RMIC_CLASSNAME
- + have been found.
- + A common solution is to
- + set the environment variable
- + JAVA_HOME or CLASSPATH.,
+StringBuffer buf = new StringBuffer(Cannot use Kaffe rmic, as
it
++ is not available. None
++ of );
+for (int i = 0; i RMIC_CLASSNAMES.length; i++) {
+if (i != 0) {
+buf.append(, );
+}
+
+buf.append(RMIC_CLASSNAMES[i]);
+}
+buf.append( have been found. A common solution is to set the
+ + environment variable JAVA_HOME or CLASSPATH.);
+throw new BuildException(buf.toString(),
getRmic().getLocation());
}
cmd.setExecutable(c.getName());
-if (c.getName().equals(RMIC_CLASSNAME)) {
+if (!c.getName().equals(RMIC_CLASSNAMES[RMIC_CLASSNAMES.length -
1])) {
+// only supported since Kaffe 1.1.2
cmd.createArgument().setValue(-verbose);
getRmic().log(Commandline.describeCommand(cmd));
}
@@ -81,12 +91,10 @@
* @return null if neither class can get loaded.
*/
private static Class getRmicClass() {
-try {
-return Class.forName(RMIC_CLASSNAME);
-} catch (ClassNotFoundException cnfe) {
+for (int i = 0; i RMIC_CLASSNAMES.length; i++) {
try {
-return Class.forName(OLD_RMIC_CLASSNAME);
-} catch (ClassNotFoundException cnfe2) {
+return Class.forName(RMIC_CLASSNAMES[i]);
+} catch (ClassNotFoundException cnfe) {
}
}
return null;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/rmic KaffeRmic.java
bodewig 2005/03/10 00:19:58
Modified:src/main/org/apache/tools/ant/taskdefs/rmic Tag:
ANT_16_BRANCH KaffeRmic.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.11.2.7 +24 -17
ant/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java
Index: KaffeRmic.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java,v
retrieving revision 1.11.2.6
retrieving revision 1.11.2.7
diff -u -r1.11.2.6 -r1.11.2.7
--- KaffeRmic.java4 Feb 2005 08:13:47 - 1.11.2.6
+++ KaffeRmic.java10 Mar 2005 08:19:58 - 1.11.2.7
@@ -28,9 +28,14 @@
* @since Ant 1.4
*/
public class KaffeRmic extends DefaultRmicAdapter {
-public static final String RMIC_CLASSNAME = gnu.java.rmi.rmic.RMIC;
-// pre Kaffe 1.1.2
-private static final String OLD_RMIC_CLASSNAME = kaffe.rmi.rmic.RMIC;
+// sorted by newest Kaffe version first
+private static final String[] RMIC_CLASSNAMES = new String[] {
+gnu.classpath.tools.rmi.rmic.RMIC,
+// pre Kaffe 1.1.5
+gnu.java.rmi.rmic.RMIC,
+// pre Kaffe 1.1.2
+kaffe.rmi.rmic.RMIC,
+};
/**
* the name of this adapter for users to select
@@ -44,15 +49,19 @@
Class c = getRmicClass();
if (c == null) {
-throw new BuildException(Cannot use Kaffe rmic, as it is not
- + available. Neither
- + RMIC_CLASSNAME
- + nor
- + OLD_RMIC_CLASSNAME
- + have been found.
- + A common solution is to
- + set the environment variable
- + JAVA_HOME or CLASSPATH.,
+StringBuffer buf = new StringBuffer(Cannot use Kaffe rmic, as
it
++ is not available. None
++ of );
+for (int i = 0; i RMIC_CLASSNAMES.length; i++) {
+if (i != 0) {
+buf.append(, );
+}
+
+buf.append(RMIC_CLASSNAMES[i]);
+}
+buf.append( have been found. A common solution is to set the
+ + environment variable JAVA_HOME or CLASSPATH.);
+throw new BuildException(buf.toString(),
getRmic().getLocation());
}
@@ -77,12 +86,10 @@
* @return null if neither class can get loaded.
*/
private static Class getRmicClass() {
-try {
-return Class.forName(RMIC_CLASSNAME);
-} catch (ClassNotFoundException cnfe) {
+for (int i = 0; i RMIC_CLASSNAMES.length; i++) {
try {
-return Class.forName(OLD_RMIC_CLASSNAME);
-} catch (ClassNotFoundException cnfe2) {
+return Class.forName(RMIC_CLASSNAMES[i]);
+} catch (ClassNotFoundException cnfe) {
}
}
return null;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii KaffeNative2Ascii.java
bodewig 2005/03/10 00:31:54
Modified:src/main/org/apache/tools/ant/taskdefs/optional/native2ascii
KaffeNative2Ascii.java
Log:
Kaffe keeps moving things, adapt
Revision ChangesPath
1.2 +31 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java
Index: KaffeNative2Ascii.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- KaffeNative2Ascii.java31 Jan 2005 11:48:25 - 1.1
+++ KaffeNative2Ascii.java10 Mar 2005 08:31:54 - 1.2
@@ -29,6 +29,13 @@
*/
public final class KaffeNative2Ascii extends DefaultNative2Ascii {
+// sorted by newest Kaffe version first
+private static final String[] N2A_CLASSNAMES = new String[] {
+gnu.classpath.tools.native2ascii.Native2Ascii,
+// pre Kaffe 1.1.5
+kaffe.tools.native2ascii.Native2Ascii,
+};
+
/**
* Identifies this adapter.
*/
@@ -45,10 +52,33 @@
protected boolean run(Commandline cmd, ProjectComponent log)
throws BuildException {
ExecuteJava ej = new ExecuteJava();
-cmd.setExecutable(kaffe.tools.native2ascii.Native2Ascii);
+Class c = getN2aClass();
+if (c == null) {
+throw new BuildException(Couldn't load Kaffe's Native2Ascii
+ + class);
+}
+
+cmd.setExecutable(c.getName());
ej.setJavaCommand(cmd);
ej.execute(log.getProject());
// otherwise ExecuteJava has thrown an exception
return true;
}
+
+/**
+ * tries to load Kaffe Native2Ascii and falls back to the older
+ * class name if necessary.
+ *
+ * @return null if neither class can get loaded.
+ */
+private static Class getN2aClass() {
+for (int i = 0; i N2A_CLASSNAMES.length; i++) {
+try {
+return Class.forName(N2A_CLASSNAMES[i]);
+} catch (ClassNotFoundException cnfe) {
+}
+}
+return null;
+}
+
}
\ No newline at end of file
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii KaffeNative2Ascii.java
bodewig 2005/03/10 00:32:13
Modified:src/main/org/apache/tools/ant/taskdefs/optional/native2ascii
Tag: ANT_16_BRANCH KaffeNative2Ascii.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.1.2.2 +31 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java
Index: KaffeNative2Ascii.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- KaffeNative2Ascii.java4 Feb 2005 08:13:47 - 1.1.2.1
+++ KaffeNative2Ascii.java10 Mar 2005 08:32:13 - 1.1.2.2
@@ -29,6 +29,13 @@
*/
public final class KaffeNative2Ascii extends DefaultNative2Ascii {
+// sorted by newest Kaffe version first
+private static final String[] N2A_CLASSNAMES = new String[] {
+gnu.classpath.tools.native2ascii.Native2Ascii,
+// pre Kaffe 1.1.5
+kaffe.tools.native2ascii.Native2Ascii,
+};
+
/**
* Identifies this adapter.
*/
@@ -45,10 +52,33 @@
protected boolean run(Commandline cmd, ProjectComponent log)
throws BuildException {
ExecuteJava ej = new ExecuteJava();
-cmd.setExecutable(kaffe.tools.native2ascii.Native2Ascii);
+Class c = getN2aClass();
+if (c == null) {
+throw new BuildException(Couldn't load Kaffe's Native2Ascii
+ + class);
+}
+
+cmd.setExecutable(c.getName());
ej.setJavaCommand(cmd);
ej.execute(log.getProject());
// otherwise ExecuteJava has thrown an exception
return true;
}
+
+/**
+ * tries to load Kaffe Native2Ascii and falls back to the older
+ * class name if necessary.
+ *
+ * @return null if neither class can get loaded.
+ */
+private static Class getN2aClass() {
+for (int i = 0; i N2A_CLASSNAMES.length; i++) {
+try {
+return Class.forName(N2A_CLASSNAMES[i]);
+} catch (ClassNotFoundException cnfe) {
+}
+}
+return null;
+}
+
}
\ No newline at end of file
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: FileSets with optional basedir and absolute paths for includes
On Wed, 9 Mar 2005, Matt Benson [EMAIL PROTECTED] wrote:
public interface FileCollection {
public (String or File?)[] getFiles();
}
maybe even Resource[]? That would capture ZipFileSet in a clean way
as well.
I think it is sufficient to require the type selector's use to
restrict to files or directories, if not overly friendly.
I agree.
Set operations are fine; the referenced bug (5035) includes talk of
nested FileSets. FileCollection unions, intersections and
differences achieve the main spirit of the request in 5035; however
we need to have some facility for adding additional restrictions (in
the form of exclude patterns and selectors) to an existing
FileCollection.
union, intersect, difference and restrict, maybe.
I think the set operations should be implemented as FileCollections
rather than tasks, for use inline.
+1
I suppose we could have a limit FileCollection that applies
exclusions and selectors to a single nested FileCollection.
Don't let me chose a name, please 8-)
Stefan
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: FileCollections WAS FileSets with optional basedir and absolute paths for includes
On Wed, 9 Mar 2005, Matt Benson [EMAIL PROTECTED] wrote:
Right now I am leaning toward:
public interface oata.types.FileCollection {
public Iterator iterator();//of Files
}
Iterator works for me, but so would an array. We do have some cases
where we only want to check whether a collection is empty, the
resulting on-liner may be easier to read with an array.
Resource instead of File could be even better.
I still need a name for an absolute collection of
files that is hopefully short enough to make a usable
XML element name a la FileSet, and am eagerly awaiting
suggestions.
I like DD's suggestion of files as well.
Stefan
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30224] - SaveFailureException when importing EAR file into WebSphere when generated from ANT script
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=30224. 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=30224 --- Additional Comments From [EMAIL PROTECTED] 2005-03-10 09:45 --- Hi, i'm currently using Ant to build EAR for Websphere, it work flawlessly for packaging it for deployement on AIX 4.3.3, AIX 5.2 and Windows 2000 (Was 4.03 and WAS 5.0.2.9) the only difference with your case is that i build the EAR outside of WSAD. i'm using Ant 1.6.2 with Sun JDK 1.3.2_04. -- 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 33943] - ReplaceCopy task throws ClassCastException
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=33943. 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=33943 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Additional Comments From [EMAIL PROTECTED] 2005-03-10 10:16 --- ReplaceCopy is not an ant task. The internal rep of ant's Copy fileCopyMap changed from ant 1.5 to 1.6. in WHATSNEW: * The values of the Copy#fileCopyMap variable has changed from String to String[]. (In java 1.5 terms it was HashtableString, String and is now HashtableString, String[]). This will affect third party code that extend Copy and override Copy#doFileOperations. One can write code that will work with both ant 1.5 and 1.6. by checking the type. Normally we try to maintain backward compatibly at an xml level and at a JavaApi level, but sometimes stuff falls tru the cracks. In this case, the copy task did not support multiple results when using mappers so the internal type needed to change from String to String[]. There is notthing we can do to fix this now, the third party ReplaceCopy code needs to change to work with ant 1.6+. Am marking the as *WONTFIX*. -- 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]
Re: FileCollections WAS FileSets with optional basedir and absolute paths for includes
An iterator would be nice.
It would be useful to deal with very large number of
files.
Currently tasks like copy store all the files and maps
in memory and then processes the files.
This causes problems like OOM exceptions when dealing
with large directories.
A url or resource would also be nice instread of File or String.
Peter
Stefan Bodewig wrote:
On Wed, 9 Mar 2005, Matt Benson [EMAIL PROTECTED] wrote:
Right now I am leaning toward:
public interface oata.types.FileCollection {
public Iterator iterator();//of Files
}
Iterator works for me, but so would an array. We do have some cases
where we only want to check whether a collection is empty, the
resulting on-liner may be easier to read with an array.
Resource instead of File could be even better.
I still need a name for an absolute collection of
files that is hopefully short enough to make a usable
XML element name a la FileSet, and am eagerly awaiting
suggestions.
I like DD's suggestion of files as well.
Stefan
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: FileCollections WAS FileSets with optional basedir and absolute paths for includes
On Thu, 10 Mar 2005, Stefan Bodewig [EMAIL PROTECTED] wrote: Resource instead of File could be even better. Just to be clear, I'm talking about the existing oata.types.Resource here which already gets used by zip family of tasks. We may even add a getInputStream method to it ... Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[patch] javadoc/html Upper-lowercase
- lowercase tags
- removed some nesting
I'm seeing a lot of empty default constructors. Is there a policy for
keeping these? I get moans about uncommented empty blocks, but I'd
rather remove them if they aren't required
Kev
Index: org/apache/tools/ant/ExitStatusException.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/ExitStatusException.java,v
retrieving revision 1.2
diff -u -r1.2 ExitStatusException.java
--- org/apache/tools/ant/ExitStatusException.java 17 Jun 2004 20:35:31
- 1.2
+++ org/apache/tools/ant/ExitStatusException.java 10 Mar 2005 09:22:16
-
@@ -27,7 +27,7 @@
private int status;
/**
- * Constructs an CODEExitStatusException/CODE.
+ * Constructs an codeExitStatusException/code.
* @param status the associated status code
*/
public ExitStatusException(int status) {
@@ -36,7 +36,7 @@
}
/**
- * Constructs an CODEExitStatusException/CODE.
+ * Constructs an codeExitStatusException/code.
* @param msg the associated message
* @param status the associated status code
*/
@@ -47,9 +47,9 @@
/**
* Get the status code.
- * @return CODEint/CODE
+ * @return codeint/code
*/
public int getStatus() {
return status;
}
-}
+}
\ No newline at end of file
Index: org/apache/tools/ant/Target.java
===
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/Target.java,v
retrieving revision 1.57
diff -u -r1.57 Target.java
--- org/apache/tools/ant/Target.java13 Aug 2004 09:27:01 - 1.57
+++ org/apache/tools/ant/Target.java10 Mar 2005 09:22:17 -
@@ -54,6 +54,7 @@
/** Sole constructor. */
public Target() {
+ //empty
}
/**
@@ -79,7 +80,7 @@
/**
* Sets the location of this target's definition.
*
- * @param location CODELocation/CODE
+ * @param location codeLocation/code
* @since 1.6.2
*/
public void setLocation(Location location) {
@@ -89,7 +90,7 @@
/**
* Get the location of this target's definition.
*
- * @return CODELocation/CODE
+ * @return codeLocation/code
* @since 1.6.2
*/
public Location getLocation() {
@@ -208,11 +209,7 @@
* @return an enumeration of the dependencies of this target
*/
public Enumeration getDependencies() {
-if (dependencies != null) {
-return Collections.enumeration(dependencies);
-} else {
-return new CollectionUtils.EmptyEnumeration();
-}
+ return (dependencies != null ? Collections.enumeration(dependencies) :
new CollectionUtils.EmptyEnumeration());
}
/**
@@ -439,4 +436,4 @@
String test = project.replaceProperties(unlessCondition);
return project.getProperty(test) == null;
}
-}
+}
\ No newline at end of file
Index: org/apache/tools/ant/filters/StringInputStream.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/filters/StringInputStream.java,v
retrieving revision 1.18
diff -u -r1.18 StringInputStream.java
--- org/apache/tools/ant/filters/StringInputStream.java 25 Jan 2005 15:31:36
- 1.18
+++ org/apache/tools/ant/filters/StringInputStream.java 10 Mar 2005 09:22:17
-
@@ -39,10 +39,10 @@
* Composes a stream from a String with the specified encoding
*
* @param source The string to read from. Must not be codenull/code.
- * @param encoding The encoding scheme. Also must not be
CODEnull/CODE.
+ * @param encoding The encoding scheme. Also must not be
codenull/code.
*/
public StringInputStream(String source, String encoding) {
super(new StringReader(source), encoding);
}
-}
+}
\ No newline at end of file
Index: org/apache/tools/ant/taskdefs/AbstractCvsTask.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java,v
retrieving revision 1.35
diff -u -r1.35 AbstractCvsTask.java
--- org/apache/tools/ant/taskdefs/AbstractCvsTask.java 17 Jul 2004 15:10:11
- 1.35
+++ org/apache/tools/ant/taskdefs/AbstractCvsTask.java 10 Mar 2005 09:22:17
-
@@ -346,25 +346,23 @@
} catch (IOException e) {
if (failOnError) {
throw new BuildException(e, getLocation());
-} else {
-log(Caught exception: + e.getMessage(), Project.MSG_WARN);
}
+log(Caught exception: + e.getMessage(), Project.MSG_WARN);
} catch (BuildException e) {
-if (failOnError) {
-throw(e);
-} else {
-Throwable t = e.getException();
-if (t == null) {
-t = e;
-
Re: Ant documentation
Steve Loughran wrote: Peter Reilly wrote: Steve Loughran wrote: Not unless we move to Java1.5 attributes :) This may be a while I know. I wasnt expecting any pick up there. Not until Jikes adds the support for parsing them, then we could say ant runs on any platform, but you need jikes or javac 1.5+ to compile, rely on the backported annotation support, etc, etc, I'm using 1.5 in only one (personal) project, and not gone near annotations yet. I see tomcat has gone 1.5+ only, and EJB3 is going the same way, but perhaps they are special cases. We should start by making sure apt works :) Also, having just written the annotation stuff, I am no longer sure that I like either annotations, java1.5 generics or the static imports used in the examples. maybe they will grow on me. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] Start a subproject for Ant libraries
Alexey N. Solofnenko wrote: Interesting. So there is yet another revision control system. All I can tell that Darcs is stable and very convenient to use. Out of curiosity, how much has your copy of ant diverged from the main one ? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33882] - Apt task with fork=false and factory tag
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=33882. 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=33882 --- Additional Comments From [EMAIL PROTECTED] 2005-03-10 11:17 --- OK. 1. There is a factorypath element that is working in our tests; I havent added a test for factorypath yet. 2. We have done dynamic processor loading in our tests, so the basics work. Either it is something to do with extra jar files, or some other reason, but we are clearly not there yet. 3. the classpath is an inherited attribute. It gets used when forking, but clearly not when not forking. To be honest, it may be simpler if we just fork every time. The tool is sluggish, so the startup hit is minimal, and it does reduce a variable from every single bugrep -- 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]
Re: Ant SVN repo URLs
On Tue, 8 Mar 2005, Dominique Devienne [EMAIL PROTECTED] wrote: From: Stefan Bodewig [mailto:[EMAIL PROTECTED] (3.2) SVN repositories Create http://svn.apache.org/repos/asf/ant/ If we are going to use SVN for this, I think we should migrate Ant to SVN as well and consider where to put it in your proposed structure. Actually I consider this a first step for the migration since more committers will get their feet wet with SVN. IMHO Ant itself fits in there as http://svn.apache.org/repos/asf/ant/ant/ How about http://svn.apache.org/repos/asf/ant/core/ http://svn.apache.org/repos/asf/ant/libs/ OK, let's see what we have. The proposal said (taking dotnet and svn as examples for now): http://svn.apache.org/repos/asf/ant/antlibs/proper/dotnet http://svn.apache.org/repos/asf/ant/antlibs/sandbox/svn and I proposed http://svn.apache.org/repos/asf/ant/ant/ as location for Ant itself after migration. DD's suugestion basically is the same with antlibs - libs and ant - core, which is fine with me. Any preferences? Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
JIRA or Bugzilla?
Hi, lurking on the infrastructure list shows that we do have stability problems with JIRA and Tomcat on issues.apache.org, so right now I'd prefer to stick with Bugzilla. Even without that I'd suggest we ask the infrastructure team what they'd prefer us to use before we make any decision. Comments? Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
AW: JIRA or Bugzilla?
Asking infrastructure for their preferences would be good - maybe they want to kill bugzilla as cvs :-) And IMO we could wait for starting the new project and bugtracking until they´ve solved the problems ... if it needs only a few weeks. But we should have a the same infrastructure for the whole ant project - same scm system for ant core and ant libs (svn) - same bugtracking for ant core and ant libs (whatever) Personally I´d prefer Bugzilla, because I am familiar with that. Jira would be complete new to me. Nearly the same as svn. But that´s a solvable problem. Jan -Ursprüngliche Nachricht- Von: Stefan Bodewig [mailto:[EMAIL PROTECTED] Gesendet am: Donnerstag, 10. März 2005 11:24 An: [EMAIL PROTECTED] Betreff: JIRA or Bugzilla? Hi, lurking on the infrastructure list shows that we do have stability problems with JIRA and Tomcat on issues.apache.org, so right now I'd prefer to stick with Bugzilla. Even without that I'd suggest we ask the infrastructure team what they'd prefer us to use before we make any decision. Comments? Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: When to move Ant to SVN?
Stefan Bodewig wrote: The question really is when, not if. Shall we do it together with the creation of the antlibs repo or should we wait a bit longer? Look at it differently do you want to do it (a) before doing the releases of Ant1.6.3, Ant1.7 (b) during (c) after - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
AW: When to move Ant to SVN?
I would stay on cvs until 1.6 branch is closed, means 1.7 is before the door. - develop on cvs 1.6.3 - develop on cvs 1.7 until release - migrate the 1.7 release to svn - ship 1.7 from svn Jan -Ursprüngliche Nachricht- Von: Stefan Bodewig [mailto:[EMAIL PROTECTED] Gesendet am: Donnerstag, 10. März 2005 11:26 An: [EMAIL PROTECTED] Betreff: When to move Ant to SVN? The question really is when, not if. Shall we do it together with the creation of the antlibs repo or should we wait a bit longer? Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Management of Antlibs
Trying to address Conor's points (I hope I have them right, otherwise it is my fault) ... I think we basically agree on the points 4.1 (each lib is released independently), 4.2 (each lib must state its dependencies), 4.4 (each lib follows a common standard - definition TBD), 4.4 (each lib gets a place on the website of its own) and 4.7 (use Apache voting rules). Where we seem to disagree is how fine grained the management of ant libraries should be. The proposal suggests that each library is a small subproject of its own, namely it has an independent set of committers - points 4.3, 4.5 and 4.8, basically. Conor suggests that the antlibs are treated as a single project with a single set of committers. As long as every committer needs an account on the svn server, the difference is pretty virtual. The reason I went for the finer grained access really is that once we can have committers without shell accounts we may want to hand out commit access to very specific ant libs more freely. I can understand if the whole system looks a bit burocratic and don't have a big problem with changing the proposal at that point. What is your preference? Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Creation of new Ant libraries
Another point that may have been unclear from the proposal so I want to explain my ideas a bit better. First of all, every existing Ant (or Ant library) committer should be free to create new sandbox libraries. After a certain amount of time this library either gets promoted to proper or retired. Promotion should happen with PMC majority approval, but I can certainly live with lazy majority as well. There may be a different route for ant libraries, libraries coming from the outside. I think we will need to move them through the incubator to be save and they'd end up as a proper Ant lib after incubation. Acceptance after successful incubation should require (lazy?) PMC majority - at least that's what I tried to say in 4.6. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: When to move Ant to SVN?
On Thu, 10 Mar 2005, Steve Loughran [EMAIL PROTECTED] wrote: Stefan Bodewig wrote: The question really is when, not if. Shall we do it together with the creation of the antlibs repo or should we wait a bit longer? Look at it differently do you want to do it (a) before doing the releases of Ant1.6.3, Ant1.7 (b) during (c) after IMHO at the point in time where we'd create the 1.7 branch in CVS. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21064] - add failontokennotfound to replace core task
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=21064. 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=21064 --- Additional Comments From [EMAIL PROTECTED] 2005-03-10 11:56 --- Created an attachment (id=14453) -- (http://issues.apache.org/bugzilla/attachment.cgi?id=14453action=view) throws a BuildException if the user doesn't specify a replace token -- 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]
[GUMP@brutus]: Project test-ant (in module ant) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project test-ant has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 3 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - test-ant : Java based build tool Full details are available at: http://brutus.apache.org/gump/public/ant/test-ant/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed The following work was performed: http://brutus.apache.org/gump/public/ant/test-ant/gump_work/build_ant_test-ant.html Work Name: build_ant_test-ant (Type: Build) Work ended in a state of : Failed Elapsed: 6 mins 48 secs Command Line: java -Djava.awt.headless=true -Xbootclasspath/p:/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar:/usr/local/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/serializer.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/xalan-unbundled.jar org.apache.tools.ant.Main -Dgump.merge=/home/gump/workspaces2/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Dtest.haltonfailure=false -Dant.home=/usr/local/gump/public/workspace/ant/dist run-tests [Working Directory: /usr/local/gump/public/workspace/ant] CLASSPATH:
[GUMP@brutus]: Project test-ant-no-xerces (in module ant) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project test-ant-no-xerces has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 25 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - test-ant-no-xerces : Java based build tool Full details are available at: http://brutus.apache.org/gump/public/ant/test-ant-no-xerces/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed The following work was performed: http://brutus.apache.org/gump/public/ant/test-ant-no-xerces/gump_work/build_ant_test-ant-no-xerces.html Work Name: build_ant_test-ant-no-xerces (Type: Build) Work ended in a state of : Failed Elapsed: 7 mins 4 secs Command Line: java -Djava.awt.headless=true org.apache.tools.ant.Main -Dgump.merge=/home/gump/workspaces2/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Dtest.haltonfailure=false -Dant.home=/usr/local/gump/public/workspace/ant/dist run-tests [Working Directory: /usr/local/gump/public/workspace/ant] CLASSPATH:
Re: AW: JIRA or Bugzilla?
[EMAIL PROTECTED] wrote: Asking infrastructure for their preferences would be good - maybe they want to kill bugzilla as cvs :-) And IMO we could wait for starting the new project and bugtracking until they´ve solved the problems ... if it needs only a few weeks. But we should have a the same infrastructure for the whole ant project - same scm system for ant core and ant libs (svn) - same bugtracking for ant core and ant libs (whatever) Personally I´d prefer Bugzilla, because I am familiar with that. Jira would be complete new to me. Nearly the same as svn. But that´s a solvable problem. Jan Axis is using Jira; I'm not 100% happy with the text of the messages it sends out, but it seems reliable. Go to http://issues.apache.org/jira/secure/Dashboard.jspa and create your own account to scope it out. What is nice is that it integrates w/ SCM if you set up your keywords right and include bug#s in check ins, then you can search for all patches related to a defect. There is good meta-level reporting, the thing managers like we use it internally with subversion; I think we'd like to do that for the OSS core we work on, but the sourceforge infrastructure isnt ready for either, so we'd have to host ourselves (not that hard, we have a 8mbit optical link to the uk superjanet network so that CERN can run LHC simulations on the ia64 rack :), its just the extra operational effort. Regarding SVN, people like it for its transacted approach; you get atomic operations. I miss the IDEA integration, but here the eclipse plugin is good, and I'm sure that IDEA will catch up. Its less important with the ant codebase as I tend to do fewer major refactorings (like moving entire packages). It can create support calls related to proxies IMO a move to Jira is less traumatic than an SVN migration. One changes the web ui for bugs, the other transforms how your code is accessible. What is important with a JIRA migration is that the bugzilla repository gets locked off the moment it happens. All old urls should still resolve, but nobody should be allowed to edit existing bugs in bugzilla; they should all be moved to jira. -steve - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Sync task
I'm just renaming variables to prevent name hiding and I saw this - is
it a bug?
private int[] removeOrphanFiles(Set nonOrphans, File toDir) {
int[] removedCount = new int[] {0, 0};
String[] excls =
(String[]) nonOrphans.toArray(new String[nonOrphans.size() +
1]);
// want to keep toDir itself
excls[nonOrphans.size()] = ;
DirectoryScanner ds = null;
if (syncTarget != null) {
FileSet fs = new FileSet();
fs.setDir(toDir);
fs.setCaseSensitive(syncTarget.isCaseSensitive());
fs.setFollowSymlinks(syncTarget.isFollowSymlinks());
// preserveInTarget would find all files we want to keep,
// but we need to find all that we want to delete - so the
// meaning of all patterns and selectors must be inverted
PatternSet ps = syncTarget.mergePatterns(getProject());
String[] excludes = ps.getExcludePatterns(getProject()); --
String[] excludes is never read, that's why I saw ...
fs.appendExcludes(ps.getIncludePatterns(getProject())); --
appendExcludes, using the includes patterns
fs.appendIncludes(ps.getExcludePatterns(getProject()));
fs.setDefaultexcludes(!syncTarget.getDefaultexcludes());
// selectors are implicitly ANDed in DirectoryScanner. To
// revert their logic we wrap them into a none selector
// instead.
FileSelector[] s = syncTarget.getSelectors(getProject());
if (s.length 0) {
NoneSelector ns = new NoneSelector();
for (int i = 0; i s.length; i++) {
ns.appendSelector(s[i]);
}
fs.appendSelector(ns);
}
ds = fs.getDirectoryScanner(getProject());
} else {
ds = new DirectoryScanner();
ds.setBasedir(toDir);
}
ds.addExcludes(excls);
ds.scan();
String[] files = ds.getIncludedFiles();
for (int i = 0; i files.length; i++) {
File f = new File(toDir, files[i]);
log(Removing orphan file: + f, Project.MSG_DEBUG);
f.delete();
++removedCount[1];
}
String[] dirs = ds.getIncludedDirectories();
// ds returns the directories in lexicographic order.
// iterating through the array backwards means we are deleting
// leaves before their parent nodes - thus making sure (well,
// more likely) that the directories are empty when we try to
// delete them.
for (int i = dirs.length - 1; i = 0; --i) {
File f = new File(toDir, dirs[i]);
log(Removing orphan directory: + f, Project.MSG_DEBUG);
f.delete();
++removedCount[0];
}
return removedCount;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: Sync task
On Thu, 10 Mar 2005, Kev Jackson [EMAIL PROTECTED] wrote: I'm just renaming variables to prevent name hiding and I saw this - is it a bug? No, intentional. The excludes of one fileset are the includes of the one we create - we need to reverse the logic. What is a bug (well, a code-slip) is the definition excludes that never get used. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Sync.java
bodewig 2005/03/10 04:27:41 Modified:src/main/org/apache/tools/ant/taskdefs Sync.java Log: Unused variable found by Kev Jackson Revision ChangesPath 1.24 +0 -1 ant/src/main/org/apache/tools/ant/taskdefs/Sync.java Index: Sync.java === RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Sync.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Sync.java 9 Mar 2005 00:20:40 - 1.23 +++ Sync.java 10 Mar 2005 12:27:41 - 1.24 @@ -174,7 +174,6 @@ // but we need to find all that we want to delete - so the // meaning of all patterns and selectors must be inverted PatternSet ps = syncTarget.mergePatterns(getProject()); -String[] excludes = ps.getExcludePatterns(getProject()); fs.appendExcludes(ps.getIncludePatterns(getProject())); fs.appendIncludes(ps.getExcludePatterns(getProject())); fs.setDefaultexcludes(!syncTarget.getDefaultexcludes()); - 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 EqualComparator.java
bodewig 2005/03/10 04:50:58
Modified:src/main/org/apache/tools/ant ExitStatusException.java
Target.java
src/main/org/apache/tools/ant/filters StringInputStream.java
src/main/org/apache/tools/ant/taskdefs AbstractCvsTask.java
Ant.java Apt.java CallTarget.java Concat.java
Execute.java Exit.java Javadoc.java
LoadProperties.java
src/main/org/apache/tools/ant/taskdefs/condition Http.java
IsSigned.java Os.java ParserSupports.java
src/main/org/apache/tools/ant/types/selectors/modifiedselector
EqualComparator.java
Log:
Various javadoc and code-style fixes by Kev Jackson
Revision ChangesPath
1.3 +5 -5
ant/src/main/org/apache/tools/ant/ExitStatusException.java
Index: ExitStatusException.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/ExitStatusException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExitStatusException.java 17 Jun 2004 20:35:31 - 1.2
+++ ExitStatusException.java 10 Mar 2005 12:50:57 - 1.3
@@ -1,5 +1,5 @@
/*
- * Copyright 2004 The Apache Software Foundation
+ * Copyright 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.
@@ -27,7 +27,7 @@
private int status;
/**
- * Constructs an CODEExitStatusException/CODE.
+ * Constructs an codeExitStatusException/code.
* @param status the associated status code
*/
public ExitStatusException(int status) {
@@ -36,7 +36,7 @@
}
/**
- * Constructs an CODEExitStatusException/CODE.
+ * Constructs an codeExitStatusException/code.
* @param msg the associated message
* @param status the associated status code
*/
@@ -47,9 +47,9 @@
/**
* Get the status code.
- * @return CODEint/CODE
+ * @return codeint/code
*/
public int getStatus() {
return status;
}
-}
+}
\ No newline at end of file
1.58 +9 -10 ant/src/main/org/apache/tools/ant/Target.java
Index: Target.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Target.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- Target.java 13 Aug 2004 09:27:01 - 1.57
+++ Target.java 10 Mar 2005 12:50:57 - 1.58
@@ -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.
@@ -54,6 +54,7 @@
/** Sole constructor. */
public Target() {
+//empty
}
/**
@@ -79,7 +80,7 @@
/**
* Sets the location of this target's definition.
*
- * @param location CODELocation/CODE
+ * @param location codeLocation/code
* @since 1.6.2
*/
public void setLocation(Location location) {
@@ -89,7 +90,7 @@
/**
* Get the location of this target's definition.
*
- * @return CODELocation/CODE
+ * @return codeLocation/code
* @since 1.6.2
*/
public Location getLocation() {
@@ -208,11 +209,8 @@
* @return an enumeration of the dependencies of this target
*/
public Enumeration getDependencies() {
-if (dependencies != null) {
-return Collections.enumeration(dependencies);
-} else {
-return new CollectionUtils.EmptyEnumeration();
-}
+return (dependencies != null ? Collections.enumeration(dependencies)
+ : new
CollectionUtils.EmptyEnumeration());
}
/**
@@ -224,7 +222,8 @@
public boolean dependsOn(String other) {
Project p = getProject();
Hashtable t = (p == null) ? null : p.getTargets();
-return (p != null p.topoSort(getName(), t,
false).contains(t.get(other)));
+return (p != null
+ p.topoSort(getName(), t, false).contains(t.get(other)));
}
/**
@@ -439,4 +438,4 @@
String test = project.replaceProperties(unlessCondition);
return project.getProperty(test) == null;
}
-}
+}
\ No newline at end of file
1.19 +2 -2
ant/src/main/org/apache/tools/ant/filters/StringInputStream.java
Index: StringInputStream.java
Re: [patch] javadoc/html Upper-lowercase
On Thu, 10 Mar 2005, Kev Jackson [EMAIL PROTECTED] wrote:
I'm seeing a lot of empty default constructors. Is there a policy
for keeping these?
None that I was aware of.
Things I did not commit:
+
+//use Java5 funtionality to get environment
+if (JavaEnvUtils.getJavaVersion().equals(JavaEnvUtils.JAVA_1_5)) {
+procEnvironment.addAll(System.getenv().entrySet());
+return procEnvironment;
+}
+
and the tabs you introduced 8-)
Please make sure that you don't have any tabs in your patches and
restict lines to 80 characters.
Cheers
Stefan
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTasks echo.html genkey.html java.html mail.html style.html tar.html unzip.html waitfor.html
peterreilly2005/03/10 05:01:55
Modified:docs/manual/CoreTasks echo.html genkey.html java.html
mail.html style.html tar.html unzip.html
waitfor.html
Log:
some fixes to align examples
Revision ChangesPath
1.14 +1 -1 ant/docs/manual/CoreTasks/echo.html
Index: echo.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/echo.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- echo.html 7 Mar 2005 18:09:09 - 1.13
+++ echo.html 10 Mar 2005 13:01:55 - 1.14
@@ -86,7 +86,7 @@
prelt;echo file=runner.csh append=falsegt;#\!/bin/tcsh
java-1.3.1 -mx1024m ${project.entrypoint} $$*
-/echo/pre
+lt;/echogt;/pre
Generate a shell script by echoing to a file.
Note the use of a double $ symbol to stop Ant
filtering out the single $ during variable expansion
1.11 +7 -6 ant/docs/manual/CoreTasks/genkey.html
Index: genkey.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/genkey.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- genkey.html 7 Mar 2005 18:09:09 - 1.10
+++ genkey.html 10 Mar 2005 13:01:55 - 1.11
@@ -86,20 +86,21 @@
pThe following two examples are identical: /p
h3Examples/h3
-blockquote
- pcodelt;genkey alias=quot;apache-groupquot;
storepass=quot;secretquot;
- dname=quot;CN=Ant Group, OU=Jakarta Division, O=Apache.org,
C=USquot;/gt;/code/p
-/blockquote
+blockquotepre
+lt;genkey alias=quot;apache-groupquot; storepass=quot;secretquot;
+ dname=quot;CN=Ant Group, OU=Jakarta Division, O=Apache.org,
C=USquot;/gt;
+/pre/blockquote
blockquote
- precodelt;genkey alias=quot;apache-groupquot;
storepass=quot;secretquot; gt;
+ pre
+lt;genkey alias=quot;apache-groupquot; storepass=quot;secretquot; gt;
lt;dnamegt;
lt;param name=quot;CNquot; value=quot;Ant Groupquot;/gt;
lt;param name=quot;OUquot; value=quot;Jakarta Divisionquot;/gt;
lt;param name=quot;Oquot; value=quot;Apache.Orgquot;/gt;
lt;param name=quot;Cquot; value=quot;USquot;/gt;
lt;/dnamegt;
-lt;/genkeygt;/code/pre
+lt;/genkeygt;/pre
/blockquote
hr
p align=centerCopyright copy; 2000-2001,2003,2005 Apache Software
Foundation. All rights
1.38 +6 -3 ant/docs/manual/CoreTasks/java.html
Index: java.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/java.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- java.html 7 Mar 2005 18:09:09 - 1.37
+++ java.html 10 Mar 2005 13:01:55 - 1.38
@@ -302,7 +302,8 @@
/pre
Run a class in this JVM with a new jar on the classpath
-prelt;java jar=quot;dist/test.jarquot;
+pre
+ lt;java jar=quot;dist/test.jarquot;
fork=true
failonerror=true
maxmemory=128m
@@ -318,7 +319,8 @@
using the manifest supplied entry point, forking (as required),
and with a maximum memory of 128MB. Any non zero return code breaks the
build.
-prelt;java
+pre
+ lt;java
dir=${exec.dir}
jar=quot;${exec.dir}/dist/test.jarquot;
fork=true
@@ -339,7 +341,8 @@
pre lt;java classname=quot;test.Mainquot;/gt;/pre
-pre lt;java classname=quot;test.Mainquot;
+pre
+ lt;java classname=quot;test.Mainquot;
fork=quot;yesquot; gt;
lt;sysproperty key=quot;DEBUGquot; value=quot;truequot;/gt;
lt;arg value=quot;-hquot;/gt;
1.28 +20 -12ant/docs/manual/CoreTasks/mail.html
Index: mail.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/mail.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mail.html 7 Mar 2005 18:09:09 - 1.27
+++ mail.html 10 Mar 2005 13:01:55 - 1.28
@@ -10,18 +10,26 @@
h2a name=mailMail/a/h2
h3Description/h3
-pA task to send SMTP email.br/brbr/br
-This task can send mail using either plain
-text, UU encoding, or MIME format mail, depending on what is
available.br/brbr/br
-br
-SMTP auth and SSL/TLS require JavaMail and are only available in MIME
format.br/brbr/br
-Attachments may be sent using nested
-a href=../CoreTypes/fileset.htmlfileset/a elements./p
-pstrongNote:/strong This task may depend on external libraries
-that are not included
-in the Ant distribution. See a href=../install.html#librarydependencies
-Library Dependencies/a for more information.
-/p
+ p
+A task to send SMTP email.
+ /p
+ p
+This task
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs AbstractCvsTask.java Apt.java Javadoc.java
bodewig 2005/03/10 05:05:04
Modified:src/main/org/apache/tools/ant/taskdefs AbstractCvsTask.java
Apt.java Javadoc.java
Log:
fix indentation
Revision ChangesPath
1.37 +12 -13
ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
Index: AbstractCvsTask.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- AbstractCvsTask.java 10 Mar 2005 12:50:57 - 1.36
+++ AbstractCvsTask.java 10 Mar 2005 13:05:03 - 1.37
@@ -350,20 +350,19 @@
}
log(Caught exception: + e.getMessage(), Project.MSG_WARN);
} catch (BuildException e) {
-if (failOnError) {
-throw(e);
-}
-Throwable t = e.getException();
-if (t == null) {
-t = e;
-}
-log(Caught exception: + t.getMessage(), Project.MSG_WARN);
+if (failOnError) {
+throw(e);
+}
+Throwable t = e.getException();
+if (t == null) {
+t = e;
+}
+log(Caught exception: + t.getMessage(), Project.MSG_WARN);
} catch (Exception e) {
-if (failOnError) {
-throw new BuildException(e, getLocation());
-}
-log(Caught exception: + e.getMessage(), Project.MSG_WARN);
-
+if (failOnError) {
+throw new BuildException(e, getLocation());
+}
+log(Caught exception: + e.getMessage(), Project.MSG_WARN);
}
}
1.8 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Apt.java
Index: Apt.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Apt.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Apt.java 10 Mar 2005 12:50:57 - 1.7
+++ Apt.java 10 Mar 2005 13:05:03 - 1.8
@@ -61,7 +61,7 @@
/** Constructor for Option */
public Option() {
-//default
+//default
}
/**
1.134 +4 -4 ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
Index: Javadoc.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- Javadoc.java 10 Mar 2005 12:50:57 - 1.133
+++ Javadoc.java 10 Mar 2005 13:05:03 - 1.134
@@ -270,7 +270,7 @@
* Default constructor
*/
public SourceFile() {
-//empty
+//empty
}
/**
@@ -1200,7 +1200,7 @@
private File packagelistLoc;
public LinkArgument() {
-//empty
+//empty
}
public void setHref(String hr) {
@@ -1271,7 +1271,7 @@
/** Sole constructor. */
public TagArgument () {
-//empty
+//empty
}
/**
@@ -1404,7 +1404,7 @@
private Vector packages = new Vector();
public GroupArgument() {
-//empty
+//empty
}
public void setTitle(String src) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTasks echo.html genkey.html java.html style.html tar.html unzip.html waitfor.html
peterreilly2005/03/10 05:07:43
Modified:docs/manual/CoreTasks Tag: ANT_16_BRANCH echo.html
genkey.html java.html style.html tar.html
unzip.html waitfor.html
Log:
2005 + stray blockquote
Revision ChangesPath
No revision
No revision
1.10.2.5 +1 -1 ant/docs/manual/CoreTasks/echo.html
Index: echo.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/echo.html,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -u -r1.10.2.4 -r1.10.2.5
--- echo.html 10 Mar 2005 13:02:14 - 1.10.2.4
+++ echo.html 10 Mar 2005 13:07:43 - 1.10.2.5
@@ -92,7 +92,7 @@
filtering out the single $ during variable expansion
hr
-p align=centerCopyright copy; 2000-2002,2004 The Apache Software
Foundation. All rights
+p align=centerCopyright copy; 2000-2002,2004-2005 The Apache Software
Foundation. All rights
Reserved./p
/body
1.8.2.3 +1 -1 ant/docs/manual/CoreTasks/genkey.html
Index: genkey.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/genkey.html,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- genkey.html 10 Mar 2005 13:02:14 - 1.8.2.2
+++ genkey.html 10 Mar 2005 13:07:43 - 1.8.2.3
@@ -103,7 +103,7 @@
lt;/genkeygt;/pre
/blockquote
hr
-p align=centerCopyright copy; 2000-2001,2003 Apache Software
Foundation. All rights
+p align=centerCopyright copy; 2000-2001,2003,2005 Apache Software
Foundation. All rights
Reserved./p
/body
1.24.2.11 +1 -1 ant/docs/manual/CoreTasks/java.html
Index: java.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/java.html,v
retrieving revision 1.24.2.10
retrieving revision 1.24.2.11
diff -u -r1.24.2.10 -r1.24.2.11
--- java.html 10 Mar 2005 13:02:14 - 1.24.2.10
+++ java.html 10 Mar 2005 13:07:43 - 1.24.2.11
@@ -309,7 +309,7 @@
JVM, as it takes different parameters for other JVMs,
That JVM can be started from codelt;execgt;/code if required.
hr
-p align=centerCopyright copy; 2000-2004 The Apache Software Foundation.
All rights
+p align=centerCopyright copy; 2000-2005 The Apache Software Foundation.
All rights
Reserved./p
/body
1.29.2.7 +1 -2 ant/docs/manual/CoreTasks/style.html
Index: style.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/style.html,v
retrieving revision 1.29.2.6
retrieving revision 1.29.2.7
diff -u -r1.29.2.6 -r1.29.2.7
--- style.html10 Mar 2005 13:02:14 - 1.29.2.6
+++ style.html10 Mar 2005 13:07:43 - 1.29.2.7
@@ -360,9 +360,8 @@
lt;mapper type=quot;globquot; from=quot;*.xml.enquot;
to=quot;*.html.enquot;/gt;
lt;/xsltgt;/pre
- /blockquote
hr
-p align=centerCopyright copy; 2000-2004 The Apache Software Foundation.
All rights
+p align=centerCopyright copy; 2000-2005 The Apache Software Foundation.
All rights
Reserved./p
/body
1.19.2.5 +1 -1 ant/docs/manual/CoreTasks/tar.html
Index: tar.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/tar.html,v
retrieving revision 1.19.2.4
retrieving revision 1.19.2.5
diff -u -r1.19.2.4 -r1.19.2.5
--- tar.html 10 Mar 2005 13:02:14 - 1.19.2.4
+++ tar.html 10 Mar 2005 13:07:43 - 1.19.2.5
@@ -254,7 +254,7 @@
to code${dist.name}/../code./p
hr
-p align=centerCopyright copy; 2000-2002,2004 The Apache Software
Foundation. All rights
+p align=centerCopyright copy; 2000-2002,2004-2005 The Apache Software
Foundation. All rights
Reserved./p
/body
1.12.2.4 +1 -1 ant/docs/manual/CoreTasks/unzip.html
Index: unzip.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/unzip.html,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -u -r1.12.2.3 -r1.12.2.4
--- unzip.html10 Mar 2005 13:02:14 - 1.12.2.3
+++ unzip.html10 Mar 2005 13:07:43 - 1.12.2.4
@@ -101,7 +101,7 @@
/pre/p
/blockquote
hr
-p align=centerCopyright copy; 2000-2004 The Apache Software Foundation.
All rights
+p align=centerCopyright copy; 2000-2005 The Apache Software Foundation.
All rights
Reserved./p
/body
1.6.4.4 +1 -1 ant/docs/manual/CoreTasks/waitfor.html
Index: waitfor.html
===
RCS file:
cvs commit: ant/docs/manual/CoreTasks style.html
peterreilly2005/03/10 05:09:25 Modified:docs/manual/CoreTasks style.html Log: stray blockquote Revision ChangesPath 1.36 +0 -1 ant/docs/manual/CoreTasks/style.html Index: style.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/style.html,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- style.html10 Mar 2005 13:01:55 - 1.35 +++ style.html10 Mar 2005 13:09:25 - 1.36 @@ -360,7 +360,6 @@ lt;mapper type=quot;globquot; from=quot;*.xml.enquot; to=quot;*.html.enquot;/gt; lt;/xsltgt;/pre - /blockquote hr p align=centerCopyright copy; 2000-2005 The Apache Software Foundation. All rights Reserved./p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/condition IsPingable.java
stevel 2005/03/10 06:09:39 Modified:docs/manual/CoreTasks conditions.html src/main/org/apache/tools/ant/types defaults.properties src/main/org/apache/tools/ant/taskdefs/optional/condition IsPingable.java Log: documented, and renamed the test to isreachable, because there may be more than just ping going on here (it goes through our firewall where http doesnt) Revision ChangesPath 1.32 +68 -0 ant/docs/manual/CoreTasks/conditions.html Index: conditions.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/conditions.html,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- conditions.html 7 Mar 2005 18:09:09 - 1.31 +++ conditions.html 10 Mar 2005 14:09:39 - 1.32 @@ -533,6 +533,74 @@ Check for Xerces-specific definition of the location of the no namespace schema. +h4isreachable/h4 + +pUses Java1.5+ networking APIs to probe for a (remote) system being +reachable. Exactly what probe mechanisms are used is an implementation +feature of the JVM. They may include ICMP ping packets + +/p +p +This condition turns unknown host exceptions into false conditions. This is +because on a laptop, DNS is one of the first services when the network goes; you +are implicitly offline. +/p +p + If a URL is supplied instead of a host, the hostname is extracted + and used in the test - all other parts of the URL are discarded. +/p +p +The test may not work through firewalls, that is, something may be reachable +using a protocol such as HTTP, while the lower level ICMP packets get dropped +on the floor. Similarly, a host may detected as reachable with ICMP, but +not reachable on other ports (i.e. port 80), because of firewalls. +/p +p + +This condition was added in Apache Ant 1.7./p + +table border=1 cellpadding=2 cellspacing=0 + tr +td valign=topbAttribute/b/td +td valign=topbDescription/b/td +td align=center valign=topbRequired/b/td + /tr + tr +td valign=tophost/td +td valign=tophost to check for/td +td valign=top align=centerone of url or host/td + /tr + tr +td valign=topurl/td +td valign=topURL containing hostname/td +td valign=top align=centerone of url or host/td + /tr + tr +td valign=toptimeout/td +td valign=toptimeout in seconds/td +td valign=top align=centerno, default is 30s/td + /tr +/table + +pre +lt;condition property=offlinegt; + lt;isreachable url=http://ibiblio.org/maven/; /gt; +lt;/conditiongt; +/pre + +p +Probe for the maven repository being reachable. +/p + +pre +lt;condition property=offlinegt; + lt;isreachable host=ibiblio.org timeout=10 /gt; +lt;/conditiongt; +/pre + +p +Probe for the maven repository being reachable using the hostname, ten second timeout.. +/p hr p align=centerCopyright copy; 2001-2005 Apache Software Foundation. All rights Reserved./p 1.38 +1 -1 ant/src/main/org/apache/tools/ant/types/defaults.properties Index: defaults.properties === RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/defaults.properties,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- defaults.properties 25 Feb 2005 11:32:35 - 1.37 +++ defaults.properties 10 Mar 2005 14:09:39 - 1.38 @@ -37,7 +37,7 @@ concatfilter=org.apache.tools.ant.filters.ConcatFilter issigned=org.apache.tools.ant.taskdefs.condition.IsSigned isfileselected=org.apache.tools.ant.taskdefs.condition.IsFileSelected -ispingable=org.apache.tools.ant.taskdefs.optional.condition.IsPingable +isreachable=org.apache.tools.ant.taskdefs.optional.condition.IsPingable mavenrepository=org.apache.tools.ant.taskdefs.repository.MavenRepository scriptselector=org.apache.tools.ant.types.optional.ScriptSelector scriptcondition=org.apache.tools.ant.types.optional.ScriptCondition 1.5 +78 -13 ant/src/main/org/apache/tools/ant/taskdefs/optional/condition/IsPingable.java Index: IsPingable.java === RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/condition/IsPingable.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- IsPingable.java 28 Jan 2005 11:29:16 - 1.4 +++ IsPingable.java 10 Mar 2005 14:09:39 - 1.5 @@ -24,36 +24,63 @@ import java.net.InetAddress; import java.net.UnknownHostException; +import java.net.URL; +import java.net.MalformedURLException; import java.io.IOException; /** * Test for a host being reachable using ICMP ping packets. *
cvs commit: ant/src/script ant.bat
peterreilly2005/03/10 06:10:47 Modified:src/script Tag: ANT_16_BRANCH ant.bat Log: sync up clear classpath in ant.bat Revision ChangesPath No revision No revision 1.32.2.8 +14 -0 ant/src/script/ant.bat Index: ant.bat === RCS file: /home/cvs/ant/src/script/ant.bat,v retrieving revision 1.32.2.7 retrieving revision 1.32.2.8 diff -u -r1.32.2.7 -r1.32.2.8 --- ant.bat 28 Jan 2005 16:39:21 - 1.32.2.7 +++ ant.bat 10 Mar 2005 14:10:47 - 1.32.2.8 @@ -25,6 +25,8 @@ if %ANT_HOME%== set ANT_HOME=%DEFAULT_ANT_HOME% set DEFAULT_ANT_HOME= +set _USE_CLASSPATH=yes + rem Slurp the command line arguments. This loop allows for an unlimited number rem of arguments (up to the command line limit, anyway). set ANT_CMD_LINE_ARGS=%1 @@ -32,9 +34,17 @@ shift :setupArgs if %1== goto doneStart +if %1==-noclasspath goto clearclasspath set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1 shift goto setupArgs + +rem here is there is a -noclasspath in the options +:clearclasspath +set _USE_CLASSPATH=no +shift +goto setupArgs + rem This label provides a place for the argument list loop to break out rem and for NT handling to skip to. @@ -79,6 +89,7 @@ if not %JIKESPATH%== goto runAntWithJikes :runAnt +if %_USE_CLASSPATH%==no goto runAntNoClasspath if not %CLASSPATH%== goto runAntWithClasspath %_JAVACMD% %ANT_OPTS% -classpath %ANT_HOME%\lib\ant-launcher.jar -Dant.home=%ANT_HOME% org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS% goto end @@ -88,7 +99,10 @@ goto end :runAntWithJikes +if %_USE_CLASSPATH%==no goto runAntWithJikesNoClasspath if not %CLASSPATH%== goto runAntWithJikesAndClasspath + +:runAntWithJikesNoClasspath %_JAVACMD% %ANT_OPTS% -classpath %ANT_HOME%\lib\ant-launcher.jar -Dant.home=%ANT_HOME% -Djikes.class.path=%JIKESPATH% org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS% goto end - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/script ant.bat
I have synced up the ant.bat changes to implement -noclasspath from HEAD to the 1.6 branch. Could windows users check this to ensure that it makes sense. The reason that ant.bat has mods for -noclasspath is that a number of people set CLASSPATH with a trailing backslash and ant.bat cannot handle this. The -noclasspath causes the script to follow a path that does not look at the CLASSPATH env variable. Peter [EMAIL PROTECTED] wrote: peterreilly2005/03/10 06:10:47 Modified:src/script Tag: ANT_16_BRANCH ant.bat Log: sync up clear classpath in ant.bat Revision ChangesPath No revision No revision 1.32.2.8 +14 -0 ant/src/script/ant.bat Index: ant.bat === RCS file: /home/cvs/ant/src/script/ant.bat,v retrieving revision 1.32.2.7 retrieving revision 1.32.2.8 diff -u -r1.32.2.7 -r1.32.2.8 --- ant.bat 28 Jan 2005 16:39:21 - 1.32.2.7 +++ ant.bat 10 Mar 2005 14:10:47 - 1.32.2.8 @@ -25,6 +25,8 @@ if %ANT_HOME%== set ANT_HOME=%DEFAULT_ANT_HOME% set DEFAULT_ANT_HOME= +set _USE_CLASSPATH=yes + rem Slurp the command line arguments. This loop allows for an unlimited number rem of arguments (up to the command line limit, anyway). set ANT_CMD_LINE_ARGS=%1 @@ -32,9 +34,17 @@ shift :setupArgs if %1== goto doneStart +if %1==-noclasspath goto clearclasspath set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1 shift goto setupArgs + +rem here is there is a -noclasspath in the options +:clearclasspath +set _USE_CLASSPATH=no +shift +goto setupArgs + rem This label provides a place for the argument list loop to break out rem and for NT handling to skip to. @@ -79,6 +89,7 @@ if not %JIKESPATH%== goto runAntWithJikes :runAnt +if %_USE_CLASSPATH%==no goto runAntNoClasspath if not %CLASSPATH%== goto runAntWithClasspath %_JAVACMD% %ANT_OPTS% -classpath %ANT_HOME%\lib\ant-launcher.jar -Dant.home=%ANT_HOME% org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS% goto end @@ -88,7 +99,10 @@ goto end :runAntWithJikes +if %_USE_CLASSPATH%==no goto runAntWithJikesNoClasspath if not %CLASSPATH%== goto runAntWithJikesAndClasspath + +:runAntWithJikesNoClasspath %_JAVACMD% %ANT_OPTS% -classpath %ANT_HOME%\lib\ant-launcher.jar -Dant.home=%ANT_HOME% -Djikes.class.path=%JIKESPATH% org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS% goto end - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant WHATSNEW
peterreilly2005/03/10 06:20:05
Modified:.WHATSNEW
Log:
moving -noclasspath and -nouserlib
Revision ChangesPath
1.767 +0 -7 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.766
retrieving revision 1.767
diff -u -r1.766 -r1.767
--- WHATSNEW 7 Mar 2005 15:17:48 - 1.766
+++ WHATSNEW 10 Mar 2005 14:20:05 - 1.767
@@ -81,13 +81,6 @@
* It is now possible to specify the pattern created/parsed by checksum.
Bugzilla Report 16539.
-* Added -nouserlib option to allow running ant without automatically loading
- up ${user.home}/.lib/ant. This is useful when compiling ant, and antlibs.
- Modified the build.sh and build.bat to use the option.
-
-* Added -noclasspath option to allow running ant WITHOUT using CLASSPATH env
- variable. Modified ant.bat to do this so that %CLASSPATH% is not looked at.
-
* Added a new failall value for the onerror attribute of typedef.
Bugzilla report 31685.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant WHATSNEW
peterreilly2005/03/10 06:21:25
Modified:.WHATSNEW
Log:
move -noclasspaht and -nouserlib to ant 1.6
Revision ChangesPath
1.768 +7 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.767
retrieving revision 1.768
diff -u -r1.767 -r1.768
--- WHATSNEW 10 Mar 2005 14:20:05 - 1.767
+++ WHATSNEW 10 Mar 2005 14:21:24 - 1.768
@@ -247,6 +247,13 @@
* Added verbose=true|false attribute to subant. When verbose is enabled,
the directory name is logged on entry and exit of the sub-build. Bugzilla
33787.
+* Added -nouserlib option to allow running ant without automatically loading
+ up ${user.home}/.lib/ant. This is useful when compiling ant, and antlibs.
+ Modified the build.sh and build.bat to use the option.
+
+* Added -noclasspath option to allow running ant WITHOUT using CLASSPATH env
+ variable. Modified ant.bat to do this so that %CLASSPATH% is not looked at.
+
Fixed bugs:
---
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant WHATSNEW
peterreilly2005/03/10 06:22:10 Modified:.Tag: ANT_16_BRANCH WHATSNEW Log: sync Revision ChangesPath No revision No revision 1.503.2.188 +3 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.503.2.187 retrieving revision 1.503.2.188 diff -u -r1.503.2.187 -r1.503.2.188 --- WHATSNEW 7 Mar 2005 09:38:00 - 1.503.2.187 +++ WHATSNEW 10 Mar 2005 14:22:05 - 1.503.2.188 @@ -228,6 +228,9 @@ * Get with usetimestamp did not work when local timestamp roughly = now. +* NPE when when presetdef tries to configure a task that + cannot be instantiated. Bugzilla Report 33689. + Changes from Ant 1.6.1 to Ant 1.6.2 === - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant WHATSNEW
peterreilly2005/03/10 06:23:40 Modified:.Tag: ANT_16_BRANCH WHATSNEW Log: extraline Revision ChangesPath No revision No revision 1.503.2.190 +0 -1 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.503.2.189 retrieving revision 1.503.2.190 diff -u -r1.503.2.189 -r1.503.2.190 --- WHATSNEW 10 Mar 2005 14:23:07 - 1.503.2.189 +++ WHATSNEW 10 Mar 2005 14:23:40 - 1.503.2.190 @@ -235,7 +235,6 @@ * Added -noclasspath option to allow running ant WITHOUT using CLASSPATH env variable. Modified ant.bat to do this so that %CLASSPATH% is not looked at. - Changes from Ant 1.6.1 to Ant 1.6.2 === - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[patch] mainly name-hiding
kev
Index: CVSPass.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/CVSPass.java,v
retrieving revision 1.25
diff -u -r1.25 CVSPass.java
--- CVSPass.java9 Mar 2005 00:20:40 - 1.25
+++ CVSPass.java10 Mar 2005 10:44:33 -
@@ -132,10 +132,10 @@
}
}
-private final String mangle(String password) {
+private final String mangle(String pass) {
StringBuffer buf = new StringBuffer();
-for (int i = 0; i password.length(); i++) {
-buf.append(shifts[password.charAt(i)]);
+for (int i = 0, size = pass.length(); i size; i++) {
+buf.append(shifts[pass.charAt(i)]);
}
return buf.toString();
}
@@ -167,4 +167,4 @@
this.password = password;
}
-}
+}
\ No newline at end of file
Index: CallTarget.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/CallTarget.java,v
retrieving revision 1.43
diff -u -r1.43 CallTarget.java
--- CallTarget.java 18 Feb 2005 23:27:59 - 1.43
+++ CallTarget.java 10 Mar 2005 10:44:33 -
@@ -185,11 +185,10 @@
*/
public int handleInput(byte[] buffer, int offset, int length)
throws IOException {
-if (callee != null) {
-return callee.handleInput(buffer, offset, length);
-} else {
-return super.handleInput(buffer, offset, length);
-}
+ return (callee != null ?
+ callee.handleInput(buffer, offset, length) :
+ super.handleInput(buffer, offset, length)
+ );
}
/**
Index: Checksum.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Checksum.java,v
retrieving revision 1.43
diff -u -r1.43 Checksum.java
--- Checksum.java 6 Jan 2005 11:15:37 - 1.43
+++ Checksum.java 10 Mar 2005 10:44:35 -
@@ -401,30 +401,30 @@
* Add key-value pair to the hashtable upon which
* to later operate upon.
*/
-private void addToIncludeFileMap(File file) throws BuildException {
-if (file != null) {
-if (file.exists()) {
+private void addToIncludeFileMap(File fileToAdd) throws BuildException {
+if (fileToAdd != null) {
+if (fileToAdd.exists()) {
if (property == null) {
-File checksumFile = getChecksumFile(file);
+File checksumFile = getChecksumFile(fileToAdd);
if (forceOverwrite || isCondition
-|| (file.lastModified()
checksumFile.lastModified())) {
-includeFileMap.put(file, checksumFile);
+|| (fileToAdd.lastModified()
checksumFile.lastModified())) {
+includeFileMap.put(fileToAdd, checksumFile);
} else {
-log(file + omitted as + checksumFile + is up to
date.,
+log(fileToAdd + omitted as + checksumFile + is
up to date.,
Project.MSG_VERBOSE);
if (totalproperty != null) {
// Read the checksum from disk.
String checksum = readChecksum(checksumFile);
byte[] digest = decodeHex(checksum.toCharArray());
-allDigests.put(file, digest);
+allDigests.put(fileToAdd, digest);
}
}
} else {
-includeFileMap.put(file, property);
+includeFileMap.put(fileToAdd, property);
}
} else {
String message = Could not find file
-+ file.getAbsolutePath()
++ fileToAdd.getAbsolutePath()
+ to generate checksum for.;
log(message);
throw new BuildException(message, getLocation());
@@ -432,20 +432,20 @@
}
}
-private File getChecksumFile(File file) {
+private File getChecksumFile(File fileToCheck) {
File directory;
if (todir != null) {
// A separate directory was explicitly declared
-String path = (String) relativeFilePaths.get(file);
+String path = (String) relativeFilePaths.get(fileToCheck);
directory = new File(todir, path).getParentFile();
// Create the directory, as it might not exist.
directory.mkdirs();
} else {
// Just use the same directory as the file itself.
// This directory will exist
-directory = file.getParentFile();
+directory =
Re: ant 1.6.3 release?
Peter Reilly wrote: Is there anything that needs to be put into the 1.6 branch to allow a 1.6.3 release soon? I think the patch to RMI for java1.5 compat makes sense. Its a small change, near-zero chance of breakage as all it does is fix dependency logic and output file generation. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/proposal/xdocs/src/org/apache/ant/xdoclet TaskTagsHandler.java
stevel 2005/03/10 07:15:26
Modified:proposal/xdocs/src/org/apache/ant/xdoclet
TaskTagsHandler.java
Log:
java1.5 patch
Revision ChangesPath
1.4 +8 -8
ant/proposal/xdocs/src/org/apache/ant/xdoclet/TaskTagsHandler.java
Index: TaskTagsHandler.java
===
RCS file:
/home/cvs/ant/proposal/xdocs/src/org/apache/ant/xdoclet/TaskTagsHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TaskTagsHandler.java 9 Mar 2004 16:47:58 - 1.3
+++ TaskTagsHandler.java 10 Mar 2005 15:15:26 - 1.4
@@ -372,8 +372,8 @@
}
if (instance != null instance instanceof EnumeratedAttribute)
{
-EnumeratedAttribute enum = (EnumeratedAttribute) instance;
-String[] values = enum.getValues();
+EnumeratedAttribute enum1 = (EnumeratedAttribute) instance;
+String[] values = enum1.getValues();
display = ;
for (int i = 0; i values.length; i++) {
@@ -538,11 +538,11 @@
// Regroup the attributes, since IntrospectionHelper
// doesn't give us the whole data structure directly
-Enumeration enum = is.getAttributes();
+Enumeration enum2 = is.getAttributes();
Properties attributeTypeMap = new Properties();
-while (enum.hasMoreElements()) {
-String name = (String) enum.nextElement();
+while (enum2.hasMoreElements()) {
+String name = (String) enum2.nextElement();
Class type = is.getAttributeType(name);
attributeTypeMap.setProperty(name, type.getName());
@@ -625,11 +625,11 @@
// Regroup the elements, since IntrospectionHelper
// doesn't give us the whole data structure directly
-Enumeration enum = is.getNestedElements();
+Enumeration enum3 = is.getNestedElements();
Properties elementTypeMap = new Properties();
-while (enum.hasMoreElements()) {
-String name = (String) enum.nextElement();
+while (enum3.hasMoreElements()) {
+String name = (String) enum3.nextElement();
Class type = is.getElementType(name);
elementTypeMap.setProperty(name, type.getName());
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] Start a subproject for Ant libraries
I changed about 20 files. Some of the files are new. - Alexey. Steve Loughran wrote: Alexey N. Solofnenko wrote: Interesting. So there is yet another revision control system. All I can tell that Darcs is stable and very convenient to use. Out of curiosity, how much has your copy of ant diverged from the main one ? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] -- / Alexey N. Solofnenko home: http://trelony.cjb.net/ / - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33952] New: - executable atttribute for .Net csc task does not work
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=33952. 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=33952 Summary: executable atttribute for .Net csc task does not work Product: Ant Version: 1.6.2 Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P3 Component: Optional Tasks AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Setting the executable attribute does not over-ride the C-sharp compiler. To reproduce attempt to execute the following and it will always default to using CSC: csc executable=msc / -- 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]
Re: ant 1.6.3 release?
I am about to merge condition else, since I documented it at Ant 1.6.3 . Should I add the latest DirectoryScanner (hopefully) improvements? -Matt --- Peter Reilly [EMAIL PROTECTED] wrote: Is there anything that needs to be put into the 1.6 branch to allow a 1.6.3 release soon? Peter - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/etc/testcases/taskdefs condition.xml
mbenson 2005/03/10 08:13:13
Modified:.Tag: ANT_16_BRANCH WHATSNEW
docs/manual/CoreTasks Tag: ANT_16_BRANCH condition.html
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
ConditionTask.java
src/testcases/org/apache/tools/ant/taskdefs Tag:
ANT_16_BRANCH ConditionTest.java
src/etc/testcases/taskdefs Tag: ANT_16_BRANCH condition.xml
Log:
Merge condition else= from HEAD.
Revision ChangesPath
No revision
No revision
1.503.2.191 +4 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.190
retrieving revision 1.503.2.191
diff -u -r1.503.2.190 -r1.503.2.191
--- WHATSNEW 10 Mar 2005 14:23:40 - 1.503.2.190
+++ WHATSNEW 10 Mar 2005 16:13:11 - 1.503.2.191
@@ -107,6 +107,10 @@
* Added verbose=true|false attribute to subant. When verbose is enabled,
the directory name is logged on entry and exit of the sub-build. Bugzilla
33787.
+* Add else attribute to the condition task, which specifies an
+ optional alternate value to set the property to if the nested
+ condition evaluates to false. Bugzilla report 33074.
+
Fixed bugs:
---
No revision
No revision
1.13.2.3 +9 -1 ant/docs/manual/CoreTasks/condition.html
Index: condition.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/condition.html,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -r1.13.2.2 -r1.13.2.3
--- condition.html9 Feb 2004 22:12:07 - 1.13.2.2
+++ condition.html10 Mar 2005 16:13:13 - 1.13.2.3
@@ -37,6 +37,14 @@
quot;truequot;./td
td valign=top align=centerNo/td
/tr
+ tr
+td valign=topelse/td
+td valign=topThe value to set the property to if the condition
+ evaluates to ifalse/i. By default the property will remain unset.
+ emSince Ant 1.6.3/em
+/td
+td valign=top align=centerNo/td
+ /tr
/table
h3a name=nestedParameters specified as nested elements/a/h3
pAll conditions to test are specified as nested elements, for a
@@ -81,7 +89,7 @@
operating system is SunOS and if it is running on a sparc architecture./p
hr
-p align=centerCopyright copy; 2001-2002,2004 The Apache Software
+p align=centerCopyright copy; 2001-2002, 2004-2005 Apache Software
Foundation. All rights Reserved./p
/body
No revision
No revision
1.16.2.6 +15 -1
ant/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java
Index: ConditionTask.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java,v
retrieving revision 1.16.2.5
retrieving revision 1.16.2.6
diff -u -r1.16.2.5 -r1.16.2.6
--- ConditionTask.java9 Mar 2005 18:56:25 - 1.16.2.5
+++ ConditionTask.java10 Mar 2005 16:13:13 - 1.16.2.6
@@ -41,6 +41,7 @@
private String property = null;
private String value = true;
+private String alternative = null;
/**
* The name of the property to set. Required.
@@ -62,6 +63,16 @@
}
/**
+ * The value for the property to set, if condition evaluates to false.
+ * If this attribute is not specified, the property will not be set.
+ * @param e the alternate value of the property.
+ * @since Ant 1.6.3
+ */
+public void setElse(String e) {
+alternative = e;
+}
+
+/**
* See whether our nested condition holds and set the property.
*
* @since Ant 1.4
@@ -79,12 +90,15 @@
if (property == null) {
throw new BuildException(The property attribute is required.);
}
-
Condition c = (Condition) getConditions().nextElement();
if (c.eval()) {
log(Condition true; setting + property + to + value,
Project.MSG_DEBUG);
getProject().setNewProperty(property, value);
+} else if (alternative != null) {
+log(Condition false; setting + property + to +
alternative,
+Project.MSG_DEBUG);
+getProject().setNewProperty(property, alternative);
} else {
log(Condition false; not setting + property,
Project.MSG_DEBUG);
No revision
No revision
1.6.2.5 +4 -1
ant/src/testcases/org/apache/tools/ant/taskdefs/ConditionTest.java
Index: ConditionTest.java
cvs commit: ant WHATSNEW
mbenson 2005/03/10 08:13:54 Modified:.WHATSNEW Log: merge condition else= to 1.6 branch Revision ChangesPath 1.769 +4 -4 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.768 retrieving revision 1.769 diff -u -r1.768 -r1.769 --- WHATSNEW 10 Mar 2005 14:21:24 - 1.768 +++ WHATSNEW 10 Mar 2005 16:13:54 - 1.769 @@ -100,10 +100,6 @@ * Added clone task. Bugzilla report 32631. -* Add else attribute to the condition task, which specifies an - optional alternate value to set the property to if the nested - condition evaluates to false. Bugzilla report 33074. - * Added scriptcondition condition, for inline scripted conditions * Added xor condition for exclusive-or combining of nested conditions. @@ -254,6 +250,10 @@ * Added -noclasspath option to allow running ant WITHOUT using CLASSPATH env variable. Modified ant.bat to do this so that %CLASSPATH% is not looked at. +* Add else attribute to the condition task, which specifies an + optional alternate value to set the property to if the nested + condition evaluates to false. Bugzilla report 33074. + Fixed bugs: --- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/types/selectors AbstractSelectorContainer.java
mbenson 2005/03/10 08:25:33 Added: src/main/org/apache/tools/ant/types/selectors Tag: ANT_16_BRANCH AbstractSelectorContainer.java Log: Commit so IsFileSelected will compile. Revision ChangesPath No revision No revision 1.2.2.1 +0 -0 ant/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/main/org/apache/tools/ant/types/selectors AbstractSelectorContainer.java
Opps, sorry! Peter [EMAIL PROTECTED] wrote: mbenson 2005/03/10 08:25:33 Added: src/main/org/apache/tools/ant/types/selectors Tag: ANT_16_BRANCH AbstractSelectorContainer.java Log: Commit so IsFileSelected will compile. Revision ChangesPath No revision No revision 1.2.2.1 +0 -0 ant/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: FileCollections WAS FileSets with optional basedir and absolute paths for includes
--- Stefan Bodewig [EMAIL PROTECTED] wrote: On Thu, 10 Mar 2005, Stefan Bodewig [EMAIL PROTECTED] wrote: Resource instead of File could be even better. Just to be clear, I'm talking about the existing oata.types.Resource here which already gets used by zip family of tasks. Yeah, not a bad idea. Do you think we are setting ourselves up for trouble here, though? If a task needs actual Files, for whatever reason... it calls FileUtils.copyFile, it passes filenames to another class or executable... then we have to check that we are not dealing with ZipEntries, right? Also, you have the fact that Resource names are often going to be relative, so we would have to add the basedir into the Resource in order for a standalone Resource to be meaningful, or convert every Resource to absolute form, which still doesn't catch the ZipEntries... Thoughts on this? -Matt We may even add a getInputStream method to it ... Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Ant SVN repo URLs
Proposals so far: http://svn.apache.org/repos/asf/ant/core/ http://svn.apache.org/repos/asf/ant/libs/ and http://svn.apache.org/repos/asf/ant/antlibs/proper/dotnet http://svn.apache.org/repos/asf/ant/antlibs/sandbox/svn Maybe we should use 3 locations though (moving is possible within a svn repository) http://svn.apache.org/repos/asf/ant/core http://svn.apache.org/repos/asf/ant/libs http://svn.apache.org/repos/asf/ant/sandbox Martijn - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33928] - Output of java task and left quote
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=33928. 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=33928 [EMAIL PROTECTED] changed: What|Removed |Added Severity|normal |major -- 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 33928] - Output of java task and left quote
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=33928. 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=33928 --- Additional Comments From [EMAIL PROTECTED] 2005-03-10 20:02 --- I am confused. You said redirector doesn't help you. You said you need inputencoding. Redirector has it. This seems to work for me: java classname=Main output=other_text classpath pathelement location=./ /classpath redirector inputencoding=UTF-8 / /java Please verify. -- 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 33928] - Output of java task and left quote
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=33928.
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=33928
--- Additional Comments From [EMAIL PROTECTED] 2005-03-10 20:05 ---
(In reply to comment #6)
I am confused. You said redirector doesn't help you. You said you need
inputencoding. Redirector has it. This seems to work for me:
java classname=Main output=other_text
classpath
pathelement location=./
/classpath
redirector inputencoding=UTF-8 /
/java
Please verify.
Nope. This is not help. I'm gettin text like this:
{220} {221}Click {222}??YesÒ{223}.
--
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 33928] - Output of java task and left quote
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=33928. 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=33928 --- Additional Comments From [EMAIL PROTECTED] 2005-03-10 20:11 --- And what do you see when you also set the outputencoding to UTF-8? -- 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 33928] - Output of java task and left quote
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=33928.
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=33928
--- Additional Comments From [EMAIL PROTECTED] 2005-03-10 20:13 ---
(In reply to comment #8)
And what do you see when you also set the outputencoding to UTF-8?
{220} {221}Click {222}#9576;#9619;#9576;Â?Yes#9576;#9619;#9576;ÂòÄâ{223}.
--
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 33928] - Output of java task and left quote
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=33928.
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=33928
--- Additional Comments From [EMAIL PROTECTED] 2005-03-10 20:15 ---
(In reply to comment #9)
(In reply to comment #8)
And what do you see when you also set the outputencoding to UTF-8?
{220} {221}Click
{222}#9576;#9619;#9576;Â?Yes#9576;#9619;#9576;ÂòÄâ{223}.
Sorry, this is ASCII graphics.
--
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 33928] - Output of java task and left quote
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=33928. 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=33928 --- Additional Comments From [EMAIL PROTECTED] 2005-03-10 20:31 --- Can you attach the text file created when you run your class from the command-line? Attach it as an octet type or whatever to make sure it doesn't get corrupted in any way. -- 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 CollectionUtils.java
mbenson 2005/03/10 13:16:08
Modified:.WHATSNEW
src/main/org/apache/tools/ant/taskdefs/optional
EchoProperties.java
src/main/org/apache/tools/ant/util CollectionUtils.java
Log:
Sort echoproperties output in text mode as well as XML.
PR: 18976
Revision ChangesPath
1.770 +1 -1 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.769
retrieving revision 1.770
diff -u -r1.769 -r1.770
--- WHATSNEW 10 Mar 2005 16:13:54 - 1.769
+++ WHATSNEW 10 Mar 2005 21:16:07 - 1.770
@@ -67,7 +67,7 @@
--
* echoproperties now (alphanumerically) sorts the property list
- before echoing, when you request XML output (format=xml).
+ before echoing. Bugzilla report 18976.
* A new base class DispatchTask has been added to facilitate elegant
creation of tasks with multiple actions.
1.30 +11 -7
ant/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
Index: EchoProperties.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- EchoProperties.java 9 Mar 2005 23:38:22 - 1.29
+++ EchoProperties.java 10 Mar 2005 21:16:08 - 1.30
@@ -325,15 +325,19 @@
[EMAIL PROTECTED] IOException trouble
*/
protected void saveProperties(Hashtable allProps, OutputStream os)
- throws IOException, BuildException {
-Properties props = new Properties();
-Enumeration e = allProps.keys();
-while (e.hasMoreElements()) {
-String name = e.nextElement().toString();
+throws IOException, BuildException {
+final List keyList = new ArrayList(allProps.keySet());
+Collections.sort(keyList);
+Properties props = new Properties() {
+public Enumeration keys() {
+return CollectionUtils.asEnumeration(keyList.iterator());
+}
+};
+for (int i = 0; i keyList.size(); i++) {
+String name = keyList.get(i).toString();
String value = allProps.get(name).toString();
-props.put(name, value);
+props.setProperty(name, value);
}
-
if (text.equals(format)) {
jdkSaveProperties(props, os, Ant properties);
} else if (xml.equals(format)) {
1.17 +37 -1
ant/src/main/org/apache/tools/ant/util/CollectionUtils.java
Index: CollectionUtils.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/CollectionUtils.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- CollectionUtils.java 24 Jan 2005 18:13:20 - 1.16
+++ CollectionUtils.java 10 Mar 2005 21:16:08 - 1.17
@@ -16,10 +16,11 @@
*/
package org.apache.tools.ant.util;
+import java.util.Vector;
+import java.util.Iterator;
import java.util.Dictionary;
import java.util.Enumeration;
import java.util.NoSuchElementException;
-import java.util.Vector;
/**
* A set of helper methods related to collection manipulation.
@@ -139,6 +140,41 @@
return new CompoundEnumeration(e1, e2);
}
+/**
+ * Adapt the specified Iterator to the Enumeration interface.
+ * @param iter the Iterator to adapt.
+ * @return an Enumeration.
+ */
+public static Enumeration asEnumeration(final Iterator iter) {
+return new Enumeration() {
+public boolean hasMoreElements() {
+return iter.hasNext();
+}
+public Object nextElement() {
+return iter.next();
+}
+};
+}
+
+/**
+ * Adapt the specified Enumeration to the Iterator interface.
+ * @param enum the Enumeration to adapt.
+ * @return an Iterator.
+ */
+public static Iterator asIterator(final Enumeration enum) {
+return new Iterator() {
+public boolean hasNext() {
+return enum.hasMoreElements();
+}
+public Object next() {
+return enum.nextElement();
+}
+public void remove() {
+throw new UnsupportedOperationException();
+}
+};
+}
+
private static final class CompoundEnumeration implements Enumeration {
private final Enumeration e1, e2;
DO NOT REPLY [Bug 18976] - Optional sort attribute for echoproperties task
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=18976. 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=18976 [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED Target Milestone|--- |1.7 --- Additional Comments From [EMAIL PROTECTED] 2005-03-10 22:17 --- sorting in text mode is implemented in CVS HEAD. 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]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/condition IsPingable.java
stevel 2005/03/10 15:20:04
Modified:.build.xml
docs/manual/CoreTasks conditions.html
src/main/org/apache/tools/ant/types defaults.properties
Added: src/main/org/apache/tools/ant/taskdefs/condition
IsReachable.java
src/etc/testcases/taskdefs/conditions isreachable.xml
src/testcases/org/apache/tools/ant/taskdefs/condition
IsReachableTest.java
Removed: src/main/org/apache/tools/ant/taskdefs/optional/condition
IsPingable.java
Log:
Moving isreachable to reflect on the new method. On java =1.4; if the
hostname can be resolved then we are reachable.
All tests run against localhost. This *should* work everywhere, but no doubt
someone with a confused /etc/hosts or no IPv4 stack will have different
opinions.
Revision ChangesPath
1.463 +281 -281 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -r1.462 -r1.463
--- build.xml 9 Mar 2005 22:56:38 - 1.462
+++ build.xml 10 Mar 2005 23:20:02 - 1.463
@@ -31,6 +31,7 @@
property name=ant.package value=org/apache/tools/ant/
property name=taskdefs.package value=${ant.package}/taskdefs/
+ property name=condition.package value=${taskdefs.package}/condition/
property name=optional.package value=${taskdefs.package}/optional/
property name=optional.condition.package
value=${optional.package}/condition/
property name=type.package value=${ant.package}/types/
@@ -56,7 +57,7 @@
property name=junit.fork value=false/
property name=junit.filtertrace value=off/
property name=junit.summary value=no/
- property name=test.haltonfailure value=yes /
+ property name=test.haltonfailure value=yes/
property name=junit.forkmode value=once/
property name=unfiltered.files
value=**/*.gif,**/*.jpg,**/*.ico,**/*.pdf,**/*.zip/
@@ -113,13 +114,13 @@
!-- turn this path into a string which is passed to the tests --
property name=tests-classpath.value
-refid=tests-classpath/
+refid=tests-classpath/
- !--
- ===
- Set up properties for the distribution area
- ===
- --
+ !--
+===
+ Set up properties for the distribution area
+===
+ --
property name=dist.name value=apache-${name}-${version}/
property name=dist.base value=distribution/
property name=dist.dir value=dist/
@@ -157,7 +158,6 @@
selector id=needs.jdk1.5+
or
- filename name=${optional.condition.package}/IsPingable*/
filename name=${taskdefs.package}/AptTest*/
/or
/selector
@@ -166,10 +166,10 @@
but not all of them --
selector id=not.in.kaffe
or
- filename name=${optional.condition.package}/IsPingable*/
+ filename name=${condition.package}/IsReachable*/
/or
/selector
-
+
selector id=needs.sun.uue
filename name=${ant.package}/taskdefs/email/UUMailer*/
/selector
@@ -312,7 +312,7 @@
selector id=needs.jai
or
filename name=${optional.package}/image/*/
- filename name=${ant.package}/types/optional/image/*/
+ filename name=${optional.type.package}/image/*/
/or
/selector
@@ -392,110 +392,110 @@
available property=jdk1.5+ classname=java.lang.Readable/
available property=kaffe classname=kaffe.util.NotImplemented/
available property=bsf.present
- classname=org.apache.bsf.BSFManager
- classpathref=classpath/
+ classname=org.apache.bsf.BSFManager
+ classpathref=classpath/
available property=netrexx.present
- classname=netrexx.lang.Rexx
- classpathref=classpath/
+ classname=netrexx.lang.Rexx
+ classpathref=classpath/
available property=trax.present
- classname=javax.xml.transform.Transformer
- classpathref=classpath/
+ classname=javax.xml.transform.Transformer
+ classpathref=classpath/
condition property=trax.impl.present
or
and
isset property=javax.xml.transform.TransformerFactory/
available classname=${javax.xml.transform.TransformerFactory}
- classpathref=classpath/
+classpathref=classpath/
/and
available
resource=META-INF/services/javax.xml.transform.TransformerFactory/
/or
/condition
cvs commit: ant/src/etc/testcases/taskdefs signjar.xml
stevel 2005/03/10 15:22:16
Modified:src/etc/testcases/taskdefs signjar.xml
Log:
little pointer to note that this test seems dependent upon viewcvs.cgi
working, which it wont after an SVN move.
Revision ChangesPath
1.6 +1 -0 ant/src/etc/testcases/taskdefs/signjar.xml
Index: signjar.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/signjar.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- signjar.xml 1 Dec 2004 11:42:43 - 1.5
+++ signjar.xml 10 Mar 2005 23:22:16 - 1.6
@@ -25,6 +25,7 @@
storepass=apacheant maxmemory=128m/
/target
+ !--TODO: change this when we move to SUBVERSION--
target name=urlKeystoreHTTP
jar jarfile=signtest.jar basedir=${classes.dir}
includes=**/Task.class/
signjar jar=signtest.jar alias=testonly
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: When to move Ant to SVN?
Steve Loughran wrote: Stefan Bodewig wrote: The question really is when, not if. Shall we do it together with the creation of the antlibs repo or should we wait a bit longer? Look at it differently do you want to do it (a) before doing the releases of Ant1.6.3, Ant1.7 (b) during (c) after Do before both releases. If we did 1.6.3 on CVS then we would need to keep the branch open in CVS for any fixes etc. I'd prefer to go to svn before the release, get it setup and working well and then do the releases. Conor - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: When to move Ant to SVN?
I do not agree. I think that 1.6.3 is nearly ready to go out. Moving to svn would delay it's release. Then the move should be made to svn for ant 1.7. Peter Conor MacNeill wrote: Steve Loughran wrote: Stefan Bodewig wrote: The question really is when, not if. Shall we do it together with the creation of the antlibs repo or should we wait a bit longer? Look at it differently do you want to do it (a) before doing the releases of Ant1.6.3, Ant1.7 (b) during (c) after Do before both releases. If we did 1.6.3 on CVS then we would need to keep the branch open in CVS for any fixes etc. I'd prefer to go to svn before the release, get it setup and working well and then do the releases. Conor - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [patch] mainly name-hiding
Kevin, I had a quick look at thi spatch and not sure I agree with some thigns in it. I'm not sure I understand the motivation for this name hiding stuff. Changing variable names from password to pass or daemonTasks to dTasks does not strike me as being an improvement. Likewise, I do not see converting an if-else to a ternary conditional makes the code clearer - on the contrary it makes it more convoluted. You've moved the // comments at the end of a block into the block. I'd prefer to just get rid of them altogether. Conor - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: JIRA or Bugzilla?
Stefan Bodewig wrote: Hi, lurking on the infrastructure list shows that we do have stability problems with JIRA and Tomcat on issues.apache.org, so right now I'd prefer to stick with Bugzilla. Even without that I'd suggest we ask the infrastructure team what they'd prefer us to use before we make any decision. I'm +0 :) I've used both systems and I'm happy with either. Happy to go with whatever infrastructure recommends. Conor - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
