Changeset 1196 for trunk/docx4j/src/main/java/org

Timestamp:

08/26/10 16:27:13 (18 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

Location:

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

Files:

• Context.java (modified) (2 diffs)
• NamespacePrefixMapperUtils.java (modified) (3 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) {

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

@@ -8 +8 @@
 public class NamespacePrefixMapperUtils {
         
-        private static Logger log = Logger.getLogger(NamespacePrefixMapperUtils.class);                         
+        private static Logger log = Logger.getLogger(NamespacePrefixMapperUtils.class);         
+        
+        /*
+         * As from 2010 08 26,  
+         * both com.sun.xml.bind.marshaller.NamespacePrefixMapper
+         * and  com.sun.xml.internal.bind.marshaller.NamespacePrefixMapper
+         * are provided in the jar JAXB-NamespacePrefixMapperInterfaces.jar
+         * so that people can build docx4j without needing both JAXB
+         * implementations.
+         * 
+         * But if that jar is on their classpath, testing for either
+         * of these classes will always succeed.
+         * 
+         * So, we have to test for something else.  The following will do:
+         * 
+         * com.sun.xml.bind.marshaller.MinimumEscapeHandler
+         * com.sun.xml.internal.bind.marshaller.MinimumEscapeHandler
+         */
         
         
@@ -15 +32 @@
         Class c;
         try {
-                c = Class.forName("com.sun.xml.bind.marshaller.NamespacePrefixMapper");
+                c = Class.forName("com.sun.xml.bind.marshaller.MinimumEscapeHandler");
                 return new NamespacePrefixMapper();  // JAXB Reference Implementation 
         } catch (ClassNotFoundException cnfe) {
                 // JAXB Reference Implementation not present
                 // Use Java 6 implementation
-                log.info("JAXB RI (com.sun.xml.bind.marshaller.NamespacePrefixMapper) not present.  Trying Java 6 implementation.");
+                log.info("JAXB RI (com.sun.xml.bind.marshaller.MinimumEscapeHandler) 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");
                         } catch (ClassNotFoundException e) {
                                 e.printStackTrace();
@@ -37 +54 @@
         Class c;
         try {
-                c = Class.forName("com.sun.xml.bind.marshaller.NamespacePrefixMapper");
+                c = Class.forName("com.sun.xml.bind.marshaller.MinimumEscapeHandler");
                 return new NamespacePrefixMapperRelationshipsPart();
         } catch (ClassNotFoundException cnfe) {
                 // JAXB Reference Implementation not present
-                log.info("JAXB RI (com.sun.xml.bind.marshaller.NamespacePrefixMapper) not present.  Trying Java 6 implementation.");
+                log.info("JAXB RI (com.sun.xml.bind.marshaller.MinimumEscapeHandler) 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");
                         } catch (ClassNotFoundException e) {
                                 e.printStackTrace();