Changeset 1196 for trunk/docx4j/src/pptx4j/java/org/pptx4j/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/pptx4j/java/org/pptx4j/jaxb/Context.java (modified) (2 diffs)

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

@@ -45 +45 @@
         Class c;
         try {
-                c = Class.forName("com.sun.xml.bind.marshaller.NamespacePrefixMapper");
+                c = Class.forName("com.sun.xml.bind.marshaller.MinimumEscapeHandler");
                 System.out.println("JAXB: Using RI");
         } catch (ClassNotFoundException cnfe) {
@@ -51 +51 @@
                 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) {