Author: mbenson
Date: Fri Nov 2 07:13:54 2007
New Revision: 591343
URL: http://svn.apache.org/viewvc?rev=591343&view=rev
Log:
merge LocatorTest fix
Modified:
ant/core/branches/ANT_17_BRANCH/build.xml
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/launch/Locator.java
Modified: ant/core/branches/ANT_17_BRANCH/build.xml
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/build.xml?rev=591343&r1=591342&r2=591343&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/build.xml (original)
+++ ant/core/branches/ANT_17_BRANCH/build.xml Fri Nov 2 07:13:54 2007
@@ -1889,6 +1889,8 @@
unless="tests.and.ant.share.classloader"/>
<exclude name="${taskdefs.package}/ProtectedJarMethodsTest.java"
unless="tests.and.ant.share.classloader"/>
+ <exclude name="${ant.package}/launch/LocatorTest.java"
+ unless="tests.and.ant.share.classloader"/>
<!-- can only run if cvs is installed on your machine
enable by setting the property have.cvs
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/launch/Locator.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/launch/Locator.java?rev=591343&r1=591342&r2=591343&view=diff
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/launch/Locator.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/launch/Locator.java
Fri Nov 2 07:13:54 2007
@@ -51,11 +51,8 @@
private static final int NIBBLE = 4;
private static final int NIBBLE_MASK = 0xF;
- private static final int ASCII = 7;
private static final int ASCII_SIZE = 128;
- private static final int BYTE = 8;
- private static final int BYTE_MASK = 0xFF;
private static final int BYTE_SIZE = 256;
private static final int WORD = 16;
@@ -242,12 +239,12 @@
}
/**
- * This is only public for testing purposes, so its use is strongly
discouraged.
+ * package-private for testing in same classloader
* @param uri uri to expand
* @return the decoded URI
* @since Ant1.7.1
*/
- public static String fromURIJava13(String uri) {
+ static String fromURIJava13(String uri) {
// Fallback method for Java 1.3 or earlier.
URL url = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
