Changeset 1707

Timestamp:

11/12/11 23:38:01 (6 months ago)

Author:

jharrop

Message:

Improved approach to specifying appropriate namespace prefix mapper

Location:

tags/VERSION_2_7_1/docx4j/src/main/java/org/docx4j/jaxb

Files:

• Context.java (modified) (1 diff)
• NamespacePrefixMapperUtils.java (modified) (2 diffs)

tags/VERSION_2_7_1/docx4j/src/main/java/org/docx4j/jaxb/Context.java

@@ -50 +50 @@
                 
                 // Display diagnostic info about version of JAXB being used.
-        try {
-                Class.forName("com.sun.xml.bind.marshaller.MinimumEscapeHandler");
-                log.info("JAXB: Using RI");
-
-        } catch (ClassNotFoundException cnfe) {
-                // JAXB Reference Implementation not present
-          log.info("JAXB: RI not present.  Trying Java 6 implementation.");
-                try {
-                                Class.forName("com.sun.xml.internal.bind.marshaller.MinimumEscapeHandler");
-        log.info("JAXB: Using Java 6 implementation.");
-          } catch (ClassNotFoundException e) {
-            log.info("JAXB: neither Reference Implementation nor Java 6 implementation present?");
-          }
-      }
+                Object namespacePrefixMapper;
+                try {
+                        namespacePrefixMapper = NamespacePrefixMapperUtils.getPrefixMapper();
+                        if ( namespacePrefixMapper.getClass().getName().equals("org.docx4j.jaxb.NamespacePrefixMapperSunInternal") ) {
+                                // Java 6
+                                log.info("Using Java 6/7 JAXB implementation");
+                        } else {
+                                log.info("Using JAXB Reference Implementation");                        
+                        }
+                } catch (JAXBException e) {
+                        log.error("PANIC! No suitable JAXB implementation available");
+                        e.printStackTrace();
+                }
       
       try { 

tags/VERSION_2_7_1/docx4j/src/main/java/org/docx4j/jaxb/NamespacePrefixMapperUtils.java

@@ -1 +1 @@
 package org.docx4j.jaxb;
 
+import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
@@ -27 +28 @@
          */
         
+        private static JAXBContext testContext;
+        
+        private static Object prefixMapper;
+        private static Object prefixMapperRels;
+        
         
         public static Object getPrefixMapper() throws JAXBException {
                 
-        Class c;
-        try {
-                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.debug("JAXB RI (com.sun.xml.bind.marshaller.MinimumEscapeHandler) not present.  Trying Java 6 implementation.");
-                try {
-                                c = Class.forName("com.sun.xml.internal.bind.marshaller.MinimumEscapeHandler");
-                        } catch (ClassNotFoundException e) {
-                                e.printStackTrace();
-                                log.error("JAXB: neither Reference Implementation nor Java 6 implementation present?", e);
+                if (prefixMapper!=null) return prefixMapper;
+                
+                if (testContext==null) {
+                        
+                        // JBOSS might use a different class loader to load JAXBContext, which causes problems,
+                        // so explicitly specify our class loader.
+                        NamespacePrefixMapperUtils tmp = new NamespacePrefixMapperUtils();
+                        java.lang.ClassLoader classLoader = tmp.getClass().getClassLoader();
+                        
+                        testContext = JAXBContext.newInstance("org.docx4j.relationships",classLoader );
+                }
+                
+                Marshaller m=testContext.createMarshaller();
+                try {
+                        // Assume use of Java 6 implementation (ie not RI)
+                        m.setProperty("com.sun.xml.internal.bind.namespacePrefixMapper", 
+                                        new NamespacePrefixMapperSunInternal() );
+                        log.info("Using NamespacePrefixMapperSunInternal, which is suitable for Java 6");
+                        prefixMapper = new NamespacePrefixMapperSunInternal();
+                        return prefixMapper;
+                } catch (java.lang.NoClassDefFoundError notJava6) {
+                        // javax.xml.bind.PropertyException
+                        log.error(notJava6.getMessage() + " .. trying RI.");
+                        try {
+                                // Try RI suitable one
+                                m.setProperty("com.sun.xml.bind.namespacePrefixMapper", 
+                                                new NamespacePrefixMapper() );
+                                log.info("Using NamespacePrefixMapper, which is suitable for the JAXB RI");
+                                prefixMapper = new NamespacePrefixMapper();
+                                return prefixMapper;
+                        } catch (javax.xml.bind.PropertyException notRIEither) {
+                                notRIEither.printStackTrace();
+                                log.error("JAXB: neither Reference Implementation nor Java 6 implementation present?", notRIEither);
                                 throw new JAXBException("JAXB: neither Reference Implementation nor Java 6 implementation present?");
                         }
-                return new NamespacePrefixMapperSunInternal();
-        }
+                        
+                }
         }
 
         
         public static Object getPrefixMapperRelationshipsPart() throws JAXBException {
+
+                if (prefixMapperRels!=null) return prefixMapperRels;
+                if (testContext==null) {
+                        
+                        // JBOSS might use a different class loader to load JAXBContext, which causes problems,
+                        // so explicitly specify our class loader.
+                        NamespacePrefixMapperUtils tmp = new NamespacePrefixMapperUtils();
+                        java.lang.ClassLoader classLoader = tmp.getClass().getClassLoader();
+                        
+                        testContext = JAXBContext.newInstance("org.docx4j.relationships",classLoader );
+                }
                 
-        Class c;
-        try {
-                c = Class.forName("com.sun.xml.bind.marshaller.MinimumEscapeHandler");
-                return new NamespacePrefixMapperRelationshipsPart();
-        } catch (ClassNotFoundException cnfe) {
-                // JAXB Reference Implementation not present
-                log.debug("JAXB RI (com.sun.xml.bind.marshaller.MinimumEscapeHandler) not present.  Trying Java 6 implementation.");
-                try {
-                                c = Class.forName("com.sun.xml.internal.bind.marshaller.MinimumEscapeHandler");
-                        } catch (ClassNotFoundException e) {
-                                e.printStackTrace();
-                                log.error("JAXB: neither Reference Implementation nor Java 6 implementation present?", e);
+                Marshaller m=testContext.createMarshaller();
+                try {
+                        // Assume use of Java 6 implementation (ie not RI)
+                        m.setProperty("com.sun.xml.internal.bind.namespacePrefixMapper", 
+                                        new NamespacePrefixMapperRelationshipsPartSunInternal() );
+                        log.info("Using NamespacePrefixMapperSunInternal, which is suitable for Java 6");
+                        prefixMapperRels = new NamespacePrefixMapperRelationshipsPartSunInternal();
+                        return prefixMapperRels;
+                } catch (java.lang.NoClassDefFoundError notJava6) {
+                        // javax.xml.bind.PropertyException
+                        log.error(notJava6.getMessage() + " .. trying RI.");
+                        try {
+                                // Try RI suitable one
+                                m.setProperty("com.sun.xml.bind.namespacePrefixMapper", 
+                                                new NamespacePrefixMapperRelationshipsPart() );
+                                log.info("Using NamespacePrefixMapperRelationshipsPart, which is suitable for the JAXB RI");
+                                prefixMapperRels = new NamespacePrefixMapperRelationshipsPart();
+                                return prefixMapperRels;
+                        } catch (javax.xml.bind.PropertyException notRIEither) {
+                                notRIEither.printStackTrace();
+                                log.error("JAXB: neither Reference Implementation nor Java 6 implementation present?", notRIEither);
                                 throw new JAXBException("JAXB: neither Reference Implementation nor Java 6 implementation present?");
                         }
-                return new NamespacePrefixMapperRelationshipsPartSunInternal();
-        }
+                        
+                }               
         }