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/07/24 15:23:36 UTC
svn commit: r1613116 - in /manifoldcf/branches/CONNECTORS-818-2: ./
build.xml connectors/ connectors/pom.xml connectors/rabbitmq/
Author: kwright
Date: Thu Jul 24 13:23:35 2014
New Revision: 1613116
URL: http://svn.apache.org/r1613116
Log:
Pull up changes from CONNECTORS-818 branch
Added:
manifoldcf/branches/CONNECTORS-818-2/connectors/rabbitmq/
- copied from r1603335, manifoldcf/branches/CONNECTORS-818-2/connectors/rabbitmq/
Modified:
manifoldcf/branches/CONNECTORS-818-2/ (props changed)
manifoldcf/branches/CONNECTORS-818-2/build.xml
manifoldcf/branches/CONNECTORS-818-2/connectors/ (props changed)
manifoldcf/branches/CONNECTORS-818-2/connectors/pom.xml
Propchange: manifoldcf/branches/CONNECTORS-818-2/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-818:r1544168-1550081,1550084-1550493
Merged /manifoldcf/branches/CONNECTORS-818-2:r1550082-1550083,1550490-1550495,1584030-1584045,1601666-1601674,1603331-1603335
Modified: manifoldcf/branches/CONNECTORS-818-2/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-818-2/build.xml?rev=1613116&r1=1613115&r2=1613116&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-818-2/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-818-2/build.xml Thu Jul 24 13:23:35 2014
@@ -51,7 +51,6 @@
<echo message="Overlay -lib package, or run 'make-core-deps' target first"/>
</target>
-
<target name="build-site" depends="downloaded-check" if="downloaded">
<ant dir="site" target="all"/>
</target>
@@ -1432,6 +1431,17 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
+ <target name="download-rabbitmq-client">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven">
+ <param name="target" value="lib"/>
+ <param name="project-path" value="com/rabbitmq"/>
+ <param name="artifact-version" value="3.1.4"/>
+ <param name="artifact-name" value="amqp-client"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
<target name="download-google-api-client">
<mkdir dir="lib"/>
<antcall target="download-via-maven">
@@ -1802,7 +1812,7 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="make-core-deps" depends="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-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,do
wnload-ecj,download-hadoop,download-protobuf,download-tika,download-jackson">
+ <target name="make-core-deps" depends="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-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,do
wnload-ecj,download-hadoop,download-protobuf,download-tika,download-jackson,download-rabbitmq-client">
<copy todir="lib">
<fileset dir="lib-license" includes="*.txt"/>
</copy>
Propchange: manifoldcf/branches/CONNECTORS-818-2/connectors/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jul 24 13:23:35 2014
@@ -1 +1,2 @@
target
+.project
Modified: manifoldcf/branches/CONNECTORS-818-2/connectors/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-818-2/connectors/pom.xml?rev=1613116&r1=1613115&r2=1613116&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-818-2/connectors/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-818-2/connectors/pom.xml Thu Jul 24 13:23:35 2014
@@ -45,7 +45,6 @@
<module>nulloutput</module>
<module>nulltransformation</module>
<module>rss</module>
- <module>sharepoint</module>
<module>solr</module>
<module>webcrawler</module>
<module>cmis</module>
@@ -63,6 +62,7 @@
<module>forcedmetadata</module>
<module>tika</module>
<module>documentfilter</module>
+ <module>rabbitmq</module>
</modules>
</project>