You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2021/02/24 21:26:33 UTC

svn commit: r1886892 - in /poi/trunk/src: java/org/apache/poi/util/XMLHelper.java ooxml/testcases/org/apache/poi/ooxml/TestNecessaryOOXMLClasses.java ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java

Author: fanningpj
Date: Wed Feb 24 21:26:33 2021
New Revision: 1886892

URL: http://svn.apache.org/viewvc?rev=1886892&view=rev
Log:
missing ooxml-schemas-lite classes

Added:
    poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/TestNecessaryOOXMLClasses.java
      - copied, changed from r1886890, poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java
Modified:
    poi/trunk/src/java/org/apache/poi/util/XMLHelper.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java

Modified: poi/trunk/src/java/org/apache/poi/util/XMLHelper.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/util/XMLHelper.java?rev=1886892&r1=1886891&r2=1886892&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/util/XMLHelper.java (original)
+++ poi/trunk/src/java/org/apache/poi/util/XMLHelper.java Wed Feb 24 21:26:33 2021
@@ -72,7 +72,7 @@ public final class XMLHelper {
     static final String METHOD_ENTITY_EXPANSION_XERCES = "setEntityExpansionLimit";
 
     static final String[] SECURITY_MANAGERS = {
-            "com.sun.org.apache.xerces.internal.util.SecurityManager",
+            //"com.sun.org.apache.xerces.internal.util.SecurityManager",
             "org.apache.xerces.util.SecurityManager"
     };
 

Copied: poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/TestNecessaryOOXMLClasses.java (from r1886890, poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java)
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/TestNecessaryOOXMLClasses.java?p2=poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/TestNecessaryOOXMLClasses.java&p1=poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java&r1=1886890&r2=1886892&rev=1886892&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/TestNecessaryOOXMLClasses.java Wed Feb 24 21:26:33 2021
@@ -15,30 +15,20 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.xwpf;
+package org.apache.poi.ooxml;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import com.microsoft.schemas.compatibility.AlternateContentDocument;
+import org.apache.xmlbeans.impl.schema.DocumentFactory;
 import org.junit.jupiter.api.Test;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTEm;
-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-lite.jar
 class TestNecessaryOOXMLClasses {
 
     @Test
     void testProblemClasses() {
-        CTTblLayoutType ctTblLayoutType = CTTblLayoutType.Factory.newInstance();
-        assertNotNull(ctTblLayoutType);
-        STTblLayoutType stTblLayoutType = STTblLayoutType.Factory.newInstance();
-        assertNotNull(stTblLayoutType);
-        CTEm ctEm = CTEm.Factory.newInstance();
-        assertNotNull(ctEm);
-        STEm stEm = STEm.Factory.newInstance();
-        assertNotNull(stEm);
-        assertEquals(STEm.CIRCLE, STEm.Enum.forString("circle"));
+        DocumentFactory<AlternateContentDocument> factory = AlternateContentDocument.Factory;
+        assertNotNull(factory);
     }
 }

Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java?rev=1886892&r1=1886891&r2=1886892&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java Wed Feb 24 21:26:33 2021
@@ -21,10 +21,7 @@ import static org.junit.jupiter.api.Asse
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.junit.jupiter.api.Test;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTEm;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblLayoutType;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STEm;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTblLayoutType;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.*;
 
 // aim is to get these classes loaded and included in poi-ooxml-lite.jar
 class TestNecessaryOOXMLClasses {
@@ -40,5 +37,7 @@ class TestNecessaryOOXMLClasses {
         STEm stEm = STEm.Factory.newInstance();
         assertNotNull(stEm);
         assertEquals(STEm.CIRCLE, STEm.Enum.forString("circle"));
+        STHexColorAuto stHexColorAuto = STHexColorAuto.Factory.newInstance();
+        assertNotNull(stHexColorAuto);
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org