Author: kiwiwings
Date: Mon Dec  9 23:56:13 2019
New Revision: 1871111

URL: http://svn.apache.org/viewvc?rev=1871111&view=rev
Log:
Provide XAdES schemas locally, because of connection timeouts

Modified:
    poi/trunk/sonar/ooxml-schema-security/pom.xml
    poi/trunk/sonar/pom.xml

Modified: poi/trunk/sonar/ooxml-schema-security/pom.xml
URL: 
http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml-schema-security/pom.xml?rev=1871111&r1=1871110&r2=1871111&view=diff
==============================================================================
--- poi/trunk/sonar/ooxml-schema-security/pom.xml (original)
+++ poi/trunk/sonar/ooxml-schema-security/pom.xml Mon Dec  9 23:56:13 2019
@@ -46,52 +46,7 @@
                                                <goals><goal>wget</goal></goals>
                                                <configuration>
                                                        
<outputDirectory>target/schemas</outputDirectory>
-                                                       
<url>http://dublincore.org/schemas/xmls/qdc/2003/04/02/dc.xsd</url>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>install-xsds-part-3</id>
-                                               <phase>generate-sources</phase>
-                                               <goals><goal>wget</goal></goals>
-                                               <configuration>
-                                                       
<outputDirectory>target/schemas</outputDirectory>
-                                                       
<url>http://dublincore.org/schemas/xmls/qdc/2003/04/02/dcterms.xsd</url>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>install-xsds-part-4</id>
-                                               <phase>generate-sources</phase>
-                                               <goals><goal>wget</goal></goals>
-                                               <configuration>
-                                                       
<outputDirectory>target/schemas</outputDirectory>
-                                                       
<url>http://dublincore.org/schemas/xmls/qdc/2003/04/02/dcmitype.xsd</url>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>install-xsds-part-5</id>
-                                               <phase>generate-sources</phase>
-                                               <goals><goal>wget</goal></goals>
-                                               <configuration>
-                                                       
<outputDirectory>target/schemas</outputDirectory>
-                                                       
<url>http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd</url>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>install-xsds-part-6</id>
-                                               <phase>generate-sources</phase>
-                                               <goals><goal>wget</goal></goals>
-                                               <configuration>
-                                                       
<outputDirectory>target/schemas</outputDirectory>
-                                                       
<url>https://uri.etsi.org/01903/v1.3.2/XAdES.xsd</url>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>install-xsds-part-7</id>
-                                               <phase>generate-sources</phase>
-                                               <goals><goal>wget</goal></goals>
-                                               <configuration>
-                                                       
<outputDirectory>target/schemas</outputDirectory>
-                                                       
<url>https://uri.etsi.org/01903/v1.4.1/XAdESv141.xsd</url>
+                                                       
<url>https://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd</url>
                                                </configuration>
                                        </execution>
                                </executions>
@@ -112,9 +67,18 @@
                                                <configuration>
                                                        <target>
                                                                <echo 
message="unzip schemas" />
-                                                               <unzip 
src="target/OpenPackagingConventions-XMLSchema.zip" dest="target/schemas/" />
-                                                               <copy 
file="../../src/ooxml/resources/org/apache/poi/poifs/crypt/signatureInfo.xsd"
-                                                                       
todir="target/schemas"/>
+                                                               <unzip 
src="target/OpenPackagingConventions-XMLSchema.zip" dest="target/schemas/">
+                                                                       
<patternset>
+                                                                               
<include name="opc-digSig.xsd"/>
+                                                                               
<include name="opc-relationships.xsd"/>
+                                                                       
</patternset>
+                                                               </unzip>
+                                                               <copy 
todir="target/schemas">
+                                                                       
<fileset dir="../../src/ooxml/resources/org/apache/poi">
+                                                                               
<include name="poifs/crypt/signatureInfo.xsd"/>
+                                                                               
<include name="schemas/XAdES*.xsd"/>
+                                                                       
</fileset>
+                                                               </copy>
                                                        </target>
                                                </configuration>
                                        </execution>
@@ -129,7 +93,7 @@
                        <groupId>org.apache.xmlbeans</groupId>
                        <artifactId>xmlbeans</artifactId>
                        <version>${xmlbeans.version}</version>
-               </dependency>           
+               </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>poi-main</artifactId>

Modified: poi/trunk/sonar/pom.xml
URL: 
http://svn.apache.org/viewvc/poi/trunk/sonar/pom.xml?rev=1871111&r1=1871110&r2=1871111&view=diff
==============================================================================
--- poi/trunk/sonar/pom.xml (original)
+++ poi/trunk/sonar/pom.xml Mon Dec  9 23:56:13 2019
@@ -269,7 +269,7 @@
                                 <configuration>
                                     <target>
                                         <copy 
todir="${basedir}/target/schemas">
-                                            <fileset 
dir="${basedir}/../../src/ooxml/resources/org/apache/poi/schemas"/>
+                                            <fileset 
dir="${basedir}/../../src/ooxml/resources/org/apache/poi/schemas" 
excludes="XAdES*.xsd"/>
                                         </copy>
                                     </target>
                                 </configuration>



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

Reply via email to