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

Timestamp:

07/09/11 06:42:23 (11 months ago)

Author:

jharrop

Message:

docx4j.properties, supports configuration of default page size, margins, orientation; also ability to set some of the doc props metadata (Application & AppVersion?; dc.creator & dc.lastModifiedBy).

Location:

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

Files:

• Docx4jProperties.java (added)
• openpackaging/io/SaveToZipFile.java (modified) (4 diffs)
• openpackaging/packages/WordprocessingMLPackage.java (modified) (3 diffs)

trunk/docx4j/src/main/java/org/docx4j/openpackaging/io/SaveToZipFile.java

@@ -41 +41 @@
 
 import org.apache.log4j.Logger;
+import org.docx4j.Docx4jProperties;
 import org.docx4j.convert.out.flatOpcXml.FlatOpcXmlCreator;
+import org.docx4j.docProps.core.CoreProperties;
+import org.docx4j.docProps.extended.Properties;
 import org.docx4j.jaxb.Context;
 import org.docx4j.jaxb.NamespacePrefixMapperUtils;
@@ -48 +51 @@
 import org.docx4j.openpackaging.exceptions.Docx4JException;
 import org.docx4j.openpackaging.packages.OpcPackage;
+import org.docx4j.openpackaging.parts.DocPropsCorePart;
+import org.docx4j.openpackaging.parts.DocPropsExtendedPart;
 import org.docx4j.openpackaging.parts.Part;
 import org.docx4j.openpackaging.parts.PartName;
@@ -195 +200 @@
                                                 
                         if (part instanceof org.docx4j.openpackaging.parts.JaxbXmlPart) {
+                                
+                                // From docx4j 2.7.1, support setting some basic metadata
+                                // from docx4j.properties
+                                if (part instanceof DocPropsCorePart) {
+                                        
+                                        boolean dcWrite= Boolean.parseBoolean(
+                                                        Docx4jProperties.getProperties().getProperty("docx4j.dc.write", "false"));
+                                        if (dcWrite) {                                  
+                                                CoreProperties cp = ((DocPropsCorePart)part).getJaxbElement();
+                                                
+                                                // Only set creator if not already present
+                                                String creator= Docx4jProperties.getProperties().getProperty("docx4j.dc.creator.value", "docx4j");
+                                                if (cp.getCreator()==null) {
+                                                        org.docx4j.docProps.core.dc.elements.ObjectFactory of = new org.docx4j.docProps.core.dc.elements.ObjectFactory(); 
+                                                        cp.setCreator(of.createSimpleLiteral() );
+                                                        cp.getCreator().getContent().add(creator);
+                                                } 
+                                                
+                                                String modifier= Docx4jProperties.getProperties().getProperty("docx4j.dc.lastModifiedBy.value", "docx4j");
+                                                cp.setLastModifiedBy(modifier);
+                                        }
+                                }                               
+                                if (part instanceof DocPropsExtendedPart) {
+                                        boolean appWrite= Boolean.parseBoolean(
+                                                        Docx4jProperties.getProperties().getProperty("docx4j.App.write", "false"));
+                                        if (appWrite) {
+                                                Properties cp = ((DocPropsExtendedPart)part).getJaxbElement();
+                                                
+                                                cp.setApplication( 
+                                                                Docx4jProperties.getProperties().getProperty("docx4j.Application", "docx4j")
+                                                                );
+                                                
+                                                String version = Docx4jProperties.getProperties().getProperty("docx4j.AppVersion");
+                                                if ( version!=null ) {
+                                                        cp.setAppVersion(version);
+                                                }
+                                                
+                                        }
+                                }
 
                         // Add ZIP entry to output stream.
@@ -218 +262 @@
 
                         } else if (part instanceof org.docx4j.openpackaging.parts.XmlPart) {
-
+                                
                         // Add ZIP entry to output stream.
                         out.putNextEntry(new ZipEntry(zipEntryName));                   

trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java

@@ -39 +39 @@
 
 import org.apache.log4j.Logger;
+import org.docx4j.Docx4jProperties;
 import org.docx4j.XmlUtils;
 import org.docx4j.convert.out.flatOpcXml.FlatOpcXmlCreator;
@@ -385 +386 @@
         
 
+        /**
+         * Creates a WordprocessingMLPackage, using default page size and orientation.
+         * From 2.7.1, these are read from docx4j.properties, or if not found, default
+         * to A4 portrait.
+         */
         public static WordprocessingMLPackage createPackage() throws InvalidFormatException {
-
-                return createPackage(PageSizePaper.A4, false); 
+                
+                String papersize= Docx4jProperties.getProperties().getProperty("docx4j.PageSize", "A4");
+                log.info("Using paper size: " + papersize);
+                
+                String landscapeString = Docx4jProperties.getProperties().getProperty("docx4j.PageOrientationLandscape", "false");
+                boolean landscape= Boolean.parseBoolean(landscapeString);
+                log.info("Landscape orientation: " + landscape);
+                
+                return createPackage(
+                                PageSizePaper.valueOf(papersize), landscape); 
         }
         
@@ -437 +451 @@
                         log.error(e);
                 }
+                
+                // Metadata: docx4j 2.7.1 can populate some of this from docx4j.properties
+                DocPropsCorePart core = new DocPropsCorePart();
+                org.docx4j.docProps.core.ObjectFactory coreFactory = new org.docx4j.docProps.core.ObjectFactory();
+                core.setJaxbElement(coreFactory.createCoreProperties() );
+                wmlPack.addTargetPart(core);
+                
+                DocPropsExtendedPart app = new DocPropsExtendedPart();
+                org.docx4j.docProps.extended.ObjectFactory extFactory = new org.docx4j.docProps.extended.ObjectFactory();
+                app.setJaxbElement(extFactory.createProperties() );
+                wmlPack.addTargetPart(app);             
+                
                 // Return the new package
                 return wmlPack;