Author: kwright
Date: Thu Aug 13 12:21:32 2015
New Revision: 1695696
URL: http://svn.apache.org/r1695696
Log:
Apply patch to use standard conventions for Confluence dependencies
Modified:
manifoldcf/trunk/connectors/confluence/build.xml
manifoldcf/trunk/framework/buildfiles/connector-build.xml
Modified: manifoldcf/trunk/connectors/confluence/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence/build.xml?rev=1695696&r1=1695695&r2=1695696&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/confluence/build.xml (original)
+++ manifoldcf/trunk/connectors/confluence/build.xml Thu Aug 13 12:21:32 2015
@@ -17,28 +17,44 @@
<project name="confluence" default="all">
- <property environment="env"/>
- <condition property="mcf-dist" value="${env.MCFDISTPATH}">
- <isset property="env.MCFDISTPATH"/>
- </condition>
- <property name="abs-dist" location="../../dist"/>
- <condition property="mcf-dist" value="${abs-dist}">
- <not>
- <isset property="env.MCFDISTPATH"/>
- </not>
- </condition>
-
- <import file="${mcf-dist}/connector-build.xml"/>
-
- <target name="deliver-connector"
depends="mcf-connector-build.deliver-connector">
- <antcall target="general-add-repository-connector">
- <param name="connector-label" value="Confluence"/>
- <param name="connector-class"
value="org.apache.manifoldcf.crawler.connectors.confluence.ConfluenceRepositoryConnector"/>
- </antcall>
- <antcall target="general-add-authority-connector">
- <param name="connector-label" value="Confluence"/>
- <param name="connector-class"
value="org.apache.manifoldcf.authorities.authorities.confluence.ConfluenceAuthorityConnector"/>
- </antcall>
- </target>
+ <property environment="env" />
+ <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+ <isset property="env.MCFDISTPATH" />
+ </condition>
+ <property name="abs-dist" location="../../dist" />
+ <condition property="mcf-dist" value="${abs-dist}">
+ <not>
+ <isset property="env.MCFDISTPATH" />
+ </not>
+ </condition>
+
+ <import file="${mcf-dist}/connector-build.xml" />
+
+ <path id="connector-classpath">
+ <path refid="mcf-connector-build.connector-classpath" />
+ <fileset dir="../../lib">
+ <include name="guava-*.jar" />
+ </fileset>
+ </path>
+
+ <target name="lib" depends="mcf-connector-build.lib,precompile-check"
if="canBuild">
+ <mkdir dir="dist/lib" />
+ <copy todir="dist/lib">
+ <fileset dir="../../lib">
+ <include name="guava-*.jar" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="deliver-connector"
depends="mcf-connector-build.deliver-connector">
+ <antcall target="general-add-repository-connector">
+ <param name="connector-label" value="Confluence" />
+ <param name="connector-class"
value="org.apache.manifoldcf.crawler.connectors.confluence.ConfluenceRepositoryConnector"
/>
+ </antcall>
+ <antcall target="general-add-authority-connector">
+ <param name="connector-label" value="Confluence" />
+ <param name="connector-class"
value="org.apache.manifoldcf.authorities.authorities.confluence.ConfluenceAuthorityConnector"
/>
+ </antcall>
+ </target>
</project>
Modified: manifoldcf/trunk/framework/buildfiles/connector-build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/buildfiles/connector-build.xml?rev=1695696&r1=1695695&r2=1695696&view=diff
==============================================================================
--- manifoldcf/trunk/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/trunk/framework/buildfiles/connector-build.xml Thu Aug 13
12:21:32 2015
@@ -194,9 +194,6 @@
<include name="castor*.jar"/>
<include name="geronimo-javamail_1.4_spec*.jar"/>
</fileset>
- <fileset dir="${mcf-dist}/connector-lib">
- <include name="guava*.jar"/>
- </fileset>
<pathelement location="build/stubclasses"/>
<pathelement location="build/wsdlclasses"/>
<pathelement location="build/xsdclasses"/>
