Get SSL working
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/CONNECTORS-1566@1866531 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/connectors/alfresco-webscript/build.xml b/connectors/alfresco-webscript/build.xml
index 0514115..8d25630 100644
--- a/connectors/alfresco-webscript/build.xml
+++ b/connectors/alfresco-webscript/build.xml
@@ -45,12 +45,12 @@
<include name="chemistry*.jar"/>
<include name="stax*.jar"/>
<include name="streambuffer*.jar"/>
- <include name="jaxws*.jar"/>
+ <include name="jaxws-api*.jar"/>
+ <include name="cxf-rt-frontend-jaxws*.jar"/>
<include name="woodstox-core-asl*.jar"/>
<include name="mimepull*.jar"/>
<include name="resolver*.jar"/>
<include name="org.osgi.core*.jar"/>
- <!-- include name="commons-lang*.jar"/ -->
<include name="joda*.jar"/>
</fileset>
</path>
diff --git a/connectors/cmis/build.xml b/connectors/cmis/build.xml
index 46de4d8..e408490 100644
--- a/connectors/cmis/build.xml
+++ b/connectors/cmis/build.xml
@@ -60,12 +60,11 @@
<include name="chemistry*.jar"/>
<include name="stax*.jar"/>
<include name="streambuffer*.jar"/>
- <include name="jaxws*.jar"/>
+ <include name="jaxws-api*.jar"/>
<include name="woodstox-core-asl*.jar"/>
<include name="mimepull*.jar"/>
<include name="resolver*.jar"/>
<include name="org.osgi.core*.jar"/>
- <!-- include name="commons-lang*.jar"/ -->
<include name="joda*.jar"/>
</fileset>
</path>
@@ -77,7 +76,7 @@
<include name="chemistry*.jar"/>
<include name="stax*.jar"/>
<include name="streambuffer*.jar"/>
- <include name="jaxws*.jar"/>
+ <include name="jaxws-api*.jar"/>
<include name="woodstox-core-asl*.jar"/>
<include name="mimepull*.jar"/>
<include name="resolver*.jar"/>
diff --git a/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java b/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
index b578aec..deeb1f9 100644
--- a/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
+++ b/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
@@ -155,17 +155,23 @@
conduitFeature.setConduitConfig(config);
// Construct service references from the URLs
+ // EVERYTHING depends on the right classloader being used to help us locate appropriate resources etc, so swap to the classloader for THIS
+ // class.
+ final ClassLoader savedCl = Thread.currentThread().getContextClassLoader();
try {
- this.authService = new Authentication_Service(new URL(authenticationServiceURL)/*, conduitFeature*/);
- this.documentManagementService = new DocumentManagement_Service(new URL(documentManagementServiceURL)/*, conduitFeature*/);
- this.contentServiceService = new ContentService_Service(new URL(contentServiceServiceURL)/*, conduitFeature*/);
- this.memberServiceService = new MemberService_Service(new URL(memberServiceServiceURL)/*, conduitFeature*/);
- this.searchServiceService = new SearchService_Service(new URL(searchServiceServiceURL)/*, conduitFeature*/);
+ Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+ this.authService = new Authentication_Service(new URL(authenticationServiceURL), conduitFeature);
+ this.documentManagementService = new DocumentManagement_Service(new URL(documentManagementServiceURL), conduitFeature);
+ this.contentServiceService = new ContentService_Service(new URL(contentServiceServiceURL), conduitFeature);
+ this.memberServiceService = new MemberService_Service(new URL(memberServiceServiceURL), conduitFeature);
+ this.searchServiceService = new SearchService_Service(new URL(searchServiceServiceURL), conduitFeature);
} catch (javax.xml.ws.WebServiceException e) {
throw new ManifoldCFException("Error initializing web services: "+e.getMessage(), e);
} catch (MalformedURLException e) {
throw new ManifoldCFException("Malformed URL: "+e.getMessage(), e);
- }
+ } finally {
+ Thread.currentThread().setContextClassLoader(savedCl);
+ }
// Initialize authclient etc.
this.authClientHandle = authService.getBasicHttpBindingAuthentication();
this.documentManagementHandle = documentManagementService.getBasicHttpBindingDocumentManagement();
