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 2015/03/21 20:32:34 UTC
svn commit: r1668312 - in /manifoldcf/trunk: ./ build.xml connectors/pom.xml
connectors/searchblox/ lib-license/LICENSE.txt
Author: kwright
Date: Sat Mar 21 19:32:33 2015
New Revision: 1668312
URL: http://svn.apache.org/r1668312
Log:
Add SearchBlox connector, CONNECTORS-1168
Added:
manifoldcf/trunk/connectors/searchblox/
- copied from r1668311, manifoldcf/branches/CONNECTORS-1168/connectors/searchblox/
Modified:
manifoldcf/trunk/ (props changed)
manifoldcf/trunk/build.xml
manifoldcf/trunk/connectors/pom.xml
manifoldcf/trunk/lib-license/LICENSE.txt
Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 21 19:32:33 2015
@@ -49,6 +49,7 @@
/manifoldcf/branches/CONNECTORS-1130:1648217-1648685
/manifoldcf/branches/CONNECTORS-1134:1649449-1649604
/manifoldcf/branches/CONNECTORS-1160:1663182-1666294
+/manifoldcf/branches/CONNECTORS-1168:1666253-1668311
/manifoldcf/branches/CONNECTORS-120:1406712-1407974,1407982-1411043,1411049-1416451
/manifoldcf/branches/CONNECTORS-120-1:1416450-1417056
/manifoldcf/branches/CONNECTORS-13:1525862-1527182,1539324-1541634
Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1668312&r1=1668311&r2=1668312&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Sat Mar 21 19:32:33 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">
@@ -1566,6 +1605,7 @@ Use Apache Forrest version forrest-0.9-d
</copy>
</target>
+
<target name="download-hadoop" depends="download-guava">
<mkdir dir="lib"/>
<antcall target="download-via-maven">
@@ -1904,7 +1944,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/trunk/connectors/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/pom.xml?rev=1668312&r1=1668311&r2=1668312&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/pom.xml (original)
+++ manifoldcf/trunk/connectors/pom.xml Sat Mar 21 19:32:33 2015
@@ -64,6 +64,7 @@
<module>forcedmetadata</module>
<module>tika</module>
<module>documentfilter</module>
+ <module>searchblox</module>
</modules>
</project>
Modified: manifoldcf/trunk/lib-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/lib-license/LICENSE.txt?rev=1668312&r1=1668311&r2=1668312&view=diff
==============================================================================
--- manifoldcf/trunk/lib-license/LICENSE.txt (original)
+++ manifoldcf/trunk/lib-license/LICENSE.txt Sat Mar 21 19:32:33 2015
@@ -389,6 +389,12 @@ jetty-jsp-jdt.jar, and jetty-schemas.jar
License: Dual Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt) and EPL (http://www.eclipse.org/legal/epl-v10.html)
Distributed under terms of Apache 2 license.
+This product includes a resteasy-client.jar and a resteasy-jaxrs.jar.
+License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a jsoup.jar.
+License: MIT license (http://opensource.org/licenses/MIT)
+
This product may include pdf files that embed IPA-licensed fonts.
License: IPA Font License Agreement v1.0 (http://ossipedia.ipa.go.jp/ipafont/index.html#LicenseEng)