Author: kwright
Date: Fri Sep 6 18:49:18 2019
New Revision: 1866531
URL: http://svn.apache.org/viewvc?rev=1866531&view=rev
Log:
Get SSL working
Modified:
manifoldcf/branches/CONNECTORS-1566/connectors/alfresco-webscript/build.xml
manifoldcf/branches/CONNECTORS-1566/connectors/cmis/build.xml
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
Modified:
manifoldcf/branches/CONNECTORS-1566/connectors/alfresco-webscript/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/alfresco-webscript/build.xml?rev=1866531&r1=1866530&r2=1866531&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/alfresco-webscript/build.xml
(original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/alfresco-webscript/build.xml
Fri Sep 6 18:49:18 2019
@@ -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>
Modified: manifoldcf/branches/CONNECTORS-1566/connectors/cmis/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/cmis/build.xml?rev=1866531&r1=1866530&r2=1866531&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/cmis/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/cmis/build.xml Fri Sep 6
18:49:18 2019
@@ -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"/>
Modified:
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java?rev=1866531&r1=1866530&r2=1866531&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
(original)
+++
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
Fri Sep 6 18:49:18 2019
@@ -155,17 +155,23 @@ public class CswsSession
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();
