Fixed complete-build errors

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/xml_signature@1628338 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/.classpath b/.classpath
index 0a1d88f45e222edfdcd99def3dcce73d6b0c5db7..313dbdb1e82ac87873f85e2f1ed1bf1e5631e28e 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -26,7 +26,7 @@
        <classpathentry kind="lib" path="ooxml-lib/ooxml-encryption-1.2.jar" sourcepath="ooxml-lib/ooxml-encryption-src-1.2.jar"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
        <classpathentry kind="lib" path="compile-lib/slf4j-api-1.7.7.jar"/>\r
-       <classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-151.jar"/>\r
+       <classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.51.jar"/>\r
        <classpathentry kind="lib" path="compile-lib/bcprov-ext-jdk15on-1.51.jar"/>\r
        <classpathentry kind="lib" path="compile-lib/xmlsec-2.0.1.jar"/>\r
        <classpathentry kind="output" path="build/eclipse"/>\r

diff --git a/build.xml b/build.xml
index 8be3cb707de0eb7db6c26fba07ad0f007ca2635c..7c46239ccf4ac92933a6e1e5e0aef87a63f90b2d 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -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">

diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java
index b9c743548f81ea2b4900281fa967be0b2034be2b..2a281a6e6f025a4fd0caa62790041159c128cbcc 100644 (file)
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java
+++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java
@@ -1,3 +1,27 @@
+/* ====================================================================\r
+   Licensed to the Apache Software Foundation (ASF) under one or more\r
+   contributor license agreements.  See the NOTICE file distributed with\r
+   this work for additional information regarding copyright ownership.\r
+   The ASF licenses this file to You under the Apache License, Version 2.0\r
+   (the "License"); you may not use this file except in compliance with\r
+   the License.  You may obtain a copy of the License at\r
+\r
+       http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+   Unless required by applicable law or agreed to in writing, software\r
+   distributed under the License is distributed on an "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+   See the License for the specific language governing permissions and\r
+   limitations under the License.\r
+==================================================================== */\r
+\r
+/* ====================================================================\r
+   This product contains an ASLv2 licensed version of the OOXML signer\r
+   package from the eID Applet project\r
+   http://code.google.com/p/eid-applet/source/browse/trunk/README.txt  \r
+   Copyright (C) 2008-2014 FedICT.\r
+   ================================================================= */ \r
+\r
 package org.apache.poi.poifs.crypt.dsig.facets;\r
 \r
 import java.security.InvalidAlgorithmParameterException;\r