manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1366466 - in /manifoldcf/trunk: ./ connectors/ connectors/alfresco/ connectors/jcifs/ connectors/livelink/ connectors/livelink/lib-proprietary/
Date Fri, 27 Jul 2012 17:18:15 GMT
Author: kwright
Date: Fri Jul 27 17:18:15 2012
New Revision: 1366466

URL: http://svn.apache.org/viewvc?rev=1366466&view=rev
Log:
Fix for CONNECTORS-494.  Add conditionalization of the code that adds registration commands
to the .xml configuration files.

Added:
    manifoldcf/trunk/connectors/alfresco/proprietary-library-instructions.txt   (with props)
    manifoldcf/trunk/connectors/jcifs/proprietary-library-instructions.txt   (with props)
    manifoldcf/trunk/connectors/livelink/proprietary-library-instructions.txt   (with props)
Modified:
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/connectors/alfresco/build.xml
    manifoldcf/trunk/connectors/connector-build.xml
    manifoldcf/trunk/connectors/jcifs/build.xml
    manifoldcf/trunk/connectors/livelink/build.xml
    manifoldcf/trunk/connectors/livelink/lib-proprietary/README.txt

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1366466&r1=1366465&r2=1366466&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Fri Jul 27 17:18:15 2012
@@ -1087,18 +1087,18 @@
         </copy>
     </target>
 
-    <target name="general-connector-proprietary-check">
-        <available file="connectors/${connector-name}/dist/lib-proprietary" type="dir"
property="${connector-name}.is-proprietary"/>
+    <target name="general-connector-proprietary-only-check">
+        <available file="connectors/${connector-name}/dist/lib-proprietary-only" type="dir"
property="${connector-name}.has-proprietary-only"/>
     </target>
 
-    <target name="general-connector-proprietary-delivery" depends="general-connector-proprietary-check"
if="${connector-name}.is-proprietary">
+    <target name="general-connector-proprietary-only-delivery" depends="general-connector-proprietary-only-check"
if="${connector-name}.has-proprietary-only">
         <mkdir dir="dist/connector-lib-proprietary"/>
         <copy todir="dist/connector-lib-proprietary">
-            <fileset dir="connectors/${connector-name}/dist/lib-proprietary"/>
+            <fileset dir="connectors/${connector-name}/dist/lib-proprietary-only"/>
         </copy>
     </target>
-    
-    <target name="general-connector-delivery" depends="general-connector-proprietary-delivery,general-connector-delivery-integration,general-connector-delivery-processes">
+
+    <target name="general-connector-delivery" depends="general-connector-proprietary-only-delivery,general-connector-delivery-integration,general-connector-delivery-processes">
         <mkdir dir="dist/connector-lib"/>
         <copy todir="dist/connector-lib">
             <fileset dir="connectors/${connector-name}/dist/lib"/>
@@ -1116,41 +1116,81 @@
         </copy>
     </target>
 
-    <target name="general-add-authority-connector-proprietary" depends="general-connector-proprietary-check"
if="${connector-name}.is-proprietary">
+    <target name="general-connector-proprietary-runnable-check">
+        <available file="connectors/${connector-name}/dist/lib-proprietary-only/${connector-name}-README.txt"
property="${connector-name}.has-readme"/>
+        <condition property="${connector-name}.is-proprietary-runnable">
+            <not>
+                <isset property="${connector-name}.has-readme"/>
+            </not>
+        </condition>
+    </target>
+
+    <target name="general-connector-runnable-check" depends="general-connector-proprietary-runnable-check">
+        <available file="connectors/${connector-name}/lib-proprietary" type="dir" property="${connector-name}.has-lib-proprietary"/>
+        <condition property="${connector-name}.is-runnable">
+            <not>
+                <isset property="${connector-name}.has-lib-proprietary"/>
+            </not>
+        </condition>
+    </target>
+    
+    
+    <target name="general-add-authority-connector-commented" depends="general-connector-runnable-check"
unless="${connector-name}.is-runnable">
         <replace file="dist/connectors.xml" token="&lt;!-- Add your authority connectors
