Erwin, Berin,
Latest CVS does not have the fix the JDK1.3 build failure :( see attached diff.
thanks,
dims
--- [EMAIL PROTECTED] wrote:
> vdkoogh 2004/03/07 10:16:02
>
> Modified: src_unitTests/org/apache/xml/security/test InteropTest.java
> . build.xml
> libs .cvsignore
> doc/site/src/documentation/content/xdocs/Java interop.xml
> src_unitTests/org/apache/xml/security/test/interop
> IBMTest.java
> Log:
> New IBM test vectors
> PR: 27435
> Submitted by: Davanum Srinivas
> Reviewed by:
> CVS: ----------------------------------------------------------------------
> CVS: PR:
> CVS: If this change addresses a PR in the problem report tracking
> CVS: database, then enter the PR number(s) here.
> CVS: Obtained from:
> CVS: If this change has been taken from another system, such as NCSA,
> CVS: then name the system in this line, otherwise delete it.
> CVS: Submitted by:
> CVS: If this code has been contributed to Apache by someone else; i.e.,
> CVS: they sent us a patch or a new module, then include their name/email
> CVS: address here. If this is your work then delete this line.
> CVS: Reviewed by:
> CVS: If we are doing pre-commit code reviews and someone else has
> CVS: reviewed your changes, include their name(s) here.
> CVS: If you have not had it reviewed then delete this line.
>
> Revision Changes Path
> 1.8 +3 -3
> xml-security/src_unitTests/org/apache/xml/security/test/InteropTest.java
>
> Index: InteropTest.java
> ===================================================================
> RCS file:
> /home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/InteropTest.java,v
> retrieving revision 1.7
> retrieving revision 1.8
> diff -u -r1.7 -r1.8
> --- InteropTest.java 8 Feb 2004 06:08:22 -0000 1.7
> +++ InteropTest.java 7 Mar 2004 18:16:02 -0000 1.8
> @@ -62,9 +62,9 @@
> * To make interop against the IBM xss4j examples, download the
> * XSS4j from http://www.alphaworks.ibm.com/tech/xmlsecuritysuite
> * and extract the test signatures from
> - * xss4j-20011029.zip#/xss4j/data/dsig
> + * xss4j-20030127.zip#/xss4j/data/dsig
> * in the directory
> - * data/com/ibm/xss4j-20011029/
> + * data/com/ibm/xss4j-20030127/
> * then the interop test is performed against these values, too.
> */
> String filename = "data/com/ibm/xss4j-20011029/enveloped-rsa.sig";
>
>
>
> 1.68 +12 -4 xml-security/build.xml
>
> Index: build.xml
> ===================================================================
> RCS file: /home/cvs/xml-security/build.xml,v
> retrieving revision 1.67
> retrieving revision 1.68
> diff -u -r1.67 -r1.68
> --- build.xml 14 Feb 2004 02:44:55 -0000 1.67
> +++ build.xml 7 Mar 2004 18:16:02 -0000 1.68
> @@ -147,7 +147,7 @@
> <patternset id="dataFiles">
> <include name="data/**"/>
> <exclude name="data/de/uni-siegen/**"/>
> - <exclude name="data/com/ibm/xss4j-20011029/**/*"/>
> + <exclude name="data/com/ibm/xss4j-20030127/**/*"/>
> </patternset>
>
> <patternset id="srcFiles">
> @@ -172,7 +172,10 @@
> <property name="javadoc.packages" value=" org.apache.xml.security.Init,
> org.apache.xml.security.algorithms, org.apache.xml.security.c14n,
> org.apache.xml.security.encryption, org.apache.xml.security.exceptions,
> org.apache.xml.security.keys, org.apache.xml.security.keys.content,
> org.apache.xml.security.keys.content.keyvalues,
> org.apache.xml.security.keys.content.x509,
> org.apache.xml.security.keys.keyresolver, org.apache.xml.security.keys.storage,
> org.apache.xml.security.signature, org.apache.xml.security.transforms,
> org.apache.xml.security.transforms.params, org.apache.xml.security.utils,
> org.apache.xml.security.utils.resolver "/>
>
> <echo
> message="-------------------------------------------------------------------"/>
> - <echo message="--------- ${product.Name} v${product.Version} [${year}]
> ----------------"/>
> + <echo message="--------- ${product.Name} v${product.Version} [${year}]
> -----------"/>
> + <echo
> message="-------------------------------------------------------------------"/>
> + <echo message="Building with ${ant.version}"/>
> + <echo message="Java ${java.version} located at ${java.home} "/>
> <echo
> message="-------------------------------------------------------------------"/>
> </target>
>
> @@ -218,6 +221,11 @@
> <delete dir="${build.dir}"/>
> <delete dir="./bak"/>
> <delete file="log.txt"/>
> + <delete>
> + <fileset dir="." includes="merlin*.html"/>
> + <fileset dir="." includes="merlin*.xml"/>
> + <fileset dir="." includes="signature.xml"/>
> + </delete>
> </target>
>
> <target depends="init" description="Clean up all temporary test vectors"
> name="clean-testdata">
> @@ -437,12 +445,12 @@
>
> and put the files into the
>
> - data/com/ibm/xss4j-20011029/
> + data/com/ibm/xss4j-20030127/
>
> directory. If the file enveloped-rsa.sig is found in that directory,
> IBM is 'magically' included in the test ;-))
> -->
> - <available file="data/com/ibm/xss4j-20011029/enveloped-rsa.sig"
> property="ibm.available"/>
> + <available file="data/com/ibm/xss4j-20030127/enveloped-rsa.sig"
> property="ibm.available"/>
> <junit filtertrace="true" fork="true" printsummary="on"
> failureproperty="build.test.failed">
> <jvmarg value="-Djava.compiler=NONE"/>
> <sysproperty key="basedir" value="${basedir}"/>
>
>
>
> 1.2 +2 -2 xml-security/libs/.cvsignore
>
> Index: .cvsignore
> ===================================================================
> RCS file: /home/cvs/xml-security/libs/.cvsignore,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- .cvsignore 26 Dec 2003 11:47:29 -0000 1.1
> +++ .cvsignore 7 Mar 2004 18:16:02 -0000 1.2
> @@ -1,2 +1,2 @@
> -jce-jdk13-???.jar
> -bcprov-jdk13-???.jar
> +jce*.jar
> +bc*.jar
>
>
>
> 1.2 +3 -3
> xml-security/doc/site/src/documentation/content/xdocs/Java/interop.xml
>
> Index: interop.xml
> ===================================================================
> RCS file:
> /home/cvs/xml-security/doc/site/src/documentation/content/xdocs/Java/interop.xml,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- interop.xml 15 Mar 2003 04:44:03 -0000 1.1
> +++ interop.xml 7 Mar 2004 18:16:02 -0000 1.2
> @@ -64,14 +64,14 @@
> copyrighted their test signatures which they have bundled with
> xss4j. If you want to include interop testing against IBM in your
> unit tests, simply do the following:
> - Download <code>xss4j-20011029.zip</code> from the
> + Download <code>xss4j-20030127.zip</code> from the
> <jump
> href="http://www.alphaworks.ibm.com/aw.nsf/download/xmlsecuritysuite";>
> alphaWorks download page
> </jump>.
> - Copy all files from the <code>xss4j-20011029.zip#/xss4j/data</code>
> + Copy all files from the <code>xss4j-20030127.zip#/xss4j/data</code>
> directory into the
> - <code>xml-security/data/com/ibm/xss4j-20011029/</code>
> + <code>xml-security/data/com/ibm/xss4j-20030127/</code>
> directory. If the
> <jump href="api/org/apache/xml/security/test/InteropTest.html">
> Interop
>
>
>
> 1.12 +3 -3
> xml-security/src_unitTests/org/apache/xml/security/test/interop/IBMTest.java
>
> Index: IBMTest.java
> ===================================================================
> RCS file:
> /home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/interop/IBMTest.java,v
> retrieving revision 1.11
> retrieving revision 1.12
> diff -u -r1.11 -r1.12
> --- IBMTest.java 8 Feb 2004 06:08:22 -0000 1.11
> +++ IBMTest.java 7 Mar 2004 18:16:02 -0000 1.12
> @@ -31,7 +31,7 @@
> /**
> * This test is to ensure interoperability with the examples provided by the IBM
> * XML Security Suite. They have to be located in the directory
> - * <CODE>data/com/ibm/xss4j-20011029/</CODE>.
> + * <CODE>data/com/ibm/xss4j-20030127/</CODE>.
> * <BR />
> * For license issues, the vectors are not included in the distibution. See
> * <A HREF="../../../../../../../interop.html">the interop page</A> for more on
> this.
> @@ -46,7 +46,7 @@
> org.apache.commons.logging.LogFactory.getLog(IBMTest.class.getName());
>
=== message truncated ===
=====
Davanum Srinivas - http://webservices.apache.org/~dims/
=====
Davanum Srinivas - http://webservices.apache.org/~dims/Index: src/org/apache/xml/security/encryption/XMLCipher.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/encryption/XMLCipher.java,v
retrieving revision 1.22
diff -d -u -b -B -w -u -r1.22 XMLCipher.java
--- src/org/apache/xml/security/encryption/XMLCipher.java 6 Mar 2004 11:36:33
-0000 1.22
+++ src/org/apache/xml/security/encryption/XMLCipher.java 7 Mar 2004 22:34:49
-0000
@@ -3767,7 +3767,7 @@
}
public Element toElement() {
- return toElement(EncryptionConstants._TAG_DATAREFERENCE);
+ return super.toElement(EncryptionConstants._TAG_DATAREFERENCE);
}
}
@@ -3777,7 +3777,7 @@
}
public Element toElement() {
- return toElement(EncryptionConstants._TAG_KEYREFERENCE);
+ return super.toElement(EncryptionConstants._TAG_KEYREFERENCE);
}
}
}
