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 2014/04/02 18:46:36 UTC
svn commit: r1584089 - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/xml/security/stax/config/
main/java/org/apache/xml/security/stax/ext/
main/java/org/apache/xml/security/stax/securityToken/
test/java/org/apache/xml/security/test/st...
Author: coheigea
Date: Wed Apr 2 16:46:35 2014
New Revision: 1584089
URL: http://svn.apache.org/r1584089
Log:
Classloading changes required by OSGi
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ConfigurationProperties.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/Init.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/SecurityHeaderHandlerMapper.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenFactory.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/InputProcessorChainTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/OutputProcessorChainTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/UncategorizedTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamWriterTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/UnknownAlgoSignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformBase64DecodeTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformCanonicalizerTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformEnvelopedSignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformIdentityTest.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ConfigurationProperties.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ConfigurationProperties.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ConfigurationProperties.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ConfigurationProperties.java Wed Apr 2 16:46:35 2014
@@ -33,21 +33,28 @@ import java.util.Properties;
public class ConfigurationProperties {
private static Properties properties;
+ private static Class<?> callingClass;
private ConfigurationProperties() {
super();
}
- protected static synchronized void init(PropertiesType propertiesType) throws Exception {
+ protected static synchronized void init(PropertiesType propertiesType,
+ Class<?> callingClass) throws Exception {
properties = new Properties();
List<PropertyType> handlerList = propertiesType.getProperty();
for (int i = 0; i < handlerList.size(); i++) {
PropertyType propertyType = handlerList.get(i);
properties.setProperty(propertyType.getNAME(), propertyType.getVAL());
}
+ ConfigurationProperties.callingClass = callingClass;
}
public static String getProperty(String key) {
return properties.getProperty(key);
}
+
+ public static Class<?> getCallingClass() {
+ return callingClass;
+ }
}
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=1584089&r1=1584088&r2=1584089&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 Wed Apr 2 16:46:35 2014
@@ -50,7 +50,7 @@ public class Init {
private static URI initialized = null;
@SuppressWarnings("unchecked")
- public static synchronized void init(URI uri) throws XMLSecurityException {
+ public static synchronized void init(URI uri, Class<?> callingClass) throws XMLSecurityException {
if (initialized == null || uri != null && !uri.equals(initialized)) {
try {
JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
@@ -77,11 +77,11 @@ public class Init {
saxParser.parse(uri.toURL().toExternalForm(), new XIncludeHandler(unmarshallerHandler));
JAXBElement<ConfigurationType> configurationTypeJAXBElement = (JAXBElement<ConfigurationType>) unmarshallerHandler.getResult();
- ConfigurationProperties.init(configurationTypeJAXBElement.getValue().getProperties());
- SecurityHeaderHandlerMapper.init(configurationTypeJAXBElement.getValue().getSecurityHeaderHandlers());
+ ConfigurationProperties.init(configurationTypeJAXBElement.getValue().getProperties(), callingClass);
+ SecurityHeaderHandlerMapper.init(configurationTypeJAXBElement.getValue().getSecurityHeaderHandlers(), callingClass);
JCEAlgorithmMapper.init(configurationTypeJAXBElement.getValue().getJCEAlgorithmMappings());
- TransformerAlgorithmMapper.init(configurationTypeJAXBElement.getValue().getTransformAlgorithms());
- ResourceResolverMapper.init(configurationTypeJAXBElement.getValue().getResourceResolvers());
+ TransformerAlgorithmMapper.init(configurationTypeJAXBElement.getValue().getTransformAlgorithms(), callingClass);
+ ResourceResolverMapper.init(configurationTypeJAXBElement.getValue().getResourceResolvers(), callingClass);
I18n.init(ConfigurationProperties.getProperty("DefaultLanguageCode"), ConfigurationProperties.getProperty("DefaultCountryCode"));
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java Wed Apr 2 16:46:35 2014
@@ -39,13 +39,14 @@ public class ResourceResolverMapper {
private ResourceResolverMapper() {
}
- protected static synchronized void init(ResourceResolversType resourceResolversType) throws Exception {
+ protected static synchronized void init(ResourceResolversType resourceResolversType,
+ Class<?> callingClass) throws Exception {
List<ResolverType> handlerList = resourceResolversType.getResolver();
resourceResolvers = new ArrayList<ResourceResolverLookup>(handlerList.size() + 1);
for (int i = 0; i < handlerList.size(); i++) {
ResolverType uriResolverType = handlerList.get(i);
resourceResolvers.add((ResourceResolverLookup)
- ClassLoaderUtils.loadClass(uriResolverType.getJAVACLASS(), ResourceResolverMapper.class).newInstance());
+ ClassLoaderUtils.loadClass(uriResolverType.getJAVACLASS(), callingClass).newInstance());
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/SecurityHeaderHandlerMapper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/SecurityHeaderHandlerMapper.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/SecurityHeaderHandlerMapper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/SecurityHeaderHandlerMapper.java Wed Apr 2 16:46:35 2014
@@ -41,14 +41,15 @@ public class SecurityHeaderHandlerMapper
private SecurityHeaderHandlerMapper() {
}
- protected static synchronized void init(SecurityHeaderHandlersType securityHeaderHandlersType) throws Exception {
+ protected static synchronized void init(SecurityHeaderHandlersType securityHeaderHandlersType,
+ Class<?> callingClass) throws Exception {
List<HandlerType> handlerList = securityHeaderHandlersType.getHandler();
handlerClassMap = new HashMap<QName, Class<?>>(handlerList.size() + 1);
for (int i = 0; i < handlerList.size(); i++) {
HandlerType handlerType = handlerList.get(i);
QName qName = new QName(handlerType.getURI(), handlerType.getNAME());
handlerClassMap.put(qName,
- ClassLoaderUtils.loadClass(handlerType.getJAVACLASS(), SecurityHeaderHandlerMapper.class));
+ ClassLoaderUtils.loadClass(handlerType.getJAVACLASS(), callingClass));
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java Wed Apr 2 16:46:35 2014
@@ -43,7 +43,8 @@ public class TransformerAlgorithmMapper
private TransformerAlgorithmMapper() {
}
- protected static synchronized void init(TransformAlgorithmsType transformAlgorithms) throws Exception {
+ protected static synchronized void init(TransformAlgorithmsType transformAlgorithms,
+ Class<?> callingClass) throws Exception {
List<TransformAlgorithmType> algorithms = transformAlgorithms.getTransformAlgorithm();
algorithmsClassMapInOut = new HashMap<String, Class<?>>();
algorithmsClassMapIn = new HashMap<String, Class<?>>();
@@ -53,13 +54,13 @@ public class TransformerAlgorithmMapper
TransformAlgorithmType algorithmType = algorithms.get(i);
if (algorithmType.getINOUT() == null) {
algorithmsClassMapInOut.put(algorithmType.getURI(),
- ClassLoaderUtils.loadClass(algorithmType.getJAVACLASS(), TransformerAlgorithmMapper.class));
+ ClassLoaderUtils.loadClass(algorithmType.getJAVACLASS(), callingClass));
} else if ("IN".equals(algorithmType.getINOUT().value())) {
algorithmsClassMapIn.put(algorithmType.getURI(),
- ClassLoaderUtils.loadClass(algorithmType.getJAVACLASS(), TransformerAlgorithmMapper.class));
+ ClassLoaderUtils.loadClass(algorithmType.getJAVACLASS(), callingClass));
} else if ("OUT".equals(algorithmType.getINOUT().value())) {
algorithmsClassMapOut.put(algorithmType.getURI(),
- ClassLoaderUtils.loadClass(algorithmType.getJAVACLASS(), TransformerAlgorithmMapper.class));
+ ClassLoaderUtils.loadClass(algorithmType.getJAVACLASS(), callingClass));
} else {
throw new IllegalArgumentException("INOUT parameter " + algorithmType.getINOUT().value() + " unsupported");
}
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=1584089&r1=1584088&r2=1584089&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 Wed Apr 2 16:46:35 2014
@@ -58,7 +58,7 @@ public class XMLSec {
if (resource == null) {
throw new RuntimeException("security-config.xml not found in classpath");
}
- Init.init(resource.toURI());
+ Init.init(resource.toURI(), XMLSec.class);
try {
XMLSecurityConstants.setJaxbContext(
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenFactory.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenFactory.java Wed Apr 2 16:46:35 2014
@@ -41,11 +41,15 @@ public abstract class SecurityTokenFacto
if (stf == null) {
throw new XMLSecurityException("algorithm.ClassDoesNotExist", "null");
}
+ Class<?> callingClass = ConfigurationProperties.getCallingClass();
+ if (callingClass == null) {
+ callingClass = SecurityTokenFactory.class;
+ }
try {
@SuppressWarnings("unchecked")
Class<SecurityTokenFactory> securityTokenFactoryClass =
- (Class<SecurityTokenFactory>) ClassLoaderUtils.loadClass(stf, SecurityTokenFactory.class);
+ (Class<SecurityTokenFactory>) ClassLoaderUtils.loadClass(stf, callingClass);
securityTokenFactory = securityTokenFactoryClass.newInstance();
} catch (ClassNotFoundException e) {
throw new XMLSecurityException("algorithm.ClassDoesNotExist", new Object[]{stf}, e);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/InputProcessorChainTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/InputProcessorChainTest.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/InputProcessorChainTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/InputProcessorChainTest.java Wed Apr 2 16:46:35 2014
@@ -43,7 +43,8 @@ public class InputProcessorChainTest ext
@Before
public void setUp() throws Exception {
- Init.init(this.getClass().getClassLoader().getResource("security-config.xml").toURI());
+ Init.init(this.getClass().getClassLoader().getResource("security-config.xml").toURI(),
+ this.getClass());
}
abstract class AbstractInputProcessor implements InputProcessor {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/OutputProcessorChainTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/OutputProcessorChainTest.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/OutputProcessorChainTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/OutputProcessorChainTest.java Wed Apr 2 16:46:35 2014
@@ -41,7 +41,8 @@ public class OutputProcessorChainTest ex
@Before
public void setUp() throws Exception {
- Init.init(this.getClass().getClassLoader().getResource("security-config.xml").toURI());
+ Init.init(this.getClass().getClassLoader().getResource("security-config.xml").toURI(),
+ this.getClass());
}
abstract class AbstractOutputProcessor implements OutputProcessor {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/UncategorizedTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/UncategorizedTest.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/UncategorizedTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/UncategorizedTest.java Wed Apr 2 16:46:35 2014
@@ -43,7 +43,7 @@ public class UncategorizedTest extends o
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/31_input.xml");
try {
- Init.init(url.toURI());
+ Init.init(url.toURI(), this.getClass());
Assert.fail();
} catch (XMLSecurityException e) {
Assert.assertTrue(e.getMessage().contains("Cannot find the declaration of element 'doc'."));
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java Wed Apr 2 16:46:35 2014
@@ -55,7 +55,8 @@ public class XMLSecurityStreamReaderTest
@Before
public void setUp() throws Exception {
- Init.init(this.getClass().getClassLoader().getResource("security-config.xml").toURI());
+ Init.init(this.getClass().getClassLoader().getResource("security-config.xml").toURI(),
+ this.getClass());
}
@Test
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamWriterTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamWriterTest.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamWriterTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamWriterTest.java Wed Apr 2 16:46:35 2014
@@ -48,7 +48,8 @@ public class XMLSecurityStreamWriterTest
@Before
public void setUp() throws Exception {
- Init.init(this.getClass().getClassLoader().getResource("security-config.xml").toURI());
+ Init.init(this.getClass().getClassLoader().getResource("security-config.xml").toURI(),
+ this.getClass());
}
@Test
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java Wed Apr 2 16:46:35 2014
@@ -68,7 +68,8 @@ public class ExclusiveC14NInteropTest ex
@Before
public void setUp() throws Exception {
- Init.init(ExclusiveC14NInteropTest.class.getClassLoader().getResource("security-config.xml").toURI());
+ Init.init(ExclusiveC14NInteropTest.class.getClassLoader().getResource("security-config.xml").toURI(),
+ this.getClass());
org.apache.xml.security.Init.init();
xmlInputFactory = XMLInputFactory.newInstance();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureVerificationTest.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureVerificationTest.java Wed Apr 2 16:46:35 2014
@@ -68,7 +68,8 @@ public class AbstractSignatureVerificati
BASEDIR = new File(".").getCanonicalPath();
}
- Init.init(AbstractSignatureVerificationTest.class.getClassLoader().getResource("security-config.xml").toURI());
+ Init.init(AbstractSignatureVerificationTest.class.getClassLoader().getResource("security-config.xml").toURI(),
+ this.getClass());
org.apache.xml.security.Init.init();
xmlInputFactory = XMLInputFactory.newInstance();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java Wed Apr 2 16:46:35 2014
@@ -109,7 +109,8 @@ public class BaltimoreTest extends org.j
@Before
public void setUp() throws Exception {
- Init.init(BaltimoreTest.class.getClassLoader().getResource("security-config.xml").toURI());
+ Init.init(BaltimoreTest.class.getClassLoader().getResource("security-config.xml").toURI(),
+ this.getClass());
org.apache.xml.security.Init.init();
xmlInputFactory = XMLInputFactory.newInstance();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java Wed Apr 2 16:46:35 2014
@@ -92,7 +92,8 @@ public class IAIKTest extends org.junit.
@Before
public void setUp() throws Exception {
- Init.init(IAIKTest.class.getClassLoader().getResource("security-config.xml").toURI());
+ Init.init(IAIKTest.class.getClassLoader().getResource("security-config.xml").toURI(),
+ this.getClass());
org.apache.xml.security.Init.init();
xmlInputFactory = XMLInputFactory.newInstance();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java Wed Apr 2 16:46:35 2014
@@ -62,7 +62,8 @@ public class PhaosTest extends org.junit
@Before
public void setUp() throws Exception {
- Init.init(PhaosTest.class.getClassLoader().getResource("security-config.xml").toURI());
+ Init.init(PhaosTest.class.getClassLoader().getResource("security-config.xml").toURI(),
+ this.getClass());
org.apache.xml.security.Init.init();
xmlInputFactory = XMLInputFactory.newInstance();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java Wed Apr 2 16:46:35 2014
@@ -67,7 +67,8 @@ public class RSASecurityTest extends Abs
@Before
public void setUp() throws Exception {
- Init.init(RSASecurityTest.class.getClassLoader().getResource("security-config.xml").toURI());
+ Init.init(RSASecurityTest.class.getClassLoader().getResource("security-config.xml").toURI(),
+ this.getClass());
org.apache.xml.security.Init.init();
xmlInputFactory = XMLInputFactory.newInstance();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java Wed Apr 2 16:46:35 2014
@@ -74,7 +74,8 @@ public class SignatureVerificationTest e
@Before
public void setUp() throws Exception {
- Init.init(SignatureVerificationTest.class.getClassLoader().getResource("security-config.xml").toURI());
+ Init.init(SignatureVerificationTest.class.getClassLoader().getResource("security-config.xml").toURI(),
+ this.getClass());
org.apache.xml.security.Init.init();
xmlInputFactory = XMLInputFactory.newInstance();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/UnknownAlgoSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/UnknownAlgoSignatureTest.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/UnknownAlgoSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/UnknownAlgoSignatureTest.java Wed Apr 2 16:46:35 2014
@@ -59,7 +59,8 @@ public class UnknownAlgoSignatureTest ex
@Before
public void setUp() throws Exception {
- Init.init(UnknownAlgoSignatureTest.class.getClassLoader().getResource("security-config.xml").toURI());
+ Init.init(UnknownAlgoSignatureTest.class.getClassLoader().getResource("security-config.xml").toURI(),
+ this.getClass());
org.apache.xml.security.Init.init();
xmlInputFactory = XMLInputFactory.newInstance();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformBase64DecodeTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformBase64DecodeTest.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformBase64DecodeTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformBase64DecodeTest.java Wed Apr 2 16:46:35 2014
@@ -53,7 +53,8 @@ public class TransformBase64DecodeTest e
@Before
public void setUp() throws Exception {
- Init.init(this.getClass().getClassLoader().getResource("security-config.xml").toURI());
+ Init.init(this.getClass().getClassLoader().getResource("security-config.xml").toURI(),
+ this.getClass());
this.xmlInputFactory = XMLInputFactory.newInstance();
this.xmlInputFactory.setEventAllocator(new XMLSecEventAllocator());
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformCanonicalizerTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformCanonicalizerTest.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformCanonicalizerTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformCanonicalizerTest.java Wed Apr 2 16:46:35 2014
@@ -50,7 +50,8 @@ public class TransformCanonicalizerTest
@Before
public void setUp() throws Exception {
- Init.init(this.getClass().getClassLoader().getResource("security-config.xml").toURI());
+ Init.init(this.getClass().getClassLoader().getResource("security-config.xml").toURI(),
+ this.getClass());
this.xmlInputFactory = XMLInputFactory.newInstance();
this.xmlInputFactory.setEventAllocator(new XMLSecEventAllocator());
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformEnvelopedSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformEnvelopedSignatureTest.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformEnvelopedSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformEnvelopedSignatureTest.java Wed Apr 2 16:46:35 2014
@@ -52,7 +52,8 @@ public class TransformEnvelopedSignature
@Before
public void setUp() throws Exception {
- Init.init(this.getClass().getClassLoader().getResource("security-config.xml").toURI());
+ Init.init(this.getClass().getClassLoader().getResource("security-config.xml").toURI(),
+ this.getClass());
this.xmlInputFactory = XMLInputFactory.newInstance();
this.xmlInputFactory.setEventAllocator(new XMLSecEventAllocator());
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformIdentityTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformIdentityTest.java?rev=1584089&r1=1584088&r2=1584089&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformIdentityTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformIdentityTest.java Wed Apr 2 16:46:35 2014
@@ -53,7 +53,8 @@ public class TransformIdentityTest exten
@Before
public void setUp() throws Exception {
- Init.init(this.getClass().getClassLoader().getResource("security-config.xml").toURI());
+ Init.init(this.getClass().getClassLoader().getResource("security-config.xml").toURI(),
+ this.getClass());
this.xmlInputFactory = XMLInputFactory.newInstance();
this.xmlInputFactory.setEventAllocator(new XMLSecEventAllocator());
this.xmlInputFactory.setProperty(XMLInputFactory.IS_COALESCING, Boolean.TRUE);