Changeset 1196 for trunk/docx4j/src/main/java/org/docx4j/jaxb/Context.java

Timestamp:

08/26/10 06:27:13 (21 months ago)

Author:

jharrop

Message:

Ensure docx4j can be built using either ant or maven, with only one of the JAXB implementations (Java 6 or RI) required

File:

• trunk/docx4j/src/main/java/org/docx4j/jaxb/Context.java (modified) (2 diffs)

trunk/docx4j/src/main/java/org/docx4j/jaxb/Context.java

@@ -49 +49 @@
         Class c;
         try {
-                c = Class.forName("com.sun.xml.bind.marshaller.NamespacePrefixMapper");
-                System.out.println("JAXB: Using RI (or recent Java 6?)");
-                
-                // 2010 07 13 recent versions of Java 6 seem to include
-                // com.sun.xml.bind.marshaller.NamespacePrefixMapper,
-                // so we can't be sure its the RI.
+                c = Class.forName("com.sun.xml.bind.marshaller.MinimumEscapeHandler");
+                System.out.println("JAXB: Using RI");
                 
         } catch (ClassNotFoundException cnfe) {
@@ -60 +56 @@
                 System.out.println("JAXB: RI not present.  Trying Java 6 implementation.");
                 try {
-                                c = Class.forName("com.sun.xml.internal.bind.marshaller.NamespacePrefixMapper");
+                                c = Class.forName("com.sun.xml.internal.bind.marshaller.MinimumEscapeHandler");
                         System.out.println("JAXB: Using Java 6 implementation.");
                         } catch (ClassNotFoundException e) {