diff options
| -rw-r--r-- | .classpath | 2 | ||||
| -rw-r--r-- | build.xml | 30 | ||||
| -rw-r--r-- | maven/ooxml-security.pom | 79 |
3 files changed, 95 insertions, 16 deletions
diff --git a/.classpath b/.classpath index 601290e297..58ae07b0f8 100644 --- a/.classpath +++ b/.classpath @@ -23,7 +23,7 @@ <classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/> <classpathentry kind="lib" path="lib/junit-4.11.jar"/> <classpathentry kind="lib" path="ooxml-lib/ooxml-schemas-1.1.jar" sourcepath="ooxml-lib/ooxml-schemas-src-1.1.jar"/> - <classpathentry kind="lib" path="ooxml-lib/ooxml-encryption-1.2.jar" sourcepath="ooxml-lib/ooxml-encryption-src-1.2.jar"/> + <classpathentry kind="lib" path="ooxml-lib/ooxml-security-1.0.jar" sourcepath="ooxml-lib/ooxml-security-src-1.0.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="compile-lib/slf4j-api-1.7.7.jar"/> <classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.51.jar"/> @@ -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" /> diff --git a/maven/ooxml-security.pom b/maven/ooxml-security.pom new file mode 100644 index 0000000000..de9112e211 --- /dev/null +++ b/maven/ooxml-security.pom @@ -0,0 +1,79 @@ +<?xml version="1.0"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.poi</groupId> + <artifactId>ooxml-security</artifactId> + <version>@VERSION@</version> + <packaging>jar</packaging> + <name>OOXML security</name> + <description> + XmlBeans generated from various supplied xsds for encryption and signing: + http://msdn.microsoft.com/en-us/library/dd925810(v=office.12).aspx + http://www.ecma-international.org/publications/files/ECMA-ST/Office%20Open%20XML%201st%20edition%20Part%202%20(PDF).zip + http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd + http://uri.etsi.org/01903/v1.3.2/XAdES.xsd + http://uri.etsi.org/01903/v1.4.1/XAdESv141.xsd + http://dublincore.org/schemas/xmls/qdc/2003/04/02/dc.xsd + http://dublincore.org/schemas/xmls/qdc/2003/04/02/dcterms.xsd + http://dublincore.org/schemas/xmls/qdc/2003/04/02/dcmitype.xsd + </description> + <url>http://poi.apache.org/</url> + + <mailingLists> + <mailingList> + <name>POI Users List</name> + <subscribe>user-subscribe@poi.apache.org</subscribe> + <unsubscribe>user-unsubscribe@poi.apache.org</unsubscribe> + <archive>http://mail-archives.apache.org/mod_mbox/poi-user/</archive> + </mailingList> + <mailingList> + <name>POI Developer List</name> + <subscribe>dev-subscribe@poi.apache.org</subscribe> + <unsubscribe>dev-unsubscribe@poi.apache.org</unsubscribe> + <archive>http://mail-archives.apache.org/mod_mbox/poi-dev/</archive> + </mailingList> + </mailingLists> + + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + + <organization> + <name>Apache Software Foundation</name> + <url>http://www.apache.org/</url> + </organization> + + <dependencies> + <dependency> + <groupId>org.apache.xmlbeans</groupId> + <artifactId>xmlbeans</artifactId> + <version>2.3.0</version> + </dependency> + </dependencies> +</project> |