You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2014/08/10 22:37:45 UTC

svn commit: r1617153 - in /poi/branches/xml_signature: build.xml ooxml-lib/ src/ooxml/resources/org/apache/poi/poifs/crypt/XAdES.xsd src/ooxml/resources/org/apache/poi/poifs/crypt/XAdESv141.xsd

Author: kiwiwings
Date: Sun Aug 10 20:37:44 2014
New Revision: 1617153

URL: http://svn.apache.org/r1617153
Log:
download xades files and remove from them resources

Removed:
    poi/branches/xml_signature/src/ooxml/resources/org/apache/poi/poifs/crypt/XAdES.xsd
    poi/branches/xml_signature/src/ooxml/resources/org/apache/poi/poifs/crypt/XAdESv141.xsd
Modified:
    poi/branches/xml_signature/build.xml
    poi/branches/xml_signature/ooxml-lib/   (props changed)

Modified: poi/branches/xml_signature/build.xml
URL: http://svn.apache.org/viewvc/poi/branches/xml_signature/build.xml?rev=1617153&r1=1617152&r2=1617153&view=diff
==============================================================================
--- poi/branches/xml_signature/build.xml (original)
+++ poi/branches/xml_signature/build.xml Sun Aug 10 20:37:44 2014
@@ -181,7 +181,9 @@ under the License.
 	<property name="ooxml.xsds.dc.1" value="http://dublincore.org/schemas/xmls/qdc/2003/04/02/dc.xsd"/>
 	<property name="ooxml.xsds.dc.2" value="http://dublincore.org/schemas/xmls/qdc/2003/04/02/dcterms.xsd"/>
 	<property name="ooxml.xsds.dc.3" value="http://dublincore.org/schemas/xmls/qdc/2003/04/02/dcmitype.xsd"/>
-	<property name="ooxml.xsds.dsig" value="http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd"/>
+	<property name="ooxml.xsds.dsig.1" value="http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd"/>
+	<property name="ooxml.xsds.dsig.2" value="http://uri.etsi.org/01903/v1.3.2/XAdES.xsd"/>
+	<property name="ooxml.xsds.dsig.3" value="http://uri.etsi.org/01903/v1.4.1/XAdESv141.xsd"/>
     <property name="ooxml.xsds.ozip.2" value="OfficeOpenXML-Part2.zip"/>
     <property name="ooxml.xsds.izip.2" value="OpenPackagingConventions-XMLSchema.zip"/>
     <property name="ooxml.xsds.url.2"
@@ -483,7 +485,9 @@ under the License.
         	<url url="${ooxml.xsds.dc.1}"/>
         	<url url="${ooxml.xsds.dc.2}"/>
         	<url url="${ooxml.xsds.dc.3}"/>
-        	<url url="${ooxml.xsds.dsig}"/>
+        	<url url="${ooxml.xsds.dsig.1}"/>
+        	<url url="${ooxml.xsds.dsig.2}"/>
+        	<url url="${ooxml.xsds.dsig.3}"/>
         	<chainedmapper>
         		<flattenmapper/>
 	        	<firstmatchmapper>
@@ -550,7 +554,7 @@ under the License.
         <unzip src="${ooxml.lib}/${ooxml.xsds.izip.2}" dest="${ooxml.enc.xsds.tmp.dir}"/>
     	
     	<copy todir="${ooxml.enc.xsds.tmp.dir}">
-    		<fileset dir="${ooxml.lib}" includes="dc*.xsd,xmldsig*.xsd"/>
+    		<fileset dir="${ooxml.lib}" includes="dc*.xsd,xmldsig*.xsd,XAdES*.xsd"/>
     		<fileset dir="${ooxml.encryption.xsd.dir}"/>
     	</copy>
 

Propchange: poi/branches/xml_signature/ooxml-lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Aug 10 20:37:44 2014
@@ -1,2 +1,3 @@
 *.jar
-OfficeOpenXML-*.zip
+*.zip
+*.xsd



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