Author: kwright
Date: Wed Dec 5 19:58:29 2012
New Revision: 1417612
URL: http://svn.apache.org/viewvc?rev=1417612&view=rev
Log:
Fix for CONNECTORS-575. Permit customer to supply their own jar readily,
instead of building exclusively against stubs.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/connector-build.xml
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1417612&r1=1417611&r2=1417612&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Dec 5 19:58:29 2012
@@ -3,6 +3,13 @@ $Id$
======================= 1.1-dev =====================
+CONNECTORS-575: Modify Livelink connector build to use stub only when
+there is no lapi.jar available. This is to support the fact that lapi jars are
+not compatible from release to release, class-wise, so clients will need to
+build this connector against the jar that they have, instead of the jar that
+we have.
+(David Morano, Karl Wright)
+
CONNECTORS-577: Typo in language message properties which cause stack
traces
(Erlend Garåsen)
Modified: manifoldcf/trunk/connectors/connector-build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/connector-build.xml?rev=1417612&r1=1417611&r2=1417612&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/connector-build.xml (original)
+++ manifoldcf/trunk/connectors/connector-build.xml Wed Dec 5 19:58:29 2012
@@ -186,6 +186,17 @@
<available file="build-stub/src/main/java" property="hasStubs"/>
</target>
+ <target name="has-proprietary-materials-check">
+ </target>
+
+ <target name="build-stubs-check"
depends="has-stubs-check,has-proprietary-materials-check" if="hasStubs">
+ <condition property="buildStubs">
+ <not>
+ <isset property="proprietaryMaterialsAvailable"/>
+ </not>
+ </condition>
+ </target>
+
<target name="include-README-lib-proprietary-check"
depends="precompile-check" if="canBuild">
<available file="proprietary-library-instructions.txt"
property="includeREADMELibProprietary"/>
</target>
@@ -194,7 +205,7 @@
<available file="proprietary-library-instructions.txt"
property="includeProprietaryInstructionsLibProprietary"/>
</target>
- <target name="compile-stubs" depends="has-stubs-check" if="hasStubs">
+ <target name="compile-stubs" depends="build-stubs-check" if="buildStubs">
<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">
<classpath>
