Change package name to be consistent with others

jluyten · Jul 15, 2015 · 1ba3614 · 1ba3614
1 parent f8489c7
commit 1ba3614
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/.../office/word_2006/wordml/CTDocEvents.java → ...office/word/x2006/wordml/CTDocEvents.java b/.../office/word_2006/wordml/CTDocEvents.java → ...office/word/x2006/wordml/CTDocEvents.java
@@ -1,5 +1,5 @@
 
-package org.docx4j.schemas.microsoft.com.office.word_2006.wordml;
+package org.docx4j.com.microsoft.schemas.office.word.x2006.wordml;
 
 import javax.xml.bind.Unmarshaller;
 import javax.xml.bind.annotation.XmlAccessType;

diff --git a/...ft/com/office/word_2006/wordml/CTMcd.java → ...hemas/office/word/x2006/wordml/CTMcd.java b/...ft/com/office/word_2006/wordml/CTMcd.java → ...hemas/office/word/x2006/wordml/CTMcd.java
@@ -1,5 +1,5 @@
 
-package org.docx4j.schemas.microsoft.com.office.word_2006.wordml;
+package org.docx4j.com.microsoft.schemas.office.word.x2006.wordml;
 
 import javax.xml.bind.Unmarshaller;
 import javax.xml.bind.annotation.XmlAccessType;

diff --git a/...t/com/office/word_2006/wordml/CTMcds.java → ...emas/office/word/x2006/wordml/CTMcds.java b/...t/com/office/word_2006/wordml/CTMcds.java → ...emas/office/word/x2006/wordml/CTMcds.java
@@ -1,5 +1,5 @@
 
-package org.docx4j.schemas.microsoft.com.office.word_2006.wordml;
+package org.docx4j.com.microsoft.schemas.office.word.x2006.wordml;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...ffice/word_2006/wordml/CTVbaSuppData.java → ...fice/word/x2006/wordml/CTVbaSuppData.java b/...ffice/word_2006/wordml/CTVbaSuppData.java → ...fice/word/x2006/wordml/CTVbaSuppData.java
@@ -1,5 +1,5 @@
 
-package org.docx4j.schemas.microsoft.com.office.word_2006.wordml;
+package org.docx4j.com.microsoft.schemas.office.word.x2006.wordml;
 
 import javax.xml.bind.Unmarshaller;
 import javax.xml.bind.annotation.XmlAccessType;

diff --git a/...ffice/word_2006/wordml/ObjectFactory.java → ...fice/word/x2006/wordml/ObjectFactory.java b/...ffice/word_2006/wordml/ObjectFactory.java → ...fice/word/x2006/wordml/ObjectFactory.java
@@ -1,5 +1,5 @@
 
-package org.docx4j.schemas.microsoft.com.office.word_2006.wordml;
+package org.docx4j.com.microsoft.schemas.office.word.x2006.wordml;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlElementDecl;
@@ -10,7 +10,7 @@
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the org.docx4j.schemas.microsoft.com.office.word_2006.wordml package. 
+ * generated in the org.docx4j.com.microsoft.schemas.office.word.x2006.wordml package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -27,7 +27,7 @@ public class ObjectFactory {
     private final static QName _VbaSuppData_QNAME = new QName("http://schemas.microsoft.com/office/word/2006/wordml", "vbaSuppData");
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.docx4j.schemas.microsoft.com.office.word_2006.wordml
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.docx4j.com.microsoft.schemas.office.word.x2006.wordml
      * 
      */
     public ObjectFactory() {

diff --git a/...office/word_2006/wordml/package-info.java → ...ffice/word/x2006/wordml/package-info.java b/...office/word_2006/wordml/package-info.java → ...ffice/word/x2006/wordml/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://schemas.microsoft.com/office/word/2006/wordml", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.docx4j.schemas.microsoft.com.office.word_2006.wordml;
+package org.docx4j.com.microsoft.schemas.office.word.x2006.wordml;
diff --git a/src/main/java/org/docx4j/jaxb/Context.java b/src/main/java/org/docx4j/jaxb/Context.java
@@ -130,7 +130,7 @@ public class Context {
 			java.lang.ClassLoader classLoader = Context.class.getClassLoader();
 
 			tempContext = JAXBContext.newInstance("org.docx4j.wml:org.docx4j.w14:org.docx4j.w15:" +
-					"org.docx4j.schemas.microsoft.com.office.word_2006.wordml:" +
+					"org.docx4j.com.microsoft.schemas.office.word.x2006.wordml:" +
 					"org.docx4j.dml:org.docx4j.dml.chart:org.docx4j.dml.chartDrawing:org.docx4j.dml.compatibility:org.docx4j.dml.diagram:org.docx4j.dml.lockedCanvas:org.docx4j.dml.picture:org.docx4j.dml.wordprocessingDrawing:org.docx4j.dml.spreadsheetdrawing:org.docx4j.dml.diagram2008:" +
 					// All VML stuff is here, since compiling it requires WML and DML (and MathML), but not PML or SML
 					"org.docx4j.vml:org.docx4j.vml.officedrawing:org.docx4j.vml.wordprocessingDrawing:org.docx4j.vml.presentationDrawing:org.docx4j.vml.spreadsheetDrawing:org.docx4j.vml.root:" +

diff --git a/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/VbaDataPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/VbaDataPart.java
@@ -23,11 +23,11 @@
 
 import javax.xml.bind.JAXBElement;
 
+import org.docx4j.com.microsoft.schemas.office.word.x2006.wordml.CTVbaSuppData;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
 import org.docx4j.openpackaging.parts.JaxbXmlPart;
 import org.docx4j.openpackaging.parts.PartName;
 import org.docx4j.openpackaging.parts.relationships.Namespaces;
-import org.docx4j.schemas.microsoft.com.office.word_2006.wordml.CTVbaSuppData;
 
 
 /**

diff --git a/xsd/offmacro/office-word-2006-wordml.xsd b/xsd/offmacro/office-word-2006-wordml.xsd
@@ -35,7 +35,7 @@
 				</jaxb:globalBindings>
 			</xsd:appinfo>
 			<jaxb:schemaBindings>
-				<jaxb:package name="org.docx4j.schemas.microsoft.com.office.word_2006.wordml"/>
+				<jaxb:package name="org.docx4j.com.microsoft.schemas.office.word.x2006.wordml"/>
 			</jaxb:schemaBindings>
 		</xsd:appinfo>
 	</xsd:annotation>