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 2012/05/04 12:42:46 UTC

svn commit: r1333869 [2/2] - in /santuario/xml-security-java/trunk/src: main/java/javax/xml/crypto/dsig/ main/java/javax/xml/crypto/dsig/keyinfo/ main/java/org/apache/jcp/xml/dsig/internal/dom/ main/java/org/apache/xml/security/ main/java/org/apache/xm...

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java?rev=1333869&r1=1333868&r2=1333869&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java Fri May  4 10:42:44 2012
@@ -44,17 +44,17 @@ public class X509SKIResolver extends Key
      * Method engineResolvePublicKey
      *
      * @param element
-     * @param BaseURI
+     * @param baseURI
      * @param storage
      * @return null if no {@link PublicKey} could be obtained
      * @throws KeyResolverException
      */
     public PublicKey engineLookupAndResolvePublicKey(
-        Element element, String BaseURI, StorageResolver storage
+        Element element, String baseURI, StorageResolver storage
     ) throws KeyResolverException {
 
         X509Certificate cert = 
-            this.engineLookupResolveX509Certificate(element, BaseURI, storage);
+            this.engineLookupResolveX509Certificate(element, baseURI, storage);
 
         if (cert != null) {
             return cert.getPublicKey();
@@ -67,13 +67,13 @@ public class X509SKIResolver extends Key
      * Method engineResolveX509Certificate
      * @inheritDoc
      * @param element
-     * @param BaseURI
+     * @param baseURI
      * @param storage
      *
      * @throws KeyResolverException
      */
     public X509Certificate engineLookupResolveX509Certificate(
-        Element element, String BaseURI, StorageResolver storage
+        Element element, String baseURI, StorageResolver storage
     ) throws KeyResolverException {
         if (log.isDebugEnabled()) {
             log.debug("Can I resolve " + element.getTagName() + "?");
@@ -112,7 +112,7 @@ public class X509SKIResolver extends Key
             x509childObject = new XMLX509SKI[x509childNodes.length];
 
             for (int i = 0; i < x509childNodes.length; i++) {
-                x509childObject[i] = new XMLX509SKI(x509childNodes[i], BaseURI);
+                x509childObject[i] = new XMLX509SKI(x509childNodes[i], baseURI);
             }
 
             Iterator<Certificate> storageIterator = storage.getIterator();
@@ -141,12 +141,12 @@ public class X509SKIResolver extends Key
      * Method engineResolveSecretKey
      * @inheritDoc
      * @param element
-     * @param BaseURI
+     * @param baseURI
      * @param storage
      *
      */
     public javax.crypto.SecretKey engineLookupAndResolveSecretKey(
-        Element element, String BaseURI, StorageResolver storage
+        Element element, String baseURI, StorageResolver storage
     ) {
         return null;
     }

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java?rev=1333869&r1=1333868&r2=1333869&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java Fri May  4 10:42:44 2012
@@ -50,11 +50,11 @@ public class X509SubjectNameResolver ext
      * @throws KeyResolverException
      */
     public PublicKey engineLookupAndResolvePublicKey(
-        Element element, String BaseURI, StorageResolver storage
+        Element element, String baseURI, StorageResolver storage
     ) throws KeyResolverException {
 
         X509Certificate cert = 
-            this.engineLookupResolveX509Certificate(element, BaseURI, storage);
+            this.engineLookupResolveX509Certificate(element, baseURI, storage);
 
         if (cert != null) {
             return cert.getPublicKey();
@@ -67,13 +67,13 @@ public class X509SubjectNameResolver ext
      * Method engineResolveX509Certificate
      * @inheritDoc
      * @param element
-     * @param BaseURI
+     * @param baseURI
      * @param storage
      *
      * @throws KeyResolverException
      */
     public X509Certificate engineLookupResolveX509Certificate(
-        Element element, String BaseURI, StorageResolver storage
+        Element element, String baseURI, StorageResolver storage
     ) throws KeyResolverException {
         if (log.isDebugEnabled()) {
             log.debug("Can I resolve " + element.getTagName() + "?");
@@ -114,7 +114,7 @@ public class X509SubjectNameResolver ext
             x509childObject = new XMLX509SubjectName[x509childNodes.length];
 
             for (int i = 0; i < x509childNodes.length; i++) {
-                x509childObject[i] = new XMLX509SubjectName(x509childNodes[i], BaseURI);
+                x509childObject[i] = new XMLX509SubjectName(x509childNodes[i], baseURI);
             }
 
             Iterator<Certificate> storageIterator = storage.getIterator();
@@ -160,12 +160,12 @@ public class X509SubjectNameResolver ext
      * Method engineResolveSecretKey
      * @inheritDoc
      * @param element
-     * @param BaseURI
+     * @param baseURI
      * @param storage
      *
      */
     public javax.crypto.SecretKey engineLookupAndResolveSecretKey(
-        Element element, String BaseURI, StorageResolver storage
+        Element element, String baseURI, StorageResolver storage
     ) {
         return null;
     }

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/NodeFilter.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/NodeFilter.java?rev=1333869&r1=1333868&r2=1333869&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/NodeFilter.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/NodeFilter.java Fri May  4 10:42:44 2012
@@ -33,7 +33,7 @@ public interface NodeFilter {
      * 		  -1 if the node and all it's child must not be output.
      * 			
      */
-    public int isNodeInclude(Node n);
+    int isNodeInclude(Node n);
     
     /**
      * Tells if a node must be output in a c14n.
@@ -46,6 +46,6 @@ public interface NodeFilter {
      * 		   0 if node must not be output, 
      * 		  -1 if the node and all it's child must not be output.
      */
-    public int isNodeIncludeDO(Node n, int level);
+    int isNodeIncludeDO(Node n, int level);
 
 }

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=1333869&r1=1333868&r2=1333869&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 Fri May  4 10:42:44 2012
@@ -48,11 +48,11 @@ public class ObjectContainer extends Sig
      * Constructs {@link ObjectContainer} from {@link Element}
      *
      * @param element is <code>Object</code> element
-     * @param BaseURI the URI of the resource where the XML instance was stored
+     * @param baseURI the URI of the resource where the XML instance was stored
      * @throws XMLSecurityException
      */
-    public ObjectContainer(Element element, String BaseURI) throws XMLSecurityException {
-        super(element, BaseURI);
+    public ObjectContainer(Element element, String baseURI) throws XMLSecurityException {
+        super(element, baseURI);
     }
 
     /**

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=1333869&r1=1333868&r2=1333869&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 Fri May  4 10:42:44 2012
@@ -131,7 +131,7 @@ public class Reference extends Signature
     private static final org.apache.commons.logging.Log log = 
         org.apache.commons.logging.LogFactory.getLog(Reference.class);
 
-    private Manifest manifest = null;
+    private Manifest manifest;
     private XMLSignatureInput transformsOutput;
 
     private Transforms transforms;
@@ -146,8 +146,8 @@ public class Reference extends Signature
      * Constructor Reference
      *
      * @param doc the {@link Document} in which <code>XMLsignature</code> is placed
-     * @param BaseURI the URI of the resource where the XML instance will be stored
-     * @param ReferenceURI URI indicate where is data which will digested
+     * @param baseURI the URI of the resource where the XML instance will be stored
+     * @param referenceURI URI indicate where is data which will digested
      * @param manifest
      * @param transforms {@link Transforms} applied to data
      * @param messageDigestAlgorithm {@link MessageDigestAlgorithm Digest algorithm} which is 
@@ -156,17 +156,17 @@ public class Reference extends Signature
      * @throws XMLSignatureException
      */
     protected Reference(
-        Document doc, String BaseURI, String ReferenceURI, Manifest manifest, 
+        Document doc, String baseURI, String referenceURI, Manifest manifest, 
         Transforms transforms, String messageDigestAlgorithm
     ) throws XMLSignatureException {
         super(doc);
 
         XMLUtils.addReturnToElement(this.constructionElement);
 
-        this.baseURI = BaseURI;
+        this.baseURI = baseURI;
         this.manifest = manifest;
 
-        this.setURI(ReferenceURI);
+        this.setURI(referenceURI);
 
         // important: The ds:Reference must be added to the associated ds:Manifest
         //            or ds:SignedInfo _before_ the this.resolverResult() is called.
@@ -197,32 +197,32 @@ public class Reference extends Signature
      * Build a {@link Reference} from an {@link Element}
      *
      * @param element <code>Reference</code> element
-     * @param BaseURI the URI of the resource where the XML instance was stored
+     * @param baseURI the URI of the resource where the XML instance was stored
      * @param manifest is the {@link Manifest} of {@link SignedInfo} in which the Reference occurs.
      * We need this because the Manifest has the individual {@link ResourceResolver}s which have 
      * been set by the user
      * @throws XMLSecurityException
      */
-    protected Reference(Element element, String BaseURI, Manifest manifest) throws XMLSecurityException {
-        this(element, BaseURI, manifest, false);
+    protected Reference(Element element, String baseURI, Manifest manifest) throws XMLSecurityException {
+        this(element, baseURI, manifest, false);
     }
 
     /**
      * Build a {@link Reference} from an {@link Element}
      *
      * @param element <code>Reference</code> element
-     * @param BaseURI the URI of the resource where the XML instance was stored
+     * @param baseURI the URI of the resource where the XML instance was stored
      * @param manifest is the {@link Manifest} of {@link SignedInfo} in which the Reference occurs.
      * @param secureValidation whether secure validation is enabled or not
      * We need this because the Manifest has the individual {@link ResourceResolver}s which have 
      * been set by the user
      * @throws XMLSecurityException
      */
-    protected Reference(Element element, String BaseURI, Manifest manifest, boolean secureValidation)
+    protected Reference(Element element, String baseURI, Manifest manifest, boolean secureValidation)
         throws XMLSecurityException {
-        super(element, BaseURI);
+        super(element, baseURI);
         this.secureValidation = secureValidation;
-        this.baseURI = BaseURI;
+        this.baseURI = baseURI;
         Element el = XMLUtils.getNextElement(element.getFirstChild());
         if (Constants._TAG_TRANSFORMS.equals(el.getLocalName()) 
             && Constants.SignatureSpecNS.equals(el.getNamespaceURI())) {
@@ -271,11 +271,11 @@ public class Reference extends Signature
     /**
      * Sets the <code>URI</code> of this <code>Reference</code> element
      *
-     * @param URI the <code>URI</code> of this <code>Reference</code> element
+     * @param uri the <code>URI</code> of this <code>Reference</code> element
      */
-    public void setURI(String URI) {
-        if (URI != null) {
-            this.constructionElement.setAttributeNS(null, Constants._ATT_URI, URI);
+    public void setURI(String uri) {
+        if (uri != null) {
+            this.constructionElement.setAttributeNS(null, Constants._ATT_URI, uri);
         }
     }
 
@@ -291,11 +291,11 @@ public class Reference extends Signature
     /**
      * Sets the <code>Id</code> attribute of this <code>Reference</code> element
      *
-     * @param Id the <code>Id</code> attribute of this <code>Reference</code> element
+     * @param id the <code>Id</code> attribute of this <code>Reference</code> element
      */
-    public void setId(String Id) {
-        if (Id != null) {
-            this.constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
+    public void setId(String id) {
+        if (id != null) {
+            this.constructionElement.setAttributeNS(null, Constants._ATT_ID, id);
             this.constructionElement.setIdAttributeNS(null, Constants._ATT_ID, true);
         }
     }
@@ -314,11 +314,11 @@ public class Reference extends Signature
      * <code>ds:Object</code>, <code>ds:SignatureProperty</code>, or <code>ds:Manifest</code> 
      * element.
      *
-     * @param Type the <code>type</code> attribute of the Reference
+     * @param type the <code>type</code> attribute of the Reference
      */
-    public void setType(String Type) {
-        if (Type != null) {
-            this.constructionElement.setAttributeNS(null, Constants._ATT_TYPE, Type);
+    public void setType(String type) {
+        if (type != null) {
+            this.constructionElement.setAttributeNS(null, Constants._ATT_TYPE, type);
         }
     }
 
@@ -405,16 +405,16 @@ public class Reference extends Signature
     public XMLSignatureInput getContentsBeforeTransformation()
         throws ReferenceNotInitializedException {
         try {
-            Attr URIAttr = 
+            Attr uriAttr = 
                 this.constructionElement.getAttributeNodeNS(null, Constants._ATT_URI);
 
             ResourceResolver resolver = 
                 ResourceResolver.getInstance(
-                    URIAttr, this.baseURI, this.manifest.getPerManifestResolvers(), secureValidation
+                    uriAttr, this.baseURI, this.manifest.getPerManifestResolvers(), secureValidation
                 );
             resolver.addProperties(this.manifest.getResolverProperties());
 
-            return resolver.resolve(URIAttr, this.baseURI);
+            return resolver.resolve(uriAttr, this.baseURI);
         }  catch (ResourceResolverException ex) {
             throw new ReferenceNotInitializedException("empty", ex);
         }
@@ -481,12 +481,12 @@ public class Reference extends Signature
             if (transforms != null) {
                 doTransforms: for (int i = 0; i < transforms.getLength(); i++) {
                     Transform t = transforms.item(i);
-                    String URI = t.getURI();
+                    String uri = t.getURI();
 
-                    if (URI.equals(Transforms.TRANSFORM_C14N_EXCL_OMIT_COMMENTS) 
-                        || URI.equals(Transforms.TRANSFORM_C14N_EXCL_WITH_COMMENTS) 
-                        || URI.equals(Transforms.TRANSFORM_C14N_OMIT_COMMENTS) 
-                        || URI.equals(Transforms.TRANSFORM_C14N_WITH_COMMENTS)) {
+                    if (uri.equals(Transforms.TRANSFORM_C14N_EXCL_OMIT_COMMENTS) 
+                        || uri.equals(Transforms.TRANSFORM_C14N_EXCL_WITH_COMMENTS) 
+                        || uri.equals(Transforms.TRANSFORM_C14N_OMIT_COMMENTS) 
+                        || uri.equals(Transforms.TRANSFORM_C14N_WITH_COMMENTS)) {
                         break doTransforms;
                     }
 
@@ -526,10 +526,10 @@ public class Reference extends Signature
             if (transforms != null) {
                 doTransforms: for (int i = 0; i < transforms.getLength(); i++) {
                     Transform t = transforms.item(i);
-                    String URI = t.getURI();
+                    String uri = t.getURI();
 
-                    if (URI.equals(Transforms.TRANSFORM_C14N_EXCL_OMIT_COMMENTS)
-                        || URI.equals(Transforms.TRANSFORM_C14N_EXCL_WITH_COMMENTS)) {
+                    if (uri.equals(Transforms.TRANSFORM_C14N_EXCL_OMIT_COMMENTS)
+                        || uri.equals(Transforms.TRANSFORM_C14N_EXCL_WITH_COMMENTS)) {
                         c14nTransform = t;
                         break doTransforms;
                     }

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=1333869&r1=1333868&r2=1333869&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 Fri May  4 10:42:44 2012
@@ -35,30 +35,30 @@ import org.w3c.dom.Node;
 public class SignatureProperty extends SignatureElementProxy {
 
     /**
-     * Constructs{@link SignatureProperty} using specified <code>Target</code> attribute
+     * Constructs{@link SignatureProperty} using specified <code>target</code> attribute
      *
      * @param doc the {@link Document} in which <code>XMLsignature</code> is placed
-     * @param Target the <code>Target</code> attribute references the <code>Signature</code> 
+     * @param target the <code>target</code> attribute references the <code>Signature</code> 
      * element to which the property applies SignatureProperty
      */
-    public SignatureProperty(Document doc, String Target) {
-        this(doc, Target, null);
+    public SignatureProperty(Document doc, String target) {
+        this(doc, target, null);
     }
 
     /**
-     * Constructs {@link SignatureProperty} using sepcified <code>Target</code> attribute and 
-     * <code>Id</code> attribute
+     * Constructs {@link SignatureProperty} using sepcified <code>target</code> attribute and 
+     * <code>id</code> attribute
      *
      * @param doc the {@link Document} in which <code>XMLsignature</code> is placed
-     * @param Target the <code>Target</code> attribute references the <code>Signature</code>
+     * @param target the <code>target</code> attribute references the <code>Signature</code>
      *  element to which the property applies
-     * @param Id the <code>Id</code> will be specified by {@link Reference#getURI} in validation
+     * @param id the <code>id</code> will be specified by {@link Reference#getURI} in validation
      */
-    public SignatureProperty(Document doc, String Target, String Id) {
+    public SignatureProperty(Document doc, String target, String id) {
         super(doc);
 
-        this.setTarget(Target);
-        this.setId(Id);
+        this.setTarget(target);
+        this.setId(id);
     }
 
     /**
@@ -72,30 +72,30 @@ public class SignatureProperty extends S
     }
 
     /**
-     *   Sets the <code>Id</code> attribute
+     *   Sets the <code>id</code> attribute
      *
-     *   @param Id the <code>Id</code> attribute
+     *   @param id the <code>id</code> attribute
      */
-    public void setId(String Id) {
-        if (Id != null) {
-            this.constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
+    public void setId(String id) {
+        if (id != null) {
+            this.constructionElement.setAttributeNS(null, Constants._ATT_ID, id);
             this.constructionElement.setIdAttributeNS(null, Constants._ATT_ID, true);
         }
     }
 
     /**
-     * Returns the <code>Id</code> attribute
+     * Returns the <code>id</code> attribute
      *
-     * @return the <code>Id</code> attribute
+     * @return the <code>id</code> attribute
      */
     public String getId() {
         return this.constructionElement.getAttributeNS(null, Constants._ATT_ID);
     }
 
     /**
-     * Sets the <code>Target</code> attribute
+     * Sets the <code>target</code> attribute
      *
-     * @param target the <code>Target</code> attribute
+     * @param target the <code>target</code> attribute
      */
     public void setTarget(String target) {
         if (target != null) {
@@ -104,9 +104,9 @@ public class SignatureProperty extends S
     }
 
     /**
-     * Returns the <code>Target</code> attribute
+     * Returns the <code>target</code> attribute
      *
-     * @return the <code>Target</code> attribute
+     * @return the <code>target</code> attribute
      */
     public String getTarget() {
         return this.constructionElement.getAttributeNS(null, Constants._ATT_TARGET);

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java?rev=1333869&r1=1333868&r2=1333869&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java Fri May  4 10:42:44 2012
@@ -58,7 +58,7 @@ import org.w3c.dom.Text;
  * <p>There are 2 types of constructors for this class. The ones that take a
  * document, baseURI and 1 or more Java Objects. This is mostly used for
  * signing purposes.
- * The other constructor is the one that takes a DOM Element and a BaseURI.
+ * The other constructor is the one that takes a DOM Element and a baseURI.
  * This is used mostly with for verifying, when you have a SignatureElement.
  *
  * There are a few different types of methods:
@@ -150,10 +150,10 @@ public final class XMLSignature extends 
         org.apache.commons.logging.LogFactory.getLog(XMLSignature.class);
     
     /** ds:Signature.ds:SignedInfo element */
-    private SignedInfo signedInfo = null;
+    private SignedInfo signedInfo;
 
     /** ds:Signature.ds:KeyInfo */
-    private KeyInfo keyInfo = null;
+    private KeyInfo keyInfo;
 
     /**
      * Checking the digests in References in a Signature are mandatory, but for
@@ -176,28 +176,28 @@ public final class XMLSignature extends 
      * by the spec. This method's main use is for creating a new signature.
      *
      * @param doc Document in which the signature will be appended after creation.
-     * @param BaseURI URI to be used as context for all relative URIs.
-     * @param SignatureMethodURI signature algorithm to use.
+     * @param baseURI URI to be used as context for all relative URIs.
+     * @param signatureMethodURI signature algorithm to use.
      * @throws XMLSecurityException
      */
-    public XMLSignature(Document doc, String BaseURI, String SignatureMethodURI)
+    public XMLSignature(Document doc, String baseURI, String signatureMethodURI)
         throws XMLSecurityException {
-        this(doc, BaseURI, SignatureMethodURI, 0, Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS);
+        this(doc, baseURI, signatureMethodURI, 0, Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS);
     }
 
     /**
      * Constructor XMLSignature
      *
      * @param doc
-     * @param BaseURI
-     * @param SignatureMethodURI the Signature method to be used.
-     * @param HMACOutputLength
+     * @param baseURI
+     * @param signatureMethodURI the Signature method to be used.
+     * @param hmacOutputLength
      * @throws XMLSecurityException
      */
-    public XMLSignature(Document doc, String BaseURI, String SignatureMethodURI,
-                        int HMACOutputLength) throws XMLSecurityException {
+    public XMLSignature(Document doc, String baseURI, String signatureMethodURI,
+                        int hmacOutputLength) throws XMLSecurityException {
         this(
-            doc, BaseURI, SignatureMethodURI, HMACOutputLength, 
+            doc, baseURI, signatureMethodURI, hmacOutputLength, 
             Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS
         );
     }
@@ -206,37 +206,37 @@ public final class XMLSignature extends 
      * Constructor XMLSignature
      *
      * @param doc
-     * @param BaseURI
-     * @param SignatureMethodURI the Signature method to be used.
-     * @param CanonicalizationMethodURI the canonicalization algorithm to be 
+     * @param baseURI
+     * @param signatureMethodURI the Signature method to be used.
+     * @param canonicalizationMethodURI the canonicalization algorithm to be 
      * used to c14nize the SignedInfo element.
      * @throws XMLSecurityException
      */
     public XMLSignature(
         Document doc, 
-        String BaseURI, 
-        String SignatureMethodURI,
-        String CanonicalizationMethodURI
+        String baseURI, 
+        String signatureMethodURI,
+        String canonicalizationMethodURI
     ) throws XMLSecurityException {
-        this(doc, BaseURI, SignatureMethodURI, 0, CanonicalizationMethodURI);
+        this(doc, baseURI, signatureMethodURI, 0, canonicalizationMethodURI);
     }
 
     /**
      * Constructor XMLSignature
      *
      * @param doc
-     * @param BaseURI
-     * @param SignatureMethodURI
-     * @param HMACOutputLength
-     * @param CanonicalizationMethodURI
+     * @param baseURI
+     * @param signatureMethodURI
+     * @param hmacOutputLength
+     * @param canonicalizationMethodURI
      * @throws XMLSecurityException
      */
     public XMLSignature(
         Document doc, 
-        String BaseURI, 
-        String SignatureMethodURI,
-        int HMACOutputLength, 
-        String CanonicalizationMethodURI
+        String baseURI, 
+        String signatureMethodURI,
+        int hmacOutputLength, 
+        String canonicalizationMethodURI
     ) throws XMLSecurityException {
         super(doc);
 
@@ -252,10 +252,10 @@ public final class XMLSignature extends 
         }
         XMLUtils.addReturnToElement(this.constructionElement);
 
-        this.baseURI = BaseURI;
+        this.baseURI = baseURI;
         this.signedInfo = 
             new SignedInfo(
-                this.doc, SignatureMethodURI, HMACOutputLength, CanonicalizationMethodURI
+                this.doc, signatureMethodURI, hmacOutputLength, canonicalizationMethodURI
             );
 
         this.constructionElement.appendChild(this.signedInfo.getElement());
@@ -272,14 +272,14 @@ public final class XMLSignature extends 
     /**
      *  Creates a XMLSignature in a Document
      * @param doc
-     * @param BaseURI
+     * @param baseURI
      * @param SignatureMethodElem
      * @param CanonicalizationMethodElem
      * @throws XMLSecurityException
      */
     public XMLSignature(
         Document doc, 
-        String BaseURI, 
+        String baseURI, 
         Element SignatureMethodElem, 
         Element CanonicalizationMethodElem
     ) throws XMLSecurityException {
@@ -297,7 +297,7 @@ public final class XMLSignature extends 
         }
         XMLUtils.addReturnToElement(this.constructionElement);
 
-        this.baseURI = BaseURI;
+        this.baseURI = baseURI;
         this.signedInfo = 
             new SignedInfo(this.doc, SignatureMethodElem, CanonicalizationMethodElem);
 
@@ -688,7 +688,7 @@ public final class XMLSignature extends 
             //SignedInfo. This is used to validate the signature.
             SignatureAlgorithm sa = si.getSignatureAlgorithm();               
             if (log.isDebugEnabled()) {
-                log.debug("SignatureMethodURI = " + sa.getAlgorithmURI());
+                log.debug("signatureMethodURI = " + sa.getAlgorithmURI());
                 log.debug("jceSigAlgorithm    = " + sa.getJCEAlgorithmString());
                 log.debug("jceSigProvider     = " + sa.getJCEProviderName());
                 log.debug("PublicKey = " + pk);
@@ -738,19 +738,19 @@ public final class XMLSignature extends 
      * each signature.
      * @param trans Optional list of transformations to be done before digesting
      * @param digestURI Mandatory URI of the digesting algorithm to use.
-     * @param ReferenceId Optional id attribute for this Reference
-     * @param ReferenceType Optional mimetype for the URI
+     * @param referenceId Optional id attribute for this Reference
+     * @param referenceType Optional mimetype for the URI
      * @throws XMLSignatureException
      */
     public void addDocument(
         String referenceURI, 
         Transforms trans, 
         String digestURI, 
-        String ReferenceId, 
-        String ReferenceType
+        String referenceId, 
+        String referenceType
     ) throws XMLSignatureException {
         this.signedInfo.addDocument(
-            this.baseURI, referenceURI, trans, digestURI, ReferenceId, ReferenceType
+            this.baseURI, referenceURI, trans, digestURI, referenceId, referenceType
         );
     }
 

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java?rev=1333869&r1=1333868&r2=1333869&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java Fri May  4 10:42:44 2012
@@ -97,7 +97,7 @@ public class XMLSignatureInput {
      * Transform algorithm and should be described in the specification for the 
      * algorithm.
      */   
-    private String MIMEType = null;
+    private String mimeType = null;
 
     /**
      * Field sourceURI 
@@ -336,21 +336,21 @@ public class XMLSignatureInput {
     }
 
     /**
-     * Returns MIMEType
+     * Returns mimeType
      *
-     * @return MIMEType
+     * @return mimeType
      */
     public String getMIMEType() {
-        return MIMEType;
+        return mimeType;
     }
 
     /**
-     * Sets MIMEType
+     * Sets mimeType
      *
      * @param mimeType
      */
     public void setMIMEType(String mimeType) {
-        this.MIMEType = mimeType;
+        this.mimeType = mimeType;
     }
 
     /**

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementChecker.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementChecker.java?rev=1333869&r1=1333868&r2=1333869&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementChecker.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementChecker.java Fri May  4 10:42:44 2012
@@ -29,8 +29,8 @@ public interface ElementChecker {
      *
      * @throws XMLSecurityException
      */
-    public void guaranteeThatElementInCorrectSpace(ElementProxy expected, Element actual)
+    void guaranteeThatElementInCorrectSpace(ElementProxy expected, Element actual)
         throws XMLSecurityException;
 
-    public boolean isNamespaceElement(Node el, String type, String ns);
+    boolean isNamespaceElement(Node el, String type, String ns);
 }

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/UnsyncBufferedOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/UnsyncBufferedOutputStream.java?rev=1333869&r1=1333868&r2=1333869&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/UnsyncBufferedOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/UnsyncBufferedOutputStream.java Fri May  4 10:42:44 2012
@@ -68,7 +68,7 @@ public class UnsyncBufferedOutputStream 
         pointer = newLen;
     }
 
-    private final void flushBuffer() throws IOException {
+    private void flushBuffer() throws IOException {
         if (pointer > 0) {
             out.write(buf, 0, pointer);
         }

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java?rev=1333869&r1=1333868&r2=1333869&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java Fri May  4 10:42:44 2012
@@ -97,10 +97,11 @@ public class XMLUtils {
     }
     
     public static Element getNextElement(Node el) {
-        while ((el != null) && (el.getNodeType() != Node.ELEMENT_NODE)) {
-            el = el.getNextSibling();
+        Node node = el;
+        while ((node != null) && (node.getNodeType() != Node.ELEMENT_NODE)) {
+            node = node.getNextSibling();
         }
-        return (Element)el;
+        return (Element)node;
     }
 
     /**
@@ -197,12 +198,10 @@ public class XMLUtils {
             if (log.isDebugEnabled()) {
                 log.debug(ex);
             }
-            ex.printStackTrace();
         } catch (CanonicalizationException ex) {
             if (log.isDebugEnabled()) {
                 log.debug(ex);
             }
-            ex.printStackTrace();
         }
     }
 

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathAPI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathAPI.java?rev=1333869&r1=1333868&r2=1333869&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathAPI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathAPI.java Fri May  4 10:42:44 2012
@@ -40,7 +40,7 @@ public interface XPathAPI {
      *
      * @throws TransformerException
      */
-    public NodeList selectNodeList(
+    NodeList selectNodeList(
         Node contextNode, Node xpathnode, String str, Node namespaceNode
     ) throws TransformerException;
     
@@ -51,12 +51,12 @@ public interface XPathAPI {
      *  @param str The XPath expression
      *  @param namespaceNode The node from which prefixes in the XPath will be resolved to namespaces.
      */
-    public boolean evaluate(Node contextNode, Node xpathnode, String str, Node namespaceNode)
+    boolean evaluate(Node contextNode, Node xpathnode, String str, Node namespaceNode)
         throws TransformerException;
     
     /**
      * Clear any context information from this object
      */
-    public void clear();
+    void clear();
 
 }

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoTest.java?rev=1333869&r1=1333868&r2=1333869&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoTest.java Fri May  4 10:42:44 2012
@@ -115,8 +115,8 @@ public class KeyInfoTest extends org.jun
             (Collections.singletonList(fac.newKeyName("foo")), "keyid");
         try {
             ki.marshal(null, null);
-            fail("Should raise a NullPointerException");
-        } catch (NullPointerException npe) {}
+            fail("Should raise a ClassCastException");
+        } catch (ClassCastException npe) {}
 
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         dbf.setNamespaceAware(true);