You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2016/07/24 10:21:41 UTC
[1/2] ant git commit: built-in implementation of native2ascii
Repository: ant
Updated Branches:
refs/heads/1.9.x 270fb2cf3 -> 51bd1cbff
built-in implementation of native2ascii
https://bz.apache.org/bugzilla/show_bug.cgi?id=59855
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/0319f813
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/0319f813
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/0319f813
Branch: refs/heads/1.9.x
Commit: 0319f8134564bb4a4912608e046728fd72a9fcf4
Parents: 270fb2c
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sun Jul 24 12:19:51 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sun Jul 24 12:19:51 2016 +0200
----------------------------------------------------------------------
WHATSNEW | 5 ++
manual/Tasks/native2ascii.html | 11 ++-
.../native2ascii/BuiltinNative2Ascii.java | 82 ++++++++++++++++++++
.../Native2AsciiAdapterFactory.java | 29 +++++--
.../tools/ant/util/Native2AsciiUtils.java | 51 ++++++++++++
.../taskdefs/optional/native2ascii-test.xml | 7 ++
.../tools/ant/util/Native2AsciiUtilsTest.java | 46 +++++++++++
7 files changed, 221 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/0319f813/WHATSNEW
----------------------------------------------------------------------
diff --git a/WHATSNEW b/WHATSNEW
index bd90733..0253e7e 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -39,6 +39,11 @@ Other changes:
* <scp> now supports compression via the optional compressed attribute.
Bugzilla Report 47552
+ * a new implementation "builtin" has been added to <native2ascii> and
+ is the default when running on JDK9+ since the tool itself has been
+ removed from the JDK.
+ Bugzilla Report 59855
+
Changes from Ant 1.9.6 TO Ant 1.9.7
===================================
http://git-wip-us.apache.org/repos/asf/ant/blob/0319f813/manual/Tasks/native2ascii.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/native2ascii.html b/manual/Tasks/native2ascii.html
index c50483b..acbd460 100644
--- a/manual/Tasks/native2ascii.html
+++ b/manual/Tasks/native2ascii.html
@@ -61,9 +61,14 @@
with the <code>implementation</code> attribute or a nested element.
<a name="implementationvalues">Here are the choices of the attribute</a>:</p>
<ul>
- <li>default - the default converter (kaffe or sun) for the platform.</li>
- <li>sun (the standard converter of the JDK)</li>
- <li>kaffe (the standard converter of <a href="http://www.kaffe.org" target="_top">Kaffe</a>)</li>
+ <li>default - the default converter for the platform - kaffee
+ when run on Kaffee, builtin if JDK9 or newer is detected, sun
+ otherwise.</li>
+ <li>sun (the standard converter of the JDK < 9)</li>
+ <li>kaffe (the standard converter
+ of <a href="http://www.kaffe.org" target="_top">Kaffe</a>)</li>
+ <li>builtin - Ant's internal implementation used for
+ JDK9+. <em>since ant 1.9.8</em></li>
</ul>
<table border="1" cellpadding="2" cellspacing="0">
http://git-wip-us.apache.org/repos/asf/ant/blob/0319f813/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/BuiltinNative2Ascii.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/BuiltinNative2Ascii.java b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/BuiltinNative2Ascii.java
new file mode 100644
index 0000000..b9e600c
--- /dev/null
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/BuiltinNative2Ascii.java
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ *
+ */
+package org.apache.tools.ant.taskdefs.optional.native2ascii;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.optional.Native2Ascii;
+import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.ant.util.Native2AsciiUtils;
+import org.apache.tools.ant.util.StringUtils;
+
+/**
+ * Encapsulates the built-in Native2Ascii implementation.
+ *
+ * @since Ant 1.9.8
+ */
+public class BuiltinNative2Ascii implements Native2AsciiAdapter {
+
+ static final String IMPLEMENTATION_NAME = "builtin";
+
+ public final boolean convert(Native2Ascii args, File srcFile,
+ File destFile) throws BuildException {
+ BufferedReader input = null;
+ try {
+ if (args.getEncoding() != null) {
+ input = new BufferedReader(new InputStreamReader(
+ new FileInputStream(srcFile), args.getEncoding()));
+ } else {
+ input = new BufferedReader(new FileReader(srcFile));
+ }
+ try {
+ BufferedWriter output = new BufferedWriter(
+ new OutputStreamWriter(new FileOutputStream(destFile),
+ "ASCII"));
+ try {
+ translate(input, output, args.getReverse());
+ } finally {
+ FileUtils.close(output);
+ }
+ } finally {
+ FileUtils.close(input);
+ }
+ return true;
+ } catch (IOException ex) {
+ throw new BuildException("Exception trying to translate data", ex);
+ }
+ }
+
+ private void translate(BufferedReader input, Writer output,
+ boolean reverse) throws IOException {
+ String line = null;
+ while ((line = input.readLine()) != null) {
+ output.write(Native2AsciiUtils.native2ascii(line));
+ output.write(StringUtils.LINE_SEP);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ant/blob/0319f813/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
index ae41903..e8bd74d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
@@ -40,10 +40,13 @@ public class Native2AsciiAdapterFactory {
* vendor
*/
public static String getDefault() {
- if (JavaEnvUtils.isKaffe() || JavaEnvUtils.isClasspathBased()) {
+ if (shouldUseKaffee()) {
return KaffeNative2Ascii.IMPLEMENTATION_NAME;
}
- return SunNative2Ascii.IMPLEMENTATION_NAME;
+ if (shouldUseSun()) {
+ return SunNative2Ascii.IMPLEMENTATION_NAME;
+ }
+ return BuiltinNative2Ascii.IMPLEMENTATION_NAME;
}
/**
@@ -79,11 +82,14 @@ public class Native2AsciiAdapterFactory {
ProjectComponent log,
Path classpath)
throws BuildException {
- if (((JavaEnvUtils.isKaffe() || JavaEnvUtils.isClasspathBased()) && choice == null)
+ if ((shouldUseKaffee() && choice == null)
|| KaffeNative2Ascii.IMPLEMENTATION_NAME.equals(choice)) {
return new KaffeNative2Ascii();
- } else if (SunNative2Ascii.IMPLEMENTATION_NAME.equals(choice)) {
+ } else if ((shouldUseSun() && choice == null)
+ || SunNative2Ascii.IMPLEMENTATION_NAME.equals(choice)) {
return new SunNative2Ascii();
+ } else if (BuiltinNative2Ascii.IMPLEMENTATION_NAME.equals(choice)) {
+ return new BuiltinNative2Ascii();
} else if (choice != null) {
return resolveClassName(choice,
// Memory leak in line below
@@ -91,9 +97,7 @@ public class Native2AsciiAdapterFactory {
.createClassLoader(classpath));
}
- // This default has been good enough until Ant 1.6.3, so stick
- // with it
- return new SunNative2Ascii();
+ return new BuiltinNative2Ascii();
}
/**
@@ -113,4 +117,15 @@ public class Native2AsciiAdapterFactory {
Native2AsciiAdapterFactory.class.getClassLoader(),
Native2AsciiAdapter.class);
}
+
+ private static final boolean shouldUseKaffee() {
+ return JavaEnvUtils.isKaffe() || JavaEnvUtils.isClasspathBased();
+ }
+
+ private static final boolean shouldUseSun() {
+ return JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_5)
+ || JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_6)
+ || JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_7)
+ || JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_8);
+ }
}
http://git-wip-us.apache.org/repos/asf/ant/blob/0319f813/src/main/org/apache/tools/ant/util/Native2AsciiUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/Native2AsciiUtils.java b/src/main/org/apache/tools/ant/util/Native2AsciiUtils.java
new file mode 100644
index 0000000..acdfaaa
--- /dev/null
+++ b/src/main/org/apache/tools/ant/util/Native2AsciiUtils.java
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ *
+ */
+package org.apache.tools.ant.util;
+
+/**
+ * Contains helper methods for Ant's built-in implementation of native2ascii.
+ *
+ * @since Ant 1.9.8
+ */
+public class Native2AsciiUtils {
+
+ private static final int MAX_ASCII = 127;
+
+ /**
+ * Replaces non-ASCII characters with their Unicode-Escapes.
+ * <p>Expects to be called once per line if applied to a file.</p>
+ * @param line the input line
+ * @return the translated line
+ */
+ public static String native2ascii(String line) {
+ StringBuilder sb = new StringBuilder();
+ for (char c : line.toCharArray()) {
+ if (c <= MAX_ASCII) {
+ sb.append(c);
+ } else {
+ sb.append("\\u");
+ String encoded = Integer.toHexString(c);
+ for (int i = encoded.length(); i < 4; i++) {
+ sb.append("0");
+ }
+ sb.append(encoded);
+ }
+ }
+ return sb.toString();
+ }
+}
http://git-wip-us.apache.org/repos/asf/ant/blob/0319f813/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/native2ascii-test.xml b/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
index a7e6b57..8705f6a 100644
--- a/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
+++ b/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
@@ -109,6 +109,13 @@ public class Adapter implements Native2AsciiAdapter {
expected="${umlauts.expected}"/>
</target>
+ <target name="testUTF8-To-ASCII-builtin" depends="-setup-UTF8-To-ASCII"
+ description="https://bz.apache.org/bugzilla/show_bug.cgi?id=59855">
+ <native2ascii-def implementation="builtin"/>
+ <assertTranslatedOutput file="umlauts.properties" encoding="ASCII"
+ expected="${umlauts.expected}"/>
+ </target>
+
<target name="-setup-ASCII-To-UTF8" depends="-real-test-macros">
<mkdir dir="${input}"/>
<mkdir dir="${output}"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/0319f813/src/tests/junit/org/apache/tools/ant/util/Native2AsciiUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/util/Native2AsciiUtilsTest.java b/src/tests/junit/org/apache/tools/ant/util/Native2AsciiUtilsTest.java
new file mode 100644
index 0000000..75719f2
--- /dev/null
+++ b/src/tests/junit/org/apache/tools/ant/util/Native2AsciiUtilsTest.java
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ *
+ */
+package org.apache.tools.ant.util;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class Native2AsciiUtilsTest {
+
+ @Test
+ public void doesntTouchAscii() {
+ StringBuilder sb = new StringBuilder();
+ for (char i = 0; i < 128; i++) {
+ sb.append(i);
+ }
+ assertEquals(sb.toString(), Native2AsciiUtils.native2ascii(sb.toString()));
+ }
+
+ @Test
+ public void escapes() {
+ assertEquals("\\u00e4\\u00f6\\u00fc",
+ Native2AsciiUtils.native2ascii("\u00e4\u00f6\u00fc"));
+ }
+
+ @Test
+ public void pads() {
+ assertEquals("\\u00e4\\u01f6\\u12fc",
+ Native2AsciiUtils.native2ascii("\u00e4\u01f6\u12fc"));
+ }
+}
[2/2] ant git commit: try to make tests pass with default encoding !=
UTF-8
Posted by bo...@apache.org.
try to make tests pass with default encoding != UTF-8
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/51bd1cbf
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/51bd1cbf
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/51bd1cbf
Branch: refs/heads/1.9.x
Commit: 51bd1cbff7615c621dfa94b6ad2b938e9b747d49
Parents: 0319f81
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sun Jul 24 12:21:10 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sun Jul 24 12:21:10 2016 +0200
----------------------------------------------------------------------
src/tests/antunit/taskdefs/optional/native2ascii-test.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/51bd1cbf/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/native2ascii-test.xml b/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
index 8705f6a..59030e9 100644
--- a/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
+++ b/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
@@ -82,7 +82,7 @@ public class Adapter implements Native2AsciiAdapter {
</sequential>
</macrodef>
<presetdef name="native2ascii-def">
- <native2ascii src="${input}" dest="${output}"
+ <native2ascii src="${input}" dest="${output}" encoding="UTF-8"
includes="**/*.properties"/>
</presetdef>
</target>