manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1854621 - in /manifoldcf/branches/CONNECTORS-1566: connectors/csws/ connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/ connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/ framework/buildf...
Date Sat, 02 Mar 2019 00:53:27 GMT
Author: kwright
Date: Sat Mar  2 00:53:27 2019
New Revision: 1854621

URL: http://svn.apache.org/viewvc?rev=1854621&view=rev
Log:
Add session class

Added:
    manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
  (with props)
Modified:
    manifoldcf/branches/CONNECTORS-1566/connectors/csws/build.xml
    manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
    manifoldcf/branches/CONNECTORS-1566/framework/buildfiles/connector-build.xml

Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/build.xml?rev=1854621&r1=1854620&r2=1854621&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/csws/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/build.xml Sat Mar  2 00:53:27 2019
@@ -77,7 +77,7 @@
             <param name="packagename" value="opentext.Core"/>
             <param name="bindingfile" value="wsdls/castor_binding.xml"/>
         </antcall>
-        <!--antcall target="classcreate-xsd-bindings">
+        <antcall target="classcreate-xsd-bindings">
             <param name="xsdname" value="wsdls/DocumentManagement2.xsd"/>
             <param name="packagename" value="opentext.DocMan"/>
             <param name="bindingfile" value="wsdls/castor_binding.xml"/>

Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java?rev=1854621&r1=1854620&r2=1854621&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
(original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
Sat Mar  2 00:53:27 2019
@@ -29,6 +29,19 @@ import org.apache.manifoldcf.connectorco
 import org.apache.manifoldcf.connectorcommon.common.InterruptibleSocketFactory;
 import org.apache.manifoldcf.core.common.DateParser;
 
+import com.opentext.ecm.api.OTAuthentication;
+import com.opentext.livelink.service.core.Authentication;
+import com.opentext.livelink.service.core.Authentication_Service;
+import com.opentext.livelink.service.core.ContentService;
+import com.opentext.livelink.service.core.ContentService_Service;
+import com.opentext.livelink.service.core.FileAtts;
+import com.opentext.livelink.service.docman.AttributeGroup;
+import com.opentext.livelink.service.docman.CategoryInheritance;
+import com.opentext.livelink.service.docman.DocumentManagement;
+import com.opentext.livelink.service.docman.DocumentManagement_Service;
+import com.opentext.livelink.service.docman.GetNodesInContainerOptions;
+import com.opentext.livelink.service.docman.Node;
+
 import org.apache.manifoldcf.csws.*;
 
 import java.io.*;

Added: 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=1854621&view=auto
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
(added)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
Sat Mar  2 00:53:27 2019
@@ -0,0 +1,152 @@
+/* $Id: LiveLinkParameters.java 988245 2010-08-23 18:39:35Z kwright $ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.manifoldcf.csws;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPHeader;
+import javax.xml.soap.SOAPHeaderElement;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.SOAPPart;
+import javax.xml.ws.soap.MTOMFeature;
+import javax.xml.ws.soap.SOAPFaultException;
+
+import com.opentext.ecm.api.OTAuthentication;
+import com.opentext.livelink.service.core.Authentication;
+import com.opentext.livelink.service.core.Authentication_Service;
+import com.opentext.livelink.service.core.ContentService;
+import com.opentext.livelink.service.core.ContentService_Service;
+import com.opentext.livelink.service.core.FileAtts;
+import com.opentext.livelink.service.docman.AttributeGroup;
+import com.opentext.livelink.service.docman.CategoryInheritance;
+import com.opentext.livelink.service.docman.DocumentManagement;
+import com.opentext.livelink.service.docman.DocumentManagement_Service;
+import com.opentext.livelink.service.docman.GetNodesInContainerOptions;
+import com.opentext.livelink.service.docman.Node;
+
+
+/** This class describes a livelink csws session.  It manages OAuth authentication
+* and provides logged-in access to csws services via methods provided within.
+*/
+public class CswsSession
+{
+
+  // Namespaces for the SOAP headers
+  private final static String ECM_API_NAMESPACE = "urn:api.ecm.opentext.com";
+  private final static String CORE_NAMESPACE = "urn:Core.service.livelink.opentext.com";
+
+  private final String userName;
+  private final String password;
+  private final long expirationInterval;
+  private final Authentication_Service authService;
+  private final ContentService_Service contentServiceService;
+  private final DocumentManagement_Service documentManagementService;
+  
+  // Authentication support
+  private final Authentication authClientHandle;
+  private final DocumentManagement documentManagementHandle;
+  private final ContentService contentServiceHandle;
+  
+  // Transient data that will need to be periodically rebuilt
+  private long currentSessionExpiration = -1L;
+  private String currentAuthToken = null;
+  
+  public CswsSession(final String userName,
+    final String password, 
+    final long sessionExpirationInterval,
+    final Authentication_Service authenticationService,
+    final ContentService_Service contentServiceService,
+    final DocumentManagement_Service documentManagementService) {
+    this.userName = userName;
+    this.password = password;
+    this.sessionExpirationInterval = sessionExpirationInterval;
+    this.authService = authService;
+    this.contentServiceService = contentServiceService;
+    this.documentManagementService = documentManagementService;
+
+    // Initialize authclient etc.
+    this.authClientHandle = authService.getBasicHttpBindingAuthentication();
+    this.documentManagementHandle = documentManagementService.getBasicHttpBindingDocumentManagement();
+    this.contentServiceHandle = contentServiceService.getBasicHttpBindingContentService();
+  }
+  
+  public ContentService getContentServiceHandle() {
+    // MHL
+    return null;
+  }
+  
+  public DocumentManagement getDocumentManagementHandle() {
+    // Set the outgoing headers; all we need is the auth token
+    // Create a SOAP header
+    final SOAPHeader header = MessageFactory.newInstance().createMessage().getSOAPPart().getEnvelope().getHeader();
+    //((WSBindingProvider)documentManagementHandle).setOutboundHeaders(createAuthHeader(header));
+    
+    List<String> rootNodeTypes = documentManagementHandle.getRootNodeTypes();
+
+    return documentManagementHandle;
+  }
+  
+  // Private methods
+  
+  /*
+  private Header createAuthHeader(final SOAPHeader header) {
+    final String authToken = getAuthToken();
+    // Create the OTAuthentication object and set the authentication token
+    final OTAuthentication otAuth = new OTAuthentication();
+    otAuth.setAuthenticationToken(authToken);
+
+    // We need to manually set the SOAP header to include the authentication token
+
+    // Add the OTAuthentication SOAP header element
+    final SOAPHeaderElement otAuthElement = header.addHeaderElement(new QName(ECM_API_NAMESPACE,
"OTAuthentication"));
+
+    // Add the AuthenticationToken SOAP element
+    final SOAPElement authTokenElement = otAuthElement.addChildElement(new QName(ECM_API_NAMESPACE,
"AuthenticationToken"));
+    authTokenElement.addTextNode(otAuth.getAuthenticationToken());
+    return Headers.create(otAuthElement);
+  }
+  */
+  
+  /*
+  private static Header getContentIDHeader(final SOAPHeader header, String contentID) {
+    final SOAPHeaderElement contentIDElement = header.addHeaderElement(new QName(CORE_NAMESPACE,
"contextID"));
+    contentIDElement.addTextNode(contentID);
+    return Headers.create(contentIDElement);
+  }
+  */
+  
+  private String getAuthToken() {
+    final long currentTime = System.currentTimeMillis();
+    if (currentSessionExpiration == -1L || currentTime > currentSessionExpiraton) {
+      // Kill current auth token etc
+      currentSessionExpiration = -1L;
+      currentAuthToken = null;
+      documentManagementHandle = null;
+      contentServiceHandle = null;
+      // Refetch the auth token (this may fail)
+      currentAuthToken = authClient.authenticateUser(userName, password);
+      currentSessionExpiration = currentTime + expirationInterval;
+    }
+    return currentAuthToken;
+  }
+  
+}

Propchange: manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: manifoldcf/branches/CONNECTORS-1566/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/framework/buildfiles/connector-build.xml?rev=1854621&r1=1854620&r2=1854621&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1566/framework/buildfiles/connector-build.xml Sat Mar 
2 00:53:27 2019
@@ -409,32 +409,34 @@
     </target>
 
     <target name="classcreate-wsdl-cxf">
-	<mkdir dir="build/wsdljava"/>
-	<java classname="org.apache.cxf.tools.wsdlto.WSDLToJava" fork="true">
-	    <classpath>
-		<fileset dir="${mcf-dist}/connector-common-lib">
-		    <include name="cxf*.jar"/>
-		    <include name="jaxb*.jar"/>
-		    <include name="wsdl4j*.jar"/>
-		    <include name="woodstox*.jar"/>
-		    <include name="stax2-api*.jar"/>
-		    <include name="xmlschema*.jar"/>
-		    <include name="neethi*.jar"/>
-		    <include name="xml-resolver*.jar"/>
-		</fileset>
-		<fileset dir="${mcf-dist}/lib">
-		    <include name="velocity*.jar"/>
-		    <include name="commons-collections*.jar"/>
-		    <include name="commons-lang*.jar"/>
-		</fileset>
-	    </classpath>
-	    <jvmarg value="-Dorg.apache.cxf.stax.allowInsecureParser=1"/>
-	    <jvmarg value="-Dfile.encoding=UTF-8"/>
-	    <arg value="-client"/>
-	    <arg value="-d"/>
-	    <arg value="build/wsdljava"/>
-	    <arg value="${wsdlname}"/>
-	</java>
+          <mkdir dir="build/wsdljava"/>
+          <java classname="org.apache.cxf.tools.wsdlto.WSDLToJava" fork="true">
+              <classpath>
+                  <fileset dir="${mcf-dist}/connector-common-lib">
+                      <include name="cxf*.jar"/>
+                      <include name="jaxb*.jar"/>
+                      <include name="wsdl4j*.jar"/>
+                      <include name="woodstox*.jar"/>
+                      <include name="stax2-api*.jar"/>
+                      <include name="xmlschema*.jar"/>
+                      <include name="neethi*.jar"/>
+                      <include name="xml-resolver*.jar"/>
+                  </fileset>
+                  <fileset dir="${mcf-dist}/lib">
+                      <include name="velocity*.jar"/>
+                      <include name="commons-collections*.jar"/>
+                      <include name="commons-lang*.jar"/>
+                  </fileset>
+              </classpath>
+              <jvmarg value="-Dorg.apache.cxf.stax.allowInsecureParser=1"/>
+              <jvmarg value="-Dfile.encoding=UTF-8"/>
+              <arg value="-client"/>
+              <arg value="-exsh"/>
+              <arg value="true"/>
+              <arg value="-d"/>
+              <arg value="build/wsdljava"/>
+              <arg value="${wsdlname}"/>
+          </java>
     </target>
 
     <target name="classcreate-wsdl">



Mime
View raw message