Author: schor
Date: Wed Oct 17 19:04:54 2018
New Revision: 1844149
URL: http://svn.apache.org/viewvc?rev=1844149&view=rev
Log:
[UIMA-5896] remove dependency on javax xml bind code no longer present in Java
11
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAClassLoader.java
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java?rev=1844149&r1=1844148&r2=1844149&view=diff
==============================================================================
---
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java
Wed Oct 17 19:04:54 2018
@@ -79,6 +79,17 @@ public class Misc {
return (s == null) ? "" : s;
}
+ public static byte[] hex_string_to_bytearray(String s) {
+ int len2 = s.length();
+ int len = len2 >> 1;
+ byte[] out = new byte[len];
+ for (int out_i = 0, str_i = 0; out_i < len; out_i ++, str_i += 2) {
+ out[out_i] = (byte) ((Character.digit(s.charAt(str_i), 16) << 4) +
+ Character.digit(s.charAt(str_i + 1), 16));
+ }
+ return out;
+ }
+
public static String dumpByteArray(byte[] b, int limit) {
if (b == null) {
return "null";
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAClassLoader.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAClassLoader.java?rev=1844149&r1=1844148&r2=1844149&view=diff
==============================================================================
---
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAClassLoader.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAClassLoader.java
Wed Oct 17 19:04:54 2018
@@ -56,7 +56,7 @@ public class UIMAClassLoader extends URL
* This is the byte array that defines the class
org.apache.uima.cas.impl.MethodHandlesLookup, obtained by
* converting the .class file to a hex byte string.
*/
- static byte[] methodHandlesLookupClass =
javax.xml.bind.DatatypeConverter.parseHexBinary(
+ static byte[] methodHandlesLookupClass = Misc.hex_string_to_bytearray(
"CAFEBABE00000034001B07000201002C6F72672F6170616368652F75696D612F6361732F696D706C2F4D6574686F6448616E646C65734C6F"
+
"6F6B75700700040100106A6176612F6C616E672F4F626A6563740100063C696E69743E010003282956010004436F64650A000300090C0005"
+
"000601000F4C696E654E756D6265725461626C650100124C6F63616C5661726961626C655461626C650100047468697301002E4C6F72672F"
