Author: kwright
Date: Thu Mar 12 18:42:24 2015
New Revision: 1666271
URL: http://svn.apache.org/r1666271
Log:
Get ant build working
Modified:
manifoldcf/branches/CONNECTORS-1168/build.xml
manifoldcf/branches/CONNECTORS-1168/connectors/searchblox/build.xml
Modified: manifoldcf/branches/CONNECTORS-1168/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1168/build.xml?rev=1666271&r1=1666270&r2=1666271&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1168/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1168/build.xml Thu Mar 12 18:42:24 2015
@@ -125,6 +125,9 @@
<property name="commons-httpclient.version" value="3.1"/>
<property name="jackson-databind.version" value="2.1.3"/>
<property name="jackson-annotations.version" value="2.1.2"/>
+ <property name="resteasy.client.version" value="3.0.8.Final"/>
+ <property name="jsoup.version" value="1.8.1"/>
+
<target name="downloaded-condition">
<!-- Spot check a few of the dependent jars; no point including ALL of
them here... -->
@@ -744,6 +747,42 @@ Use Apache Forrest version forrest-0.9-d
</java>
</target>
+ <target name="download-resteasy">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven">
+ <param name="project-path" value="org/jboss/resteasy"/>
+ <param name="artifact-version" value="${resteasy.client.version}"/>
+ <param name="target" value="lib"/>
+ <param name="artifact-name" value="resteasy-jaxrs"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="project-path" value="org/jboss/resteasy"/>
+ <param name="artifact-version" value="${resteasy.client.version}"/>
+ <param name="target" value="lib"/>
+ <param name="artifact-name" value="resteasy-client"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="project-path" value="org/jboss/resteasy"/>
+ <param name="artifact-version" value="${resteasy.client.version}"/>
+ <param name="target" value="lib"/>
+ <param name="artifact-name" value="jaxrs-api"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
+ <target name="download-jsoup">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven">
+ <param name="project-path" value="org/jsoup"/>
+ <param name="artifact-version" value="${jsoup.version}"/>
+ <param name="target" value="lib"/>
+ <param name="artifact-name" value="jsoup"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
<target name="download-alfresco-webscript-plugin">
<mkdir dir="lib/alfresco-webscript"/>
<antcall target="download-via-maven">
@@ -1899,7 +1938,7 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="make-core-deps"
depends="download-mockito,download-alfresco-webscript-plugin,download-alfresco-indexer-client,download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-a
ctivation,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,download-protobuf,download-tika,download-jackson">
+ <target name="make-core-deps"
depends="download-resteasy,download-jsoup,download-mockito,download-alfresco-webscript-plugin,download-alfresco-indexer-client,download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,downloa
d-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,download-protobuf,download-tika,download-jackson">
<copy todir="lib">
<fileset dir="lib-license" includes="*.txt"/>
</copy>
Modified: manifoldcf/branches/CONNECTORS-1168/connectors/searchblox/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1168/connectors/searchblox/build.xml?rev=1666271&r1=1666270&r2=1666271&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1168/connectors/searchblox/build.xml
(original)
+++ manifoldcf/branches/CONNECTORS-1168/connectors/searchblox/build.xml Thu Mar
12 18:42:24 2015
@@ -27,64 +27,30 @@
</not>
</condition>
- <property name="resteasy.client.version" value="3.0.8.Final"/>
- <property name="jsoup.version" value="1.8.1"/>
-
<import file="${mcf-dist}/connector-build.xml"/>
<path id="connector-classpath">
<path refid="mcf-connector-build.connector-classpath"/>
- <fileset dir="../../lib-proprietary">
- <include name="jaxrs-*.jar" />
- <include name="jsoup*.jar" />
- <include name="resteasy-*.jar" />
- </fileset>
- <fileset dir="../../lib">
- <include name="*.jar" />
- </fileset>
- </path>
-
- <path id="connector-test-classpath">
- <path refid="mcf-connector-build.connector-test-classpath"/>
<fileset dir="../../lib">
+ <include name="jaxrs-*.jar" />
+ <include name="jsoup*.jar" />
+ <include name="resteasy-*.jar" />
+ <include name="guava-*.jar" />
</fileset>
</path>
- <target name="lib">
+ <target name="lib" depends="mcf-connector-build.lib,precompile-check"
if="canBuild">
<mkdir dir="dist/lib"/>
<copy todir="dist/lib">
- <fileset dir="../../lib-proprietary">
+ <fileset dir="../../lib">
<include name="jaxrs-*.jar" />
<include name="jsoup*.jar" />
<include name="resteasy-*.jar" />
+ <include name="guava-*.jar" />
</fileset>
</copy>
</target>
- <target name="download-cleanup">
- <delete>
- <fileset dir="test-materials-proprietary" excludes="README*.txt"/>
- </delete>
- </target>
-
- <target name="download-resteasy-jaxrs">
- <get
src="http://central.maven.org/maven2/org/jboss/resteasy/resteasy-jaxrs/${resteasy.client.version}/resteasy-jaxrs-${resteasy.client.version}.jar";
dest="../../lib-proprietary"/>
- </target>
-
- <target name="download-resteasy-client">
- <get
src="http://central.maven.org/maven2/org/jboss/resteasy/resteasy-client/${resteasy.client.version}/resteasy-client-${resteasy.client.version}.jar";
dest="../../lib-proprietary"/>
- </target>
-
- <target name="download-jaxrs-api">
- <get
src="http://central.maven.org/maven2/org/jboss/resteasy/jaxrs-api/${resteasy.client.version}/jaxrs-api-${resteasy.client.version}.jar";
dest="../../lib-proprietary"/>
- </target>
-
- <target name="download-jsoup">
- <get
src="http://central.maven.org/maven2/org/jsoup/jsoup/${jsoup.version}/jsoup-${jsoup.version}.jar";
dest="../../lib-proprietary/"/>
- </target>
-
- <target name="download-dependencies" depends="download-jaxrs-api,
download-resteasy-client, download-resteasy-jaxrs, download-jsoup"/>
-
<target name="deliver-connector"
depends="mcf-connector-build.deliver-connector">
<antcall target="general-add-output-connector">
<param name="connector-label" value="Searchblox"/>
