You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by gi...@apache.org on 2013/03/24 16:47:35 UTC
svn commit: r1460408 [2/3] - in /santuario/xml-security-java/trunk:
samples/org/apache/xml/security/samples/encryption/
samples/org/apache/xml/security/samples/iaik/
samples/org/apache/xml/security/samples/signature/
samples/org/apache/xml/security/sam...
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java Sun Mar 24 15:47:32 2013
@@ -30,9 +30,9 @@ import org.w3c.dom.Element;
* For a KeyName hint, the KeyName must match the alias of a PrivateKey entry within the KeyStore.
*/
public class PrivateKeyResolver extends KeyResolverSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(PrivateKeyResolver.class.getName());
+
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(PrivateKeyResolver.class);
private KeyStore keyStore;
private char[] password;
@@ -204,7 +204,7 @@ public class PrivateKeyResolver extends
Enumeration<String> aliases = keyStore.aliases();
while (aliases.hasMoreElements()) {
- String alias = (String) aliases.nextElement();
+ String alias = aliases.nextElement();
if (keyStore.isKeyEntry(alias)) {
Certificate cert = keyStore.getCertificate(alias);
@@ -239,7 +239,7 @@ public class PrivateKeyResolver extends
Enumeration<String> aliases = keyStore.aliases();
while (aliases.hasMoreElements()) {
- String alias = (String) aliases.nextElement();
+ String alias = aliases.nextElement();
if (keyStore.isKeyEntry(alias)) {
Certificate cert = keyStore.getCertificate(alias);
@@ -275,7 +275,7 @@ public class PrivateKeyResolver extends
Enumeration<String> aliases = keyStore.aliases();
while (aliases.hasMoreElements()) {
- String alias = (String) aliases.nextElement();
+ String alias = aliases.nextElement();
if (keyStore.isKeyEntry(alias)) {
Certificate cert = keyStore.getCertificate(alias);
@@ -314,7 +314,7 @@ public class PrivateKeyResolver extends
Enumeration<String> aliases = keyStore.aliases();
while (aliases.hasMoreElements()) {
- String alias = (String) aliases.nextElement();
+ String alias = aliases.nextElement();
if (keyStore.isKeyEntry(alias)) {
Certificate cert = keyStore.getCertificate(alias);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java Sun Mar 24 15:47:32 2013
@@ -32,8 +32,7 @@ import org.w3c.dom.Element;
public class RSAKeyValueResolver extends KeyResolverSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(RSAKeyValueResolver.class);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java Sun Mar 24 15:47:32 2013
@@ -67,8 +67,7 @@ import org.xml.sax.SAXException;
*/
public class RetrievalMethodResolver extends KeyResolverSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(RetrievalMethodResolver.class);
/**
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java Sun Mar 24 15:47:32 2013
@@ -19,9 +19,8 @@ import org.w3c.dom.Element;
*/
public class SecretKeyResolver extends KeyResolverSpi
{
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(SecretKeyResolver.class.getName());
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(SecretKeyResolver.class);
private KeyStore keyStore;
private char[] password;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java Sun Mar 24 15:47:32 2013
@@ -16,9 +16,8 @@ import org.w3c.dom.Element;
*/
public class SingleKeyResolver extends KeyResolverSpi
{
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(SingleKeyResolver.class.getName());
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(SingleKeyResolver.class);
private String keyName;
private PublicKey publicKey;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java Sun Mar 24 15:47:32 2013
@@ -38,8 +38,7 @@ import org.w3c.dom.Element;
*/
public class X509CertificateResolver extends KeyResolverSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(X509CertificateResolver.class);
/**
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java Sun Mar 24 15:47:32 2013
@@ -26,8 +26,7 @@ import org.w3c.dom.Element;
*/
public class X509DigestResolver extends KeyResolverSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(X509DigestResolver.class);
/** {@inheritDoc}. */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java Sun Mar 24 15:47:32 2013
@@ -35,8 +35,7 @@ import org.w3c.dom.Element;
public class X509IssuerSerialResolver extends KeyResolverSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(X509IssuerSerialResolver.class);
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=1460408&r1=1460407&r2=1460408&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 Sun Mar 24 15:47:32 2013
@@ -35,8 +35,7 @@ import org.w3c.dom.Element;
public class X509SKIResolver extends KeyResolverSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(X509SKIResolver.class);
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=1460408&r1=1460407&r2=1460408&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 Sun Mar 24 15:47:32 2013
@@ -35,8 +35,7 @@ import org.w3c.dom.Element;
public class X509SubjectNameResolver extends KeyResolverSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(X509SubjectNameResolver.class);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java Sun Mar 24 15:47:32 2013
@@ -34,8 +34,7 @@ import org.apache.xml.security.keys.stor
*/
public class StorageResolver {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(StorageResolver.class);
/** Field storageResolvers */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java Sun Mar 24 15:47:32 2013
@@ -43,8 +43,7 @@ import org.apache.xml.security.utils.Bas
*/
public class CertsInFilesystemDirectoryResolver extends StorageResolverSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(
CertsInFilesystemDirectoryResolver.class
);
@@ -98,7 +97,7 @@ public class CertsInFilesystemDirectoryR
}
for (int i = 0; i < al.size(); i++) {
- String filename = certDir.getAbsolutePath() + File.separator + (String) al.get(i);
+ String filename = certDir.getAbsolutePath() + File.separator + al.get(i);
File file = new File(filename);
boolean added = false;
String dn = null;
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=1460408&r1=1460407&r2=1460408&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 Sun Mar 24 15:47:32 2013
@@ -56,8 +56,7 @@ public class Manifest extends SignatureE
*/
public static final int MAXIMUM_REFERENCE_COUNT = 30;
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(Manifest.class);
/** Field references */
@@ -356,7 +355,7 @@ public class Manifest extends SignatureE
Manifest referencedManifest = null;
Iterator<Node> nlIterator = nl.iterator();
- findManifest: while (nlIterator.hasNext()) {
+ while (nlIterator.hasNext()) {
Node n = nlIterator.next();
if ((n.getNodeType() == Node.ELEMENT_NODE)
@@ -368,7 +367,7 @@ public class Manifest extends SignatureE
new Manifest(
(Element)n, signedManifestNodes.getSourceURI(), secureValidation
);
- break findManifest;
+ break;
} catch (XMLSecurityException ex) {
if (log.isDebugEnabled()) {
log.debug(ex.getMessage(), ex);
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=1460408&r1=1460407&r2=1460408&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 Sun Mar 24 15:47:32 2013
@@ -120,15 +120,14 @@ public class Reference extends Signature
* will be added if necessary when generating the signature. See section
* 3.1.1 of http://www.w3.org/2007/xmlsec/Drafts/xmldsig-core/ for more info.
*/
- private static boolean useC14N11 = ((Boolean)
+ private static boolean useC14N11 =
AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
public Boolean run() {
- return Boolean.valueOf(Boolean.getBoolean("org.apache.xml.security.useC14N11"));
+ return Boolean.getBoolean("org.apache.xml.security.useC14N11");
}
- })).booleanValue();
+ });
- /** {@link org.apache.commons.logging} logging facility */
- private static final org.slf4j.Logger log =
+ private static final org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(Reference.class);
private Manifest manifest;
@@ -478,7 +477,7 @@ public class Reference extends Signature
Transforms transforms = this.getTransforms();
if (transforms != null) {
- doTransforms: for (int i = 0; i < transforms.getLength(); i++) {
+ for (int i = 0; i < transforms.getLength(); i++) {
Transform t = transforms.item(i);
String uri = t.getURI();
@@ -486,7 +485,7 @@ public class Reference extends Signature
|| uri.equals(Transforms.TRANSFORM_C14N_EXCL_WITH_COMMENTS)
|| uri.equals(Transforms.TRANSFORM_C14N_OMIT_COMMENTS)
|| uri.equals(Transforms.TRANSFORM_C14N_WITH_COMMENTS)) {
- break doTransforms;
+ break;
}
output = t.performTransform(output, null);
@@ -523,14 +522,14 @@ public class Reference extends Signature
Transform c14nTransform = null;
if (transforms != null) {
- doTransforms: for (int i = 0; i < transforms.getLength(); i++) {
+ for (int i = 0; i < transforms.getLength(); i++) {
Transform t = transforms.item(i);
String uri = t.getURI();
if (uri.equals(Transforms.TRANSFORM_C14N_EXCL_OMIT_COMMENTS)
|| uri.equals(Transforms.TRANSFORM_C14N_EXCL_WITH_COMMENTS)) {
c14nTransform = t;
- break doTransforms;
+ break;
}
}
}
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=1460408&r1=1460407&r2=1460408&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 Sun Mar 24 15:47:32 2013
@@ -278,7 +278,7 @@ public class SignedInfo extends Manifest
}
// make defensive copy
- return (byte[]) this.c14nizedBytes.clone();
+ return this.c14nizedBytes.clone();
}
/**
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=1460408&r1=1460407&r2=1460408&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 Sun Mar 24 15:47:32 2013
@@ -145,8 +145,7 @@ public final class XMLSignature extends
public static final String ALGO_ID_SIGNATURE_ECDSA_SHA512 =
"http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512";
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(XMLSignature.class);
/** ds:Signature.ds:SignedInfo element */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java Sun Mar 24 15:47:32 2013
@@ -149,7 +149,7 @@ public class XMLSignatureInputDebugger {
}
// get only a single node as anchor to fetch the owner document
- Node n = (Node) this.xpathNodeSet.iterator().next();
+ Node n = this.xpathNodeSet.iterator().next();
this.doc = XMLUtils.getOwnerDocument(n);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/Init.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/Init.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/Init.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/Init.java Sun Mar 24 15:47:32 2013
@@ -33,6 +33,7 @@ import javax.xml.parsers.SAXParserFactor
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import java.net.URI;
+import java.net.URL;
/**
* Class to load the algorithms-mappings from a configuration file.
@@ -61,7 +62,13 @@ public class Init {
saxParserFactory.setNamespaceAware(true);
SAXParser saxParser = saxParserFactory.newSAXParser();
if (uri == null) {
- uri = Init.class.getClassLoader().getResource("security-config.xml").toURI();
+ URL resource = Init.class.getClassLoader().getResource("security-config.xml");
+ if (resource == null) {
+ //kind of chicken-egg problem here
+ I18n.init("en", "US");
+ throw new XMLSecurityConfigurationException("empty", "security-config.xml not found in classpath");
+ }
+ uri = resource.toURI();
}
saxParser.parse(uri.toURL().toExternalForm(), new XIncludeHandler(unmarshallerHandler));
JAXBElement<ConfigurationType> configurationTypeJAXBElement = (JAXBElement<ConfigurationType>) unmarshallerHandler.getResult();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java Sun Mar 24 15:47:32 2013
@@ -19,6 +19,7 @@
package org.apache.xml.security.stax.ext;
import java.net.URISyntaxException;
+import java.net.URL;
import java.security.interfaces.DSAPrivateKey;
import java.security.interfaces.RSAPrivateKey;
@@ -39,7 +40,11 @@ public class XMLSec {
static {
try {
- Init.init(XMLSec.class.getClassLoader().getResource("security-config.xml").toURI());
+ URL resource = XMLSec.class.getClassLoader().getResource("security-config.xml");
+ if (resource == null) {
+ throw new RuntimeException("security-config.xml not found in classpath");
+ }
+ Init.init(resource.toURI());
} catch (XMLSecurityException e) {
throw new RuntimeException(e.getMessage(), e);
} catch (URISyntaxException e) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java Sun Mar 24 15:47:32 2013
@@ -56,7 +56,7 @@ public class Canonicalizer11 extends Can
if (outputStack.containsOnStack(comparableAttribute) != null) {
continue;
}
- if (utilizedAttributes == (Object)Collections.emptyList()) {
+ if (utilizedAttributes == Collections.<XMLSecAttribute>emptyList()) {
utilizedAttributes = new ArrayList<XMLSecAttribute>(2);
}
utilizedAttributes.add(comparableAttribute);
@@ -72,7 +72,7 @@ public class Canonicalizer11 extends Can
if (XML.equals(attributeName.getPrefix())) {
continue;
}
- if (utilizedAttributes == (Object)Collections.emptyList()) {
+ if (utilizedAttributes == Collections.<XMLSecAttribute>emptyList()) {
utilizedAttributes = new ArrayList<XMLSecAttribute>(2);
}
utilizedAttributes.add(comparableAttribute);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java Sun Mar 24 15:47:32 2013
@@ -94,7 +94,7 @@ public abstract class Canonicalizer20010
if (resultNamespace == null || resultNamespace.getNamespaceURI() == null
|| !resultNamespace.getNamespaceURI().equals(attributeNamespace.getNamespaceURI())) {
- if (utilizedNamespaces == (Object)Collections.emptyList()) {
+ if (utilizedNamespaces == Collections.<XMLSecNamespace>emptyList()) {
utilizedNamespaces = new ArrayList<XMLSecNamespace>(2);
}
utilizedNamespaces.add(attributeNamespace);
@@ -119,7 +119,7 @@ public abstract class Canonicalizer20010
|| !resultNamespace.getNamespaceURI().equals(comparableNamespace.getNamespaceURI())
|| (firstCall && propagateDefaultNamespace && !utilizedNamespaces.contains(comparableNamespace))) {
- if (utilizedNamespaces == (Object)Collections.emptyList()) {
+ if (utilizedNamespaces == Collections.<XMLSecNamespace>emptyList()) {
utilizedNamespaces = new ArrayList<XMLSecNamespace>(2);
}
utilizedNamespaces.add(comparableNamespace);
@@ -145,7 +145,7 @@ public abstract class Canonicalizer20010
List<XMLSecAttribute> comparableAttributes = xmlSecStartElement.getOnElementDeclaredAttributes();
for (int i = 0; i < comparableAttributes.size(); i++) {
XMLSecAttribute comparableAttribute = comparableAttributes.get(i);
- if (utilizedAttributes == (Object)Collections.emptyList()) {
+ if (utilizedAttributes == Collections.<XMLSecAttribute>emptyList()) {
utilizedAttributes = new ArrayList<XMLSecAttribute>(2);
}
utilizedAttributes.add(comparableAttribute);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java Sun Mar 24 15:47:32 2013
@@ -115,7 +115,7 @@ public abstract class CanonicalizerBase
continue;
}
- if (utilizedNamespaces == (Object)Collections.emptyList()) {
+ if (utilizedNamespaces == Collections.<XMLSecNamespace>emptyList()) {
utilizedNamespaces = new ArrayList<XMLSecNamespace>(2);
}
utilizedNamespaces.add(comparableNamespace);
@@ -137,7 +137,7 @@ public abstract class CanonicalizerBase
if (resultNamespace == null || resultNamespace.getNamespaceURI() == null
|| !resultNamespace.getNamespaceURI().equals(attributeNamespace.getNamespaceURI())) {
- if (utilizedNamespaces == (Object)Collections.emptyList()) {
+ if (utilizedNamespaces == Collections.<XMLSecNamespace>emptyList()) {
utilizedNamespaces = new ArrayList<XMLSecNamespace>(2);
}
utilizedNamespaces.add(attributeNamespace);
@@ -201,7 +201,7 @@ public abstract class CanonicalizerBase
if (outputStack.containsOnStack(comparableAttribute) != null) {
continue;
}
- if (utilizedAttributes == (Object)Collections.emptyList()) {
+ if (utilizedAttributes == Collections.<XMLSecAttribute>emptyList()) {
utilizedAttributes = new ArrayList<XMLSecAttribute>(2);
}
utilizedAttributes.add(comparableAttribute);
@@ -217,7 +217,7 @@ public abstract class CanonicalizerBase
if (XML.equals(attributeName.getPrefix())) {
continue;
}
- if (utilizedAttributes == (Object)Collections.emptyList()) {
+ if (utilizedAttributes == Collections.<XMLSecAttribute>emptyList()) {
utilizedAttributes = new ArrayList<XMLSecAttribute>(2);
}
utilizedAttributes.add(comparableAttribute);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java Sun Mar 24 15:47:32 2013
@@ -65,8 +65,7 @@ import org.xml.sax.SAXException;
*/
public final class Transform extends SignatureElementProxy {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(Transform.class);
/** All available Transform classes are registered here */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java Sun Mar 24 15:47:32 2013
@@ -97,13 +97,12 @@ public class Transforms extends Signatur
public static final String TRANSFORM_XPATH2FILTER
= "http://www.w3.org/2002/06/xmldsig-filter2";
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(Transforms.class);
private Element[] transforms;
- protected Transforms() { };
+ protected Transforms() { }
private boolean secureValidation;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java Sun Mar 24 15:47:32 2013
@@ -147,7 +147,7 @@ public class TransformXPath extends Tran
Object[] eArgs = {currentNode};
throw new XMLSecurityRuntimeException("signature.Transform.node", eArgs, e);
} catch (Exception e) {
- Object[] eArgs = {currentNode, Short.valueOf(currentNode.getNodeType())};
+ Object[] eArgs = {currentNode, currentNode.getNodeType()};
throw new XMLSecurityRuntimeException("signature.Transform.nodeAndType",eArgs, e);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/InclusiveNamespaces.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/InclusiveNamespaces.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/InclusiveNamespaces.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/InclusiveNamespaces.java Sun Mar 24 15:47:32 2013
@@ -81,7 +81,8 @@ public class InclusiveNamespaces extends
if (prefix.equals("xmlns")) {
sb.append("#default ");
} else {
- sb.append(prefix + " ");
+ sb.append(prefix);
+ sb.append(" ");
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Base64.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Base64.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Base64.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Base64.java Sun Mar 24 15:47:32 2013
@@ -323,11 +323,9 @@ public class Base64 {
throws IOException, Base64DecodingException {
byte[] retBytes = null;
- UnsyncByteArrayOutputStream baos = null;
+ UnsyncByteArrayOutputStream baos = new UnsyncByteArrayOutputStream();
try {
- baos = new UnsyncByteArrayOutputStream();
String line;
-
while (null != (line = reader.readLine())) {
byte[] bytes = decode(line);
baos.write(bytes);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java Sun Mar 24 15:47:32 2013
@@ -34,8 +34,7 @@ import java.util.List;
*/
public final class ClassLoaderUtils {
- /** {@link org.apache.commons.logging} logging facility */
- private static final org.slf4j.Logger log =
+ private static final org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(ClassLoaderUtils.class);
private ClassLoaderUtils() {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java Sun Mar 24 15:47:32 2013
@@ -30,7 +30,6 @@ import org.xml.sax.SAXParseException;
*/
public class IgnoreAllErrorHandler implements ErrorHandler {
- /** {@link org.apache.commons.logging} logging facility */
private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(IgnoreAllErrorHandler.class);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JDKXPathAPI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JDKXPathAPI.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JDKXPathAPI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JDKXPathAPI.java Sun Mar 24 15:47:32 2013
@@ -109,8 +109,7 @@ public class JDKXPathAPI implements XPat
}
}
try {
- Boolean result = (Boolean)xpathExpression.evaluate(contextNode, XPathConstants.BOOLEAN);
- return result.booleanValue();
+ return (Boolean)xpathExpression.evaluate(contextNode, XPathConstants.BOOLEAN);
} catch (XPathExpressionException ex) {
throw new TransformerException("empty", ex);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java Sun Mar 24 15:47:32 2013
@@ -31,8 +31,7 @@ import java.io.InputStream;
*/
public class JavaUtils {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(JavaUtils.class);
private JavaUtils() {
@@ -123,22 +122,16 @@ public class JavaUtils {
* @throws IOException
*/
public static byte[] getBytesFromStream(InputStream inputStream) throws IOException {
- UnsyncByteArrayOutputStream baos = null;
-
- byte[] retBytes = null;
+ UnsyncByteArrayOutputStream baos = new UnsyncByteArrayOutputStream();
try {
- baos = new UnsyncByteArrayOutputStream();
byte buf[] = new byte[4 * 1024];
int len;
-
while ((len = inputStream.read(buf)) > 0) {
baos.write(buf, 0, len);
}
- retBytes = baos.toByteArray();
+ return baos.toByteArray();
} finally {
baos.close();
}
-
- return retBytes;
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Signature11ElementProxy.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Signature11ElementProxy.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Signature11ElementProxy.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Signature11ElementProxy.java Sun Mar 24 15:47:32 2013
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
public abstract class Signature11ElementProxy extends ElementProxy {
protected Signature11ElementProxy() {
- };
+ }
/**
* Constructor Signature11ElementProxy
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/SignatureElementProxy.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/SignatureElementProxy.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/SignatureElementProxy.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/SignatureElementProxy.java Sun Mar 24 15:47:32 2013
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
public abstract class SignatureElementProxy extends ElementProxy {
protected SignatureElementProxy() {
- };
+ }
/**
* Constructor SignatureElementProxy
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=1460408&r1=1460407&r2=1460408&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 Sun Mar 24 15:47:32 2013
@@ -37,7 +37,6 @@ import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.w3c.dom.ProcessingInstruction;
import org.w3c.dom.Text;
/**
@@ -50,18 +49,17 @@ public class XMLUtils {
private static boolean ignoreLineBreaks =
AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
public Boolean run() {
- return Boolean.valueOf(Boolean.getBoolean
- ("org.apache.xml.security.ignoreLineBreaks"));
+ return Boolean.getBoolean
+ ("org.apache.xml.security.ignoreLineBreaks");
}
- }).booleanValue();
+ });
private static volatile String dsPrefix = "ds";
private static volatile String ds11Prefix = "dsig11";
private static volatile String xencPrefix = "xenc";
private static volatile String xenc11Prefix = "xenc11";
- /** {@link org.apache.commons.logging} logging facility */
- private static final org.slf4j.Logger log =
+ private static final org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(XMLUtils.class);
@@ -843,9 +841,9 @@ public class XMLUtils {
return sb.toString();
} else if (xpathnode.getNodeType() == Node.ATTRIBUTE_NODE) {
- return ((Attr) xpathnode).getNodeValue();
+ return xpathnode.getNodeValue();
} else if (xpathnode.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE) {
- return ((ProcessingInstruction) xpathnode).getNodeValue();
+ return xpathnode.getNodeValue();
}
return null;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java Sun Mar 24 15:47:32 2013
@@ -146,7 +146,7 @@ public class XalanXPathAPI implements XP
Class<?>[] classes = new Class[]{String.class, SourceLocator.class, PrefixResolver.class, int.class,
ErrorListener.class, FunctionTable.class};
Object[] objects =
- new Object[]{str, null, prefixResolver, Integer.valueOf(XPath.SELECT), null, funcTable};
+ new Object[]{str, null, prefixResolver, XPath.SELECT, null, funcTable};
try {
Constructor<?> constructor = XPath.class.getConstructor(classes);
xpath = (XPath) constructor.newInstance(objects);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java Sun Mar 24 15:47:32 2013
@@ -37,12 +37,11 @@ import org.w3c.dom.Attr;
*/
public class ResourceResolver {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(ResourceResolver.class);
/** these are the system-wide resolvers */
- private static List<ResourceResolver> resolverList = new ArrayList<ResourceResolver>();
+ private static final List<ResourceResolver> resolverList = new ArrayList<ResourceResolver>();
/** Field resolverSpi */
private final ResourceResolverSpi resolverSpi;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java Sun Mar 24 15:47:32 2013
@@ -30,8 +30,7 @@ import org.apache.xml.security.signature
*/
public abstract class ResourceResolverSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(ResourceResolverSpi.class);
/** Field properties */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java Sun Mar 24 15:47:32 2013
@@ -57,8 +57,7 @@ import org.apache.xml.security.utils.res
*/
public class ResolverDirectHTTP extends ResourceResolverSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(ResolverDirectHTTP.class);
/** Field properties[] */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java Sun Mar 24 15:47:32 2013
@@ -37,8 +37,7 @@ import org.w3c.dom.Node;
*/
public class ResolverFragment extends ResourceResolverSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(ResolverFragment.class);
@Override
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java Sun Mar 24 15:47:32 2013
@@ -34,8 +34,7 @@ public class ResolverLocalFilesystem ext
private static final int FILE_URI_LENGTH = "file:/".length();
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(ResolverLocalFilesystem.class);
@Override
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java Sun Mar 24 15:47:32 2013
@@ -44,8 +44,7 @@ import org.w3c.dom.Node;
*/
public class ResolverXPointer extends ResourceResolverSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(ResolverXPointer.class);
private static final String XP = "#xpointer(id(";
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorTest.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorTest.java Sun Mar 24 15:47:32 2013
@@ -44,7 +44,7 @@ public class KeySelectorTest extends org
private byte[] val;
MyOwnKey(String algorithm, byte[] value) {
algo = algorithm;
- val = (byte[]) value.clone();
+ val = value.clone();
}
public String getAlgorithm() {
@@ -88,7 +88,7 @@ public class KeySelectorTest extends org
private static boolean compareKey(Object answer, Key key) {
boolean result = false;
if (answer instanceof MyOwnKey) {
- result = ((MyOwnKey) answer == key);
+ result = (answer == key);
} else if (answer instanceof X509Certificate) {
result =
((X509Certificate)answer).getPublicKey().equals(key);
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java Sun Mar 24 15:47:32 2013
@@ -72,7 +72,7 @@ public class KeySelectors {
}
public byte[] getEncoded() {
- return (byte[]) bytes.clone();
+ return bytes.clone();
}
};
}
@@ -186,12 +186,14 @@ public class KeySelectors {
}
certs = new Vector<X509Certificate>();
File[] files = new File(certDir, "certs").listFiles();
- for (File file : files) {
- try {
- certs.add((X509Certificate)certFac.generateCertificate
- (new FileInputStream(file)));
- } catch (Exception ex) {
- // ignore non-cert files
+ if (files != null) {
+ for (File file : files) {
+ try {
+ certs.add((X509Certificate)certFac.generateCertificate
+ (new FileInputStream(file)));
+ } catch (Exception ex) {
+ // ignore non-cert files
+ }
}
}
}
@@ -354,16 +356,20 @@ public class KeySelectors {
public static String dumpArray(byte[] in) {
int numDumped = 0;
- StringBuffer buf = new StringBuffer(512);
+ StringBuilder buf = new StringBuilder(512);
buf.append("{");
for (int i = 0;i < (in.length / numBytesPerRow); i++) {
for (int j=0; j < (numBytesPerRow); j++) {
- buf.append("(byte)0x" + getHex(in[i * numBytesPerRow+j]) + ", ");
+ buf.append("(byte)0x");
+ buf.append(getHex(in[i * numBytesPerRow+j]));
+ buf.append(", ");
}
numDumped += numBytesPerRow;
}
while (numDumped < in.length) {
- buf.append("(byte)0x" + getHex(in[numDumped]) + " ");
+ buf.append("(byte)0x");
+ buf.append(getHex(in[numDumped]));
+ buf.append(" ");
numDumped += 1;
}
buf.append("}");
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java Sun Mar 24 15:47:32 2013
@@ -96,7 +96,7 @@ public class ClassLoaderTest extends org
Method canonicalizationMethod = factoryClass.getDeclaredMethod
("newCanonicalizationMethod",
new Class[]{String.class,methodParameterClass});
- Object factory = factoryMethod.invoke(null, new Object[]{"DOM"});
+ Object factory = factoryMethod.invoke(null, "DOM");
long start = System.currentTimeMillis();
for (int i = 0; i < 100; i++) {
canonicalizationMethod.invoke
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java Sun Mar 24 15:47:32 2013
@@ -120,7 +120,7 @@ public class CreateInteropExcC14NTest ex
fac.newDigestMethod(DigestMethod.SHA1, null),
Collections.singletonList(fac.newTransform
(CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS,
- (TransformParameterSpec) params)),
+ params)),
null, null));
// create SignedInfo
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TestUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TestUtils.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TestUtils.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TestUtils.java Sun Mar 24 15:47:32 2013
@@ -179,7 +179,7 @@ public class TestUtils {
} catch (Exception ex) {
// should never be thrown
}
- };
+ }
public MyOwnDOMReference(String id, boolean status) {
super(newDocument());
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/dom/DOMValidateContextTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/dom/DOMValidateContextTest.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/dom/DOMValidateContextTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/dom/DOMValidateContextTest.java Sun Mar 24 15:47:32 2013
@@ -75,9 +75,9 @@ public class DOMValidateContextTest exte
String pvalue1 = "value";
String pvalue2 = "newvalue";
assertNull(domVC.setProperty(pname, pvalue1));
- assertEquals((String)domVC.getProperty(pname), pvalue1);
+ assertEquals(domVC.getProperty(pname), pvalue1);
assertEquals(domVC.setProperty(pname, pvalue2), pvalue1);
- assertEquals((String)domVC.getProperty(pname), pvalue2);
+ assertEquals(domVC.getProperty(pname), pvalue2);
}
@org.junit.Test
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoFactoryTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoFactoryTest.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoFactoryTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoFactoryTest.java Sun Mar 24 15:47:32 2013
@@ -119,7 +119,7 @@ public class KeyInfoFactoryTest extends
} catch (KeyException ke) { }
try {
- factory.newKeyValue((PublicKey) null);
+ factory.newKeyValue(null);
fail("Should raise a NPE for null key");
} catch (KeyException ke) {
fail("Should raise a NPE for null key");
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=1460408&r1=1460407&r2=1460408&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 Sun Mar 24 15:47:32 2013
@@ -69,7 +69,7 @@ public class KeyInfoTest extends org.jun
for (int i = 0; i < content.length; i++) {
if (!(content[i] instanceof XMLStructure)) {
fail("KeyInfo element has the wrong type");
- };
+ }
}
} else {
try {
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java Sun Mar 24 15:47:32 2013
@@ -65,7 +65,7 @@ public class PGPDataTest extends org.jun
for (int j=0; j<types.length; j++) {
if (!(types[j] instanceof XMLStructure)) {
fail("PGP element has the wrong type");
- };
+ }
}
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509DataTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509DataTest.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509DataTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509DataTest.java Sun Mar 24 15:47:32 2013
@@ -57,7 +57,7 @@ public class X509DataTest extends org.ju
!(content[j] instanceof X509CRL) &&
!(content[j] instanceof XMLStructure)) {
fail("X509 element has the wrong type");
- };
+ }
}
} else {
li.add("any string");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java Sun Mar 24 15:47:32 2013
@@ -30,9 +30,8 @@ import org.w3c.dom.Document;
public class SignatureAlgorithmTest extends org.junit.Assert {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(SignatureAlgorithmTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(SignatureAlgorithmTest.class);
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/C14nHelperTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/C14nHelperTest.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/C14nHelperTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/C14nHelperTest.java Sun Mar 24 15:47:32 2013
@@ -26,9 +26,8 @@ import org.apache.xml.security.c14n.help
*/
public class C14nHelperTest extends org.junit.Assert {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(C14nHelperTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(C14nHelperTest.class);
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java Sun Mar 24 15:47:32 2013
@@ -50,9 +50,8 @@ import org.xml.sax.SAXException;
*/
public class Canonicalizer11Test extends org.junit.Assert {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(Canonicalizer11Test.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(Canonicalizer11Test.class);
static {
org.apache.xml.security.Init.init();
@@ -386,7 +385,7 @@ public class Canonicalizer11Test extends
new DSNamespaceContext(namespaces);
xPath.setNamespaceContext(namespaceContext);
- nl = (NodeList)xPath.evaluate((String) xpath, doc, XPathConstants.NODESET);
+ nl = (NodeList)xPath.evaluate(xpath, doc, XPathConstants.NODESET);
c14nBytes = c14n.canonicalizeXPathNodeSet(nl);
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java Sun Mar 24 15:47:32 2013
@@ -66,10 +66,9 @@ public class Canonicalizer20010315Exclus
org.apache.xml.security.Init.init();
}
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
+ static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(
- Canonicalizer20010315ExclusiveTest.class.getName()
+ Canonicalizer20010315ExclusiveTest.class
);
/** Field dbf */
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java Sun Mar 24 15:47:32 2013
@@ -63,9 +63,8 @@ import org.xml.sax.SAXException;
*/
public class Canonicalizer20010315Test extends org.junit.Assert {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(Canonicalizer20010315Test.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(Canonicalizer20010315Test.class);
static {
org.apache.xml.security.Init.init();
@@ -635,7 +634,7 @@ public class Canonicalizer20010315Test e
new DSNamespaceContext(namespace);
xPath.setNamespaceContext(namespaceContext);
- NodeList nodes = (NodeList)xPath.evaluate((String) xpath, doc, XPathConstants.NODESET);
+ NodeList nodes = (NodeList)xPath.evaluate(xpath, doc, XPathConstants.NODESET);
Canonicalizer c14n =
Canonicalizer.getInstance(Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS);
byte c14nBytes[] = c14n.canonicalizeXPathNodeSet(nodes);
@@ -1014,7 +1013,7 @@ public class Canonicalizer20010315Test e
String xpath =
"(//*[local-name()='included'] | //@*[parent::node()[local-name()='included']])";
NodeList nodes =
- (NodeList)xPath.evaluate((String) xpath, doc, XPathConstants.NODESET);
+ (NodeList)xPath.evaluate(xpath, doc, XPathConstants.NODESET);
byte result[] = c14nizer.canonicalizeXPathNodeSet(nodes);
byte defined[] = definedOutput.getBytes();
@@ -1079,7 +1078,7 @@ public class Canonicalizer20010315Test e
new DSNamespaceContext(namespaces);
xPath.setNamespaceContext(namespaceContext);
- nl = (NodeList)xPath.evaluate((String) xpath, doc, XPathConstants.NODESET);
+ nl = (NodeList)xPath.evaluate(xpath, doc, XPathConstants.NODESET);
c14nBytes = c14n.canonicalizeXPathNodeSet(nl);
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java Sun Mar 24 15:47:32 2013
@@ -34,9 +34,8 @@ import org.w3c.dom.Element;
*/
public class ExclusiveC14NInteropTest extends InteropTestBase {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(ExclusiveC14NInteropTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(ExclusiveC14NInteropTest.class);
static {
org.apache.xml.security.Init.init();
@@ -142,7 +141,7 @@ public class ExclusiveC14NInteropTest ex
log.debug(" signature.checkSignatureValue finished: " + verify);
// if (!verify) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < signature.getSignedInfo().getLength(); i++) {
boolean refVerify =
@@ -152,7 +151,8 @@ public class ExclusiveC14NInteropTest ex
if (refVerify) {
log.debug("Reference " + i + " was OK");
} else {
- sb.append(i + " ");
+ sb.append(i);
+ sb.append(" ");
//JavaUtils.writeBytesToFilename(directory + "/c14n-" + i + ".apache.txt", signature.getSignedInfo().item(i).getContentsAfterTransformation().getBytes());
//JavaUtils.writeBytesToFilename(directory + "/c14n-" + i + ".apache.html", signature.getSignedInfo().item(i).getHTMLRepresentation().getBytes());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java Sun Mar 24 15:47:32 2013
@@ -73,9 +73,8 @@ public class BaltimoreEncTest extends or
private boolean haveISOPadding;
private boolean haveKeyWraps;
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(BaltimoreEncTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(BaltimoreEncTest.class);
/**
* Constructor BaltimoreEncTest
@@ -101,7 +100,7 @@ public class BaltimoreEncTest extends or
cardNumber = retrieveCCNumber(doc);
// Test decrypt
- testDecryptString = new String("top secret message\n");
+ testDecryptString = "top secret message\n";
// Count the nodes in the document as a secondary test
nodeCount = countNodes(doc);
@@ -112,7 +111,7 @@ public class BaltimoreEncTest extends or
jedBytes = "abcdefghijklmnopqrstuvwxyz012345".getBytes("ASCII");
// Certificate information
- rsaCertSerialNumber = new String("1014918766910");
+ rsaCertSerialNumber = "1014918766910";
// rsaKey
filename = "src/test/resources/ie/baltimore/merlin-examples/merlin-xmlenc-five/rsa.p8";
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BobKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BobKeyResolver.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BobKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BobKeyResolver.java Sun Mar 24 15:47:32 2013
@@ -39,9 +39,8 @@ import org.w3c.dom.Element;
*/
public class BobKeyResolver extends KeyResolverSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(BobKeyResolver.class.getName());
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(BobKeyResolver.class);
private KeyName _kn = null;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java Sun Mar 24 15:47:32 2013
@@ -42,9 +42,8 @@ import org.w3c.dom.NodeList;
public class EncryptContentTest extends org.junit.Assert {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(EncryptContentTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(EncryptContentTest.class);
private static final String DATA =
"<users>\n" +
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java Sun Mar 24 15:47:32 2013
@@ -32,9 +32,8 @@ import org.w3c.dom.Element;
public class ReferenceListTest extends org.junit.Assert {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(ReferenceListTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(ReferenceListTest.class);
private DocumentBuilder db;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java Sun Mar 24 15:47:32 2013
@@ -61,9 +61,8 @@ import org.w3c.dom.NodeList;
*/
public class XMLCipherTest extends org.junit.Assert {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(XMLCipherTest.class.getName());
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(XMLCipherTest.class);
static {
org.apache.xml.security.Init.init();
@@ -86,7 +85,7 @@ public class XMLCipherTest extends org.j
elementIndex = System.getProperty("org.apache.xml.enc.test.idx", "0");
tstBase64EncodedString =
- new String("YmNkZWZnaGlqa2xtbm9wcRrPXjQ1hvhDFT+EdesMAPE4F6vlT+y0HPXe0+nAGLQ8");
+ "YmNkZWZnaGlqa2xtbm9wcRrPXjQ1hvhDFT+EdesMAPE4F6vlT+y0HPXe0+nAGLQ8";
// Determine if we have ISO 10126 Padding - needed for Bulk AES or
// 3DES encryption
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java Sun Mar 24 15:47:32 2013
@@ -71,9 +71,8 @@ public class XMLEncryption11Test extends
private static int nodeCount = 0;
private boolean haveISOPadding;
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(XMLEncryption11Test.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(XMLEncryption11Test.class);
/**
* Constructor XMLEncryption11Test
@@ -96,7 +95,7 @@ public class XMLEncryption11Test extends
// BouncyCastle is not available so just return
return;
} else {
- Provider provider = (java.security.Provider)cons.newInstance(new Object[]{});
+ Provider provider = (java.security.Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java Sun Mar 24 15:47:32 2013
@@ -32,9 +32,8 @@ import org.apache.xml.security.signature
*/
public class BaltimoreTest extends InteropTestBase {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(BaltimoreTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(BaltimoreTest.class);
/** Field merlinsDir15 */
static String merlinsDir15 =
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java Sun Mar 24 15:47:32 2013
@@ -33,9 +33,8 @@ import org.apache.xml.security.utils.res
*/
public class IAIKTest extends InteropTestBase {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(IAIKTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(IAIKTest.class);
/** Field gregorsDir */
static String gregorsDir = "src/test/resources/at/iaik/ixsil/";
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IBMTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IBMTest.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IBMTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IBMTest.java Sun Mar 24 15:47:32 2013
@@ -46,9 +46,8 @@ import org.apache.xml.security.utils.res
*/
public class IBMTest extends InteropTestBase {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(IBMTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(IBMTest.class);
/** Field kentsDir */
static final String kentsDir = "data/com/ibm/xss4j-20030127/";