Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@manifoldcf.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1458168 - in
 /manifoldcf/branches/CONNECTORS-664/connectors/livelink: ./
 build-stub/src/main/java/com/opentext/api/
 connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/
 lib-proprietary/
Date: Tue, 19 Mar 2013 07:41:53 -0000
To: commits@manifoldcf.apache.org
From: kwright@apache.org
Message-Id: <20130319074153.DA0EC238890D@eris.apache.org>

Author: kwright
Date: Tue Mar 19 07:41:53 2013
New Revision: 1458168

URL: http://svn.apache.org/r1458168
Log:
Add proper error handling for missing llssl.jar

Added:
    manifoldcf/branches/CONNECTORS-664/connectors/livelink/build-stub/src/main/java/com/opentext/api/LLSSLNotAvailableException.java   (with props)
Modified:
    manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
    manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
    manifoldcf/branches/CONNECTORS-664/connectors/livelink/lib-proprietary/README.txt
    manifoldcf/branches/CONNECTORS-664/connectors/livelink/proprietary-library-instructions.txt

Added: manifoldcf/branches/CONNECTORS-664/connectors/livelink/build-stub/src/main/java/com/opentext/api/LLSSLNotAvailableException.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-664/connectors/livelink/build-stub/src/main/java/com/opentext/api/LLSSLNotAvailableException.java?rev=1458168&view=auto
==============================================================================
--- manifoldcf/branches/CONNECTORS-664/connectors/livelink/build-stub/src/main/java/com/opentext/api/LLSSLNotAvailableException.java (added)
+++ manifoldcf/branches/CONNECTORS-664/connectors/livelink/build-stub/src/main/java/com/opentext/api/LLSSLNotAvailableException.java Tue Mar 19 07:41:53 2013
@@ -0,0 +1,26 @@
+/* $Id$ */
+
+/**
+* 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 com.opentext.api;
+
+/** Stub classes to get connector to build.
+*/
+public class LLSSLNotAvailableException extends LLIOException
+{
+}
+

Propchange: manifoldcf/branches/CONNECTORS-664/connectors/livelink/build-stub/src/main/java/com/opentext/api/LLSSLNotAvailableException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/branches/CONNECTORS-664/connectors/livelink/build-stub/src/main/java/com/opentext/api/LLSSLNotAvailableException.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java?rev=1458168&r1=1458167&r2=1458168&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java (original)
+++ manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java Tue Mar 19 07:41:53 2013
@@ -1105,6 +1105,11 @@ public class LivelinkAuthority extends o
       String details = llServer.getErrors();
       throw new ManifoldCFException("Livelink API error: "+e.getMessage()+((details==null)?"":"; "+details),e);
     }
+    else if (e instanceof com.opentext.api.LLSSLNotAvailableException)
+    {
+      String details = llServer.getErrors();
+      throw new ManifoldCFException("Missing llssl.jar error: "+e.getMessage()+((details==null)?"":"; "+details),e);
+    }
     else if (e instanceof com.opentext.api.LLIllegalOperationException)
     {
       // This usually means that LAPI has had a minor communication difficulty but hasn't reported it accurately.

Modified: manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java?rev=1458168&r1=1458167&r2=1458168&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java (original)
+++ manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java Tue Mar 19 07:41:53 2013
@@ -6973,10 +6973,14 @@ public class LivelinkConnector extends o
       e instanceof com.opentext.api.LLWebAuthInitException
     )
     {
-
       String details = llServer.getErrors();
       throw new ManifoldCFException("Livelink API error: "+e.getMessage()+((details==null)?"":"; "+details),e);
     }
+    else if (e instanceof com.opentext.api.LLSSLNotAvailableException)
+    {
+      String details = llServer.getErrors();
+      throw new ManifoldCFException("Missing llssl.jar error: "+e.getMessage()+((details==null)?"":"; "+details),e);
+    }
     else if (e instanceof com.opentext.api.LLIllegalOperationException)
     {
       // This usually means that LAPI has had a minor communication difficulty but hasn't reported it accurately.

Modified: manifoldcf/branches/CONNECTORS-664/connectors/livelink/lib-proprietary/README.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-664/connectors/livelink/lib-proprietary/README.txt?rev=1458168&r1=1458167&r2=1458168&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-664/connectors/livelink/lib-proprietary/README.txt (original)
+++ manifoldcf/branches/CONNECTORS-664/connectors/livelink/lib-proprietary/README.txt Tue Mar 19 07:41:53 2013
@@ -13,9 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-The LiveLink connector requires a client library from OpenText in order to function.
-The client jar is call lapi.jar, and the version we have tested against can be found
-in the LAPI 9.7.1 package from OpenText.  Copy that jar to this directory, and build the
+The LiveLink connector requires a client library from OpenText in order
+to function.  The client jar is call lapi.jar, and the version we have
+tested against can be found in the LAPI 9.7.1 package from OpenText.
+For some modes of operation, the jar llssl.jar from the same package
+may also be required.  Copy these jars to this directory, and build the
 connector using the standard ant build process.  More can be found in the
 "how-to-build-and-deploy.html" documentation page.
 

Modified: manifoldcf/branches/CONNECTORS-664/connectors/livelink/proprietary-library-instructions.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-664/connectors/livelink/proprietary-library-instructions.txt?rev=1458168&r1=1458167&r2=1458168&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-664/connectors/livelink/proprietary-library-instructions.txt (original)
+++ manifoldcf/branches/CONNECTORS-664/connectors/livelink/proprietary-library-instructions.txt Tue Mar 19 07:41:53 2013
@@ -16,13 +16,15 @@
 The LiveLink connector requires a client library from OpenText in
 order to function.  The client jar is call lapi.jar, and the version we
 have tested against can be found in the LAPI 9.7.1 package from
-OpenText.  Copy that jar to this directory, and run ManifoldCF
-using the appropriate means.
+OpenText.  For some modes of operation, you may also need llssl.jar
+from the same package.  Copy those jars to this directory, and run
+ManifoldCF using the appropriate means.
 
 If you find there are incompatibilities between your version of lapi.jar
 and the one your release of ManifoldCF was built against, you must build
-ManifoldCF yourself, and include a copy of your lapi.jar prior to building,
+ManifoldCF yourself, and include a copy of your jars prior to building,
 in the directory "connectors/livelink/lib-proprietary".
 
-More can be found in the "how-to-build-and-deploy.html" documentation page.
+More can be found in the "how-to-build-and-deploy.html"
+documentation page.