here --&gt;" value="&lt;!-- Add your authority connectors here --&gt;&#0010;
 &lt;!--authorityconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/--&gt;"/>
     </target>
 
-    <target name="general-add-authority-connector-non-proprietary" depends="general-connector-proprietary-check"
unless="${connector-name}.is-proprietary">
+    <target name="general-add-authority-connector-non-commented" depends="general-connector-runnable-check"
if="${connector-name}.is-runnable">
         <replace file="dist/connectors.xml" token="&lt;!-- Add your authority connectors
here --&gt;" value="&lt;!-- Add your authority connectors here --&gt;&#0010;
 &lt;authorityconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
     </target>
 
-    <target name="general-add-authority-connector" depends="general-add-authority-connector-proprietary,general-add-authority-connector-non-proprietary">
+    <target name="general-add-authority-connector-proprietary-commented" depends="general-connector-proprietary-runnable-check"
unless="${connector-name}.is-proprietary-runnable">
+        <replace file="dist/connectors-proprietary.xml" token="&lt;!-- Add your authority
connectors here --&gt;" value="&lt;!-- Add your authority connectors here --&gt;&#0010;
 &lt;!--authorityconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/--&gt;"/>
+    </target>
+
+    <target name="general-add-authority-connector-proprietary-non-commented" depends="general-connector-proprietary-runnable-check"
if="${connector-name}.is-proprietary-runnable">
         <replace file="dist/connectors-proprietary.xml" token="&lt;!-- Add your authority
connectors here --&gt;" value="&lt;!-- Add your authority connectors here --&gt;&#0010;
 &lt;authorityconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
     </target>
 
-    <target name="general-add-output-connector-proprietary" depends="general-connector-proprietary-check"
if="${connector-name}.is-proprietary">
+    <target name="general-add-authority-connector" depends="general-add-authority-connector-commented,general-add-authority-connector-non-commented,general-add-authority-connector-proprietary-commented,general-add-authority-connector-proprietary-non-commented">
+    </target>
+
+    <target name="general-add-output-connector-commented" depends="general-connector-runnable-check"
unless="${connector-name}.is-runnable">
         <replace file="dist/connectors.xml" token="&lt;!-- Add your output connectors
here --&gt;" value="&lt;!-- Add your output connectors here --&gt;&#0010;
 &lt;!--outputconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/--&gt;"/>
     </target>
 
-    <target name="general-add-output-connector-non-proprietary" depends="general-connector-proprietary-check"
unless="${connector-name}.is-proprietary">
+    <target name="general-add-output-connector-non-commented" depends="general-connector-runnable-check"
if="${connector-name}.is-runnable">
         <replace file="dist/connectors.xml" token="&lt;!-- Add your output connectors
here --&gt;" value="&lt;!-- Add your output connectors here --&gt;&#0010;
 &lt;outputconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
     </target>
 
-    <target name="general-add-output-connector" depends="general-add-output-connector-proprietary,general-add-output-connector-non-proprietary">
+    <target name="general-add-output-connector-proprietary-commented" depends="general-connector-proprietary-runnable-check"
unless="${connector-name}.is-proprietary-runnable">
+        <replace file="dist/connectors-proprietary.xml" token="&lt;!-- Add your output
connectors here --&gt;" value="&lt;!-- Add your output connectors here --&gt;&#0010;
 &lt;!--outputconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/--&gt;"/>
+    </target>
+
+    <target name="general-add-output-connector-proprietary-non-commented" depends="general-connector-proprietary-runnable-check"
if="${connector-name}.is-proprietary-runnable">
         <replace file="dist/connectors-proprietary.xml" token="&lt;!-- Add your output
connectors here --&gt;" value="&lt;!-- Add your output connectors here --&gt;&#0010;
 &lt;outputconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
     </target>
 
