Attempt to fix GUMP build error due to case mismatch on package part 'INPUT' (doesn...

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

diff --git a/build.xml b/build.xml
index 0e67323b0ba0b49908a20b838b9c2d527a6eb8ff..0ac55d2348677a6ed51298e04b6e165779c686a3 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -795,8 +795,8 @@ under the License.
             <sysproperty key="HSLF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hslf/data"/>
             <sysproperty key="HDGF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hdgf/data"/>
             <sysproperty key="OOXML.testdata.path" file="${ooxml.src.test}/org/apache/poi/ooxml/data"/> 
-            <sysproperty key="openxml4j.compliance.input" file="${ooxml.src.test}/org/apache/poi/openxml4j/opc/compliance/input"/> 
-            <sysproperty key="openxml4j.testdata.input" file="${ooxml.src.test}/org/apache/poi/openxml4j/opc/INPUT"/> 
+            <sysproperty key="openxml4j.compliance.input" file="${ooxml.src.test}/org/apache/poi/openxml4j/opc/compliance/data"/> 
+            <sysproperty key="openxml4j.testdata.input" file="${ooxml.src.test}/org/apache/poi/openxml4j/opc/data"/> 
             <sysproperty key="java.awt.headless" value="true"/>
             <formatter type="plain"/>
             <formatter type="xml"/>
@@ -804,7 +804,6 @@ under the License.
                 <fileset dir="${ooxml.src.test}">
                     <include name="**/Test*.java"/>
                     <exclude name="**/All*Tests.java"/>
-                    <exclude name="**/TestCore.java"/> <!--non-junit class from OpenXML4j-->
                 </fileset>
             </batchtest>
         </junit>

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/ExcelWithHyperlinks.xlsx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/ExcelWithHyperlinks.xlsx
deleted file mode 100755 (executable)
index ba5ed27..0000000
Binary files a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/ExcelWithHyperlinks.xlsx and /dev/null differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestOpenPackageINPUT.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestOpenPackageINPUT.docx
deleted file mode 100755 (executable)
index dc105f0..0000000
Binary files a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestOpenPackageINPUT.docx and /dev/null differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestPackageCommon.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestPackageCommon.docx
deleted file mode 100755 (executable)
index 771cd18..0000000
Binary files a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestPackageCommon.docx and /dev/null differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestPackageCoreProperiesGetters.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestPackageCoreProperiesGetters.docx
deleted file mode 100755 (executable)
index 2d8bb35..0000000
Binary files a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestPackageCoreProperiesGetters.docx and /dev/null differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestPackageCoreProperiesSetters.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestPackageCoreProperiesSetters.docx
deleted file mode 100755 (executable)
index 2d8bb35..0000000
Binary files a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestPackageCoreProperiesSetters.docx and /dev/null differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestPackageThumbnail.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestPackageThumbnail.docx
deleted file mode 100755 (executable)
index ccc990d..0000000
Binary files a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/TestPackageThumbnail.docx and /dev/null differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/sample.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/sample.docx
deleted file mode 100755 (executable)
index 8e77521..0000000
Binary files a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/sample.docx and /dev/null differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/sample.xlsx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/sample.xlsx
deleted file mode 100755 (executable)
index a275cf4..0000000
Binary files a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/sample.xlsx and /dev/null differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/thumbnail.jpg b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/thumbnail.jpg
deleted file mode 100755 (executable)
index 5119960..0000000
Binary files a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/INPUT/thumbnail.jpg and /dev/null differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx
deleted file mode 100755 (executable)
index 89533f0..0000000
Binary files a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx and /dev/null differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx
deleted file mode 100755 (executable)
index 63555e4..0000000
Binary files a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx and /dev/null differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx
deleted file mode 100755 (executable)
index 304e5ce..0000000
Binary files a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx and /dev/null differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx
deleted file mode 100755 (executable)
index 7b4f765..0000000
Binary files a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx and /dev/null differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx
deleted file mode 100755 (executable)
index 7a63ee1..0000000
Binary files a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx and /dev/null differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx
deleted file mode 100755 (executable)
index 3ee9fc3..0000000
Binary files a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx and /dev/null differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_SUCCESS.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_SUCCESS.docx
deleted file mode 100755 (executable)
index 7a63ee1..0000000
Binary files a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_SUCCESS.docx and /dev/null differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx
deleted file mode 100755 (executable)
index 3984aea..0000000
Binary files a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx and /dev/null differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_DerivedPartNameFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_DerivedPartNameFAIL.docx
deleted file mode 100755 (executable)
index 8ccfb61..0000000
Binary files a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/INPUT/OPCCompliance_DerivedPartNameFAIL.docx and /dev/null differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx
new file mode 100755 (executable)
index 0000000..89533f0
Binary files /dev/null and b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx
new file mode 100755 (executable)
index 0000000..63555e4
Binary files /dev/null and b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx
new file mode 100755 (executable)
index 0000000..304e5ce
Binary files /dev/null and b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx
new file mode 100755 (executable)
index 0000000..7b4f765
Binary files /dev/null and b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx
new file mode 100755 (executable)
index 0000000..7a63ee1
Binary files /dev/null and b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx
new file mode 100755 (executable)
index 0000000..3ee9fc3
Binary files /dev/null and b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_SUCCESS.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_SUCCESS.docx
new file mode 100755 (executable)
index 0000000..7a63ee1
Binary files /dev/null and b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_SUCCESS.docx differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx
new file mode 100755 (executable)
index 0000000..3984aea
Binary files /dev/null and b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_DerivedPartNameFAIL.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_DerivedPartNameFAIL.docx
new file mode 100755 (executable)
index 0000000..8ccfb61
Binary files /dev/null and b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_DerivedPartNameFAIL.docx differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/ExcelWithHyperlinks.xlsx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/ExcelWithHyperlinks.xlsx
new file mode 100755 (executable)
index 0000000..ba5ed27
Binary files /dev/null and b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/ExcelWithHyperlinks.xlsx differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestOpenPackageINPUT.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestOpenPackageINPUT.docx
new file mode 100755 (executable)
index 0000000..dc105f0
Binary files /dev/null and b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestOpenPackageINPUT.docx differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCommon.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCommon.docx
new file mode 100755 (executable)
index 0000000..771cd18
Binary files /dev/null and b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCommon.docx differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCoreProperiesGetters.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCoreProperiesGetters.docx
new file mode 100755 (executable)
index 0000000..2d8bb35
Binary files /dev/null and b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCoreProperiesGetters.docx differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCoreProperiesSetters.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCoreProperiesSetters.docx
new file mode 100755 (executable)
index 0000000..2d8bb35
Binary files /dev/null and b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCoreProperiesSetters.docx differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageThumbnail.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageThumbnail.docx
new file mode 100755 (executable)
index 0000000..ccc990d
Binary files /dev/null and b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageThumbnail.docx differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/sample.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/sample.docx
new file mode 100755 (executable)
index 0000000..8e77521
Binary files /dev/null and b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/sample.docx differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/sample.xlsx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/sample.xlsx
new file mode 100755 (executable)
index 0000000..a275cf4
Binary files /dev/null and b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/sample.xlsx differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/thumbnail.jpg b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/thumbnail.jpg
new file mode 100755 (executable)
index 0000000..5119960
Binary files /dev/null and b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/thumbnail.jpg differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/INPUT/sample.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/INPUT/sample.docx
deleted file mode 100755 (executable)
index dc87bc8..0000000
Binary files a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/INPUT/sample.docx and /dev/null differ

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/data/sample.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/data/sample.docx
new file mode 100755 (executable)
index 0000000..dc87bc8
Binary files /dev/null and b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/data/sample.docx differ