You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2014/04/02 18:48:34 UTC
svn commit: r1584090 - in /webservices/wss4j/trunk:
ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/
ws-security-stax/src/main/java/org/apache/wss4j/stax/
ws-security-stax/src/test/java/org/apache/wss4j/stax/test/
Author: coheigea
Date: Wed Apr 2 16:48:33 2014
New Revision: 1584090
URL: http://svn.apache.org/r1584090
Log:
Classloading changes required by OSGi
Modified:
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java?rev=1584090&r1=1584089&r2=1584090&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java Wed Apr 2 16:48:33 2014
@@ -64,7 +64,7 @@ public class AbstractPolicyTestBase exte
@BeforeClass
public static void setUp() throws Exception {
WSProviderConfig.init();
- Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI());
+ Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI(), WSSec.class);
}
@AfterClass
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java?rev=1584090&r1=1584089&r2=1584090&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java Wed Apr 2 16:48:33 2014
@@ -1246,7 +1246,7 @@ public class AsymmetricBindingIntegratio
inSecurityProperties.addInputProcessor(new PolicyInputProcessor(policyEnforcer, inSecurityProperties));
try {
- Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI());
+ Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI(), WSSec.class);
switchAllowMD5Algorithm(true);
Document document = doInboundSecurity(inSecurityProperties, new ByteArrayInputStream(baos.toByteArray()), policyEnforcer);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java?rev=1584090&r1=1584089&r2=1584090&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java Wed Apr 2 16:48:33 2014
@@ -1417,7 +1417,7 @@ public class TransportBindingIntegration
securityEventList.add(httpsTokenSecurityEvent);
try {
- Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI());
+ Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI(), WSSec.class);
switchAllowMD5Algorithm(true);
Document document = doInboundSecurity(inSecurityProperties, new ByteArrayInputStream(baos.toByteArray()), securityEventList, policyEnforcer);
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java?rev=1584090&r1=1584089&r2=1584090&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java Wed Apr 2 16:48:33 2014
@@ -31,7 +31,6 @@ import javax.xml.validation.SchemaFactor
import org.apache.wss4j.common.crypto.WSProviderConfig;
import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.util.Loader;
import org.apache.wss4j.stax.ext.InboundWSSec;
import org.apache.wss4j.stax.ext.OutboundWSSec;
import org.apache.wss4j.stax.ext.WSSConfigurationException;
@@ -59,7 +58,7 @@ public class WSSec {
static {
WSProviderConfig.init();
try {
- Init.init(ClassLoaderUtils.getResource("wss/wss-config.xml", WSSec.class).toURI());
+ Init.init(ClassLoaderUtils.getResource("wss/wss-config.xml", WSSec.class).toURI(), WSSec.class);
WSSConstants.setJaxbContext(
JAXBContext.newInstance(
@@ -81,40 +80,41 @@ public class WSSec {
public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) {
if ("http://www.w3.org/2001/XMLSchema.dtd".equals(systemId)) {
ConcreteLSInput concreteLSInput = new ConcreteLSInput();
- concreteLSInput.setByteStream(Loader.getResourceAsStream("schemas/XMLSchema.dtd"));
+ concreteLSInput.setByteStream(ClassLoaderUtils.getResourceAsStream("schemas/XMLSchema.dtd", WSSec.class));
return concreteLSInput;
} else if ("XMLSchema.dtd".equals(systemId)) {
ConcreteLSInput concreteLSInput = new ConcreteLSInput();
- concreteLSInput.setByteStream(Loader.getResourceAsStream("schemas/XMLSchema.dtd"));
+ concreteLSInput.setByteStream(ClassLoaderUtils.getResourceAsStream("schemas/XMLSchema.dtd", WSSec.class));
return concreteLSInput;
} else if ("datatypes.dtd".equals(systemId)) {
ConcreteLSInput concreteLSInput = new ConcreteLSInput();
- concreteLSInput.setByteStream(Loader.getResourceAsStream("schemas/datatypes.dtd"));
+ concreteLSInput.setByteStream(ClassLoaderUtils.getResourceAsStream("schemas/datatypes.dtd", WSSec.class));
return concreteLSInput;
} else if ("http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd".equals(systemId)) {
ConcreteLSInput concreteLSInput = new ConcreteLSInput();
- concreteLSInput.setByteStream(Loader.getResourceAsStream("schemas/xmldsig-core-schema.xsd"));
+ concreteLSInput.setByteStream(ClassLoaderUtils.getResourceAsStream("schemas/xmldsig-core-schema.xsd", WSSec.class));
return concreteLSInput;
} else if ("http://www.w3.org/2001/xml.xsd".equals(systemId)) {
ConcreteLSInput concreteLSInput = new ConcreteLSInput();
- concreteLSInput.setByteStream(Loader.getResourceAsStream("schemas/xml.xsd"));
+ concreteLSInput.setByteStream(ClassLoaderUtils.getResourceAsStream("schemas/xml.xsd", WSSec.class));
return concreteLSInput;
}
return null;
}
});
+
Schema schema = schemaFactory.newSchema(
new Source[]{
- new StreamSource(Loader.getResourceAsStream("schemas/exc-c14n.xsd")),
- new StreamSource(Loader.getResourceAsStream("schemas/xmldsig-core-schema.xsd")),
- new StreamSource(Loader.getResourceAsStream("schemas/xenc-schema.xsd")),
- new StreamSource(Loader.getResourceAsStream("schemas/xenc-schema-11.xsd")),
- new StreamSource(Loader.getResourceAsStream("schemas/xmldsig11-schema.xsd")),
- new StreamSource(Loader.getResourceAsStream("schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd")),
- new StreamSource(Loader.getResourceAsStream("schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd")),
- new StreamSource(Loader.getResourceAsStream("schemas/oasis-wss-wssecurity-secext-1.1.xsd")),
- new StreamSource(Loader.getResourceAsStream("schemas/ws-secureconversation-200502.xsd")),
- new StreamSource(Loader.getResourceAsStream("schemas/ws-secureconversation-1.3.xsd")),
+ new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/exc-c14n.xsd", WSSec.class)),
+ new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/xmldsig-core-schema.xsd", WSSec.class)),
+ new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/xenc-schema.xsd", WSSec.class)),
+ new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/xenc-schema-11.xsd", WSSec.class)),
+ new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/xmldsig11-schema.xsd", WSSec.class)),
+ new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd", WSSec.class)),
+ new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd", WSSec.class)),
+ new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/oasis-wss-wssecurity-secext-1.1.xsd", WSSec.class)),
+ new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/ws-secureconversation-200502.xsd", WSSec.class)),
+ new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/ws-secureconversation-1.3.xsd", WSSec.class)),
}
);
WSSConstants.setJaxbSchemas(schema);
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java?rev=1584090&r1=1584089&r2=1584090&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java Wed Apr 2 16:48:33 2014
@@ -1694,7 +1694,7 @@ public class EncDecryptionTest extends A
@SuppressWarnings("unchecked")
public void testCompressedEncDecryption() throws Exception {
- Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI());
+ Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI(), WSSec.class);
Field algorithmsClassMapField = TransformerAlgorithmMapper.class.getDeclaredField("algorithmsClassMapOut");
algorithmsClassMapField.setAccessible(true);
Map<String, Class<?>> map = (Map<String, Class<?>>)algorithmsClassMapField.get(null);
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java?rev=1584090&r1=1584089&r2=1584090&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java Wed Apr 2 16:48:33 2014
@@ -59,7 +59,7 @@ public class InboundWSSecurityContextImp
@BeforeClass
public static void setUp() throws Exception {
WSProviderConfig.init();
- Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI());
+ Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI(), WSSec.class);
}
@Test
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java?rev=1584090&r1=1584089&r2=1584090&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java Wed Apr 2 16:48:33 2014
@@ -359,7 +359,7 @@ public class VulnerabliltyVectorsTest ex
int oldval = 0;
try {
- Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI());
+ Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI(), WSSec.class);
oldval = changeValueOfMaximumAllowedTransformsPerReference(0);
doInboundSecurity(securityProperties,
xmlInputFactory.createXMLStreamReader(
@@ -441,7 +441,7 @@ public class VulnerabliltyVectorsTest ex
inboundsecurityProperties.addIgnoreBSPRule(BSPRule.R5421);
try {
- Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI());
+ Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI(), WSSec.class);
switchAllowMD5Algorithm(true);
Document document = doInboundSecurity(inboundsecurityProperties,
xmlInputFactory.createXMLStreamReader(
@@ -478,7 +478,7 @@ public class VulnerabliltyVectorsTest ex
int oldval = 0;
try {
- Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI());
+ Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI(), WSSec.class);
oldval = changeValueOfMaximumAllowedXMLStructureDepth(10);
doInboundSecurity(securityProperties,
xmlInputFactory.createXMLStreamReader(
@@ -519,7 +519,7 @@ public class VulnerabliltyVectorsTest ex
int oldval = 0;
try {
- Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI());
+ Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI(), WSSec.class);
oldval = changeValueOfMaximumAllowedXMLStructureDepth(10);
doInboundSecurity(securityProperties,
xmlInputFactory.createXMLStreamReader(
@@ -542,7 +542,7 @@ public class VulnerabliltyVectorsTest ex
long oldval = 0;
try {
- Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI());
+ Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI(), WSSec.class);
Field algorithmsClassMapField = TransformerAlgorithmMapper.class.getDeclaredField("algorithmsClassMapOut");
algorithmsClassMapField.setAccessible(true);
Map<String, Class<?>> map = (Map<String, Class<?>>)algorithmsClassMapField.get(null);