diff options
| author | Andreas Beeker <kiwiwings@apache.org> | 2014-10-25 19:34:42 +0000 |
|---|---|---|
| committer | Andreas Beeker <kiwiwings@apache.org> | 2014-10-25 19:34:42 +0000 |
| commit | 1499778fddf4134b429bf346efc6e67998dc8c2e (patch) | |
| tree | 985bc70bc7583cb03ebd977669b7c7050d5b2b9d /build.xml | |
| parent | 0506512a36f4799522077159fe174480588a0099 (diff) | |
| download | poi-1499778fddf4134b429bf346efc6e67998dc8c2e.tar.gz poi-1499778fddf4134b429bf346efc6e67998dc8c2e.zip | |
added ooxml-security-1.0 to the maven artifacts
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1634247 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -198,10 +198,10 @@ under the License. <property name="ooxml.xsds.izip.2" value="OpenPackagingConventions-XMLSchema.zip"/> <property name="ooxml.xsds.url.2" value="http://www.ecma-international.org/publications/files/ECMA-ST/Office%20Open%20XML%201st%20edition%20Part%202%20(PDF).zip"/> - <property name="ooxml.encryption.src.dir" location="build/ooxml-encryption-src"/> - <property name="ooxml.encryption.src.jar" location="${ooxml.lib}/ooxml-encryption-src-1.2.jar"/> - <property name="ooxml.encryption.jar" location="${ooxml.lib}/ooxml-encryption-1.2.jar"/> - <property name="ooxml.encryption.xsd.dir" location="src/ooxml/resources/org/apache/poi/poifs/crypt"/> + <property name="ooxml.security.src.dir" location="build/ooxml-security-src"/> + <property name="ooxml.security.src.jar" location="${ooxml.lib}/ooxml-security-src-1.0.jar"/> + <property name="ooxml.security.jar" location="${ooxml.lib}/ooxml-security-1.0.jar"/> + <property name="ooxml.security.xsd.dir" location="src/ooxml/resources/org/apache/poi/poifs/crypt"/> <property name="maven.ooxml.xsds.version.id" value="1.0"/> <property name="maven.ooxml.xsds.jar" value="ooxml-schemas-${maven.ooxml.xsds.version.id}.jar"/> @@ -255,7 +255,7 @@ under the License. <path refid="main.classpath"/> <pathelement location="${main.output.dir}"/> <pathelement location="${scratchpad.output.dir}"/> - <pathelement location="${ooxml.encryption.jar}"/> + <pathelement location="${ooxml.security.jar}"/> <!-- classes are omitted on test cases outside the xml-dsign area to avoid classpath poisioning --> <!--path refid="ooxml.xmlsec.classpath"/--> </path> @@ -550,7 +550,7 @@ under the License. <or> <and> <available file="${ooxml.xsds.jar}"/> - <available file="${ooxml.encryption.jar}"/> + <available file="${ooxml.security.jar}"/> </and> <isset property="disconnected"/> </or> @@ -592,14 +592,14 @@ under the License. destfile="${ooxml.xsds.src.jar}" /> - <!-- Now do the same for the encryption and supporting schemas --> - <property name="ooxml.enc.xsds.tmp.dir" location="build/ooxml-encryption-xsds"/> + <!-- Now do the same for the security schemas --> + <property name="ooxml.enc.xsds.tmp.dir" location="build/ooxml-security-xsds"/> <mkdir dir="${ooxml.enc.xsds.tmp.dir}"/> <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,XAdES*.xsd"/> - <fileset dir="${ooxml.encryption.xsd.dir}"/> + <fileset dir="${ooxml.security.xsd.dir}"/> </copy> <!-- noupa/nopvr is set because of the dublincore schemas --> @@ -607,9 +607,9 @@ under the License. <!-- javasource > 1.5 will not generate all array accessor --> <xmlbean schema="${ooxml.enc.xsds.tmp.dir}" - srcgendir="${ooxml.encryption.src.dir}" + srcgendir="${ooxml.security.src.dir}" optimize="yes" - destfile="${ooxml.encryption.jar}" + destfile="${ooxml.security.jar}" javasource="1.5" failonerror="true" fork="true" @@ -621,8 +621,8 @@ under the License. </xmlbean> <jar - basedir="${ooxml.encryption.src.dir}" - destfile="${ooxml.encryption.src.jar}" + basedir="${ooxml.security.src.dir}" + destfile="${ooxml.security.src.jar}" /> </target> @@ -1031,7 +1031,7 @@ under the License. <jar destfile="${ooxml.lite-merged.dir}/ooxml-lite-merged.jar"> <zipfileset includes="**/*" src="${ooxml.xsds.jar}"/> - <zipfileset includes="**/*" src="${ooxml.encryption.jar}"/> + <zipfileset includes="**/*" src="${ooxml.security.jar}"/> </jar> <java classname="org.apache.poi.util.OOXMLLite" fork="yes"> @@ -1540,7 +1540,7 @@ under the License. <exclude name="poi-*${version.id}-sources-*.jar"/> </fileset> <auxClasspath path="ooxml-lib/ooxml-schemas-1.1.jar" /> - <auxClasspath path="ooxml-lib/ooxml-encryption-1.2.jar" /> + <auxClasspath path="ooxml-lib/ooxml-security-1.0.jar" /> <auxClasspath path="ooxml-lib/xmlbeans-2.6.0.jar" /> <auxClasspath path="lib/commons-codec-1.9.jar" /> <auxClasspath path="lib/commons-logging-1.1.3.jar" /> |