[idwsfconsumer] 11/25: More porting to resolve compile errors.
Scott Cantor
cantor.2 at osu.edu
Wed Nov 18 14:41:15 EST 2015
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository idwsfconsumer.
commit e7f181b11acb3117b0a9a4434fe65e1c2fc26fe9
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Wed Apr 1 19:51:10 2015 -0400
More porting to resolve compile errors.
---
pom.xml | 48 +++++++++++++++++++++-
.../org/openliberty/wsc/OpenLibertyBootstrap.java | 16 ++++----
.../java/org/openliberty/wsc/SSLUtilities.java | 4 ++
src/main/java/org/openliberty/wsc/WSFMessage.java | 13 ++++--
.../java/org/openliberty/wsc/WSFMessageSigner.java | 4 +-
5 files changed, 70 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index eb3cffe..eb54465 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,14 +52,58 @@
<version>1.4</version>
</dependency>
- <!-- TODO -->
+ <!-- TODO port to HC 4.x? -->
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- TODO remove if/when port to HC 4.x -->
+ <dependency>
+ <groupId>ca.juliusdavies</groupId>
+ <artifactId>not-yet-commons-ssl</artifactId>
+ <version>0.3.9</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.7.10</version>
+ </dependency>
+
+ <!-- TODO commons-logging API used by HC 3.x, so bridge to slf4j until port to HC 4.x -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.7.10</version>
+ </dependency>
+
+
+ <!-- TODO can replace this with something else? -->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.1</version>
</dependency>
- <!-- TODO -->
+ <!-- TODO switch library to use slf4j natively? -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
diff --git a/src/main/java/org/openliberty/wsc/OpenLibertyBootstrap.java b/src/main/java/org/openliberty/wsc/OpenLibertyBootstrap.java
index 05ebc3e..e456811 100755
--- a/src/main/java/org/openliberty/wsc/OpenLibertyBootstrap.java
+++ b/src/main/java/org/openliberty/wsc/OpenLibertyBootstrap.java
@@ -5,9 +5,8 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.log4j.Logger;
-import org.opensaml.Configuration;
-import org.opensaml.xml.ConfigurationException;
-import org.opensaml.xml.XMLConfigurator;
+import org.opensaml.core.xml.config.XMLConfigurationException;
+import org.opensaml.core.xml.config.XMLConfigurator;
/**
* This class is used to bootstrap the openLiberty WSC Client Library with the default configurations that ship with the library.
@@ -135,7 +134,7 @@ public class OpenLibertyBootstrap
*
* @throws ConfigurationException thrown if there is a problem initializing the OpenSAML library
*/
- public static synchronized void bootstrap() throws ConfigurationException
+ public static synchronized void bootstrap() throws XMLConfigurationException
{
initializeXMLTooling(xmlToolingConfigs);
initializeClientLibProperties();
@@ -148,7 +147,7 @@ public class OpenLibertyBootstrap
*
* @throws ConfigurationException thrown if there is a problem initializing the OpenSAML library
*/
- public static synchronized void bootstrap(String[] additionalXmlToolingConfigs) throws ConfigurationException
+ public static synchronized void bootstrap(String[] additionalXmlToolingConfigs) throws XMLConfigurationException
{
String[] xmlToolingConfigsCombined = null;
if(null!=additionalXmlToolingConfigs)
@@ -181,17 +180,16 @@ public class OpenLibertyBootstrap
*
* @param providerConfigs list of provider configuration files located on the classpath
*
- * @throws ConfigurationException thrown if there is a problem loading the configuration files
+ * @throws XMLConfigurationException thrown if there is a problem loading the configuration files
*/
- protected static void initializeXMLTooling(String[] providerConfigs) throws ConfigurationException
+ protected static void initializeXMLTooling(String[] providerConfigs) throws XMLConfigurationException
{
- Class<Configuration> clazz = Configuration.class;
XMLConfigurator configurator = new XMLConfigurator();
for (String config : providerConfigs)
{
log.info("Loading XMLTooling configuration " + config);
- configurator.load(clazz.getResourceAsStream(config));
+ configurator.load(Thread.currentThread().getContextClassLoader().getResourceAsStream(config));
}
}
diff --git a/src/main/java/org/openliberty/wsc/SSLUtilities.java b/src/main/java/org/openliberty/wsc/SSLUtilities.java
index 25bf602..b4c2383 100755
--- a/src/main/java/org/openliberty/wsc/SSLUtilities.java
+++ b/src/main/java/org/openliberty/wsc/SSLUtilities.java
@@ -28,6 +28,10 @@ import javax.net.ssl.X509TrustManager;
import net.shibboleth.utilities.java.support.xml.SerializeSupport;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.ssl.KeyMaterial;
+import org.apache.commons.ssl.SSL;
+import org.apache.commons.ssl.SSLClient;
+import org.apache.commons.ssl.TrustMaterial;
import org.apache.log4j.Logger;
import org.openliberty.LibConstants;
import org.openliberty.LibUtils;
diff --git a/src/main/java/org/openliberty/wsc/WSFMessage.java b/src/main/java/org/openliberty/wsc/WSFMessage.java
index c65f510..2870434 100644
--- a/src/main/java/org/openliberty/wsc/WSFMessage.java
+++ b/src/main/java/org/openliberty/wsc/WSFMessage.java
@@ -6,6 +6,7 @@ import java.security.GeneralSecurityException;
import java.util.ArrayList;
import java.util.List;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.xml.BasicParserPool;
import net.shibboleth.utilities.java.support.xml.QNameSupport;
import net.shibboleth.utilities.java.support.xml.SerializeSupport;
@@ -43,6 +44,7 @@ import org.openliberty.xmltooling.wsu.TimestampBuilder;
import org.opensaml.core.xml.AttributeExtensibleXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.XMLObjectBuilderFactory;
+import org.opensaml.core.xml.XMLRuntimeException;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.MarshallerFactory;
@@ -515,7 +517,7 @@ public class WSFMessage
else
{
// Marshall the XMLObject Envelope into a DOM object
- EnvelopeMarshaller em = new EnvelopeMarshaller();
+ Marshaller em = XMLObjectSupport.getMarshaller(Envelope.DEFAULT_ELEMENT_NAME);
outgoingMessage = em.marshall(envelope);
if(log.isDebugEnabled())
@@ -608,7 +610,7 @@ public class WSFMessage
// Unmarshall the Response Envelope
Element envelopeElem = responseDoc.getDocumentElement();
- EnvelopeUnmarshaller unmarshaller = new EnvelopeUnmarshaller();
+ Unmarshaller unmarshaller = XMLObjectSupport.getUnmarshaller(envelopeElem);
responseEnvelope = (Envelope) unmarshaller.unmarshall(envelopeElem);
/**
@@ -1136,7 +1138,7 @@ public class WSFMessage
Element envelopeElem = soapDoc.getDocumentElement();
// Create envelope java object from DOM element (unmarshall envelope)
- EnvelopeUnmarshaller unmarshaller = new EnvelopeUnmarshaller();
+ Unmarshaller unmarshaller = XMLObjectSupport.getUnmarshaller(envelopeElem);
return (Envelope) unmarshaller.unmarshall(envelopeElem);
}
@@ -1197,6 +1199,11 @@ public class WSFMessage
// TODO: what is the cost of instantiating the BasicParserPool
parser = new BasicParserPool();
parser.setNamespaceAware(true);
+ try {
+ parser.initialize();
+ } catch (ComponentInitializationException e) {
+ throw new XMLRuntimeException("Could not initialize BasicParserPool", e);
+ }
// TODO: what is the cost of the factory calls?
marshallerFactory = XMLObjectProviderRegistrySupport.getMarshallerFactory();
diff --git a/src/main/java/org/openliberty/wsc/WSFMessageSigner.java b/src/main/java/org/openliberty/wsc/WSFMessageSigner.java
index 2dc91c4..df5b570 100644
--- a/src/main/java/org/openliberty/wsc/WSFMessageSigner.java
+++ b/src/main/java/org/openliberty/wsc/WSFMessageSigner.java
@@ -32,7 +32,9 @@ import javax.xml.parsers.DocumentBuilderFactory;
import net.shibboleth.utilities.java.support.xml.SerializeSupport;
import org.openliberty.xmltooling.Konstantz;
+import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.MarshallingException;
+import org.opensaml.core.xml.util.XMLObjectSupport;
import org.opensaml.soap.soap11.Envelope;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -166,7 +168,7 @@ public class WSFMessageSigner
try
{
Envelope envelope = message.getRequestEnvelope();
- EnvelopeMarshaller envelopeMarshaller = new EnvelopeMarshaller();
+ Marshaller envelopeMarshaller = XMLObjectSupport.getMarshaller(Envelope.DEFAULT_ELEMENT_NAME);
Element envelopeElement = envelopeMarshaller.marshall(envelope);
Document messageDoc = envelopeElement.getOwnerDocument();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list