You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/06/21 15:35:58 UTC
svn commit: r1604368 - in /manifoldcf/trunk: CHANGES.txt
framework/buildfiles/connector-build.xml
Author: kwright
Date: Sat Jun 21 13:35:58 2014
New Revision: 1604368
URL: http://svn.apache.org/r1604368
Log:
Fix for CONNECTORS-979
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/framework/buildfiles/connector-build.xml
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1604368&r1=1604367&r2=1604368&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sat Jun 21 13:35:58 2014
@@ -3,6 +3,10 @@ $Id$
======================= 1.7-dev =====================
+CONNECTORS-979: Fix ant build so that documentum and filenet show
+up.
+(Karl Wright)
+
CONNECTORS-980: Output connector gets notified now when job is deleted.
(Karl Wright)
Modified: manifoldcf/trunk/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/buildfiles/connector-build.xml?rev=1604368&r1=1604367&r2=1604368&view=diff
==============================================================================
--- manifoldcf/trunk/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/trunk/framework/buildfiles/connector-build.xml Sat Jun 21 13:35:58 2014
@@ -738,21 +738,27 @@
</copy>
</target>
- <target name="general-connector-proprietary-runnable-check" depends="lib-proprietary-instructions">
+ <target name="general-connector-proprietary-runnable-check" depends="lib-proprietary-instructions,has-RMI-check">
<available file="dist/lib-proprietary-only/${ant.project.name}-PLACEHOLDER.txt" property="has-placeholder"/>
<condition property="is-proprietary-runnable">
- <not>
- <isset property="has-placeholder"/>
- </not>
+ <or>
+ <not>
+ <isset property="has-placeholder"/>
+ </not>
+ <isset property="hasRMI"/>
+ </or>
</condition>
</target>
- <target name="general-connector-runnable-check" depends="general-connector-proprietary-runnable-check">
+ <target name="general-connector-runnable-check" depends="general-connector-proprietary-runnable-check,has-RMI-check">
<available file="lib-proprietary" type="dir" property="has-lib-proprietary"/>
<condition property="is-runnable">
- <not>
- <isset property="has-lib-proprietary"/>
- </not>
+ <or>
+ <not>
+ <isset property="has-lib-proprietary"/>
+ </not>
+ <isset property="hasRMI"/>
+ </or>
</condition>
</target>