#64979 - Change artifact names of poi-/ooxml-schemas

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1884381 13f79535-47bb-0310-9956-ffa450edef68

13 files changed, 38 insertions, 37 deletions

diff --git a/src/ooxml/java/org/apache/poi/ooxml/util/XPathHelper.java b/src/ooxml/java/org/apache/poi/ooxml/util/XPathHelper.java
index 0e1700317f..cd4b25da2b 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/util/XPathHelper.java
+++ b/src/ooxml/java/org/apache/poi/ooxml/util/XPathHelper.java
@@ -40,7 +40,7 @@ public final class XPathHelper {
         "Schemas (*.xsb) for <CLASS> can't be loaded - usually this happens when OSGI " +
         "loading is used and the thread context classloader has no reference to " +
         "the xmlbeans classes - please either verify if the <XSB>.xsb is on the " +
-        "classpath or alternatively try to use the full ooxml-schemas-x.x.jar";
+        "classpath or alternatively try to use the poi-ooxml-full-x.x.jar";
 
     private static final String MC_NS = "http://schemas.openxmlformats.org/markup-compatibility/2006";
     private static final String MAC_DML_NS = "http://schemas.microsoft.com/office/mac/drawingml/2008/main";
@@ -119,7 +119,7 @@ public final class XPathHelper {
             }
 
             // Pesky XmlBeans bug - see Bugzilla #49934
-            // it never happens when using the full ooxml-schemas jar but may happen with the abridged poi-ooxml-schemas
+            // it never happens when using poi-ooxml-full jar but may happen with the abridged poi-ooxml-lite jar
             xo = innerCur.getObject();
             if (xo instanceof XmlAnyTypeImpl) {
                 String errorTxt = OSGI_ERROR
@@ -169,7 +169,7 @@ public final class XPathHelper {
             alterCont = (AlternateContentDocument.AlternateContent)xo;
         } else {
             // Pesky XmlBeans bug - see Bugzilla #49934
-            // it never happens when using the full ooxml-schemas jar but may happen with the abridged poi-ooxml-schemas
+            // it never happens when using poi-ooxml-full jar but may happen with the abridged poi-ooxml-lite jar
             if (!reparseAlternate) {
                 throw new XmlException(OSGI_ERROR
                                                .replace("<CLASS>", "AlternateContent")
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
index f334052e81..df419014cd 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
@@ -68,7 +68,7 @@ public class XSLFTable extends XSLFGraphicFrame implements Iterable<XSLFTableRow
 
             XmlObject xo = xc.getObject();
             // Pesky XmlBeans bug - see Bugzilla #49934
-            // it never happens when using the full ooxml-schemas jar but may happen with the abridged poi-ooxml-schemas
+            // it never happens when using poi-ooxml-full jar but may happen with the abridged poi-ooxml-lite jar
             if (xo instanceof XmlAnyTypeImpl){
                 String errStr =
                     "Schemas (*.xsb) for CTTable can't be loaded - usually this happens when OSGI " +
diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java
index 68652f636d..f2b7731714 100644
--- a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java
+++ b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 import org.openxmlformats.schemas.drawingml.x2006.chart.*;
 import org.openxmlformats.schemas.drawingml.x2006.main.*;
 
-// aim is to get these classes loaded and included in poi-ooxml-schemas.jar
+// aim is to get these classes loaded and included in poi-ooxml-lite.jar
 public class TestNecessaryOOXMLClasses {
 
     @Test
diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java
index fe838bbe77..e6dc55c5da 100644
--- a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java
+++ b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java
@@ -18,18 +18,18 @@
  */
 package org.apache.poi.xddf.usermodel.chart;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import org.apache.poi.ooxml.POIXMLFactory;
 import org.apache.poi.ooxml.POIXMLRelation;
 import org.junit.Test;
 import org.openxmlformats.schemas.drawingml.x2006.chart.CTChartSpace;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 public class TestXDDFChart {
     @Test
     public void testConstruct() {
-        // minimal test to cause ooxml-lite to include all the classes in poi-ooxml-schemas
+        // minimal test to cause ooxml-lite to include all the classes in poi-ooxml-lite
         XDDFChart xddfChart = newXDDFChart();
 
         assertNotNull(xddfChart.getCTChartSpace());
@@ -43,7 +43,7 @@ public class TestXDDFChart {
 
         xddfChart.setExternalId("rid1");
         assertEquals("rid1", ctChartSpace.getExternalData().getId());
-        
+
         xddfChart.setExternalId("rid2");
         assertEquals("rid2", ctChartSpace.getExternalData().getId());
     }
diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java
index 1db0f09783..2c5adf6978 100644
--- a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java
+++ b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java
@@ -16,15 +16,16 @@
 ==================================================================== */
 package org.apache.poi.xddf.usermodel.chart;
 
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 public class TestXDDFChartExtensionList {
 
     @Test
     public void getXmlObject() {
-        // minimal test to include generated classes in poi-ooxml-schemas
+        // minimal test to include generated classes in poi-ooxml-lite
         XDDFChartExtensionList list = new XDDFChartExtensionList();
         assertNotNull(list.getXmlObject());
 
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java b/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java
index dea1966af6..15f2813b64 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java
@@ -26,7 +26,7 @@ import java.util.function.Supplier;
 import org.apache.xmlbeans.XmlObject;
 import org.junit.Test;
 
-// aim is to get these classes loaded and included in poi-ooxml-schemas.jar
+// aim is to get these classes loaded and included in poi-ooxml-lite.jar
 public class TestNecessaryOOXMLClasses {
 
     @Test
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java b/src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java
index adadbc5b09..9884584e8e 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java
@@ -22,7 +22,7 @@ import org.junit.Test;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRow;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSheetData;
 
-// aim is to get these classes loaded and included in poi-ooxml-schemas.jar
+// aim is to get these classes loaded and included in poi-ooxml-lite.jar
 public class TestNecessaryOOXMLClasses {
 
     @Test
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
index 6fe63c5e94..667b4ff5dc 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
@@ -272,7 +272,7 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues {
     }
 
     /**
-     * ensure that CTPhoneticPr is loaded by the ooxml test suite so that it is included in poi-ooxml-schemas
+     * ensure that CTPhoneticPr is loaded by the ooxml test suite so that it is included in poi-ooxml-lite
      */
     @Test
     public void bug49325() throws IOException {
@@ -1969,7 +1969,7 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues {
 
     /**
      * CTDefinedNamesImpl should be included in the smaller
-     * poi-ooxml-schemas jar
+     * poi-ooxml-lite jar
      */
     @Test
     public void bug57176() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java b/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java
index 743fdb2f71..15b47927f3 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java
@@ -24,7 +24,7 @@ import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblLayoutType;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.STEm;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTblLayoutType;
 
-// aim is to get these classes loaded and included in poi-ooxml-schemas.jar
+// aim is to get these classes loaded and included in poi-ooxml-lite.jar
 public class TestNecessaryOOXMLClasses {
 
     @Test
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java b/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
index 8a14b25ba0..2ba870aed7 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
@@ -17,16 +17,6 @@
 
 package org.apache.poi.xwpf.extractor;
 
-import org.apache.poi.util.StringUtil;
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import static org.apache.poi.POITestCase.assertContains;
 import static org.apache.poi.POITestCase.assertEndsWith;
 import static org.apache.poi.POITestCase.assertNotContained;
@@ -35,6 +25,16 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import java.io.IOException;
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.poi.util.StringUtil;
+import org.apache.poi.xwpf.XWPFTestDataSamples;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.junit.Test;
+
 /**
  * Tests for HXFWordExtractor
  */
@@ -431,7 +431,7 @@ public class TestXWPFWordExtractor {
 
     @Test
     public void testCTPictureBase() throws IOException {
-        //This forces ctpicturebase to be included in the poi-ooxml-schemas jar
+        //This forces ctpicturebase to be included in the poi-ooxml-lite jar
         try (XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("61991.docx");
             XWPFWordExtractor extractor = new XWPFWordExtractor(doc)) {
             String txt = extractor.getText();
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
index e29186ab10..c5db3cbb13 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
@@ -659,7 +659,7 @@ public class TestXWPFRun {
         final XWPFRun run = document.createParagraph().createRun();
 
         // at least trigger some of the setters to ensure classes are included in
-        // the poi-ooxml-schemas
+        // the poi-ooxml-lite
         run.setBold(true);
         run.setCapitalized(true);
         run.setCharacterSpacing(2);
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
index c429c7434e..8794798802 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
@@ -94,7 +94,7 @@ public final class TestXWPFStyles {
 
     /**
      * YK: tests below don't make much sense,
-     * they exist only to copy xml beans to pi-ooxml-schemas.jar
+     * they exist only to copy xml beans to pi-ooxml-lite.jar
      */
     @SuppressWarnings("resource")
     @Test
@@ -206,7 +206,7 @@ public final class TestXWPFStyles {
             assertEquals(200, styles.getDefaultParagraphStyle().getSpacingAfter());
         }
     }
-    
+
     // Bug 60329: style with missing StyleID throws NPE
     @Test
     public void testMissingStyleId() throws IOException {
@@ -218,7 +218,7 @@ public final class TestXWPFStyles {
                 assertNotNull(styles.getStyle("NoList"));
                 assertNull(styles.getStyle("EmptyCellLayoutStyle"));
                 assertNotNull(styles.getStyle("BalloonText"));
-                
+
                 // Bug 64600: styleExist throws NPE
                 assertTrue(styles.styleExist("NoList"));
                 assertFalse(styles.styleExist("EmptyCellLayoutStyle"));
@@ -228,7 +228,7 @@ public final class TestXWPFStyles {
             }
         }
     }
-    
+
     @Test
     public void testGetStyleByName() throws IOException {
         try (XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("SampleDoc.docx")) {
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/XWPFAbstractNumTest.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/XWPFAbstractNumTest.java
index 2f58bc9b0f..c4d0aec45d 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/XWPFAbstractNumTest.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/XWPFAbstractNumTest.java
@@ -16,15 +16,15 @@
 ==================================================================== */
 package org.apache.poi.xwpf.usermodel;
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertNull;
 
+import org.junit.Test;
+
 public class XWPFAbstractNumTest {
 
     @Test
     public void getXmlObject() {
-        // minimal test to include generated classes in poi-ooxml-schemas
+        // minimal test to include generated classes in poi-ooxml-lite
         XWPFAbstractNum num = new XWPFAbstractNum();
         assertNull(num.getCTAbstractNum());
     }