You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2011/02/02 12:10:00 UTC
svn commit: r1066412 [1/2] - in /santuario/xml-security-java/trunk:
samples/org/apache/xml/security/samples/
src/main/java/org/apache/xml/security/algorithms/
src/main/java/org/apache/xml/security/encryption/
src/main/java/org/apache/xml/security/keys/...
Author: coheigea
Date: Wed Feb 2 11:09:58 2011
New Revision: 1066412
URL: http://svn.apache.org/viewvc?rev=1066412&view=rev
Log:
[SANTUARIO-259] - More source refactoring.
Modified:
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/TransformPerformanceTester.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/Algorithm.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/KeyValue.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/RetrievalMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/ObjectContainer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignatureProperties.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignatureProperty.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignedInfo.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/InclusiveNamespaces.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/XPath2FilterContainer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/XPath2FilterContainer04.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/XPathContainer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/XPathFilterCHGPContainer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/EncryptionConstants.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/EncryptionElementProxy.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/HelperNodeList.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/SignatureElementProxy.java
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/TransformPerformanceTester.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/TransformPerformanceTester.java?rev=1066412&r1=1066411&r2=1066412&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/TransformPerformanceTester.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/TransformPerformanceTester.java Wed Feb 2 11:09:58 2011
@@ -189,7 +189,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("pureedge_xfilter2_doc.xml");
+ fos = new FileOutputStream("pureedge_xfilter2doc.xml");
fos.write(result[0]);
fos.close();
@@ -226,7 +226,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("pureedge_xfilter2_new_doc.xml");
+ fos = new FileOutputStream("pureedge_xfilter2_newdoc.xml");
fos.write(result[0]);
fos.close();
@@ -263,7 +263,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("pureedge_apachefilter_doc.xml");
+ fos = new FileOutputStream("pureedge_apachefilterdoc.xml");
fos.write(result[0]);
fos.close();
@@ -313,7 +313,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("xfilter2spec_xfilter2_doc_1.xml");
+ fos = new FileOutputStream("xfilter2spec_xfilter2doc_1.xml");
fos.write(result[0]);
fos.close();
@@ -363,7 +363,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("xfilter2spec_xfilter2_doc_2.xml");
+ fos = new FileOutputStream("xfilter2spec_xfilter2doc_2.xml");
fos.write(result[0]);
fos.close();
@@ -413,7 +413,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("xfilter2spec_xfilter2_doc_3.xml");
+ fos = new FileOutputStream("xfilter2spec_xfilter2doc_3.xml");
fos.write(result[0]);
fos.close();
@@ -464,7 +464,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("xfilter2spec_apachefilter_doc_1.xml");
+ fos = new FileOutputStream("xfilter2spec_apachefilterdoc_1.xml");
fos.write(result[0]);
fos.close();
@@ -515,7 +515,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("xfilter2spec_apachefilter_doc_2.xml");
+ fos = new FileOutputStream("xfilter2spec_apachefilterdoc_2.xml");
fos.write(result[0]);
fos.close();
@@ -566,7 +566,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("xfilter2spec_apachefilter_doc_3.xml");
+ fos = new FileOutputStream("xfilter2spec_apachefilterdoc_3.xml");
fos.write(result[0]);
fos.close();
@@ -609,7 +609,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
fos = new FileOutputStream(
- "apachesample_apachefilter_doc_7_optimal.xml");
+ "apachesample_apachefilterdoc_7_optimal.xml");
fos.write(result[0]);
fos.close();
@@ -651,7 +651,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("apachesample_apachefilter_doc_1.xml");
+ fos = new FileOutputStream("apachesample_apachefilterdoc_1.xml");
fos.write(result[0]);
fos.close();
@@ -691,7 +691,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("apachesample_apachefilter_doc_2.xml");
+ fos = new FileOutputStream("apachesample_apachefilterdoc_2.xml");
fos.write(result[0]);
fos.close();
@@ -731,7 +731,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("apachesample_apachefilter_doc_3.xml");
+ fos = new FileOutputStream("apachesample_apachefilterdoc_3.xml");
fos.write(result[0]);
fos.close();
@@ -771,7 +771,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("apachesample_apachefilter_doc_4.xml");
+ fos = new FileOutputStream("apachesample_apachefilterdoc_4.xml");
fos.write(result[0]);
fos.close();
@@ -811,7 +811,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("apachesample_apachefilter_doc_5.xml");
+ fos = new FileOutputStream("apachesample_apachefilterdoc_5.xml");
fos.write(result[0]);
fos.close();
@@ -851,7 +851,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("apachesample_apachefilter_doc_6.xml");
+ fos = new FileOutputStream("apachesample_apachefilterdoc_6.xml");
fos.write(result[0]);
fos.close();
@@ -891,7 +891,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("apachesample_apachefilter_doc_7.xml");
+ fos = new FileOutputStream("apachesample_apachefilterdoc_7.xml");
fos.write(result[0]);
fos.close();
@@ -930,7 +930,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("apachesample_xfilter2_doc_1.xml");
+ fos = new FileOutputStream("apachesample_xfilter2doc_1.xml");
fos.write(result[0]);
fos.close();
@@ -969,7 +969,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("apachesample_xfilter2_doc_2.xml");
+ fos = new FileOutputStream("apachesample_xfilter2doc_2.xml");
fos.write(result[0]);
fos.close();
@@ -1008,7 +1008,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("apachesample_xfilter2_doc_3.xml");
+ fos = new FileOutputStream("apachesample_xfilter2doc_3.xml");
fos.write(result[0]);
fos.close();
@@ -1047,7 +1047,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("apachesample_xfilter2_doc_4.xml");
+ fos = new FileOutputStream("apachesample_xfilter2doc_4.xml");
fos.write(result[0]);
fos.close();
@@ -1086,7 +1086,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("apachesample_xfilter2_doc_5.xml");
+ fos = new FileOutputStream("apachesample_xfilter2doc_5.xml");
fos.write(result[0]);
fos.close();
@@ -1125,7 +1125,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("apachesample_xfilter2_doc_6.xml");
+ fos = new FileOutputStream("apachesample_xfilter2doc_6.xml");
fos.write(result[0]);
fos.close();
@@ -1164,7 +1164,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("apachesample_xfilter2_doc_7.xml");
+ fos = new FileOutputStream("apachesample_xfilter2doc_7.xml");
fos.write(result[0]);
fos.close();
@@ -1210,7 +1210,7 @@ public class TransformPerformanceTester
FileOutputStream fos;
- fos = new FileOutputStream("xfilter2spec_xfilter2_3_new_doc.xml");
+ fos = new FileOutputStream("xfilter2spec_xfilter2_3_newdoc.xml");
fos.write(result[0]);
fos.close();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/Algorithm.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/Algorithm.java?rev=1066412&r1=1066411&r2=1066412&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/Algorithm.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/Algorithm.java Wed Feb 2 11:09:58 2011
@@ -61,7 +61,7 @@ public abstract class Algorithm extends
* @return The URI of the alogrithm
*/
public String getAlgorithmURI() {
- return this._constructionElement.getAttributeNS(null, Constants._ATT_ALGORITHM);
+ return this.constructionElement.getAttributeNS(null, Constants._ATT_ALGORITHM);
}
/**
@@ -72,7 +72,7 @@ public abstract class Algorithm extends
protected void setAlgorithmURI(String algorithmURI) {
if ( (algorithmURI != null)) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_ALGORITHM,
+ this.constructionElement.setAttributeNS(null, Constants._ATT_ALGORITHM,
algorithmURI);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java?rev=1066412&r1=1066411&r2=1066412&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java Wed Feb 2 11:09:58 2011
@@ -96,7 +96,7 @@ public class SignatureAlgorithm extends
_signatureAlgorithm=isForSigning ? getInstanceForSigning(algorithmURI) :
getInstanceForVerify(algorithmURI);
this._signatureAlgorithm
- .engineGetContextFromElement(this._constructionElement);
+ .engineGetContextFromElement(this.constructionElement);
}
private static SignatureAlgorithmSpi getInstanceForSigning
@@ -167,7 +167,7 @@ public class SignatureAlgorithm extends
initializeAlgorithm(true);
this._signatureAlgorithm.engineSetHMACOutputLength(HMACOutputLength);
((IntegrityHmac)this._signatureAlgorithm)
- .engineAddContextToElement(this._constructionElement);
+ .engineAddContextToElement(this.constructionElement);
}
/**
@@ -374,7 +374,7 @@ public class SignatureAlgorithm extends
* @return the URI representation of Transformation algorithm
*/
public final String getURI() {
- return this._constructionElement.getAttributeNS(null,
+ return this.constructionElement.getAttributeNS(null,
Constants._ATT_ALGORITHM);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java?rev=1066412&r1=1066411&r2=1066412&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java Wed Feb 2 11:09:58 2011
@@ -3631,8 +3631,8 @@ public class XMLCipher {
throw new RuntimeException("Document is null");
}
- this._doc = doc;
- this._constructionElement = createElementForFamilyLocal(this._doc,
+ this.doc = doc;
+ this.constructionElement = createElementForFamilyLocal(this.doc,
this.getBaseNamespace(), this.getBaseLocalName());
}
@@ -3658,8 +3658,8 @@ public class XMLCipher {
* @return the XML Element form of that Transforms
*/
public Element toElement() {
- if (_doc == null)
- _doc = _contextDocument;
+ if (doc == null)
+ doc = _contextDocument;
return getElement();
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java?rev=1066412&r1=1066411&r2=1066412&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java Wed Feb 2 11:09:58 2011
@@ -117,7 +117,7 @@ public class KeyInfo extends SignatureEl
super(doc);
- XMLUtils.addReturnToElement(this._constructionElement);
+ XMLUtils.addReturnToElement(this.constructionElement);
}
@@ -142,8 +142,8 @@ public class KeyInfo extends SignatureEl
public void setId(String Id) {
if ((Id != null)) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
- IdResolver.registerElementById(this._constructionElement, Id);
+ this.constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
+ IdResolver.registerElementById(this.constructionElement, Id);
}
}
@@ -153,7 +153,7 @@ public class KeyInfo extends SignatureEl
* @return the <code>Id</code> attribute
*/
public String getId() {
- return this._constructionElement.getAttributeNS(null, Constants._ATT_ID);
+ return this.constructionElement.getAttributeNS(null, Constants._ATT_ID);
}
/**
@@ -162,7 +162,7 @@ public class KeyInfo extends SignatureEl
* @param keynameString
*/
public void addKeyName(String keynameString) {
- this.add(new KeyName(this._doc, keynameString));
+ this.add(new KeyName(this.doc, keynameString));
}
/**
@@ -172,8 +172,8 @@ public class KeyInfo extends SignatureEl
*/
public void add(KeyName keyname) {
- this._constructionElement.appendChild(keyname.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(keyname.getElement());
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -182,7 +182,7 @@ public class KeyInfo extends SignatureEl
* @param pk
*/
public void addKeyValue(PublicKey pk) {
- this.add(new KeyValue(this._doc, pk));
+ this.add(new KeyValue(this.doc, pk));
}
/**
@@ -191,7 +191,7 @@ public class KeyInfo extends SignatureEl
* @param unknownKeyValueElement
*/
public void addKeyValue(Element unknownKeyValueElement) {
- this.add(new KeyValue(this._doc, unknownKeyValueElement));
+ this.add(new KeyValue(this.doc, unknownKeyValueElement));
}
/**
@@ -200,7 +200,7 @@ public class KeyInfo extends SignatureEl
* @param dsakeyvalue
*/
public void add(DSAKeyValue dsakeyvalue) {
- this.add(new KeyValue(this._doc, dsakeyvalue));
+ this.add(new KeyValue(this.doc, dsakeyvalue));
}
/**
@@ -209,7 +209,7 @@ public class KeyInfo extends SignatureEl
* @param rsakeyvalue
*/
public void add(RSAKeyValue rsakeyvalue) {
- this.add(new KeyValue(this._doc, rsakeyvalue));
+ this.add(new KeyValue(this.doc, rsakeyvalue));
}
/**
@@ -218,7 +218,7 @@ public class KeyInfo extends SignatureEl
* @param pk
*/
public void add(PublicKey pk) {
- this.add(new KeyValue(this._doc, pk));
+ this.add(new KeyValue(this.doc, pk));
}
/**
@@ -227,8 +227,8 @@ public class KeyInfo extends SignatureEl
* @param keyvalue
*/
public void add(KeyValue keyvalue) {
- this._constructionElement.appendChild(keyvalue.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(keyvalue.getElement());
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -237,7 +237,7 @@ public class KeyInfo extends SignatureEl
* @param mgmtdata
*/
public void addMgmtData(String mgmtdata) {
- this.add(new MgmtData(this._doc, mgmtdata));
+ this.add(new MgmtData(this.doc, mgmtdata));
}
/**
@@ -246,8 +246,8 @@ public class KeyInfo extends SignatureEl
* @param mgmtdata
*/
public void add(MgmtData mgmtdata) {
- this._constructionElement.appendChild(mgmtdata.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(mgmtdata.getElement());
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -256,8 +256,8 @@ public class KeyInfo extends SignatureEl
* @param pgpdata
*/
public void add(PGPData pgpdata) {
- this._constructionElement.appendChild(pgpdata.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(pgpdata.getElement());
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -269,7 +269,7 @@ public class KeyInfo extends SignatureEl
*/
public void addRetrievalMethod(String URI, Transforms transforms,
String Type) {
- this.add(new RetrievalMethod(this._doc, URI, transforms, Type));
+ this.add(new RetrievalMethod(this.doc, URI, transforms, Type));
}
/**
@@ -278,8 +278,8 @@ public class KeyInfo extends SignatureEl
* @param retrievalmethod
*/
public void add(RetrievalMethod retrievalmethod) {
- this._constructionElement.appendChild(retrievalmethod.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(retrievalmethod.getElement());
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -288,8 +288,8 @@ public class KeyInfo extends SignatureEl
* @param spkidata
*/
public void add(SPKIData spkidata) {
- this._constructionElement.appendChild(spkidata.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(spkidata.getElement());
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -301,8 +301,8 @@ public class KeyInfo extends SignatureEl
if (x509Datas==null)
x509Datas=new ArrayList();
x509Datas.add(x509data);
- this._constructionElement.appendChild(x509data.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(x509data.getElement());
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -318,7 +318,7 @@ public class KeyInfo extends SignatureEl
encryptedKeys=new ArrayList();
encryptedKeys.add(encryptedKey);
XMLCipher cipher = XMLCipher.getInstance();
- this._constructionElement.appendChild(cipher.martial(encryptedKey));
+ this.constructionElement.appendChild(cipher.martial(encryptedKey));
}
/**
@@ -327,8 +327,8 @@ public class KeyInfo extends SignatureEl
* @param element
*/
public void addUnknownElement(Element element) {
- this._constructionElement.appendChild(element);
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(element);
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -406,7 +406,7 @@ public class KeyInfo extends SignatureEl
public int lengthUnknownElement() {
int res = 0;
- NodeList nl = this._constructionElement.getChildNodes();
+ NodeList nl = this.constructionElement.getChildNodes();
for (int i = 0; i < nl.getLength(); i++) {
Node current = nl.item(i);
@@ -434,11 +434,11 @@ public class KeyInfo extends SignatureEl
*/
public KeyName itemKeyName(int i) throws XMLSecurityException {
- Element e = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
+ Element e = XMLUtils.selectDsNode(this.constructionElement.getFirstChild(),
Constants._TAG_KEYNAME,i);
if (e != null) {
- return new KeyName(e, this._baseURI);
+ return new KeyName(e, this.baseURI);
}
return null;
}
@@ -452,11 +452,11 @@ public class KeyInfo extends SignatureEl
*/
public KeyValue itemKeyValue(int i) throws XMLSecurityException {
- Element e = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
+ Element e = XMLUtils.selectDsNode(this.constructionElement.getFirstChild(),
Constants._TAG_KEYVALUE,i);
if (e != null) {
- return new KeyValue(e, this._baseURI);
+ return new KeyValue(e, this.baseURI);
}
return null;
}
@@ -470,11 +470,11 @@ public class KeyInfo extends SignatureEl
*/
public MgmtData itemMgmtData(int i) throws XMLSecurityException {
- Element e = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
+ Element e = XMLUtils.selectDsNode(this.constructionElement.getFirstChild(),
Constants._TAG_MGMTDATA,i);
if (e != null) {
- return new MgmtData(e, this._baseURI);
+ return new MgmtData(e, this.baseURI);
}
return null;
}
@@ -488,11 +488,11 @@ public class KeyInfo extends SignatureEl
*/
public PGPData itemPGPData(int i) throws XMLSecurityException {
- Element e = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
+ Element e = XMLUtils.selectDsNode(this.constructionElement.getFirstChild(),
Constants._TAG_PGPDATA,i);
if (e != null) {
- return new PGPData(e, this._baseURI);
+ return new PGPData(e, this.baseURI);
}
return null;
}
@@ -507,11 +507,11 @@ public class KeyInfo extends SignatureEl
public RetrievalMethod itemRetrievalMethod(int i)
throws XMLSecurityException {
- Element e = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
+ Element e = XMLUtils.selectDsNode(this.constructionElement.getFirstChild(),
Constants._TAG_RETRIEVALMETHOD,i);
if (e != null) {
- return new RetrievalMethod(e, this._baseURI);
+ return new RetrievalMethod(e, this.baseURI);
}
return null;
}
@@ -525,11 +525,11 @@ public class KeyInfo extends SignatureEl
*/
public SPKIData itemSPKIData(int i) throws XMLSecurityException {
- Element e = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
+ Element e = XMLUtils.selectDsNode(this.constructionElement.getFirstChild(),
Constants._TAG_SPKIDATA,i);
if (e != null) {
- return new SPKIData(e, this._baseURI);
+ return new SPKIData(e, this.baseURI);
}
return null;
}
@@ -545,11 +545,11 @@ public class KeyInfo extends SignatureEl
if (x509Datas!=null) {
return (X509Data) x509Datas.get(i);
}
- Element e = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
+ Element e = XMLUtils.selectDsNode(this.constructionElement.getFirstChild(),
Constants._TAG_X509DATA,i);
if (e != null) {
- return new X509Data(e, this._baseURI);
+ return new X509Data(e, this.baseURI);
}
return null;
}
@@ -567,7 +567,7 @@ public class KeyInfo extends SignatureEl
return (EncryptedKey) encryptedKeys.get(i);
}
Element e =
- XMLUtils.selectXencNode(this._constructionElement.getFirstChild(),
+ XMLUtils.selectXencNode(this.constructionElement.getFirstChild(),
EncryptionConstants._TAG_ENCRYPTEDKEY,i);
if (e != null) {
@@ -586,7 +586,7 @@ public class KeyInfo extends SignatureEl
*/
public Element itemUnknownElement(int i) {
- NodeList nl = this._constructionElement.getChildNodes();
+ NodeList nl = this.constructionElement.getChildNodes();
int res = 0;
for (int j = 0; j < nl.getLength(); j++) {
@@ -616,7 +616,7 @@ public class KeyInfo extends SignatureEl
* @return true if the element has no descedants.
*/
public boolean isEmpty() {
- return this._constructionElement.getFirstChild()==null;
+ return this.constructionElement.getFirstChild()==null;
}
/**
@@ -733,7 +733,7 @@ public class KeyInfo extends SignatureEl
Iterator it= KeyResolver.iterator();
for (int i = 0; i < length; i++) {
KeyResolverSpi keyResolver = (KeyResolverSpi) it.next();
- Node currentChild=this._constructionElement.getFirstChild();
+ Node currentChild=this.constructionElement.getFirstChild();
String uri= this.getBaseURI();
while (currentChild!=null) {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
@@ -772,7 +772,7 @@ public class KeyInfo extends SignatureEl
if (log.isDebugEnabled())
log.debug("Try " + keyResolver.getClass().getName());
- Node currentChild=this._constructionElement.getFirstChild();
+ Node currentChild=this.constructionElement.getFirstChild();
String uri=this.getBaseURI();
while (currentChild!=null) {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
@@ -860,7 +860,7 @@ public class KeyInfo extends SignatureEl
}
private X509Certificate applyCurrentResolver(String uri, int storageLength, KeyResolverSpi keyResolver) throws KeyResolverException {
- Node currentChild=this._constructionElement.getFirstChild();
+ Node currentChild=this.constructionElement.getFirstChild();
while (currentChild!=null) {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
for (int k = 0; k < storageLength; k++) {
@@ -950,7 +950,7 @@ public class KeyInfo extends SignatureEl
for (int i = 0; i < length; i++) {
KeyResolverSpi keyResolver = (KeyResolverSpi) it.next();
- Node currentChild=this._constructionElement.getFirstChild();
+ Node currentChild=this.constructionElement.getFirstChild();
String uri=this.getBaseURI();
while (currentChild!=null) {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
@@ -988,7 +988,7 @@ public class KeyInfo extends SignatureEl
if (log.isDebugEnabled())
log.debug("Try " + keyResolver.getClass().getName());
- Node currentChild=this._constructionElement.getFirstChild();
+ Node currentChild=this.constructionElement.getFirstChild();
String uri=this.getBaseURI();
while (currentChild!=null) {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
@@ -1047,7 +1047,7 @@ public class KeyInfo extends SignatureEl
for (int i = 0; i < length; i++) {
KeyResolverSpi keyResolver = (KeyResolverSpi) it.next();
- Node currentChild=this._constructionElement.getFirstChild();
+ Node currentChild=this.constructionElement.getFirstChild();
String uri=this.getBaseURI();
while (currentChild!=null) {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
@@ -1082,7 +1082,7 @@ public class KeyInfo extends SignatureEl
if (log.isDebugEnabled())
log.debug("Try " + keyResolver.getClass().getName());
- Node currentChild=this._constructionElement.getFirstChild();
+ Node currentChild=this.constructionElement.getFirstChild();
String uri=this.getBaseURI();
while (currentChild!=null) {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/KeyValue.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/KeyValue.java?rev=1066412&r1=1066411&r2=1066412&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/KeyValue.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/KeyValue.java Wed Feb 2 11:09:58 2011
@@ -49,9 +49,9 @@ public class KeyValue extends SignatureE
super(doc);
- XMLUtils.addReturnToElement(this._constructionElement);
- this._constructionElement.appendChild(dsaKeyValue.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
+ XMLUtils.addReturnToElement(this.constructionElement);
+ this.constructionElement.appendChild(dsaKeyValue.getElement());
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -64,9 +64,9 @@ public class KeyValue extends SignatureE
super(doc);
- XMLUtils.addReturnToElement(this._constructionElement);
- this._constructionElement.appendChild(rsaKeyValue.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
+ XMLUtils.addReturnToElement(this.constructionElement);
+ this.constructionElement.appendChild(rsaKeyValue.getElement());
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -79,9 +79,9 @@ public class KeyValue extends SignatureE
super(doc);
- XMLUtils.addReturnToElement(this._constructionElement);
- this._constructionElement.appendChild(unknownKeyValue);
- XMLUtils.addReturnToElement(this._constructionElement);
+ XMLUtils.addReturnToElement(this.constructionElement);
+ this.constructionElement.appendChild(unknownKeyValue);
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -94,18 +94,18 @@ public class KeyValue extends SignatureE
super(doc);
- XMLUtils.addReturnToElement(this._constructionElement);
+ XMLUtils.addReturnToElement(this.constructionElement);
if (pk instanceof java.security.interfaces.DSAPublicKey) {
- DSAKeyValue dsa = new DSAKeyValue(this._doc, pk);
+ DSAKeyValue dsa = new DSAKeyValue(this.doc, pk);
- this._constructionElement.appendChild(dsa.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(dsa.getElement());
+ XMLUtils.addReturnToElement(this.constructionElement);
} else if (pk instanceof java.security.interfaces.RSAPublicKey) {
- RSAKeyValue rsa = new RSAKeyValue(this._doc, pk);
+ RSAKeyValue rsa = new RSAKeyValue(this.doc, pk);
- this._constructionElement.appendChild(rsa.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(rsa.getElement());
+ XMLUtils.addReturnToElement(this.constructionElement);
}
}
@@ -130,20 +130,20 @@ public class KeyValue extends SignatureE
public PublicKey getPublicKey() throws XMLSecurityException {
Element rsa = XMLUtils.selectDsNode
- (this._constructionElement.getFirstChild(),
+ (this.constructionElement.getFirstChild(),
Constants._TAG_RSAKEYVALUE,0);
if (rsa != null) {
- RSAKeyValue kv = new RSAKeyValue(rsa, this._baseURI);
+ RSAKeyValue kv = new RSAKeyValue(rsa, this.baseURI);
return kv.getPublicKey();
}
Element dsa = XMLUtils.selectDsNode
- (this._constructionElement.getFirstChild(),
+ (this.constructionElement.getFirstChild(),
Constants._TAG_DSAKEYVALUE,0);
if (dsa != null) {
- DSAKeyValue kv = new DSAKeyValue(dsa, this._baseURI);
+ DSAKeyValue kv = new DSAKeyValue(dsa, this.baseURI);
return kv.getPublicKey();
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/RetrievalMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/RetrievalMethod.java?rev=1066412&r1=1066411&r2=1066412&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/RetrievalMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/RetrievalMethod.java Wed Feb 2 11:09:58 2011
@@ -75,15 +75,15 @@ public class RetrievalMethod extends Sig
super(doc);
- this._constructionElement.setAttributeNS(null, Constants._ATT_URI, URI);
+ this.constructionElement.setAttributeNS(null, Constants._ATT_URI, URI);
if (Type != null) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_TYPE, Type);
+ this.constructionElement.setAttributeNS(null, Constants._ATT_TYPE, Type);
}
if (transforms != null) {
- this._constructionElement.appendChild(transforms.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(transforms.getElement());
+ XMLUtils.addReturnToElement(this.constructionElement);
}
}
@@ -93,7 +93,7 @@ public class RetrievalMethod extends Sig
* @return the URI attribute
*/
public Attr getURIAttr() {
- return this._constructionElement.getAttributeNodeNS(null, Constants._ATT_URI);
+ return this.constructionElement.getAttributeNodeNS(null, Constants._ATT_URI);
}
/**
@@ -108,7 +108,7 @@ public class RetrievalMethod extends Sig
/** @return the type*/
public String getType() {
- return this._constructionElement.getAttributeNS(null, Constants._ATT_TYPE);
+ return this.constructionElement.getAttributeNS(null, Constants._ATT_TYPE);
}
/**
@@ -122,12 +122,12 @@ public class RetrievalMethod extends Sig
try {
Element transformsElem =
- XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
+ XMLUtils.selectDsNode(this.constructionElement.getFirstChild(),
Constants
._TAG_TRANSFORMS, 0);
if (transformsElem != null) {
- return new Transforms(transformsElem, this._baseURI);
+ return new Transforms(transformsElem, this.baseURI);
}
return null;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java?rev=1066412&r1=1066411&r2=1066412&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java Wed Feb 2 11:09:58 2011
@@ -54,7 +54,7 @@ public class X509Data extends SignatureE
super(doc);
- XMLUtils.addReturnToElement(this._constructionElement);
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -68,7 +68,7 @@ public class X509Data extends SignatureE
throws XMLSecurityException {
super(element, BaseURI);
- Node sibling=this._constructionElement.getFirstChild();
+ Node sibling=this.constructionElement.getFirstChild();
while (sibling!=null) {
if (sibling.getNodeType()!=Node.ELEMENT_NODE) {
sibling=sibling.getNextSibling();
@@ -89,7 +89,7 @@ public class X509Data extends SignatureE
*/
public void addIssuerSerial(String X509IssuerName,
BigInteger X509SerialNumber) {
- this.add(new XMLX509IssuerSerial(this._doc, X509IssuerName,
+ this.add(new XMLX509IssuerSerial(this.doc, X509IssuerName,
X509SerialNumber));
}
@@ -100,7 +100,7 @@ public class X509Data extends SignatureE
* @param X509SerialNumber
*/
public void addIssuerSerial(String X509IssuerName, String X509SerialNumber) {
- this.add(new XMLX509IssuerSerial(this._doc, X509IssuerName,
+ this.add(new XMLX509IssuerSerial(this.doc, X509IssuerName,
X509SerialNumber));
}
@@ -111,7 +111,7 @@ public class X509Data extends SignatureE
* @param X509SerialNumber
*/
public void addIssuerSerial(String X509IssuerName, int X509SerialNumber) {
- this.add(new XMLX509IssuerSerial(this._doc, X509IssuerName,
+ this.add(new XMLX509IssuerSerial(this.doc, X509IssuerName,
X509SerialNumber));
}
@@ -122,9 +122,9 @@ public class X509Data extends SignatureE
*/
public void add(XMLX509IssuerSerial xmlX509IssuerSerial) {
- this._constructionElement
+ this.constructionElement
.appendChild(xmlX509IssuerSerial.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -133,7 +133,7 @@ public class X509Data extends SignatureE
* @param skiBytes
*/
public void addSKI(byte[] skiBytes) {
- this.add(new XMLX509SKI(this._doc, skiBytes));
+ this.add(new XMLX509SKI(this.doc, skiBytes));
}
/**
@@ -144,7 +144,7 @@ public class X509Data extends SignatureE
*/
public void addSKI(X509Certificate x509certificate)
throws XMLSecurityException {
- this.add(new XMLX509SKI(this._doc, x509certificate));
+ this.add(new XMLX509SKI(this.doc, x509certificate));
}
/**
@@ -153,8 +153,8 @@ public class X509Data extends SignatureE
* @param xmlX509SKI
*/
public void add(XMLX509SKI xmlX509SKI) {
- this._constructionElement.appendChild(xmlX509SKI.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(xmlX509SKI.getElement());
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -163,7 +163,7 @@ public class X509Data extends SignatureE
* @param subjectName
*/
public void addSubjectName(String subjectName) {
- this.add(new XMLX509SubjectName(this._doc, subjectName));
+ this.add(new XMLX509SubjectName(this.doc, subjectName));
}
/**
@@ -172,7 +172,7 @@ public class X509Data extends SignatureE
* @param x509certificate
*/
public void addSubjectName(X509Certificate x509certificate) {
- this.add(new XMLX509SubjectName(this._doc, x509certificate));
+ this.add(new XMLX509SubjectName(this.doc, x509certificate));
}
/**
@@ -181,8 +181,8 @@ public class X509Data extends SignatureE
* @param xmlX509SubjectName
*/
public void add(XMLX509SubjectName xmlX509SubjectName) {
- this._constructionElement.appendChild(xmlX509SubjectName.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(xmlX509SubjectName.getElement());
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -193,7 +193,7 @@ public class X509Data extends SignatureE
*/
public void addCertificate(X509Certificate x509certificate)
throws XMLSecurityException {
- this.add(new XMLX509Certificate(this._doc, x509certificate));
+ this.add(new XMLX509Certificate(this.doc, x509certificate));
}
/**
@@ -202,7 +202,7 @@ public class X509Data extends SignatureE
* @param x509certificateBytes
*/
public void addCertificate(byte[] x509certificateBytes) {
- this.add(new XMLX509Certificate(this._doc, x509certificateBytes));
+ this.add(new XMLX509Certificate(this.doc, x509certificateBytes));
}
/**
@@ -211,8 +211,8 @@ public class X509Data extends SignatureE
* @param xmlX509Certificate
*/
public void add(XMLX509Certificate xmlX509Certificate) {
- this._constructionElement.appendChild(xmlX509Certificate.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(xmlX509Certificate.getElement());
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -221,7 +221,7 @@ public class X509Data extends SignatureE
* @param crlBytes
*/
public void addCRL(byte[] crlBytes) {
- this.add(new XMLX509CRL(this._doc, crlBytes));
+ this.add(new XMLX509CRL(this.doc, crlBytes));
}
/**
@@ -230,8 +230,8 @@ public class X509Data extends SignatureE
* @param xmlX509CRL
*/
public void add(XMLX509CRL xmlX509CRL) {
- this._constructionElement.appendChild(xmlX509CRL.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(xmlX509CRL.getElement());
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -240,8 +240,8 @@ public class X509Data extends SignatureE
* @param element
*/
public void addUnknownElement(Element element) {
- this._constructionElement.appendChild(element);
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(element);
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -300,7 +300,7 @@ public class X509Data extends SignatureE
public int lengthUnknownElement() {
int result = 0;
- Node n=this._constructionElement.getFirstChild();
+ Node n=this.constructionElement.getFirstChild();
while (n!=null){
if ((n.getNodeType() == Node.ELEMENT_NODE)
@@ -324,11 +324,11 @@ public class X509Data extends SignatureE
throws XMLSecurityException {
Element e =
- XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
+ XMLUtils.selectDsNode(this.constructionElement.getFirstChild(),
Constants._TAG_X509ISSUERSERIAL,i);
if (e != null) {
- return new XMLX509IssuerSerial(e, this._baseURI);
+ return new XMLX509IssuerSerial(e, this.baseURI);
}
return null;
}
@@ -342,11 +342,11 @@ public class X509Data extends SignatureE
*/
public XMLX509SKI itemSKI(int i) throws XMLSecurityException {
- Element e = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
+ Element e = XMLUtils.selectDsNode(this.constructionElement.getFirstChild(),
Constants._TAG_X509SKI,i);
if (e != null) {
- return new XMLX509SKI(e, this._baseURI);
+ return new XMLX509SKI(e, this.baseURI);
}
return null;
}
@@ -361,11 +361,11 @@ public class X509Data extends SignatureE
public XMLX509SubjectName itemSubjectName(int i)
throws XMLSecurityException {
- Element e = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
+ Element e = XMLUtils.selectDsNode(this.constructionElement.getFirstChild(),
Constants._TAG_X509SUBJECTNAME,i);
if (e != null) {
- return new XMLX509SubjectName(e, this._baseURI);
+ return new XMLX509SubjectName(e, this.baseURI);
}
return null;
}
@@ -380,11 +380,11 @@ public class X509Data extends SignatureE
public XMLX509Certificate itemCertificate(int i)
throws XMLSecurityException {
- Element e = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
+ Element e = XMLUtils.selectDsNode(this.constructionElement.getFirstChild(),
Constants._TAG_X509CERTIFICATE,i);
if (e != null) {
- return new XMLX509Certificate(e, this._baseURI);
+ return new XMLX509Certificate(e, this.baseURI);
}
return null;
}
@@ -398,11 +398,11 @@ public class X509Data extends SignatureE
*/
public XMLX509CRL itemCRL(int i) throws XMLSecurityException {
- Element e = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
+ Element e = XMLUtils.selectDsNode(this.constructionElement.getFirstChild(),
Constants._TAG_X509CRL,i);
if (e != null) {
- return new XMLX509CRL(e, this._baseURI);
+ return new XMLX509CRL(e, this.baseURI);
}
return null;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java?rev=1066412&r1=1066411&r2=1066412&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java Wed Feb 2 11:09:58 2011
@@ -66,7 +66,7 @@ public class DSAKeyValue extends Signatu
super(doc);
- XMLUtils.addReturnToElement(this._constructionElement);
+ XMLUtils.addReturnToElement(this.constructionElement);
this.addBigIntegerElement(P, Constants._TAG_P);
this.addBigIntegerElement(Q, Constants._TAG_Q);
this.addBigIntegerElement(G, Constants._TAG_G);
@@ -84,7 +84,7 @@ public class DSAKeyValue extends Signatu
super(doc);
- XMLUtils.addReturnToElement(this._constructionElement);
+ XMLUtils.addReturnToElement(this.constructionElement);
if (key instanceof java.security.interfaces.DSAPublicKey) {
this.addBigIntegerElement(((DSAPublicKey) key).getParams().getP(),
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java?rev=1066412&r1=1066411&r2=1066412&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java Wed Feb 2 11:09:58 2011
@@ -63,7 +63,7 @@ public class RSAKeyValue extends Signatu
super(doc);
- XMLUtils.addReturnToElement(this._constructionElement);
+ XMLUtils.addReturnToElement(this.constructionElement);
this.addBigIntegerElement(modulus, Constants._TAG_MODULUS);
this.addBigIntegerElement(exponent, Constants._TAG_EXPONENT);
}
@@ -79,7 +79,7 @@ public class RSAKeyValue extends Signatu
super(doc);
- XMLUtils.addReturnToElement(this._constructionElement);
+ XMLUtils.addReturnToElement(this.constructionElement);
if (key instanceof java.security.interfaces.RSAPublicKey ) {
this.addBigIntegerElement(((RSAPublicKey) key).getModulus(),
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java?rev=1066412&r1=1066411&r2=1066412&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java Wed Feb 2 11:09:58 2011
@@ -62,7 +62,7 @@ public class XMLX509IssuerSerial extends
BigInteger x509SerialNumber) {
super(doc);
- XMLUtils.addReturnToElement(this._constructionElement);
+ XMLUtils.addReturnToElement(this.constructionElement);
addTextElement(x509IssuerName, Constants._TAG_X509ISSUERNAME);
addTextElement(x509SerialNumber.toString(), Constants._TAG_X509SERIALNUMBER);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java?rev=1066412&r1=1066411&r2=1066412&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java Wed Feb 2 11:09:58 2011
@@ -79,7 +79,7 @@ public class Manifest extends SignatureE
super(doc);
- XMLUtils.addReturnToElement(this._constructionElement);
+ XMLUtils.addReturnToElement(this.constructionElement);
this._references = new ArrayList();
}
@@ -97,7 +97,7 @@ public class Manifest extends SignatureE
super(element, BaseURI);
// check out Reference children
- this._referencesEl = XMLUtils.selectDsNodes(this._constructionElement.getFirstChild(),
+ this._referencesEl = XMLUtils.selectDsNodes(this.constructionElement.getFirstChild(),
Constants._TAG_REFERENCE);
int le = this._referencesEl.length;
{
@@ -137,8 +137,8 @@ public class Manifest extends SignatureE
String BaseURI, String referenceURI, Transforms transforms, String digestURI, String ReferenceId, String ReferenceType)
throws XMLSignatureException {
- // the this._doc is handed implicitly by the this.getOwnerDocument()
- Reference ref = new Reference(this._doc, BaseURI, referenceURI, this,
+ // the this.doc is handed implicitly by the this.getOwnerDocument()
+ Reference ref = new Reference(this.doc, BaseURI, referenceURI, this,
transforms, digestURI);
if (ReferenceId != null) {
@@ -153,8 +153,8 @@ public class Manifest extends SignatureE
this._references.add(ref);
// add the Element of the Reference object to the Manifest/SignedInfo
- this._constructionElement.appendChild(ref.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(ref.getElement());
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -199,7 +199,7 @@ public class Manifest extends SignatureE
if (this._references.get(i) == null) {
// not yet constructed, so _we_ have to
- Reference ref = new Reference(_referencesEl[i], this._baseURI, this);
+ Reference ref = new Reference(_referencesEl[i], this.baseURI, this);
this._references.set(i, ref);
}
@@ -216,8 +216,8 @@ public class Manifest extends SignatureE
public void setId(String Id) {
if (Id != null) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
- IdResolver.registerElementById(this._constructionElement, Id);
+ this.constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
+ IdResolver.registerElementById(this.constructionElement, Id);
}
}
@@ -227,7 +227,7 @@ public class Manifest extends SignatureE
* @return the <code>Id</code> attribute in <code>ds:Manifest</code>
*/
public String getId() {
- return this._constructionElement.getAttributeNS(null, Constants._ATT_ID);
+ return this.constructionElement.getAttributeNS(null, Constants._ATT_ID);
}
/**
@@ -274,7 +274,7 @@ public class Manifest extends SignatureE
throws MissingResourceFailureException, XMLSecurityException {
if (_referencesEl==null) {
this._referencesEl =
- XMLUtils.selectDsNodes(this._constructionElement.getFirstChild(),
+ XMLUtils.selectDsNodes(this.constructionElement.getFirstChild(),
Constants._TAG_REFERENCE);
}
if (log.isDebugEnabled()) {
@@ -295,7 +295,7 @@ public class Manifest extends SignatureE
for (int i =
0; i < this._referencesEl.length; i++) {
Reference currentRef =
- new Reference(_referencesEl[i], this._baseURI, this);
+ new Reference(_referencesEl[i], this.baseURI, this);
this._references.set(i, currentRef);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/ObjectContainer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/ObjectContainer.java?rev=1066412&r1=1066411&r2=1066412&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/ObjectContainer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/ObjectContainer.java Wed Feb 2 11:09:58 2011
@@ -65,8 +65,8 @@ public class ObjectContainer extends Sig
public void setId(String Id) {
if ((Id != null)) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
- IdResolver.registerElementById(this._constructionElement, Id);
+ this.constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
+ IdResolver.registerElementById(this.constructionElement, Id);
}
}
@@ -76,7 +76,7 @@ public class ObjectContainer extends Sig
* @return the <code>Id</code> attribute
*/
public String getId() {
- return this._constructionElement.getAttributeNS(null, Constants._ATT_ID);
+ return this.constructionElement.getAttributeNS(null, Constants._ATT_ID);
}
/**
@@ -87,7 +87,7 @@ public class ObjectContainer extends Sig
public void setMimeType(String MimeType) {
if ( (MimeType != null)) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_MIMETYPE,
+ this.constructionElement.setAttributeNS(null, Constants._ATT_MIMETYPE,
MimeType);
}
}
@@ -98,7 +98,7 @@ public class ObjectContainer extends Sig
* @return the <code>MimeType</code> attribute
*/
public String getMimeType() {
- return this._constructionElement.getAttributeNS(null, Constants._ATT_MIMETYPE);
+ return this.constructionElement.getAttributeNS(null, Constants._ATT_MIMETYPE);
}
/**
@@ -109,7 +109,7 @@ public class ObjectContainer extends Sig
public void setEncoding(String Encoding) {
if ((Encoding != null)) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_ENCODING,
+ this.constructionElement.setAttributeNS(null, Constants._ATT_ENCODING,
Encoding);
}
}
@@ -120,7 +120,7 @@ public class ObjectContainer extends Sig
* @return the <code>Encoding</code> attribute
*/
public String getEncoding() {
- return this._constructionElement.getAttributeNS(null, Constants._ATT_ENCODING);
+ return this.constructionElement.getAttributeNS(null, Constants._ATT_ENCODING);
}
/**
@@ -133,7 +133,7 @@ public class ObjectContainer extends Sig
Node result = null;
- result = this._constructionElement.appendChild(node);
+ result = this.constructionElement.appendChild(node);
return result;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java?rev=1066412&r1=1066411&r2=1066412&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java Wed Feb 2 11:09:58 2011
@@ -57,17 +57,17 @@ import org.w3c.dom.Text;
*
* <p>Create a new reference</p>
* <pre>
- * Document _doc;
+ * Document doc;
* MessageDigestAlgorithm sha1 = MessageDigestAlgorithm.getInstance("http://#sha1");
* Reference ref = new Reference(new XMLSignatureInput(new FileInputStream("1.gif"),
* "http://localhost/1.gif",
* (Transforms) null, sha1);
- * Element refElem = ref.toElement(_doc);
+ * Element refElem = ref.toElement(doc);
* </pre>
*
* <p>Verify a reference</p>
* <pre>
- * Element refElem = _doc.getElement("Reference"); // PSEUDO
+ * Element refElem = doc.getElement("Reference"); // PSEUDO
* Reference ref = new Reference(refElem);
* String url = ref.getURI();
* ref.setData(new XMLSignatureInput(new FileInputStream(url)));
@@ -151,39 +151,39 @@ private Element digestValueElement;
super(doc);
- XMLUtils.addReturnToElement(this._constructionElement);
+ XMLUtils.addReturnToElement(this.constructionElement);
- this._baseURI = BaseURI;
+ this.baseURI = BaseURI;
this._manifest = manifest;
this.setURI(ReferenceURI);
// important: The ds:Reference must be added to the associated ds:Manifest
// or ds:SignedInfo _before_ the this.resolverResult() is called.
- // this._manifest.appendChild(this._constructionElement);
- // this._manifest.appendChild(this._doc.createTextNode("\n"));
+ // this._manifest.appendChild(this.constructionElement);
+ // this._manifest.appendChild(this.doc.createTextNode("\n"));
if (transforms != null) {
this.transforms=transforms;
- this._constructionElement.appendChild(transforms.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(transforms.getElement());
+ XMLUtils.addReturnToElement(this.constructionElement);
}
{
MessageDigestAlgorithm mda =
- MessageDigestAlgorithm.getInstance(this._doc,
+ MessageDigestAlgorithm.getInstance(this.doc,
messageDigestAlgorithm);
digestMethodElem=mda.getElement();
- this._constructionElement.appendChild(digestMethodElem);
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(digestMethodElem);
+ XMLUtils.addReturnToElement(this.constructionElement);
}
{
digestValueElement =
- XMLUtils.createElementInSignatureSpace(this._doc,
+ XMLUtils.createElementInSignatureSpace(this.doc,
Constants._TAG_DIGESTVALUE);
- this._constructionElement.appendChild(digestValueElement);
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(digestValueElement);
+ XMLUtils.addReturnToElement(this.constructionElement);
}
}
@@ -200,11 +200,11 @@ private Element digestValueElement;
throws XMLSecurityException {
super(element, BaseURI);
- this._baseURI=BaseURI;
+ this.baseURI=BaseURI;
Element el=XMLUtils.getNextElement(element.getFirstChild());
if (Constants._TAG_TRANSFORMS.equals(el.getLocalName()) &&
Constants.SignatureSpecNS.equals(el.getNamespaceURI())) {
- transforms = new Transforms(el,this._baseURI);
+ transforms = new Transforms(el,this.baseURI);
el=XMLUtils.getNextElement(el.getNextSibling());
}
digestMethodElem = el;
@@ -234,7 +234,7 @@ private Element digestValueElement;
return null;
}
- return MessageDigestAlgorithm.getInstance(this._doc, uri);
+ return MessageDigestAlgorithm.getInstance(this.doc, uri);
}
/**
@@ -245,7 +245,7 @@ private Element digestValueElement;
public void setURI(String URI) {
if ( URI != null) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_URI,
+ this.constructionElement.setAttributeNS(null, Constants._ATT_URI,
URI);
}
}
@@ -256,7 +256,7 @@ private Element digestValueElement;
* @return URI the <code>URI</code> of this <code>Reference</code> element
*/
public String getURI() {
- return this._constructionElement.getAttributeNS(null, Constants._ATT_URI);
+ return this.constructionElement.getAttributeNS(null, Constants._ATT_URI);
}
/**
@@ -267,8 +267,8 @@ private Element digestValueElement;
public void setId(String Id) {
if ( Id != null ) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
- IdResolver.registerElementById(this._constructionElement, Id);
+ this.constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
+ IdResolver.registerElementById(this.constructionElement, Id);
}
}
@@ -278,7 +278,7 @@ private Element digestValueElement;
* @return Id the <code>Id</code> attribute of this <code>Reference</code> element
*/
public String getId() {
- return this._constructionElement.getAttributeNS(null, Constants._ATT_ID);
+ return this.constructionElement.getAttributeNS(null, Constants._ATT_ID);
}
/**
@@ -289,7 +289,7 @@ private Element digestValueElement;
public void setType(String Type) {
if (Type != null) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_TYPE,
+ this.constructionElement.setAttributeNS(null, Constants._ATT_TYPE,
Type);
}
}
@@ -300,7 +300,7 @@ private Element digestValueElement;
* @return the <code>type</code> attribute of the Reference
*/
public String getType() {
- return this._constructionElement.getAttributeNS(null,
+ return this.constructionElement.getAttributeNS(null,
Constants._ATT_TYPE);
}
@@ -352,7 +352,7 @@ private Element digestValueElement;
}
String base64codedValue = Base64.encode(digestValue);
- Text t = this._doc.createTextNode(base64codedValue);
+ Text t = this.doc.createTextNode(base64codedValue);
digestValueElement.appendChild(t);
}
@@ -378,7 +378,7 @@ private Element digestValueElement;
throws ReferenceNotInitializedException {
try {
- Attr URIAttr = this._constructionElement.getAttributeNodeNS(null,
+ Attr URIAttr = this.constructionElement.getAttributeNodeNS(null,
Constants._ATT_URI);
String URI;
@@ -389,7 +389,7 @@ private Element digestValueElement;
}
ResourceResolver resolver = ResourceResolver.getInstance(URIAttr,
- this._baseURI, this._manifest._perManifestResolvers);
+ this.baseURI, this._manifest._perManifestResolvers);
if (resolver == null) {
Object exArgs[] = { URI };
@@ -400,7 +400,7 @@ private Element digestValueElement;
resolver.addProperties(this._manifest._resolverProperties);
- XMLSignatureInput input = resolver.resolve(URIAttr, this._baseURI);
+ XMLSignatureInput input = resolver.resolve(URIAttr, this.baseURI);
return input;
@@ -696,8 +696,8 @@ private Element digestValueElement;
if (Reference.useC14N11 && !validating &&
!output.isOutputStreamSet() && !output.isOctetStream()) {
if (transforms == null) {
- transforms = new Transforms(this._doc);
- this._constructionElement.insertBefore
+ transforms = new Transforms(this.doc);
+ this.constructionElement.insertBefore
(transforms.getElement(), digestMethodElem);
}
transforms.addTransform(Transforms.TRANSFORM_C14N11_OMIT_COMMENTS);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignatureProperties.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignatureProperties.java?rev=1066412&r1=1066411&r2=1066412&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignatureProperties.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignatureProperties.java Wed Feb 2 11:09:58 2011
@@ -45,7 +45,7 @@ public class SignatureProperties extends
super(doc);
- XMLUtils.addReturnToElement(this._constructionElement);
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -67,7 +67,7 @@ public class SignatureProperties extends
public int getLength() {
Element[] propertyElems =
- XMLUtils.selectDsNodes(this._constructionElement,
+ XMLUtils.selectDsNodes(this.constructionElement,
Constants._TAG_SIGNATUREPROPERTY
);
@@ -85,14 +85,14 @@ public class SignatureProperties extends
public SignatureProperty item(int i) throws XMLSignatureException {
try {
Element propertyElem =
- XMLUtils.selectDsNode(this._constructionElement,
+ XMLUtils.selectDsNode(this.constructionElement,
Constants._TAG_SIGNATUREPROPERTY,
i );
if (propertyElem == null) {
return null;
}
- return new SignatureProperty(propertyElem, this._baseURI);
+ return new SignatureProperty(propertyElem, this.baseURI);
} catch (XMLSecurityException ex) {
throw new XMLSignatureException("empty", ex);
}
@@ -106,8 +106,8 @@ public class SignatureProperties extends
public void setId(String Id) {
if ((Id != null)) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
- IdResolver.registerElementById(this._constructionElement, Id);
+ this.constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
+ IdResolver.registerElementById(this.constructionElement, Id);
}
}
@@ -117,7 +117,7 @@ public class SignatureProperties extends
* @return the <code>Id</code> attribute
*/
public String getId() {
- return this._constructionElement.getAttributeNS(null, Constants._ATT_ID);
+ return this.constructionElement.getAttributeNS(null, Constants._ATT_ID);
}
/**
@@ -126,8 +126,8 @@ public class SignatureProperties extends
* @param sp
*/
public void addSignatureProperty(SignatureProperty sp) {
- this._constructionElement.appendChild(sp.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(sp.getElement());
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/** @inheritDoc */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignatureProperty.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignatureProperty.java?rev=1066412&r1=1066411&r2=1066412&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignatureProperty.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignatureProperty.java Wed Feb 2 11:09:58 2011
@@ -77,8 +77,8 @@ public class SignatureProperty extends S
public void setId(String Id) {
if ((Id != null)) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
- IdResolver.registerElementById(this._constructionElement, Id);
+ this.constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
+ IdResolver.registerElementById(this.constructionElement, Id);
}
}
@@ -88,7 +88,7 @@ public class SignatureProperty extends S
* @return the <code>Id</code> attribute
*/
public String getId() {
- return this._constructionElement.getAttributeNS(null, Constants._ATT_ID);
+ return this.constructionElement.getAttributeNS(null, Constants._ATT_ID);
}
/**
@@ -99,7 +99,7 @@ public class SignatureProperty extends S
public void setTarget(String Target) {
if ((Target != null)) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_TARGET, Target);
+ this.constructionElement.setAttributeNS(null, Constants._ATT_TARGET, Target);
}
}
@@ -109,7 +109,7 @@ public class SignatureProperty extends S
* @return the <code>Target</code> attribute
*/
public String getTarget() {
- return this._constructionElement.getAttributeNS(null, Constants._ATT_TARGET);
+ return this.constructionElement.getAttributeNS(null, Constants._ATT_TARGET);
}
/**
@@ -119,7 +119,7 @@ public class SignatureProperty extends S
* @return the node in this element.
*/
public Node appendChild(Node node) {
- return this._constructionElement.appendChild(node);
+ return this.constructionElement.appendChild(node);
}
/** @inheritDoc */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignedInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignedInfo.java?rev=1066412&r1=1066411&r2=1066412&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignedInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignedInfo.java Wed Feb 2 11:09:58 2011
@@ -100,25 +100,25 @@ public class SignedInfo extends Manifest
super(doc);
- c14nMethod = XMLUtils.createElementInSignatureSpace(this._doc,
+ c14nMethod = XMLUtils.createElementInSignatureSpace(this.doc,
Constants._TAG_CANONICALIZATIONMETHOD);
c14nMethod.setAttributeNS(null, Constants._ATT_ALGORITHM,
canonicalizationMethodURI);
- this._constructionElement.appendChild(c14nMethod);
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(c14nMethod);
+ XMLUtils.addReturnToElement(this.constructionElement);
if (hMACOutputLength > 0) {
- this._signatureAlgorithm = new SignatureAlgorithm(this._doc,
+ this._signatureAlgorithm = new SignatureAlgorithm(this.doc,
signatureMethodURI, hMACOutputLength);
} else {
- this._signatureAlgorithm = new SignatureAlgorithm(this._doc,
+ this._signatureAlgorithm = new SignatureAlgorithm(this.doc,
signatureMethodURI);
}
signatureMethod = this._signatureAlgorithm.getElement();
- this._constructionElement.appendChild(signatureMethod);
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(signatureMethod);
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -133,16 +133,16 @@ public class SignedInfo extends Manifest
super(doc);
// Check this?
this.c14nMethod = canonicalizationMethodElem;
- this._constructionElement.appendChild(c14nMethod);
- XMLUtils.addReturnToElement(this._constructionElement);
+ this.constructionElement.appendChild(c14nMethod);
+ XMLUtils.addReturnToElement(this.constructionElement);
this._signatureAlgorithm =
new SignatureAlgorithm(signatureMethodElem, null);
signatureMethod = this._signatureAlgorithm.getElement();
- this._constructionElement.appendChild(signatureMethod);
+ this.constructionElement.appendChild(signatureMethod);
- XMLUtils.addReturnToElement(this._constructionElement);
+ XMLUtils.addReturnToElement(this.constructionElement);
}
/**
@@ -256,7 +256,7 @@ public class SignedInfo extends Manifest
Canonicalizer.getInstance(this.getCanonicalizationMethodURI());
this._c14nizedBytes =
- c14nizer.canonicalizeSubtree(this._constructionElement);
+ c14nizer.canonicalizeSubtree(this.constructionElement);
}
// make defensive copy
@@ -281,10 +281,10 @@ public class SignedInfo extends Manifest
String inclusiveNamespaces = this.getInclusiveNamespaces();
if (inclusiveNamespaces == null) {
- c14nizer.canonicalizeSubtree(this._constructionElement);
+ c14nizer.canonicalizeSubtree(this.constructionElement);
} else {
c14nizer.canonicalizeSubtree
- (this._constructionElement, inclusiveNamespaces);
+ (this.constructionElement, inclusiveNamespaces);
}
} else {
try {