ACL sharing between ivy and ant
I know I might comes a little bit late with my question. I have no problem to have all ant committers becoming ivy commiter. Certainly not. It is a quick way to increase the size of the ivy community. But I suddently have a doubt on what will happen if someone demonstrates his trustability to the ivy community but is not present in the ant community? How will be the vote for a new committer being made in that context? -- Gilles SCOKART
JUnit Filter, extension of JUnitTask?
Hi, JUnit (since 4.?) allows filtering of the tests to be run. It would be nice to allow ant build scripts to use this filter capacity. This would allow developers to run a (small, fast running) set of tests, while the integration or production build runs extra test sets. The filtering only works with JUnit 4 test code. I've changed a few source files (of ant 1.7.0) and added two. It works fine (here). It requires (at the moment) a typedef of the filter: typedef name=junitfilter classname=org.apache.tools.ant.taskdefs.optional.junit.JUnitFilter/ and can be used as follows: junit junitfilter classname=com.example.JUnitDBFilter properties=dbtest/ /junit I would like to know if you find this useful (enough) for inclusion. Would someone like to see the code and comment on it? Thanks Kind regards, Rutger Lubbers - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: JUnit Filter, extension of JUnitTask?
Rutger Lubbers wrote: Hi, JUnit (since 4.?) allows filtering of the tests to be run. It would be nice to allow ant build scripts to use this filter capacity. This would allow developers to run a (small, fast running) set of tests, while the integration or production build runs extra test sets. The filtering only works with JUnit 4 test code. I've changed a few source files (of ant 1.7.0) and added two. It works fine (here). It requires (at the moment) a typedef of the filter: typedef name=junitfilter classname=org.apache.tools.ant.taskdefs.optional.junit.JUnitFilter/ and can be used as follows: junit junitfilter classname=com.example.JUnitDBFilter properties=dbtest/ /junit I would like to know if you find this useful (enough) for inclusion. Would someone like to see the code and comment on it? Thanks Kind regards, JUnit4 stuff is something I'd like to work on, either as a separate antlib or as somethig in Ant, presumably in the package org.apache.tools.ant.taskdefs.optional.junit4 1. I was planning a new task for it, one that is a superset of junit; this filtering could go in there. 2. I'm planning to extend the xml test results to include more data (from junit4, antunit, and anything else compatible) -add skipped tests: count+details -allow every test to have a description, a URL and a bugID (well, a list of them) -dump more machine details into a per-machine file when we do the test run; I think the filter stuff could go in there; why not add it as an enhancement request (with code) to bugzilla under issues.apache.org? -steve -- Steve Loughran http://www.1060.org/blogxter/publish/5 Author: Ant in Action http://antbook.org/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[EMAIL PROTECTED]: Project dotnet-antlib-test (in module ant-antlibs) 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 dotnet-antlib-test has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 243 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - dotnet-antlib-test : Task and Type Libraries for Apache Ant Full details are available at: http://vmgump.apache.org/gump/public/ant-antlibs/dotnet-antlib-test/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://vmgump.apache.org/gump/public/ant-antlibs/dotnet-antlib-test/gump_work/build_ant-antlibs_dotnet-antlib-test.html Work Name: build_ant-antlibs_dotnet-antlib-test (Type: Build) Work ended in a state of : Failed Elapsed: 20 secs Command Line: /usr/lib/jvm/java-1.5.0-sun/bin/java -Djava.awt.headless=true -Xbootclasspath/p:/srv/gump/public/workspace/xml-xerces2/build/xercesImpl.jar:/srv/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Dant-testutil.jar=/srv/gump/public/workspace/ant/build/lib/ant-testutil.jar test [Working Directory: /srv/gump/public/workspace/ant-antlibs/dotnet] CLASSPATH: /usr/lib/jvm/java-1.5.0-sun/lib/tools.jar:/srv/gump/public/workspace/ant-antlibs/dotnet/build/test-classes:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-trax.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant-antlibs/antunit/build/ant-antunit-03102007.jar:/srv/gump/public/workspace/ant-antlibs/dotnet/build/ant-dotnet-03102007.jar:/srv/gump/public/workspace/xml-commons/java/external/build/xml-apis-ext.jar - [au:antunit] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.191 sec [au:antunit] Target: test-passing took 0.023 sec [au:antunit] Build File: /srv/gump/public/workspace/ant-antlibs/dotnet/src/tests/antunit/dir with spaces/wsdl-test.xml [au:antunit] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.878 sec [au:antunit] Target: testWSDL took 0.86 sec [au:antunit] Build File: /srv/gump/public/workspace/ant-antlibs/dotnet/src/tests/antunit/dotnetexec-test.xml [au:antunit] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.814 sec [au:antunit] Target: testCSC took 0.781 sec [au:antunit] Build File: /srv/gump/public/workspace/ant-antlibs/dotnet/src/tests/antunit/nunit/nunit-test.xml [au:antunit] Tests run: 5, Failures: 0, Errors: 0, Time elapsed: 0.208 sec [au:antunit] Target: test-passing took 0.008 sec [au:antunit] Target: test-failing took 0.008 sec [au:antunit] Target: test-failing-errorproperty took 0.11 sec [au:antunit] Target: test-failing-with-fail took 0.008 sec [au:antunit] Target: test-no-assembly took 0.021 sec [au:antunit] Build File: /srv/gump/public/workspace/ant-antlibs/dotnet/src/tests/antunit/old-core-test.xml [au:antunit] Tests run: 9, Failures: 0, Errors: 0, Time elapsed: 5.447 sec [au:antunit] Target: testCSCintrinsicFileset took 0.907 sec [au:antunit] Target: testCSCresponseFile took 0.623 sec [au:antunit] Target: testILASM took 0.728 sec [au:antunit] Target: testCSCdll took 0.613 sec [au:antunit] Target: testILDASM took 0.813 sec [au:antunit] Target: testILDASM_empty took 0.045 sec [au:antunit] Target: testJsharp took 0.011 sec [au:antunit] Target: testCSCResources took 0.728 sec [au:antunit] Target: testCSC took 0.732 sec [au:antunit] Build File: /srv/gump/public/workspace/ant-antlibs/dotnet/src/tests/antunit/wsdl2dotnet-test.xml [au:antunit] Tests run: 15, Failures: 0, Errors: 0, Time elapsed: 3.885 sec [au:antunit] Target: testSchemaMustBeSet took 0.098 sec [au:antunit] Target: testLocalWsdlVB took 0.023 sec [au:antunit] Target: testInvalidExtraOps took 0.01 sec [au:antunit] Target: testSrcIsMissing took 0.037 sec [au:antunit] Target: testNoParams took 0.064 sec [au:antunit] Target: testBothSrc took 0.078 sec [au:antunit] Target: testSchemaFileMustHaveOneOptionOnly took 0.041 sec [au:antunit] Target: testLocalWsdl took 1.518 sec [au:antunit] Target: testSrcIsDir took 0.032 sec [au:antunit] Target: testLocalWsdlServerVB took 0.059 sec [au:antunit] Target: testLocalWsdlServer took 1.565 sec [au:antunit] Target: testNoSrc took 0.018 sec [au:antunit] Target:
Re: Cannot run ant test target on svn trunk
I do not see this problem.
1)
However, the failing tests java file is autogenerated by
org.apache.tools.ant.taskdefs.optional.FailureRecoder.
You may have had failing tests that do not
have nice names.
The change to the build file was done here:
http://svn.apache.org/viewvc?view=revrevision=574557
2)
the test you are trying to run is by default excluded:
!-- test needs special setup --
exclude name=${optional.package}/ssh/ScpTest.java/
3)
(I think that) You should not run the tests in the fashion you do.
- the optional jars in lib/optional are not used
- the contents of .ant/lib are used (and should not be)
I think that ./build.sh (normal params) should be used..
On 10/3/07, Kevin Jackson [EMAIL PROTECTED] wrote:
Hi all,
Tried to run a single test with:
ant -Djunit.testcase=org.apache.tools.ant.taskdefs.optional.ssh.ScpTest
junit-single-test
And I'm getting a failure with:
Buildfile: build.xml
prepare:
check_for_optional_packages:
build:
[copy] Copying 2 files to
D:\eclipse\workspace\ant-core-trunk\build\classes
compile-tests:
probe-offline:
test-init:
junit-single-test-only:
[javac] Compiling 1 source file to
D:\eclipse\workspace\ant-core-trunk\build
\failingTests
[javac]
D:\eclipse\workspace\ant-core-trunk\build\failingTests\FailedTests.j
ava:9: junit.framework.TestSuite$1 is not public in junit.framework; cannot
be a
ccessed from outside package
[javac] suite.addTest(new junit.framework.TestSuite$1(warning));
[javac] ^
[javac] 1 error
BUILD FAILED
D:\eclipse\workspace\ant-core-trunk\build.xml:1903: The following error
occurred
while executing this line:
D:\eclipse\workspace\ant-core-trunk\build.xml:1610: Compile failed; see the
comp
iler error output for details.
Total time: 3 seconds
I get the same error with vanilla 'ant test'
I can bootstrap + build fine, but the tests aren't compiling. Anyone
else seeing this problem? (WinXP SP2)
Thanks,
Kev
-
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]
svn commit: r581549 - /ant/core/trunk/build.xml
Author: peterreilly
Date: Wed Oct 3 02:57:39 2007
New Revision: 581549
URL: http://svn.apache.org/viewvc?rev=581549view=rev
Log:
removing starteam
Modified:
ant/core/trunk/build.xml
Modified: ant/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/build.xml?rev=581549r1=581548r2=581549view=diff
==
--- ant/core/trunk/build.xml (original)
+++ ant/core/trunk/build.xml Wed Oct 3 02:57:39 2007
@@ -271,13 +271,6 @@
/or
/selector
- selector id=needs.starteam
-or
- filename name=${optional.package}/scm/AntStarTeam*/
- filename name=${optional.package}/starteam/*/
-/or
- /selector
-
selector id=needs.antlr
filename name=${optional.package}/ANTLR*/
/selector
@@ -402,9 +395,6 @@
available property=commons.net.present
classname=org.apache.commons.net.ftp.FTPClient
classpathref=classpath/
-available property=starteam.present
- classname=com.starbase.util.Platform
- classpathref=classpath/
available property=antlr.present
classname=antlr.Tool
classpathref=classpath/
@@ -634,7 +624,6 @@
selector refid=needs.javamail unless=javamail.complete/
selector refid=needs.netrexx unless=netrexx.present/
selector refid=needs.commons-net unless=commons.net.present/
-selector refid=needs.starteam unless=starteam.present/
selector refid=needs.antlr unless=antlr.present/
selector refid=needs.jmf unless=jmf.present/
selector refid=needs.jai unless=jai.present/
@@ -813,7 +802,6 @@
selector refid=needs.javamail/
selector refid=needs.netrexx/
selector refid=needs.commons-net/
-selector refid=needs.starteam/
selector refid=needs.antlr/
selector refid=needs.jmf/
selector refid=needs.jai/
@@ -854,7 +842,6 @@
optional-jar dep=javamail/
optional-jar dep=netrexx/
optional-jar dep=commons-net/
-optional-jar dep=starteam/
optional-jar dep=antlr/
optional-jar dep=jmf/
optional-jar dep=jai/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: ACL sharing between ivy and ant
Gilles Scokart wrote: I know I might comes a little bit late with my question. I have no problem to have all ant committers becoming ivy commiter. Certainly not. It is a quick way to increase the size of the ivy community. But I suddently have a doubt on what will happen if someone demonstrates his trustability to the ivy community but is not present in the ant community? How will be the vote for a new committer being made in that context? I guess you make them a committer in ivy; they get access to both. -there's almost no security risk in ant changes; its hard for anyone to deliberately stick a back door in, the way you could with Xerces or Axis. -biggest risk is just making backwards-incompatible changes to classes and tasks. -All commits on ant get looked by other people; its pretty hard to get away with something drastic except in a commit so big the mailer doesn't send it to the group (100K of change). We'd ask some hard questions if a change that big went in, as it is incredibly rare. steve - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r581394 - /ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Union.java
Why not just return the set and remove the use of arraylist?
The method returns a collection.
On 10/2/07, [EMAIL PROTECTED] [EMAIL PROTECTED] wrote:
Author: jglick
Date: Tue Oct 2 14:38:20 2007
New Revision: 581394
URL: http://svn.apache.org/viewvc?rev=581394view=rev
Log:
Silly little optimization: javac was taking time quadratic in fileset size.
Unfortunately this is not the only place in Ant where List.contains is called;
DirectoryScanner.processIncluded seems to be as bad.
Alas, someone long ago made protected Vector fields in DS, and it seems too
late to change them now:
even changing to ArrayList would break subclasses like FTP which call
addElement!
Yuck!!
Peter
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Union.java
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Union.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Union.java?rev=581394r1=581393r2=581394view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Union.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Union.java
Tue Oct 2 14:38:20 2007
@@ -22,6 +22,8 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
import org.apache.tools.ant.types.Resource;
import org.apache.tools.ant.types.ResourceCollection;
@@ -100,14 +102,16 @@
return Collections.EMPTY_LIST;
}
//preserve order-encountered using a list; enforce set logic
manually:
+// (LinkedHashSet better, but JDK 1.4+)
ArrayList union = new ArrayList(rc.size() * 2);
+Set _union = new HashSet(rc.size() * 2);
for (Iterator rcIter = rc.iterator(); rcIter.hasNext();) {
for (Iterator r = nextRC(rcIter).iterator(); r.hasNext();) {
Object o = r.next();
if (asString) {
o = o.toString();
}
-if (!(union.contains(o))) {
+if (_union.add(o)) {
union.add(o);
}
}
-
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: svn commit: r581394 - /ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Union.java
On 10/3/07, Peter Reilly [EMAIL PROTECTED] wrote:
Why not just return the set and remove the use of arraylist?
The method returns a collection.
Oh, I see the comment now preserve order
Peter
On 10/2/07, [EMAIL PROTECTED] [EMAIL PROTECTED] wrote:
Author: jglick
Date: Tue Oct 2 14:38:20 2007
New Revision: 581394
URL: http://svn.apache.org/viewvc?rev=581394view=rev
Log:
Silly little optimization: javac was taking time quadratic in fileset
size.
Unfortunately this is not the only place in Ant where List.contains is
called;
DirectoryScanner.processIncluded seems to be as bad.
Alas, someone long ago made protected Vector fields in DS, and it seems too
late to change them now:
even changing to ArrayList would break subclasses like FTP which call
addElement!
Yuck!!
Peter
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Union.java
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Union.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Union.java?rev=581394r1=581393r2=581394view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Union.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Union.java
Tue Oct 2 14:38:20 2007
@@ -22,6 +22,8 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
import org.apache.tools.ant.types.Resource;
import org.apache.tools.ant.types.ResourceCollection;
@@ -100,14 +102,16 @@
return Collections.EMPTY_LIST;
}
//preserve order-encountered using a list; enforce set logic
manually:
+// (LinkedHashSet better, but JDK 1.4+)
ArrayList union = new ArrayList(rc.size() * 2);
+Set _union = new HashSet(rc.size() * 2);
for (Iterator rcIter = rc.iterator(); rcIter.hasNext();) {
for (Iterator r = nextRC(rcIter).iterator(); r.hasNext();) {
Object o = r.next();
if (asString) {
o = o.toString();
}
-if (!(union.contains(o))) {
+if (_union.add(o)) {
union.add(o);
}
}
-
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]
svn commit: r581576 - /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
Author: kevj
Date: Wed Oct 3 04:58:38 2007
New Revision: 581576
URL: http://svn.apache.org/viewvc?rev=581576view=rev
Log:
-open session once for a command resource not each command
-bugzilla 43437 don't make properties immutable
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java?rev=581576r1=581575r2=581576view=diff
==
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
Wed Oct 3 04:58:38 2007
@@ -150,37 +150,56 @@
if (command == null commandResource == null) {
throw new BuildException(Command or commandResource is
required.);
}
-
-/* called once */
-if (command != null) {
-log(cmd : + command, Project.MSG_INFO);
-executeCommand(command);
-} else { // read command resource and execute for each command
-try {
-BufferedReader br = new BufferedReader(
-new InputStreamReader(commandResource.getInputStream()));
-String cmd;
-while ((cmd = br.readLine()) != null) {
-log(cmd : + cmd, Project.MSG_INFO);
-executeCommand(cmd);
+
+Session session = null;
+
+try {
+session = openSession();
+/* called once */
+if (command != null) {
+log(cmd : + command, Project.MSG_INFO);
+ByteArrayOutputStream out = executeCommand(session, command);
+if(outputProperty != null) {
+//#bugzilla 43437
+getProject().setNewProperty(outputProperty, command + :
+ out);
+}
+} else { // read command resource and execute for each command
+try {
+BufferedReader br = new BufferedReader(
+new
InputStreamReader(commandResource.getInputStream()));
+String cmd;
+String output = ;
+while ((cmd = br.readLine()) != null) {
+log(cmd : + cmd, Project.MSG_INFO);
+ByteArrayOutputStream out = executeCommand(session,
cmd);
+output += cmd + : + out + \n;
+}
+if(outputProperty != null) {
+//#bugzilla 43437
+getProject().setNewProperty(outputProperty, output);
+}
+FileUtils.close(br);
+} catch (IOException e) {
+throw new BuildException(e);
}
-FileUtils.close(br);
-} catch (IOException e) {
-throw new BuildException(e);
+}
+} catch(JSchException e) {
+throw new BuildException(e);
+} finally {
+if (session != null session.isConnected()) {
+session.disconnect();
}
}
}
-
-private void executeCommand(String cmd) throws BuildException {
+
+private ByteArrayOutputStream executeCommand(Session session, String cmd)
throws BuildException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
TeeOutputStream tee = new TeeOutputStream(out, new
KeepAliveOutputStream(System.out));
-Session session = null;
try {
final ChannelExec channel;
-/* execute the command */
-session = openSession();
session.setTimeout((int) maxwait);
+/* execute the command */
channel = (ChannelExec) session.openChannel(exec);
channel.setCommand(cmd);
channel.setOutputStream(tee);
@@ -215,10 +234,7 @@
log(TIMEOUT_MESSAGE, Project.MSG_ERR);
}
} else {
-// completed successfully
-if (outputProperty != null) {
-getProject().setProperty(outputProperty, out.toString());
-}
+//success
if (outputFile != null) {
writeToFile(out.toString(), append, outputFile);
}
@@ -258,11 +274,8 @@
} else {
log(Caught exception: + e.getMessage(), Project.MSG_ERR);
}
-} finally {
-if (session != null session.isConnected()) {
-session.disconnect();
-}
}
+return out;
}
/**
DO NOT REPLY [Bug 43437] - sshexec only saves one of a commandResource sequence, rather than all responses
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=43437. 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=43437 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED -- 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]
svn commit: r581587 - /ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Union.java
Author: peterreilly
Date: Wed Oct 3 05:49:47 2007
New Revision: 581587
URL: http://svn.apache.org/viewvc?rev=581587view=rev
Log:
checkstyle
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Union.java
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Union.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Union.java?rev=581587r1=581586r2=581587view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Union.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Union.java Wed
Oct 3 05:49:47 2007
@@ -104,14 +104,15 @@
//preserve order-encountered using a list; enforce set logic manually:
// (LinkedHashSet better, but JDK 1.4+)
ArrayList union = new ArrayList(rc.size() * 2);
-Set _union = new HashSet(rc.size() * 2);
+// Use a set as list.contains() can be expensive for lots of resources
+Set set = new HashSet(rc.size() * 2);
for (Iterator rcIter = rc.iterator(); rcIter.hasNext();) {
for (Iterator r = nextRC(rcIter).iterator(); r.hasNext();) {
Object o = r.next();
if (asString) {
o = o.toString();
}
-if (_union.add(o)) {
+if (set.add(o)) {
union.add(o);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r581588 - /ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/types/resources/Union.java
Author: peterreilly
Date: Wed Oct 3 05:50:09 2007
New Revision: 581588
URL: http://svn.apache.org/viewvc?rev=581588view=rev
Log:
sync: checkstyle
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/types/resources/Union.java
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/types/resources/Union.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/types/resources/Union.java?rev=581588r1=581587r2=581588view=diff
==
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/types/resources/Union.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/types/resources/Union.java
Wed Oct 3 05:50:09 2007
@@ -104,14 +104,15 @@
//preserve order-encountered using a list; enforce set logic manually:
// (LinkedHashSet better, but JDK 1.4+)
ArrayList union = new ArrayList(rc.size() * 2);
-Set _union = new HashSet(rc.size() * 2);
+// Use a set as list.contains() can be expensive for lots of resources
+Set set = new HashSet(rc.size() * 2);
for (Iterator rcIter = rc.iterator(); rcIter.hasNext();) {
for (Iterator r = nextRC(rcIter).iterator(); r.hasNext();) {
Object o = r.next();
if (asString) {
o = o.toString();
}
-if (_union.add(o)) {
+if (set.add(o)) {
union.add(o);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r581599 - /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
Author: peterreilly
Date: Wed Oct 3 06:48:26 2007
New Revision: 581599
URL: http://svn.apache.org/viewvc?rev=581599view=rev
Log:
checkstyle: remove inner assignment
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java?rev=581599r1=581598r2=581599view=diff
==
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
Wed Oct 3 06:48:26 2007
@@ -278,8 +278,6 @@
Vector entries = new Vector();
String line = reader.readLine();
-int index;
-CvsTagEntry entry = null;
while (null != line) {
if (line.length() headerLength) {
@@ -289,45 +287,11 @@
line = line.substring(FILE_STRING.length());
}
-index = line.indexOf(FILE_IS_NEW);
-if (index != -1) {
-// it is a new file
-// set the revision but not the prevrevision
-String filename = line.substring(0, index);
-String rev = null;
-int indexrev = line.indexOf(REVISION, index);
-if (indexrev != -1) {
-rev = line.substring(indexrev + REVISION.length());
-}
-entry = new CvsTagEntry(filename, rev);
-entries.addElement(entry);
-log(entry.toString(), Project.MSG_VERBOSE);
-} else if ((index = line.indexOf(FILE_HAS_CHANGED)) != -1)
{
-// it is a modified file
-// set the revision and the prevrevision
-String filename = line.substring(0, index);
-int revSeparator = line.indexOf( to , index);
-String prevRevision =
-line.substring(index + FILE_HAS_CHANGED.length(),
-revSeparator);
-String revision = line.substring(revSeparator +
TO_STRING.length());
-entry = new CvsTagEntry(filename,
-revision,
-prevRevision);
-entries.addElement(entry);
-log(entry.toString(), Project.MSG_VERBOSE);
-} else if ((index = line.indexOf(FILE_WAS_REMOVED)) != -1)
{
-// it is a removed file
-String filename = line.substring(0, index);
-String rev = null;
-int indexrev = line.indexOf(REVISION, index);
-if (indexrev != -1) {
-rev = line.substring(indexrev + REVISION.length());
-}
-entry = new CvsTagEntry(filename, null, rev);
-entries.addElement(entry);
-log(entry.toString(), Project.MSG_VERBOSE);
-}
+// use || in a perl like fashion
+boolean processed
+= doFileIsNew(entries, line)
+|| doFileHasChanged(entries, line)
+|| doFileWasRemoved(entries, line);
}
line = reader.readLine();
}
@@ -347,6 +311,64 @@
}
}
}
+}
+
+private boolean doFileIsNew(Vector entries, String line) {
+int index = line.indexOf(FILE_IS_NEW);
+if (index == -1) {
+return false;
+}
+// it is a new file
+// set the revision but not the prevrevision
+String filename = line.substring(0, index);
+String rev = null;
+int indexrev = line.indexOf(REVISION, index);
+if (indexrev != -1) {
+rev = line.substring(indexrev + REVISION.length());
+}
+CvsTagEntry entry = new CvsTagEntry(filename, rev);
+entries.addElement(entry);
+log(entry.toString(), Project.MSG_VERBOSE);
+return true;
+}
+
+private boolean doFileHasChanged(Vector entries, String line) {
+int index = line.indexOf(FILE_HAS_CHANGED);
+if (index == -1) {
+return false;
+}
+// it is a modified file
+// set the revision and the prevrevision
+String filename = line.substring(0, index);
+int revSeparator = line.indexOf( to , index);
+String prevRevision =
+
svn commit: r581623 - /ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
Author: peterreilly
Date: Wed Oct 3 08:22:59 2007
New Revision: 581623
URL: http://svn.apache.org/viewvc?rev=581623view=rev
Log:
remove inner assignments, functionize some code
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java?rev=581623r1=581622r2=581623view=diff
==
---
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
Wed Oct 3 08:22:59 2007
@@ -318,7 +318,7 @@
*Must not be codenull/code.
* @param str The string which must be matched against the pattern.
*Must not be codenull/code.
- * @param isCaseSensitive Whether or not matching should be performed
+ * @param caseSensitive Whether or not matching should be performed
*case sensitively.
*
*
@@ -326,7 +326,7 @@
* or codefalse/code otherwise.
*/
public static boolean match(String pattern, String str,
-boolean isCaseSensitive) {
+boolean caseSensitive) {
char[] patArr = pattern.toCharArray();
char[] strArr = str.toCharArray();
int patIdxStart = 0;
@@ -351,13 +351,9 @@
for (int i = 0; i = patIdxEnd; i++) {
ch = patArr[i];
if (ch != '?') {
-if (isCaseSensitive ch != strArr[i]) {
+if (different(caseSensitive, ch, strArr[i])) {
return false; // Character mismatch
}
-if (!isCaseSensitive Character.toUpperCase(ch)
-!= Character.toUpperCase(strArr[i])) {
-return false; // Character mismatch
-}
}
}
return true; // String matches against pattern
@@ -368,13 +364,13 @@
}
// Process characters before first star
-while ((ch = patArr[patIdxStart]) != '*' strIdxStart = strIdxEnd) {
+while (true) {
+ch = patArr[patIdxStart];
+if (ch == '*' || strIdxStart strIdxEnd) {
+break;
+}
if (ch != '?') {
-if (isCaseSensitive ch != strArr[strIdxStart]) {
-return false; // Character mismatch
-}
-if (!isCaseSensitive Character.toUpperCase(ch)
-!= Character.toUpperCase(strArr[strIdxStart])) {
+if (different(caseSensitive, ch, strArr[strIdxStart])) {
return false; // Character mismatch
}
}
@@ -384,22 +380,17 @@
if (strIdxStart strIdxEnd) {
// All characters in the string are used. Check if only '*'s are
// left in the pattern. If so, we succeeded. Otherwise failure.
-for (int i = patIdxStart; i = patIdxEnd; i++) {
-if (patArr[i] != '*') {
-return false;
-}
-}
-return true;
+return allStars(patArr, patIdxStart, patIdxEnd);
}
// Process characters after last star
-while ((ch = patArr[patIdxEnd]) != '*' strIdxStart = strIdxEnd) {
+while (true) {
+ch = patArr[patIdxEnd];
+if (ch == '*' || strIdxStart strIdxEnd) {
+break;
+}
if (ch != '?') {
-if (isCaseSensitive ch != strArr[strIdxEnd]) {
-return false; // Character mismatch
-}
-if (!isCaseSensitive Character.toUpperCase(ch)
-!= Character.toUpperCase(strArr[strIdxEnd])) {
+if (different(caseSensitive, ch, strArr[strIdxEnd])) {
return false; // Character mismatch
}
}
@@ -409,12 +400,7 @@
if (strIdxStart strIdxEnd) {
// All characters in the string are used. Check if only '*'s are
// left in the pattern. If so, we succeeded. Otherwise failure.
-for (int i = patIdxStart; i = patIdxEnd; i++) {
-if (patArr[i] != '*') {
-return false;
-}
-}
-return true;
+return allStars(patArr, patIdxStart, patIdxEnd);
}
// process pattern between stars. padIdxStart and patIdxEnd point
@@ -442,13 +428,8 @@
for (int j = 0; j patLength; j++) {
ch = patArr[patIdxStart + j + 1];
svn commit: r581748 - in /ant/core/trunk: ./ src/main/org/apache/tools/ant/ src/main/org/apache/tools/ant/taskdefs/ src/main/org/apache/tools/ant/taskdefs/optional/depend/ src/main/org/apache/tools/an
Author: jglick
Date: Wed Oct 3 16:44:10 2007
New Revision: 581748
URL: http://svn.apache.org/viewvc?rev=581748view=rev
Log:
Various microoptimizations to reduce I/O load of common tasks, esp. no-op
javac and depend.
Many inner loops altered to make just 1-2 system calls rather than 4-5.
You can easily see how wasteful the previous code was, and find the culprits,
by patching r/o java.io.File methods and adding to -Xbootclasspath/p (or use
AspectJ). E.g.:
public boolean isDirectory() {
System.err.println(isDirectory: + this); if (Math.random() .01)
Thread.dumpStack();
// as before...
}
Ant still makes an order of magnitude more system calls to do what seem like
simple operations
than you would think necessary, but this patch should at least improve the
situation.
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Rmic.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
ant/core/trunk/src/main/org/apache/tools/ant/util/ResourceUtils.java
ant/core/trunk/src/main/org/apache/tools/ant/util/SourceFileScanner.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=581748r1=581747r2=581748view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Wed Oct 3 16:44:10 2007
@@ -196,6 +196,10 @@
Other changes:
--
+
+* Various small optimizations speed up common tasks such as javac on large
+ filesets, reducing both I/O and CPU usage.
+
* Profiling logger has been added with basic profiling capabilities.
* script now has basic support for JavaFX scripts
Modified: ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java?rev=581748r1=581747r2=581748view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java Wed Oct
3 16:44:10 2007
@@ -1065,28 +1065,25 @@
protected void scandir(File dir, String vpath, boolean fast) {
if (dir == null) {
throw new BuildException(dir must not be null.);
-} else if (!dir.exists()) {
-throw new BuildException(dir + doesn't exist.);
-} else if (!dir.isDirectory()) {
-throw new BuildException(dir + is not a directory.);
}
+String[] newfiles = dir.list();
+if (newfiles == null) {
+if (!dir.exists()) {
+throw new BuildException(dir + doesn't exist.);
+} else if (!dir.isDirectory()) {
+throw new BuildException(dir + is not a directory.);
+} else {
+throw new BuildException(IO error scanning directory '
+ + dir.getAbsolutePath() + ');
+}
+}
+scandir(dir, vpath, fast, newfiles);
+}
+private void scandir(File dir, String vpath, boolean fast, String[]
newfiles) {
// avoid double scanning of directories, can only happen in fast mode
if (fast hasBeenScanned(vpath)) {
return;
}
-String[] newfiles = dir.list();
-
-if (newfiles == null) {
-/*
- * two reasons are mentioned in the API docs for File.list
- * (1) dir is not a directory. This is impossible as
- * we wouldn't get here in this case.
- * (2) an IO error occurred (why doesn't it throw an exception
- * then???)
- */
-throw new BuildException(IO error scanning directory '
- + dir.getAbsolutePath() + ');
-}
if (!followSymlinks) {
Vector noLinks = new Vector();
for (int i = 0; i newfiles.length; i++) {
@@ -1112,25 +1109,26 @@
for (int i = 0; i newfiles.length; i++) {
String name = vpath + newfiles[i];
File file = new File(dir, newfiles[i]);
-if (file.isDirectory()) {
+String[] children = file.list();
+if (children == null) { // probably file
if (isIncluded(name)) {
-accountForIncludedDir(name, file, fast);
+accountForIncludedFile(name, file);
+} else {
+everythingIncluded = false;
+filesNotIncluded.addElement(name);
+}
+} else { // dir
+if (isIncluded(name)) {
+accountForIncludedDir(name, file, fast,
svn commit: r581753 - in /ant/core/branches/ANT_17_BRANCH: ./ src/main/org/apache/tools/ant/ src/main/org/apache/tools/ant/taskdefs/ src/main/org/apache/tools/ant/taskdefs/optional/depend/ src/main/or
Author: jglick
Date: Wed Oct 3 16:58:14 2007
New Revision: 581753
URL: http://svn.apache.org/viewvc?rev=581753view=rev
Log:
optimizations; merge of rev 581748 from trunk
Modified:
ant/core/branches/ANT_17_BRANCH/WHATSNEW
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/DirectoryScanner.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Rmic.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/ResourceUtils.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/SourceFileScanner.java
Modified: ant/core/branches/ANT_17_BRANCH/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/WHATSNEW?rev=581753r1=581752r2=581753view=diff
==
--- ant/core/branches/ANT_17_BRANCH/WHATSNEW (original)
+++ ant/core/branches/ANT_17_BRANCH/WHATSNEW Wed Oct 3 16:58:14 2007
@@ -130,6 +130,12 @@
Other changes:
--
+
+* Various small optimizations speed up common tasks such as javac on large
+ filesets, reducing both I/O and CPU usage.
+
+* Profiling logger has been added with basic profiling capabilities.
+
* script now has basic support for JavaFX scripts
* SSH task can now take a command parameter containing the commands to execute.
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/DirectoryScanner.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/DirectoryScanner.java?rev=581753r1=581752r2=581753view=diff
==
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/DirectoryScanner.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/DirectoryScanner.java
Wed Oct 3 16:58:14 2007
@@ -1065,28 +1065,25 @@
protected void scandir(File dir, String vpath, boolean fast) {
if (dir == null) {
throw new BuildException(dir must not be null.);
-} else if (!dir.exists()) {
-throw new BuildException(dir + doesn't exist.);
-} else if (!dir.isDirectory()) {
-throw new BuildException(dir + is not a directory.);
}
+String[] newfiles = dir.list();
+if (newfiles == null) {
+if (!dir.exists()) {
+throw new BuildException(dir + doesn't exist.);
+} else if (!dir.isDirectory()) {
+throw new BuildException(dir + is not a directory.);
+} else {
+throw new BuildException(IO error scanning directory '
+ + dir.getAbsolutePath() + ');
+}
+}
+scandir(dir, vpath, fast, newfiles);
+}
+private void scandir(File dir, String vpath, boolean fast, String[]
newfiles) {
// avoid double scanning of directories, can only happen in fast mode
if (fast hasBeenScanned(vpath)) {
return;
}
-String[] newfiles = dir.list();
-
-if (newfiles == null) {
-/*
- * two reasons are mentioned in the API docs for File.list
- * (1) dir is not a directory. This is impossible as
- * we wouldn't get here in this case.
- * (2) an IO error occurred (why doesn't it throw an exception
- * then???)
- */
-throw new BuildException(IO error scanning directory '
- + dir.getAbsolutePath() + ');
-}
if (!followSymlinks) {
Vector noLinks = new Vector();
for (int i = 0; i newfiles.length; i++) {
@@ -1112,25 +1109,26 @@
for (int i = 0; i newfiles.length; i++) {
String name = vpath + newfiles[i];
File file = new File(dir, newfiles[i]);
-if (file.isDirectory()) {
+String[] children = file.list();
+if (children == null) { // probably file
if (isIncluded(name)) {
-accountForIncludedDir(name, file, fast);
+accountForIncludedFile(name, file);
+} else {
+everythingIncluded = false;
+filesNotIncluded.addElement(name);
+}
+} else { // dir
+if (isIncluded(name)) {
+accountForIncludedDir(name, file, fast, children);
} else {
everythingIncluded = false;
dirsNotIncluded.addElement(name);
if (fast couldHoldIncluded(name)) {
-scandir(file, name + File.separator, fast);
+
DO NOT REPLY [Bug 33057] - VSS tasks do not handle CRLF in comments
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=33057. 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=33057 --- Additional Comments From [EMAIL PROTECTED] 2007-10-03 20:11 --- ping: - is this fixed now? Can we close this? -- 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 6687] - suppress console output for input task (e.g. to protect passwords)
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=6687. 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=6687 [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2007-10-03 20:22 --- Fixed in SVN Trunk with Java6 API - reverts back to echoing on Java5 or less -- 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 43466] - Failure in tearDown does not result in a failed test run
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=43466. 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=43466 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2007-10-03 21:10 --- Patch applied and tested to antunit svn trunk - 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]
svn commit: r581771 - in /ant/antlibs/antunit/trunk: ./ src/etc/testcases/ src/etc/testcases/antunit/setupandteardown/ src/main/org/apache/ant/antunit/ src/tests/junit/org/apache/ant/antunit/
Author: kevj
Date: Wed Oct 3 21:13:24 2007
New Revision: 581771
URL: http://svn.apache.org/viewvc?rev=581771view=rev
Log:
-bugzilla #43466
Added:
ant/antlibs/antunit/trunk/src/etc/testcases/antunit/setupandteardown/
ant/antlibs/antunit/trunk/src/etc/testcases/antunit/setupandteardown/both.xml
ant/antlibs/antunit/trunk/src/etc/testcases/antunit/setupandteardown/failedsetup.xml
ant/antlibs/antunit/trunk/src/etc/testcases/antunit/setupandteardown/failedteardown.xml
ant/antlibs/antunit/trunk/src/etc/testcases/antunit/setupandteardown/failedtest.xml
ant/antlibs/antunit/trunk/src/etc/testcases/antunit/setupandteardown/nosetup.xml
ant/antlibs/antunit/trunk/src/etc/testcases/antunit/setupandteardown/noteardown.xml
ant/antlibs/antunit/trunk/src/etc/testcases/setupandteardown.xml
ant/antlibs/antunit/trunk/src/tests/junit/org/apache/ant/antunit/SetUpAndTearDownTest.java
Modified:
ant/antlibs/antunit/trunk/contributors.xml
ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/AntUnit.java
Modified: ant/antlibs/antunit/trunk/contributors.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/contributors.xml?rev=581771r1=581770r2=581771view=diff
==
--- ant/antlibs/antunit/trunk/contributors.xml (original)
+++ ant/antlibs/antunit/trunk/contributors.xml Wed Oct 3 21:13:24 2007
@@ -15,6 +15,10 @@
These are some of the many people who have helped with this Ant Library.
/introduction
name
+firstDavid/first
+lastJackman/last
+ /name
+ name
firstJan/first
lastMat#232;rne/last
/name
Added:
ant/antlibs/antunit/trunk/src/etc/testcases/antunit/setupandteardown/both.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/etc/testcases/antunit/setupandteardown/both.xml?rev=581771view=auto
==
---
ant/antlibs/antunit/trunk/src/etc/testcases/antunit/setupandteardown/both.xml
(added)
+++
ant/antlibs/antunit/trunk/src/etc/testcases/antunit/setupandteardown/both.xml
Wed Oct 3 21:13:24 2007
@@ -0,0 +1,55 @@
+?xml version=1.0?
+
+!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+License); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+--
+
+project name=setup-and-teardown
+default=all
+ xmlns:au=antlib:org.apache.ant.antunit
+
+ target name=all
+fail message=These are not standalone tests. /
+ /target
+
+ target name=setUp
+fail message=outputfile property is not set. unless=outputfile /
+echo file=${outputfile} append=true message=S /
+ /target
+
+ target name=test1
+echo file=${outputfile} append=true message=E /
+ /target
+
+ target name=test2
+echo file=${outputfile} append=true message=E /
+ /target
+
+ target name=test3
+echo file=${outputfile} append=true message=E /
+ /target
+
+ target name=test4
+echo file=${outputfile} append=true message=E /
+ /target
+
+ target name=tearDown
+echo file=${outputfile} append=true message=T /
+ /target
+
+/project
Added:
ant/antlibs/antunit/trunk/src/etc/testcases/antunit/setupandteardown/failedsetup.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/etc/testcases/antunit/setupandteardown/failedsetup.xml?rev=581771view=auto
==
---
ant/antlibs/antunit/trunk/src/etc/testcases/antunit/setupandteardown/failedsetup.xml
(added)
+++
ant/antlibs/antunit/trunk/src/etc/testcases/antunit/setupandteardown/failedsetup.xml
Wed Oct 3 21:13:24 2007
@@ -0,0 +1,43 @@
+?xml version=1.0?
+
+!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+License); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or
svn commit: r581772 - /ant/antlibs/antunit/trunk/src/tests/junit/org/apache/ant/antunit/SetUpAndTearDownTest.java
Author: kevj
Date: Wed Oct 3 21:14:08 2007
New Revision: 581772
URL: http://svn.apache.org/viewvc?rev=581772view=rev
Log:
-whitespace
Modified:
ant/antlibs/antunit/trunk/src/tests/junit/org/apache/ant/antunit/SetUpAndTearDownTest.java
Modified:
ant/antlibs/antunit/trunk/src/tests/junit/org/apache/ant/antunit/SetUpAndTearDownTest.java
URL:
http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/tests/junit/org/apache/ant/antunit/SetUpAndTearDownTest.java?rev=581772r1=581771r2=581772view=diff
==
---
ant/antlibs/antunit/trunk/src/tests/junit/org/apache/ant/antunit/SetUpAndTearDownTest.java
(original)
+++
ant/antlibs/antunit/trunk/src/tests/junit/org/apache/ant/antunit/SetUpAndTearDownTest.java
Wed Oct 3 21:14:08 2007
@@ -56,5 +56,4 @@
public void testFailedTeardown() {
executeTarget(testFailedTeardown);
}
-
-}
+}
\ No newline at end of file
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r581773 - /ant/antlibs/antunit/trunk/changes.xml
Author: kevj Date: Wed Oct 3 21:15:55 2007 New Revision: 581773 URL: http://svn.apache.org/viewvc?rev=581773view=rev Log: -bugzilla #43466 Modified: ant/antlibs/antunit/trunk/changes.xml Modified: ant/antlibs/antunit/trunk/changes.xml URL: http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/changes.xml?rev=581773r1=581772r2=581773view=diff == --- ant/antlibs/antunit/trunk/changes.xml (original) +++ ant/antlibs/antunit/trunk/changes.xml Wed Oct 3 21:15:55 2007 @@ -25,6 +25,9 @@ action type=fix issue=42745 assertFileExists example wrong, should use @file instead of @name /action +action type=fix issue=43466 + Failure in tearDown doesn't result in failed test run +/action /release /document - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r581774 - /ant/core/trunk/docs/bindownload.html
Author: kevj Date: Wed Oct 3 21:32:13 2007 New Revision: 581774 URL: http://svn.apache.org/viewvc?rev=581774view=rev Log: -add info about windows GnuPG bugzilla #43162 Modified: ant/core/trunk/docs/bindownload.html Modified: ant/core/trunk/docs/bindownload.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/bindownload.html?rev=581774r1=581773r2=581774view=diff == --- ant/core/trunk/docs/bindownload.html (original) +++ ant/core/trunk/docs/bindownload.html Wed Oct 3 21:32:13 2007 @@ -285,6 +285,9 @@ % gpg --import KEYSbr / % gpg --verify apache-ant-1.7.0-bin.tar.gz.asc /code/p +pA command line version of a href=http://www.gnupg.org/download/;GnuPG/a is also +available for Windows users. Follow the a href=http://www.gnupg.org/(en)/documentation/faqs.html#q4.19instructions/a +to verify the package./p pAlternatively, you can verify the checksums on the files. Unix programs called codemd5/code/codesha1/code or codemd5sum/code/codesha1sum/code are included in many unix - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r581775 - /ant/core/trunk/xdocs/bindownload.xml
Author: kevj Date: Wed Oct 3 21:33:31 2007 New Revision: 581775 URL: http://svn.apache.org/viewvc?rev=581775view=rev Log: -add info about windows GnuPG bugzilla #43162 Modified: ant/core/trunk/xdocs/bindownload.xml Modified: ant/core/trunk/xdocs/bindownload.xml URL: http://svn.apache.org/viewvc/ant/core/trunk/xdocs/bindownload.xml?rev=581775r1=581774r2=581775view=diff == --- ant/core/trunk/xdocs/bindownload.xml (original) +++ ant/core/trunk/xdocs/bindownload.xml Wed Oct 3 21:33:31 2007 @@ -152,6 +152,11 @@ % gpg --verify apache-ant-1.7.0-bin.tar.gz.asc /code/p +pA command line version of a href=http://www.gnupg.org/download/;GnuPG/a +is also available for Windows users. Follow the +a href=http://www.gnupg.org/(en)/documentation/faqs.html#q4.19instructions/a +to verify the package./p + pAlternatively, you can verify the checksums on the files. Unix programs called codemd5/code/codesha1/code or codemd5sum/code/codesha1sum/code are included in many unix - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: DO NOT REPLY [Bug 43466] - Failure in tearDown does not result in a failed test run
I do not see a commit email with changes. Was it checked in? - Alexey. On 10/3/07, [EMAIL PROTECTED] [EMAIL PROTECTED] wrote: 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=43466. 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=43466 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2007-10-03 21:10 --- Patch applied and tested to antunit svn trunk - 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] -- Alexey N. Solofnenko Home: http://trelony.cjb.net/ Pleasant Hill, CA (GMT-8 usually)