-    <target name="general-add-repository-connector-proprietary" depends="general-connector-proprietary-check"
if="${connector-name}.is-proprietary">
+    <target name="general-add-output-connector" depends="general-add-output-connector-commented,general-add-output-connector-non-commented,general-add-output-connector-proprietary-commented,general-add-output-connector-proprietary-non-commented">
+    </target>
+
+    <target name="general-add-repository-connector-commented" depends="general-connector-runnable-check"
unless="${connector-name}.is-runnable">
         <replace file="dist/connectors.xml" token="&lt;!-- Add your repository connectors
here --&gt;" value="&lt;!-- Add your repository connectors here --&gt;&#0010;
 &lt;!--repositoryconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/--&gt;"/>
     </target>
 
-    <target name="general-add-repository-connector-non-proprietary" depends="general-connector-proprietary-check"
unless="${connector-name}.is-proprietary">
+    <target name="general-add-repository-connector-non-commented" depends="general-connector-runnable-check"
if="${connector-name}.is-runnable">
         <replace file="dist/connectors.xml" token="&lt;!-- Add your repository connectors
here --&gt;" value="&lt;!-- Add your repository connectors here --&gt;&#0010;
 &lt;repositoryconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
     </target>
 
-    <target name="general-add-repository-connector" depends="general-add-repository-connector-proprietary,general-add-repository-connector-non-proprietary">
+    <target name="general-add-repository-connector-proprietary-commented" depends="general-connector-proprietary-runnable-check"
unless="${connector-name}.is-proprietary-runnable">
+        <replace file="dist/connectors-proprietary.xml" token="&lt;!-- Add your repository
connectors here --&gt;" value="&lt;!-- Add your repository connectors here --&gt;&#0010;
 &lt;!--repositoryconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/--&gt;"/>
+    </target>
+
+    <target name="general-add-repository-connector-proprietary-non-commented" depends="general-connector-proprietary-runnable-check"
if="${connector-name}.is-proprietary-runnable">
         <replace file="dist/connectors-proprietary.xml" token="&lt;!-- Add your repository
connectors here --&gt;" value="&lt;!-- Add your repository connectors here --&gt;&#0010;
 &lt;repositoryconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
     </target>
+
+    <target name="general-add-repository-connector" depends="general-add-repository-connector-commented,general-add-repository-connector-non-commented,general-add-repository-connector-proprietary-commented,general-add-repository-connector-proprietary-non-commented">
+    </target>
     
     <target name="calculate-activedirectory-condition" depends="build-activedirectory-connector">
         <available file="connectors/activedirectory/dist/lib" type="dir" property="activedirectory.exists"/>

Modified: manifoldcf/trunk/connectors/alfresco/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco/build.xml?rev=1366466&r1=1366465&r2=1366466&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco/build.xml (original)
+++ manifoldcf/trunk/connectors/alfresco/build.xml Fri Jul 27 17:18:15 2012
@@ -22,23 +22,23 @@
   
     <target name="calculate-condition">
         <available file="lib-proprietary/alfresco-web-service-client-3.4.e.jar" property="alfrescoStatus"/>
-        <condition property="canBuild">
+        <condition property="build-present">
             <isset property="alfrescoStatus"/>
         </condition>
     </target>
 
-    <target name="calculate-testcode-condition" depends="calculate-condition" if="canBuild">
+    <target name="calculate-testcode-condition">
         <available file="test-materials-proprietary/alfresco.war" property="alfrescoTestcodeStatus"/>
-        <condition property="canTest">
+        <condition property="tests-present">
             <isset property="alfrescoTestcodeStatus"/>
         </condition>
     </target>
 
-    <target name="precompile-check" depends="calculate-condition" unless="canBuild">
+    <target name="precompile-warn" depends="calculate-condition" unless="build-present">
         <echo message="Alfresco Connector cannot be built without alfresco-web-service-client-3.4.e.jar"/>
     </target>
 
-    <target name="pretest-check" depends="calculate-testcode-condition" unless="canTest">
+    <target name="pretest-warn" depends="calculate-testcode-condition" unless="tests-present">
         <echo message="Alfresco Connector integration tests cannot be be performed without
