You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by ra...@apache.org on 2008/02/01 19:52:29 UTC
svn commit: r617604 - in /xml/security/trunk: ./
src_samples/org/apache/xml/security/samples/
src_samples/org/apache/xml/security/samples/canonicalization/
src_samples/org/apache/xml/security/samples/iaik/
src_samples/org/apache/xml/security/samples/ke...
Author: raul
Date: Fri Feb 1 10:52:07 2008
New Revision: 617604
URL: http://svn.apache.org/viewvc?rev=617604&view=rev
Log:
Fix the gump compilation error
Modified:
xml/security/trunk/build.xml
xml/security/trunk/src_samples/org/apache/xml/security/samples/ResolverUsageHTTP.java
xml/security/trunk/src_samples/org/apache/xml/security/samples/canonicalization/CanonSubTree.java
xml/security/trunk/src_samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java
xml/security/trunk/src_samples/org/apache/xml/security/samples/keys/RetrievePublicKeys.java
xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/TestSignature.java
xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifyCollectableSignature.java
xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java
xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java
xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java
xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifySignature.java
xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/contract/ThreeSignerContractVerify.java
xml/security/trunk/src_samples/org/apache/xml/security/samples/transforms/SampleTransformChaining.java
xml/security/trunk/src_samples/org/apache/xml/security/samples/transforms/SampleTransformEnvelopedSignature.java
xml/security/trunk/src_samples/org/apache/xml/security/samples/transforms/SampleTransformXPathHereFunc.java
xml/security/trunk/src_unitTests/org/apache/xml/security/c14n/implementations/UtfHelperTest.java
Modified: xml/security/trunk/build.xml
URL: http://svn.apache.org/viewvc/xml/security/trunk/build.xml?rev=617604&r1=617603&r2=617604&view=diff
==============================================================================
--- xml/security/trunk/build.xml (original)
+++ xml/security/trunk/build.xml Fri Feb 1 10:52:07 2008
@@ -139,6 +139,7 @@
<path id="id.classpath.samples" >
<path refid="id.classpath" />
<pathelement location="${dir.build.bin}" />
+ <pathelement location="${dir.build.test}" />
<pathelement location="${dir.build.samples}" />
<pathelement location="${lib.xmlsec}" />
<pathelement location="${lib.xmlsec.samples}" />
Modified: xml/security/trunk/src_samples/org/apache/xml/security/samples/ResolverUsageHTTP.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_samples/org/apache/xml/security/samples/ResolverUsageHTTP.java?rev=617604&r1=617603&r2=617604&view=diff
==============================================================================
--- xml/security/trunk/src_samples/org/apache/xml/security/samples/ResolverUsageHTTP.java (original)
+++ xml/security/trunk/src_samples/org/apache/xml/security/samples/ResolverUsageHTTP.java Fri Feb 1 10:52:07 2008
@@ -20,6 +20,7 @@
import org.apache.xml.security.signature.XMLSignature;
+import org.apache.xml.security.test.TestUtils;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
import org.apache.xml.security.utils.resolver.ResourceResolver;
@@ -105,7 +106,7 @@
javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
org.w3c.dom.Document doc =
db.parse(new java.io.ByteArrayInputStream(inputStr.getBytes()));
- Element context = XMLUtils.createDSctx(doc, "ds", Constants.SignatureSpecNS);
+ Element context = TestUtils.createDSctx(doc, "ds", Constants.SignatureSpecNS);
Element dsElem = (Element) XPathAPI.selectSingleNode(doc,
"//ds:Signature[1]", context);
Modified: xml/security/trunk/src_samples/org/apache/xml/security/samples/canonicalization/CanonSubTree.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_samples/org/apache/xml/security/samples/canonicalization/CanonSubTree.java?rev=617604&r1=617603&r2=617604&view=diff
==============================================================================
--- xml/security/trunk/src_samples/org/apache/xml/security/samples/canonicalization/CanonSubTree.java (original)
+++ xml/security/trunk/src_samples/org/apache/xml/security/samples/canonicalization/CanonSubTree.java Fri Feb 1 10:52:07 2008
@@ -25,6 +25,7 @@
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.xml.security.c14n.Canonicalizer;
+import org.apache.xml.security.test.TestUtils;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
import org.apache.xpath.XPathAPI;
@@ -88,7 +89,7 @@
Canonicalizer c14n =
Canonicalizer
.getInstance("http://www.w3.org/TR/2001/REC-xml-c14n-20010315");
- Element nscontext = XMLUtils.createDSctx(doc, "ds", Constants.SignatureSpecNS);
+ Element nscontext = TestUtils.createDSctx(doc, "ds", Constants.SignatureSpecNS);
Node signedInfo = XPathAPI.selectSingleNode(doc, "//ds:SignedInfo",
nscontext);
Modified: xml/security/trunk/src_samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java?rev=617604&r1=617603&r2=617604&view=diff
==============================================================================
--- xml/security/trunk/src_samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java (original)
+++ xml/security/trunk/src_samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java Fri Feb 1 10:52:07 2008
@@ -26,6 +26,7 @@
import org.apache.xml.security.keys.KeyInfo;
import org.apache.xml.security.signature.XMLSignature;
+import org.apache.xml.security.test.TestUtils;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
import org.apache.xml.security.utils.resolver.ResourceResolverSpi;
@@ -158,7 +159,7 @@
javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
org.w3c.dom.Document doc = db.parse(new java.io.FileInputStream(f));
- Element nscontext = XMLUtils.createDSctx(doc, "ds",
+ Element nscontext = TestUtils.createDSctx(doc, "ds",
Constants.SignatureSpecNS);
Element sigElement = (Element) XPathAPI.selectSingleNode(doc,
"//ds:Signature[1]", nscontext);
Modified: xml/security/trunk/src_samples/org/apache/xml/security/samples/keys/RetrievePublicKeys.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_samples/org/apache/xml/security/samples/keys/RetrievePublicKeys.java?rev=617604&r1=617603&r2=617604&view=diff
==============================================================================
--- xml/security/trunk/src_samples/org/apache/xml/security/samples/keys/RetrievePublicKeys.java (original)
+++ xml/security/trunk/src_samples/org/apache/xml/security/samples/keys/RetrievePublicKeys.java Fri Feb 1 10:52:07 2008
@@ -25,6 +25,7 @@
import org.apache.xml.security.keys.KeyInfo;
import org.apache.xml.security.keys.storage.StorageResolver;
import org.apache.xml.security.keys.storage.implementations.CertsInFilesystemDirectoryResolver;
+import org.apache.xml.security.test.TestUtils;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
import org.apache.xpath.XPathAPI;
@@ -91,7 +92,7 @@
javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
org.w3c.dom.Document doc =
db.parse(new java.io.FileInputStream(filename));
- Element nscontext = XMLUtils.createDSctx(doc, "ds", Constants.SignatureSpecNS);
+ Element nscontext = TestUtils.createDSctx(doc, "ds", Constants.SignatureSpecNS);
Element kiElement = (Element) XPathAPI.selectSingleNode(doc,
"//ds:KeyInfo[1]", nscontext);
Modified: xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/TestSignature.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/TestSignature.java?rev=617604&r1=617603&r2=617604&view=diff
==============================================================================
--- xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/TestSignature.java (original)
+++ xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/TestSignature.java Fri Feb 1 10:52:07 2008
@@ -26,6 +26,7 @@
import org.apache.xml.security.keys.storage.StorageResolver;
import org.apache.xml.security.samples.utils.resolver.OfflineResolver;
import org.apache.xml.security.signature.XMLSignature;
+import org.apache.xml.security.test.TestUtils;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
import org.apache.xpath.XPathAPI;
@@ -94,7 +95,7 @@
db.parse(new java.io.FileInputStream(filename));
//create a namespace context for use in the XPath expression below
- Element nscontext = XMLUtils.createDSctx(doc, "ds",
+ Element nscontext = TestUtils.createDSctx(doc, "ds",
Constants.SignatureSpecNS);
//retrieve the signature Element from the document
Modified: xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifyCollectableSignature.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifyCollectableSignature.java?rev=617604&r1=617603&r2=617604&view=diff
==============================================================================
--- xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifyCollectableSignature.java (original)
+++ xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifyCollectableSignature.java Fri Feb 1 10:52:07 2008
@@ -22,6 +22,7 @@
import org.apache.xml.security.signature.SignedInfo;
import org.apache.xml.security.signature.XMLSignature;
+import org.apache.xml.security.test.TestUtils;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
import org.apache.xpath.XPathAPI;
@@ -67,7 +68,7 @@
org.w3c.dom.Document doc =
db.parse(new java.io.FileInputStream(signatureFile));
- Element nscontext = XMLUtils.createDSctx(doc, "ds",
+ Element nscontext = TestUtils.createDSctx(doc, "ds",
Constants.SignatureSpecNS);
NodeList signatureElems = XPathAPI.selectNodeList(doc,
"//ds:Signature", nscontext);
Modified: xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java?rev=617604&r1=617603&r2=617604&view=diff
==============================================================================
--- xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java (original)
+++ xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java Fri Feb 1 10:52:07 2008
@@ -25,6 +25,7 @@
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.xml.security.signature.XMLSignature;
+import org.apache.xml.security.test.TestUtils;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
import org.apache.xpath.XPathAPI;
@@ -161,7 +162,7 @@
org.w3c.dom.Document doc = db.parse(new java.io.FileInputStream(f));
- Element nscontext = XMLUtils.createDSctx(doc, "ds",
+ Element nscontext = TestUtils.createDSctx(doc, "ds",
Constants.SignatureSpecNS);
Element sigElement = (Element) XPathAPI.selectSingleNode(doc,
"//ds:Signature[1]", nscontext);
Modified: xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java?rev=617604&r1=617603&r2=617604&view=diff
==============================================================================
--- xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java (original)
+++ xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java Fri Feb 1 10:52:07 2008
@@ -28,6 +28,7 @@
import org.apache.xml.security.keys.KeyInfo;
import org.apache.xml.security.signature.XMLSignature;
+import org.apache.xml.security.test.TestUtils;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
import org.apache.xpath.XPathAPI;
@@ -146,7 +147,7 @@
org.w3c.dom.Document doc = db.parse(new java.io.FileInputStream(f));
- Element nscontext = XMLUtils.createDSctx(doc, "ds",
+ Element nscontext = TestUtils.createDSctx(doc, "ds",
Constants.SignatureSpecNS);
Element sigElement = (Element) XPathAPI.selectSingleNode(doc,
"//ds:Signature[1]", nscontext);
Modified: xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java?rev=617604&r1=617603&r2=617604&view=diff
==============================================================================
--- xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java (original)
+++ xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java Fri Feb 1 10:52:07 2008
@@ -28,6 +28,7 @@
import org.apache.xml.security.keys.KeyInfo;
import org.apache.xml.security.signature.XMLSignature;
+import org.apache.xml.security.test.TestUtils;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
import org.apache.xpath.XPathAPI;
@@ -156,7 +157,7 @@
org.w3c.dom.Document doc = db.parse(new java.io.FileInputStream(f));
- Element nscontext = XMLUtils.createDSctx(doc, "ds",
+ Element nscontext = TestUtils.createDSctx(doc, "ds",
Constants.SignatureSpecNS);
Element sigElement = (Element) XPathAPI.selectSingleNode(doc,
"//ds:Signature[1]", nscontext);
Modified: xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifySignature.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifySignature.java?rev=617604&r1=617603&r2=617604&view=diff
==============================================================================
--- xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifySignature.java (original)
+++ xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/VerifySignature.java Fri Feb 1 10:52:07 2008
@@ -27,6 +27,7 @@
import org.apache.xml.security.keys.KeyInfo;
import org.apache.xml.security.samples.utils.resolver.OfflineResolver;
import org.apache.xml.security.signature.XMLSignature;
+import org.apache.xml.security.test.TestUtils;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
import org.apache.xpath.XPathAPI;
@@ -116,7 +117,7 @@
}
org.w3c.dom.Document doc = db.parse(new java.io.FileInputStream(f));
- Element nscontext = XMLUtils.createDSctx(doc, "ds",
+ Element nscontext = TestUtils.createDSctx(doc, "ds",
Constants.SignatureSpecNS);
Element sigElement = (Element) XPathAPI.selectSingleNode(doc,
"//ds:Signature[1]", nscontext);
Modified: xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/contract/ThreeSignerContractVerify.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/contract/ThreeSignerContractVerify.java?rev=617604&r1=617603&r2=617604&view=diff
==============================================================================
--- xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/contract/ThreeSignerContractVerify.java (original)
+++ xml/security/trunk/src_samples/org/apache/xml/security/samples/signature/contract/ThreeSignerContractVerify.java Fri Feb 1 10:52:07 2008
@@ -21,6 +21,7 @@
import java.io.File;
import org.apache.xml.security.signature.XMLSignature;
+import org.apache.xml.security.test.TestUtils;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
import org.apache.xpath.XPathAPI;
@@ -64,7 +65,7 @@
org.w3c.dom.Document doc =
db.parse(new java.io.FileInputStream(signatureFile));
- Element nscontext = XMLUtils.createDSctx(doc, "ds",
+ Element nscontext = TestUtils.createDSctx(doc, "ds",
Constants.SignatureSpecNS);
NodeList signatureElems = XPathAPI.selectNodeList(doc,
"//ds:Signature", nscontext);
Modified: xml/security/trunk/src_samples/org/apache/xml/security/samples/transforms/SampleTransformChaining.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_samples/org/apache/xml/security/samples/transforms/SampleTransformChaining.java?rev=617604&r1=617603&r2=617604&view=diff
==============================================================================
--- xml/security/trunk/src_samples/org/apache/xml/security/samples/transforms/SampleTransformChaining.java (original)
+++ xml/security/trunk/src_samples/org/apache/xml/security/samples/transforms/SampleTransformChaining.java Fri Feb 1 10:52:07 2008
@@ -20,6 +20,7 @@
import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.test.TestUtils;
import org.apache.xml.security.transforms.Transforms;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
@@ -90,7 +91,7 @@
db.parse(new java.io.ByteArrayInputStream(inputStr.getBytes()));
// catch the ds:Transforms
- Element nscontext = XMLUtils.createDSctx(doc, "ds", Constants.SignatureSpecNS);
+ Element nscontext = TestUtils.createDSctx(doc, "ds", Constants.SignatureSpecNS);
Element transformsElement = (Element) XPathAPI.selectSingleNode(doc,
"//ds:Transforms", nscontext);
Modified: xml/security/trunk/src_samples/org/apache/xml/security/samples/transforms/SampleTransformEnvelopedSignature.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_samples/org/apache/xml/security/samples/transforms/SampleTransformEnvelopedSignature.java?rev=617604&r1=617603&r2=617604&view=diff
==============================================================================
--- xml/security/trunk/src_samples/org/apache/xml/security/samples/transforms/SampleTransformEnvelopedSignature.java (original)
+++ xml/security/trunk/src_samples/org/apache/xml/security/samples/transforms/SampleTransformEnvelopedSignature.java Fri Feb 1 10:52:07 2008
@@ -20,6 +20,7 @@
import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.test.TestUtils;
import org.apache.xml.security.transforms.Transforms;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
@@ -80,7 +81,7 @@
javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
org.w3c.dom.Document doc =
db.parse(new java.io.ByteArrayInputStream(inputStr.getBytes()));
- Element nscontext = XMLUtils.createDSctx(doc, "ds", Constants.SignatureSpecNS);
+ Element nscontext = TestUtils.createDSctx(doc, "ds", Constants.SignatureSpecNS);
Element transformsElem = (Element) XPathAPI.selectSingleNode(
doc, "//ds:Signature[@Id='SignatureToBeOmitted']//ds:Transforms",
Modified: xml/security/trunk/src_samples/org/apache/xml/security/samples/transforms/SampleTransformXPathHereFunc.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_samples/org/apache/xml/security/samples/transforms/SampleTransformXPathHereFunc.java?rev=617604&r1=617603&r2=617604&view=diff
==============================================================================
--- xml/security/trunk/src_samples/org/apache/xml/security/samples/transforms/SampleTransformXPathHereFunc.java (original)
+++ xml/security/trunk/src_samples/org/apache/xml/security/samples/transforms/SampleTransformXPathHereFunc.java Fri Feb 1 10:52:07 2008
@@ -20,6 +20,7 @@
import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.test.TestUtils;
import org.apache.xml.security.transforms.Transforms;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
@@ -77,7 +78,7 @@
javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
org.w3c.dom.Document doc =
db.parse(new java.io.ByteArrayInputStream(inputStr.getBytes()));
- Element nscontext = XMLUtils.createDSctx(doc, "ds", Constants.SignatureSpecNS);
+ Element nscontext = TestUtils.createDSctx(doc, "ds", Constants.SignatureSpecNS);
Element transformsElem = (Element) XPathAPI.selectSingleNode(
doc,
Modified: xml/security/trunk/src_unitTests/org/apache/xml/security/c14n/implementations/UtfHelperTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/org/apache/xml/security/c14n/implementations/UtfHelperTest.java?rev=617604&r1=617603&r2=617604&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/org/apache/xml/security/c14n/implementations/UtfHelperTest.java (original)
+++ xml/security/trunk/src_unitTests/org/apache/xml/security/c14n/implementations/UtfHelperTest.java Fri Feb 1 10:52:07 2008
@@ -10,7 +10,7 @@
public class UtfHelperTest extends TestCase {
public void testBug40156() {
- String s="äöü";
+ String s="äöü";
byte a[]=UtfHelpper.getStringInUtf8(s);
try {
byte correct[]=s.getBytes("UTF8");