Author: kiwiwings
Date: Sat Oct 25 19:34:42 2014
New Revision: 1634247
URL: http://svn.apache.org/r1634247
Log:
added ooxml-security-1.0 to the maven artifacts
Added:
poi/trunk/maven/ooxml-security.pom
Modified:
poi/site/src/documentation/content/xdocs/encryption.xml
poi/site/src/documentation/content/xdocs/faq.xml
poi/site/src/documentation/content/xdocs/overview.xml
poi/site/src/documentation/content/xdocs/status.xml
poi/trunk/.classpath
poi/trunk/build.xml
Modified: poi/site/src/documentation/content/xdocs/encryption.xml
URL:
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/encryption.xml?rev=1634247&r1=1634246&r2=1634247&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/encryption.xml (original)
+++ poi/site/src/documentation/content/xdocs/encryption.xml Sat Oct 25 19:34:42
2014
@@ -103,8 +103,8 @@ fos.close();
is dual-licensed to <link
href="https://code.google.com/p/eid-applet/source/browse/trunk/README.txt";>ASF/POI</link>.
Instead of using the internal <link
href="http://www.jsourcecode.com/class.php?proj=jdk%5Copenjdk&jar=openjdk-6-b14&class=org.jcp.xml.dsig.internal.dom.DOMXMLSignatureFactory";>JDK
API</link>
this version is based on <link href="http://santuario.apache.org";>Apache
Santuario</link>.</p>
- <p>The classes have been tested against the following libraries, which
need to be included additionally to the default
- dependencies:</p>
+ <p>The classes have been tested against the following libraries, which
need to be included additionally to the
+ <link href="overview.html#components">default dependencies</link>:</p>
<ul>
<li>BouncyCastle bcpkix and bcprov (tested against 1.51)</li>
<li>Apache Santuario "xmlsec" (tested against 2.0.1)</li>
Modified: poi/site/src/documentation/content/xdocs/faq.xml
URL:
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/faq.xml?rev=1634247&r1=1634246&r2=1634247&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/faq.xml (original)
+++ poi/site/src/documentation/content/xdocs/faq.xml Sat Oct 25 19:34:42 2014
@@ -62,7 +62,7 @@ System.out.println("Core POI came from "
XSDs, once compiled into Java classes, live in the
<em>org.openxmlformats.schemas</em> namespace.</p>
<p>There are two jar files available, as described in
- <link href="/overview.html">the components overview section</link>.
+ <link href="overview.html">the components overview section</link>.
The <em>full jar of all of the schemas is ooxml-schemas-1.1.jar</em>,
and it is currently around 15mb. The <em>smaller poi-ooxml-schemas
jar</em> is only about 4mb. This latter jar file only contains the
@@ -78,10 +78,10 @@ System.out.println("Core POI came from "
include them.</p>
<p>There are a number of ways to get the full ooxml-schemas-1.1.jar.
If you are a maven user, see the
- <link href="/overview.html">the components overview section</link>
+ <link href="overview.html">the components overview section</link>
for the artifact details to have maven download it for you.
If you download the source release of POI, and/or checkout the
- source code from <link href="/subversion.html">subversion</link>,
+ source code from <link href="subversion.html">subversion</link>,
then you can run the ant task "compile-ooxml-xsds" to have the
OOXML schemas downloaded and compiled for you (This will also
give you the XMLBeans generated source code, in case you wish to
@@ -92,7 +92,7 @@ System.out.println("Core POI came from "
named ooxml-schemas-1.0.jar. For POI 3.7, the filename was bumped
to ooxml-schemas-1.1.jar when generics support was added. You can
use ooxml-schemas-1.1.jar with POI 3.5 and 3.6 if you wish, but
- POI 3.7 won't wokr with ooxml-schemas-1.0.jar (it needs thew newer
+ POI 3.7 won't work with ooxml-schemas-1.0.jar (it needs the newer
one).</p>
</answer>
</faq>
@@ -396,7 +396,7 @@ System.out.println("Core POI came from "
should probably in this case speak to whoever is generating the file,
and have them fix it there. If your POI generated file is identified
as having an issue, and you're on the
- <link href="/howtobuild.html">latest codebase</link>, report a new
+ <link href="howtobuild.html">latest codebase</link>, report a new
POI bug and include the details of the validation failure.</p>
<p>Another thing to try, especially if the file is valid but POI isn't
behaving as expected, are the POI Dev Tools for the component you're
Modified: poi/site/src/documentation/content/xdocs/overview.xml
URL:
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/overview.xml?rev=1634247&r1=1634246&r2=1634247&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/overview.xml (original)
+++ poi/site/src/documentation/content/xdocs/overview.xml Sat Oct 25 19:34:42
2014
@@ -213,8 +213,8 @@
<tr>
<td><link href="./oxml4j/index.html">OpenXML4J</link></td>
<td>OOXML</td>
- <td>poi-ooxml plus one of<br />poi-ooxml-schemas, ooxml-schemas</td>
- <td>Only one schemas jar is needed, see below for differences</td>
+ <td>poi-ooxml plus either poi-ooxml-schemas or<br/>ooxml-schemas and
ooxml-security</td>
+ <td>see below for differences</td>
</tr>
<tr>
<td><link href="./spreadsheet/index.html">XSSF</link></td>
@@ -260,33 +260,52 @@
</tr>
<tr>
<td>poi</td>
- <td>commons-logging, commons-codec, log4j</td>
+ <td><link
href="http://search.maven.org/#artifactdetails|commons-logging|commons-logging|1.1.3|jar">commons-logging</link>,
+ <link
href="http://search.maven.org/#artifactdetails|commons-codec|commons-codec|1.9|jar">commons-codec</link>,
+ <link
href="http://search.maven.org/#artifactdetails|log4j|log4j|1.2.17|bundle">log4j</link>
+ </td>
<td>poi-version-yyyymmdd.jar</td>
</tr>
<tr>
<td>poi-scratchpad</td>
- <td>poi</td>
+ <td><link
href="http://search.maven.org/#search|gav|1|g:org.apache.poi AND
a:poi">poi</link></td>
<td>poi-scratchpad-version-yyyymmdd.jar</td>
</tr>
<tr>
<td>poi-ooxml</td>
- <td>poi, poi-ooxml-schemas</td>
+ <td><link
href="http://search.maven.org/#search|gav|1|g:org.apache.poi AND
a:poi">poi</link>,
+ <link
href="http://search.maven.org/#search|gav|1|g:org.apache.poi AND
a:poi-ooxml-schemas">poi-ooxml-schemas</link>
+ </td>
<td>poi-ooxml-version-yyyymmdd.jar</td>
</tr>
<tr>
<td>poi-ooxml-schemas</td>
- <td>xmlbeans</td>
+ <td><link
href="http://search.maven.org/#artifactdetails|org.apache.xmlbeans|xmlbeans|2.6.0|jar">xmlbeans</link></td>
<td>poi-ooxml-schemas-version-yyyymmdd.jar</td>
</tr>
<tr>
<td>poi-examples</td>
- <td>poi, poi-scratchpad, poi-ooxml</td>
+ <td><link
href="http://search.maven.org/#search|gav|1|g:org.apache.poi AND
a:poi">poi</link>,
+ <link
href="http://search.maven.org/#search|gav|1|g:org.apache.poi AND
a:poi-scratchpad">poi-scratchpad</link>,
+ <link
href="http://search.maven.org/#search|gav|1|g:org.apache.poi AND
a:poi-ooxml">poi-ooxml</link>
+ </td>
<td>poi-examples-version-yyyymmdd.jar</td>
</tr>
<tr>
<td>ooxml-schemas</td>
- <td>xmlbeans</td>
- <td>ooxml-schemas-1.1.jar</td>
+ <td><link
href="http://search.maven.org/#artifactdetails|org.apache.xmlbeans|xmlbeans|2.6.0|jar">xmlbeans</link></td>
+ <td><link
href="http://search.maven.org/#artifactdetails|org.apache.poi|ooxml-schemas|1.1|jar">ooxml-schemas-1.1.jar</link></td>
+ </tr>
+ <tr>
+ <td>ooxml-security</td>
+ <td><link
href="http://search.maven.org/#artifactdetails|org.apache.xmlbeans|xmlbeans|2.6.0|jar">xmlbeans</link><br/>
+ For signing:
+ <link
href="http://search.maven.org/#artifactdetails|org.bouncycastle|bcpkix-jdk15on|1.51|jar">bcpkix-jdk15on</link>,
+ <link
href="http://search.maven.org/#artifactdetails|org.bouncycastle|bcprov-jdk15on|1.51|jar">bcprov-jdk15on</link>,
+ <link
href="http://search.maven.org/#artifactdetails|org.apache.santuario|xmlsec|2.0.1|bundle">xmlsec</link>,
+ <link
href="http://search.maven.org/#artifactdetails|org.slf4j|slf4j-api|1.7.7|jar">slf4j-api</link>
+ </td>
+ <td><link
href="http://search.maven.org/#artifactdetails|org.apache.poi|ooxml-security|1.0|jar">ooxml-security-1.0.jar</link></td>
</tr>
</table>
@@ -295,8 +314,11 @@
poi-ooxml requires poi-ooxml-schemas. This is a substantially smaller
version of the ooxml-schemas jar (ooxml-schemas-1.1.jar for POI 3.7 or
later, ooxml-scheams-1.0.jar for POI 3.5 and 3.6).
- The larger ooxml-schemas jar is <link href="faq.html">normally</link>
- only required for development
+ The larger ooxml-schemas jar is <link
href="faq.html#faq-N10025">normally</link>
+ only required for development.
+ Similar to the ooxml-schemas jar, the ooxml-security jar contains
+ all generated classes for the encryption and signing schemas
+ and is subsetted in poi-ooxml-schemas.
</p>
<p>
The OOXML jars require a stax implementation, but now that Apache
Modified: poi/site/src/documentation/content/xdocs/status.xml
URL:
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/status.xml?rev=1634247&r1=1634246&r2=1634247&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/status.xml (original)
+++ poi/site/src/documentation/content/xdocs/status.xml Sat Oct 25 19:34:42 2014
@@ -38,6 +38,7 @@
</devs>
<release version="3.11-beta3" date="2014-??-??">
+ <action dev="PD" type="add">added ooxml-security-1.0 to the maven
artifacts</action>
<action dev="PD" type="fix"
fixes-bug="55864">XSSFImportFromXML.importFromXML() does not support optional
elements</action>
<action dev="PD" type="fix" fixes-bug="56835">Unreadable content when
adding multiple comments to cell</action>
<action dev="PD" type="add">SheetUtil.getCellWithMerges for getting a
cell at a co-ordinate, or the primary one of it's merged region if it's a
merged cell</action>
Modified: poi/trunk/.classpath
URL:
http://svn.apache.org/viewvc/poi/trunk/.classpath?rev=1634247&r1=1634246&r2=1634247&view=diff
==============================================================================
--- poi/trunk/.classpath (original)
+++ poi/trunk/.classpath Sat Oct 25 19:34:42 2014
@@ -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"/>
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1634247&r1=1634246&r2=1634247&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Sat Oct 25 19:34:42 2014
@@ -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" />
Added: poi/trunk/maven/ooxml-security.pom
URL:
http://svn.apache.org/viewvc/poi/trunk/maven/ooxml-security.pom?rev=1634247&view=auto
==============================================================================
--- poi/trunk/maven/ooxml-security.pom (added)
+++ poi/trunk/maven/ooxml-security.pom Sat Oct 25 19:34:42 2014
@@ -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>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/poi-user/</archive>
+ </mailingList>
+ <mailingList>
+ <name>POI Developer List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