alfresco.war"/>
     </target>
 
@@ -82,8 +82,8 @@
                 <include name="xmlsec*.jar"/>
             </fileset>
         </copy>
-        <mkdir dir="dist/lib"/>
-        <copy todir="dist/lib-proprietary">
+        <mkdir dir="dist/lib-proprietary-only"/>
+        <copy todir="dist/lib-proprietary-only">
             <fileset dir="lib-proprietary">
                 <include name="alfresco-web-service-client*.jar"/>
             </fileset>

Added: manifoldcf/trunk/connectors/alfresco/proprietary-library-instructions.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco/proprietary-library-instructions.txt?rev=1366466&view=auto
==============================================================================
--- manifoldcf/trunk/connectors/alfresco/proprietary-library-instructions.txt (added)
+++ manifoldcf/trunk/connectors/alfresco/proprietary-library-instructions.txt Fri Jul 27 17:18:15
2012
@@ -0,0 +1,18 @@
+# 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.
+
+To run the Alfresco connector, copy the alfresco-web-service-client-3.4.e.jar
+into this directory, and run ManifoldCF using the standard means.  You can read more
+about the process on the "how-to-build-and-deploy.html" documentation page.

Propchange: manifoldcf/trunk/connectors/alfresco/proprietary-library-instructions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/trunk/connectors/alfresco/proprietary-library-instructions.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: manifoldcf/trunk/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/connector-build.xml?rev=1366466&r1=1366465&r2=1366466&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/connector-build.xml (original)
+++ manifoldcf/trunk/connectors/connector-build.xml Fri Jul 27 17:18:15 2012
@@ -115,22 +115,77 @@
         <path refid="mcf-connector-build.interface-classpath"/>
     </path>
 
+    <!-- Standard connector proprietary/non-proprietary setup described below.
+    (1) If there's a lib-proprietary directory, we presume that the connector requires one
or
+        more proprietary libraries to build and run.  We expect to find a README.txt file
in
+        the directory, which describes what is needed at build time, and that if the required
+        libraries are not present, the connector's build.xml file will override "calculate-condition"
+        and "precompile-check" appropriately.
+    (3) If there's a build-stub directory, we presume that the connector requires one or
+        more proprietary libraries to run, but can be built without proprietary libraries
through
+        the use of stubs.  In this case the connector MAY also have a
+        "proprietary-library-instructions.txt" file, if proprietary libraries are required
at
+        runtime.  This file will be copied to the
+        connector-lib directory with the name {connector}-README.txt
+        as a placeholder for the required proprietary libraries.
+
+    A connector can have both a build-stub and a lib-proprietary directory.  In this case,
+    the connector will build against stubs but will deliver proprietary libraries to
+    connector-lib-proprietary for use at runtime, and the {connector}-README.txt
+    file will only be delivered to the connector-lib directory.
+    -->
+    
     <target name="calculate-condition">
-        <available file="build.xml" property="canBuild"/>
+        <available file="build.xml" property="build-present"/>
+    </target>
+
+    <target name="calculate-testcode-condition">
+        <available file="connector/src/test/java" property="tests-present"/>
     </target>
 
-    <target name="calculate-testcode-condition" depends="calculate-condition" if="canBuild">
-        <available file="connector/src/test/java" property="canTest"/>
+    <target name="calculate-run-condition">
+        <property name="libs-present" value="true"/>
     </target>
 
-    <target name="precompile-check" depends="calculate-condition" unless="canBuild"/>
+    <target name="precompile-warn" depends="calculate-condition" unless="build-present"/>
+
+    <target name="pretest-warn" depends="calculate-testcode-condition" unless="tests-present"/>
+
+    <target name="prerun-warn" depends="calculate-run-condition" unless="libs-present"/>
+
+
+    <target name="precompile-check" depends="precompile-warn">
+        <condition property="canBuild">
+            <isset property="build-present"/>
+        </condition>
+    </target>
+    
+    <target name="pretest-check" depends="precompile-warn,pretest-warn">
+        <condition property="canTest">
+            <and>
+                <isset property="build-present"/>
+                <isset property="tests-present"/>
+            </and>
+        </condition>
+    </target>
 
