Author: kiwiwings
Date: Mon Sep 29 23:39:45 2014
New Revision: 1628338
URL: http://svn.apache.org/r1628338
Log:
Fixed complete-build errors
Modified:
poi/branches/xml_signature/.classpath
poi/branches/xml_signature/build.xml
poi/branches/xml_signature/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java
Modified: poi/branches/xml_signature/.classpath
URL:
http://svn.apache.org/viewvc/poi/branches/xml_signature/.classpath?rev=1628338&r1=1628337&r2=1628338&view=diff
==============================================================================
--- poi/branches/xml_signature/.classpath (original)
+++ poi/branches/xml_signature/.classpath Mon Sep 29 23:39:45 2014
@@ -26,7 +26,7 @@
<classpathentry kind="lib" path="ooxml-lib/ooxml-encryption-1.2.jar"
sourcepath="ooxml-lib/ooxml-encryption-src-1.2.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-151.jar"/>
+ <classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.51.jar"/>
<classpathentry kind="lib"
path="compile-lib/bcprov-ext-jdk15on-1.51.jar"/>
<classpathentry kind="lib" path="compile-lib/xmlsec-2.0.1.jar"/>
<classpathentry kind="output" path="build/eclipse"/>
Modified: poi/branches/xml_signature/build.xml
URL:
http://svn.apache.org/viewvc/poi/branches/xml_signature/build.xml?rev=1628338&r1=1628337&r2=1628338&view=diff
==============================================================================
--- poi/branches/xml_signature/build.xml (original)
+++ poi/branches/xml_signature/build.xml Mon Sep 29 23:39:45 2014
@@ -152,8 +152,8 @@ under the License.
<property name="dsig.xmlsec.url"
value="${repository.m2}/maven2/org/apache/santuario/xmlsec/2.0.1/xmlsec-2.0.1.jar"/>
<property name="dsig.bouncycastle-prov.jar"
location="${compile.lib}/bcprov-ext-jdk15on-1.51.jar"/>
<property name="dsig.bouncycastle-prov.url"
value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.51/bcprov-ext-jdk15on-1.51.jar"/>
- <property name="dsig.bouncycastle-pkix.jar"
location="${compile.lib}/bcpkix-jdk15on-151.jar"/>
- <property name="dsig.bouncycastle-pkix.url"
value="${repository.m2}/maven2/org/bouncycastle/bcpkix-jdk15on/1.51/bcpkix-jdk15on-151.jar"/>
+ <property name="dsig.bouncycastle-pkix.jar"
location="${compile.lib}/bcpkix-jdk15on-1.51.jar"/>
+ <property name="dsig.bouncycastle-pkix.url"
value="${repository.m2}/maven2/org/bouncycastle/bcpkix-jdk15on/1.51/bcpkix-jdk15on-1.51.jar"/>
<property name="dsig.sl4j-api.jar"
location="${compile.lib}/slf4j-api-1.7.7.jar"/>
<property name="dsig.sl4j-api.url"
value="${repository.m2}/maven2/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar"/>
@@ -245,6 +245,13 @@ under the License.
<pathelement location="${main.output.dir}"/>
</path>
+ <path id="ooxml.xmlsec.classpath">
+ <pathelement location="${dsig.xmlsec.jar}"/>
+ <pathelement location="${dsig.bouncycastle-prov.jar}"/>
+ <pathelement location="${dsig.bouncycastle-pkix.jar}"/>
+ <pathelement location="${dsig.sl4j-api.jar}"/>
+ </path>
+
<path id="ooxml.classpath">
<pathelement location="${ooxml.xmlbeans26.jar}"/>
<pathelement location="${ooxml.xsds.jar}"/>
@@ -252,6 +259,7 @@ under the License.
<pathelement location="${main.output.dir}"/>
<pathelement location="${scratchpad.output.dir}"/>
<pathelement location="${ooxml.encryption.jar}"/>
+ <path refid="ooxml.xmlsec.classpath"/>
</path>
<path id="test.classpath">
@@ -398,6 +406,10 @@ under the License.
<available file="${jacoco.zip}"/>
<available file="${rat.jar}"/>
<available file="${xerces.jar}"/>
+ <available file="${dsig.bouncycastle-prov.jar}"/>
+ <available file="${dsig.bouncycastle-pkix.jar}"/>
+ <available file="${dsig.xmlsec.jar}"/>
+ <available file="${dsig.sl4j-api.jar}"/>
</and>
<isset property="disconnected"/>
</or>
@@ -468,6 +480,10 @@ under the License.
<param name="sourcefile" value="${dsig.xmlsec.url}"/>
<param name="destfile" value="${dsig.xmlsec.jar}"/>
</antcall>
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${dsig.sl4j-api.url}"/>
+ <param name="destfile" value="${dsig.sl4j-api.jar}"/>
+ </antcall>
</target>
<target name="check-ooxml-jars">
Modified:
poi/branches/xml_signature/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java
URL:
http://svn.apache.org/viewvc/poi/branches/xml_signature/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java?rev=1628338&r1=1628337&r2=1628338&view=diff
==============================================================================
---
poi/branches/xml_signature/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java
(original)
+++
poi/branches/xml_signature/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java
Mon Sep 29 23:39:45 2014
@@ -1,3 +1,27 @@
+/* ====================================================================
+ 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.
+==================================================================== */
+
+/* ====================================================================
+ This product contains an ASLv2 licensed version of the OOXML signer
+ package from the eID Applet project
+ http://code.google.com/p/eid-applet/source/browse/trunk/README.txt
+ Copyright (C) 2008-2014 FedICT.
+ ================================================================= */
+
package org.apache.poi.poifs.crypt.dsig.facets;
import java.security.InvalidAlgorithmParameterException;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
