Changeset 904

Timestamp:

09/28/09 18:14:41 (3 years ago)

Author:

jharrop

Message:

Iff you are using Java 5, you need a stax implementation jar in order for Differencer to work.

Location:

trunk/docx4j

Files:

• pom.xml (modified) (3 diffs)
• src/main/java/org/docx4j/diff/Differencer.java (modified) (3 diffs)

trunk/docx4j/pom.xml

@@ -7 +7 @@
         <artifactId>docx4j</artifactId>
         <name>docx4j</name>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
         <description>
                 docx4j is a library which helps you to work with the Office Open
@@ -106 +106 @@
         </repositories>
         <dependencies>
+        
+                  <!--  Uncomment this if you are using Java 5.  
+                                
+                                StAX reference implementation,
+                        required for MLInputFactory.newInstance() in Differencer
+                        iff you are using Java 1.5  
+                        (not necessary for Java 6) 
+                        -->
+                                <!-- 
+                        <dependency>
+                          <groupId>stax</groupId>
+                          <artifactId>stax</artifactId>
+                          <version>1.2.0</version>      
+                                <exclusions>
+                                        <exclusion>
+                                        <groupId>stax</groupId>
+                                        <artifactId>stax-api</artifactId>
+                                        </exclusion>
+                                </exclusions>
+                        </dependency>  -->
+                        <!--  stax 1.2.0 grabs 1.0.1(!); jaxb would grab 1.0.2 (where from?) -->
+        
                         <dependency>
                                 <groupId>javax.xml.bind</groupId>
@@ -116 +138 @@
                                 <artifactId>jaxb-impl</artifactId>
                                 <version>2.1.3</version> 
+                                
                         </dependency>  <!--  nothing newer in the repository! -->
         

trunk/docx4j/src/main/java/org/docx4j/diff/Differencer.java

@@ -127 +127 @@
 
     static Templates xsltDiffx2Wml;
+    
+        /**
+         * org/docx4j/diff/diffx2wml.xslt will be used by default
+         * to transform the diff output into a Word docx with tracked
+         * changes. This method allows you to use your own xslt 
+         * instead.
+         * @param xsltDiffx2Wml
+         */
+        public static void setXsltDiffx2Wml(Templates xsltDiffx2Wml) {
+                Differencer.xsltDiffx2Wml = xsltDiffx2Wml;
+        }
+    
+    
+    
     static Templates xsltMarkupInsert;
     static Templates xsltMarkupDelete;
@@ -317 +331 @@
                         
                         XMLInputFactory inputFactory = XMLInputFactory.newInstance();
+                        /*
+                         * With JDK 1.5, you need to supply a stax jar, or you
+                         * will get:
+                         * 
+                         * javax.xml.stream.FactoryConfigurationError: Provider com.bea.xml.stream.MXParserFactory not found
+                                at javax.xml.stream.FactoryFinder.newInstance(FactoryFinder.java:72)
+                                at javax.xml.stream.FactoryFinder.find(FactoryFinder.java:176)
+                                at javax.xml.stream.FactoryFinder.find(FactoryFinder.java:92)
+                                at javax.xml.stream.XMLInputFactory.newInstance(XMLInputFactory.java:136) 
+                                
+                         * This is not necessary if you use Java 6. 
+                         * 
+                         * From http://java.sun.com/webservices/docs/1.6/tutorial/doc/SJSXP4.html
+                         * 
+                         * The XMLInputFactory class lets you configure implementation instances of XML 
+                         * stream reader processors created by the factory. New instances of the abstract 
+                         * class XMLInputFactory are created by calling the newInstance() method on the 
+                         * class. The static method XMLInputFactory.newInstance() is then used to create 
+                         * a new factory instance.
+
+                                Deriving from JAXP, the XMLInputFactory.newInstance() method determines the 
+                                specific XMLInputFactory implementation class to load by using the following 
+                                lookup procedure:
+                                
+                                   1. Use the javax.xml.stream.XMLInputFactory system property.
+                                   
+                                   2. Use the lib/xml.stream.properties file in the JRE directory.
+                                   
+                                   3. Use the Services API, if available, to determine the classname 
+                                   by looking in the META-INF/services/javax.xml.stream.XMLInputFactory 
+                                   files in jars available to the JRE.
+                                   
+                                   4. Use the platform default XMLInputFactory instance.
+                         * 
+                         */
+                        
+                        
                         //java.io.InputStream is = new java.io.ByteArrayInputStream(naive.getBytes("UTF-8"));
                         Reader reader;
@@ -1300 +1351 @@
                 }
         }
+