-    <target name="pretest-check" depends="calculate-testcode-condition" unless="canTest"/>
+    <target name="prerun-check" depends="precompile-warn,prerun-warn">
+        <condition property="canRun">
+            <and>
+                <isset property="build-present"/>
+                <isset property="libs-present"/>
+            </and>
+        </condition>
+    </target>
 
     <target name="has-stubs-check" depends="precompile-check" if="canBuild">
         <available file="build-stub/src/main/java" property="hasStubs"/>
     </target>
-    
+
+    <target name="include-proprietary-instructions-lib-proprietary-check" depends="prerun-check"
unless="canRun">
+        <available file="proprietary-library-instructions.txt" property="includeProprietaryInstructionsLibProprietary"/>
+    </target>
+
     <target name="compile-stubs" depends="has-stubs-check" if="hasStubs">
         <mkdir dir="build/stubclasses"/>
         <javac srcdir="build-stub/src/main/java" destdir="build/stubclasses" target="1.6"
source="1.6" debug="true" debuglevel="lines,vars,source">
@@ -466,6 +521,11 @@
         <copy todir="dist/lib" file="build/jar/mcf-${ant.project.name}-connector.jar"/>
     </target>
 
+    <target name="lib-proprietary-instructions" depends="include-proprietary-instructions-lib-proprietary-check"
if="includeProprietaryInstructionsLibProprietary">
+        <mkdir dir="dist/lib-proprietary-only"/>
+        <copy tofile="dist/lib-proprietary-only/${ant.project.name}-README.txt" file="proprietary-library-instructions.txt"/>
+    </target>
+    
     <target name="server-process" depends="jar-interface,jar-implementation,jar-rmiskel,jar-server,has-RMI-check"
if="hasRMI">
         <mkdir dir="dist/server-process/lib"/>
         <copy todir="dist/server-process/lib">
@@ -502,7 +562,7 @@
 
     <target name="integration"/>
 
-    <target name="build" depends="lib,server-process,registry-process,integration"/>
+    <target name="build" depends="lib,lib-proprietary-instructions,server-process,registry-process,integration"/>
     
     <target name="build-tests" depends="build,jar-tests"/>
 

Modified: manifoldcf/trunk/connectors/jcifs/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jcifs/build.xml?rev=1366466&r1=1366465&r2=1366466&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jcifs/build.xml (original)
+++ manifoldcf/trunk/connectors/jcifs/build.xml Fri Jul 27 17:18:15 2012
@@ -21,12 +21,12 @@
 
     <target name="calculate-condition">
         <available file="lib-proprietary/jcifs.jar" property="jcifsStatus"/>
-        <condition property="canBuild">
+        <condition property="build-present">
             <isset property="jcifsStatus"/>
         </condition>
     </target>
 
-    <target name="precompile-check" depends="calculate-condition" unless="canBuild">
+    <target name="precompile-warn" depends="calculate-condition" unless="build-present">
         <echo message="JCifs Connector cannot be built without jcifs.jar"/>
     </target>
 
@@ -36,8 +36,8 @@
     </path>
 
     <target name="lib" depends="mcf-connector-build.lib,precompile-check" if="canBuild">
-        <mkdir dir="dist/lib-proprietary"/>
-        <copy todir="dist/lib-proprietary">
+        <mkdir dir="dist/lib-proprietary-only"/>
+        <copy todir="dist/lib-proprietary-only">
             <fileset dir="lib-proprietary" includes="*.jar"/>
         </copy>
     </target>

Added: manifoldcf/trunk/connectors/jcifs/proprietary-library-instructions.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jcifs/proprietary-library-instructions.txt?rev=1366466&view=auto
==============================================================================
--- manifoldcf/trunk/connectors/jcifs/proprietary-library-instructions.txt (added)
+++ manifoldcf/trunk/connectors/jcifs/proprietary-library-instructions.txt Fri Jul 27 17:18:15
2012
@@ -0,0 +1,25 @@
+# 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.
+
+For the jcifs connector, certain changes were made to jcifs itself to work reliably
+with Samba systems.  This set of upstream changes is encapsulated in the following file:
+
+jcifs.diffs, against version 1.3.9 as downloaded from http://jcifs.samba.org.
+
+To run this connector, copy the jcifs.jar into this directory, and run ManifoldCF in
+the normal way.  You can read more about the process on the
+"how-to-build-and-deploy.html" documentation page.
+
+

Propchange: manifoldcf/trunk/connectors/jcifs/proprietary-library-instructions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/trunk/connectors/jcifs/proprietary-library-instructions.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: manifoldcf/trunk/connectors/livelink/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/livelink/build.xml?rev=1366466&r1=1366465&r2=1366466&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/livelink/build.xml (original)
+++ manifoldcf/trunk/connectors/livelink/build.xml Fri Jul 27 17:18:15 2012
@@ -19,27 +19,25 @@
 
     <import file="../connector-build.xml"/>
 
-    <!-- target name="calculate-condition">
+    <target name="calculate-run-condition">
         <available file="lib-proprietary/lapi.jar" property="lapiStatus"/>
-        <condition property="canBuild">
+        <condition property="libs-present">
             <isset property="lapiStatus"/>
         </condition>
     </target>
-
-    <target name="precompile-check" depends="calculate-condition" unless="canBuild">
-        <echo message="LiveLink Connector cannot be built without lapi.jar"/>
+    
+    <target name="prerun-warn" depends="calculate-run-condition" unless="libs-present">
+        <echo message="LiveLink connector requires lapi.jar to be runnable"/>
     </target>
-
-    <path id="connector-classpath">
-        <path refid="mcf-connector-build.connector-classpath"/>
-        <fileset dir="lib-proprietary" includes="*.jar"/>
-    </path -->
-
-    <target name="lib" depends="mcf-connector-build.lib,precompile-check" if="canBuild">
-        <mkdir dir="dist/lib-proprietary"/>
-        <copy todir="dist/lib-proprietary">
-	    <fileset dir="lib-proprietary" includes="*.jar"/>
+    
+    <target name="copy-proprietary-libs" depends="prerun-check" if="canRun">
+        <mkdir dir="dist/lib-proprietary-only"/>
+        <copy todir="dist/lib-proprietary-only">
+            <fileset dir="lib-proprietary" includes="*.jar"/>
         </copy>
     </target>
+    
+    <target name="lib" depends="mcf-connector-build.lib,copy-proprietary-libs,precompile-check"
if="canBuild">
+    </target>
 
 </project>

Modified: manifoldcf/trunk/connectors/livelink/lib-proprietary/README.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/livelink/lib-proprietary/README.txt?rev=1366466&r1=1366465&r2=1366466&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/livelink/lib-proprietary/README.txt (original)
+++ manifoldcf/trunk/connectors/livelink/lib-proprietary/README.txt Fri Jul 27 17:18:15 2012
@@ -13,7 +13,7 @@
 # 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 build and function.
+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
 connector using the standard ant build process.  More can be found in the

Added: manifoldcf/trunk/connectors/livelink/proprietary-library-instructions.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/livelink/proprietary-library-instructions.txt?rev=1366466&view=auto
==============================================================================
--- manifoldcf/trunk/connectors/livelink/proprietary-library-instructions.txt (added)
+++ manifoldcf/trunk/connectors/livelink/proprietary-library-instructions.txt Fri Jul 27 17:18:15
2012
@@ -0,0 +1,22 @@
+# 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.
+
+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.  More can be found in the
+"how-to-build-and-deploy.html" documentation page.
+
+

Propchange: manifoldcf/trunk/connectors/livelink/proprietary-library-instructions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/trunk/connectors/livelink/proprietary-library-instructions.txt
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message