Author: kwright
Date: Thu Apr 2 07:14:08 2015
New Revision: 1670830
URL: http://svn.apache.org/r1670830
Log:
Pull up SearchBlox connector from trunk.
Added:
manifoldcf/branches/dev_1x/connectors/searchblox/
- copied from r1668312, manifoldcf/trunk/connectors/searchblox/
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/build.xml
manifoldcf/branches/dev_1x/connectors/pom.xml
manifoldcf/branches/dev_1x/connectors/searchblox/pom.xml
manifoldcf/branches/dev_1x/lib-license/LICENSE.txt
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 2 07:14:08 2015
@@ -47,6 +47,7 @@
/manifoldcf/branches/CONNECTORS-1119:1645497-1647584
/manifoldcf/branches/CONNECTORS-1130:1648217-1648685
/manifoldcf/branches/CONNECTORS-1134:1649449-1649604
+/manifoldcf/branches/CONNECTORS-1168:1666253-1668311
/manifoldcf/branches/CONNECTORS-1177:1670213-1670613
/manifoldcf/branches/CONNECTORS-120:1406712-1407974,1407982-1411043,1411049-1416451
/manifoldcf/branches/CONNECTORS-120-1:1416450-1417056
@@ -122,4 +123,4 @@
/manifoldcf/branches/CONNECTORS-981:1605049-1605773
/manifoldcf/branches/CONNECTORS-989:1611600-1612101
/manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1624982,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628046,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1631750,1631953,1632013,1632225,1632289,1632562,1632844,1632847,1632854,1633062-1633063,1633108,1633193,1633202,1633282,1633284,1633295,1633336,1633339,1633345,1633348,1633364,1633378,1633383,1633432,1633546,1633590,1633634,1633668,1633727,1633760,1633764,1633786,1633910,1633923,1634021,1634028,1634067,1634132,1634145,1634148,163
4155,1634188,1634202,1634264,1634373,1634530,1634688,1634850,1634857,1635103,1635116,1635421,1635438,1635478,1635481,1635484,1635490,1635809,1635939,1636146,1636167,1636180,1636207,1636215,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1637310,1637350,1637364,1637373,1637378,1639259,1639593,1639600,1640018,1640101,1640199,1640204,1640208,1640314,1640319,1640749,1640772,1640805,1640888,1640925,1640941-1640942,1641222,1641328,1641557,1641559,1641629,1641633,1641724,1641754,1641911,1642163,1642255,1642318,1642531,1642650,1642658,1642673,1642716,1644197,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646408,1646640,1646947,1647574,1647585,1647608,1648686,1648976,1649201,1649203,1649529,1649605,1649628,1649794,1650351,1650722,1650741-1650742,1650745,1650747,1650911,1650954,1651332,1651539,1651907,1651921,1652071,1652974,1653175,1653899,1654651,1655205,1655261,1655264,1655377,1655411,1655618,1655914,1657346,1657443,1658004,1658036,1658121,1658155,1658188,1658463,1658476,
1660258,1660276,1661454,1665848,1666160,1666781,1666820,1669100,1669238,1669487,1669523,1669586,1669660,1670614,1670625,1670715
+/manifoldcf/trunk:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1624982,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628046,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1631750,1631953,1632013,1632225,1632289,1632562,1632844,1632847,1632854,1633062-1633063,1633108,1633193,1633202,1633282,1633284,1633295,1633336,1633339,1633345,1633348,1633364,1633378,1633383,1633432,1633546,1633590,1633634,1633668,1633727,1633760,1633764,1633786,1633910,1633923,1634021,1634028,1634067,1634132,1634145,1634148,163
4155,1634188,1634202,1634264,1634373,1634530,1634688,1634850,1634857,1635103,1635116,1635421,1635438,1635478,1635481,1635484,1635490,1635809,1635939,1636146,1636167,1636180,1636207,1636215,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1637310,1637350,1637364,1637373,1637378,1639259,1639593,1639600,1640018,1640101,1640199,1640204,1640208,1640314,1640319,1640749,1640772,1640805,1640888,1640925,1640941-1640942,1641222,1641328,1641557,1641559,1641629,1641633,1641724,1641754,1641911,1642163,1642255,1642318,1642531,1642650,1642658,1642673,1642716,1644197,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646408,1646640,1646947,1647574,1647585,1647608,1648686,1648976,1649201,1649203,1649529,1649605,1649628,1649794,1650351,1650722,1650741-1650742,1650745,1650747,1650911,1650954,1651332,1651539,1651907,1651921,1652071,1652974,1653175,1653899,1654651,1655205,1655261,1655264,1655377,1655411,1655618,1655914,1657346,1657443,1658004,1658036,1658121,1658155,1658188,1658463,1658476,
1660258,1660276,1661454,1665848,1666160,1666781,1666820,1668312,1669100,1669238,1669487,1669523,1669586,1669660,1670614,1670625,1670715
Modified: manifoldcf/branches/dev_1x/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/build.xml?rev=1670830&r1=1670829&r2=1670830&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/build.xml (original)
+++ manifoldcf/branches/dev_1x/build.xml Thu Apr 2 07:14:08 2015
@@ -127,6 +127,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... -->
@@ -772,6 +775,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">
@@ -1669,6 +1708,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">
@@ -2007,7 +2047,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-woodstox,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-x
alan,download-activation,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-woodstox,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,downloa
d-jetty,download-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/dev_1x/connectors/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/pom.xml?rev=1670830&r1=1670829&r2=1670830&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/pom.xml (original)
+++ manifoldcf/branches/dev_1x/connectors/pom.xml Thu Apr 2 07:14:08 2015
@@ -64,6 +64,7 @@
<module>forcedmetadata</module>
<module>tika</module>
<module>documentfilter</module>
+ <module>searchblox</module>
</modules>
</project>
Modified: manifoldcf/branches/dev_1x/connectors/searchblox/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/searchblox/pom.xml?rev=1670830&r1=1668312&r2=1670830&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/searchblox/pom.xml (original)
+++ manifoldcf/branches/dev_1x/connectors/searchblox/pom.xml Thu Apr 2
07:14:08 2015
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.manifoldcf</groupId>
<artifactId>mcf-connectors</artifactId>
- <version>2.0.2</version>
+ <version>1.9-SNAPSHOT</version>
</parent>
<artifactId>mcf-searchblox-connector</artifactId>
Modified: manifoldcf/branches/dev_1x/lib-license/LICENSE.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/lib-license/LICENSE.txt?rev=1670830&r1=1670829&r2=1670830&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/lib-license/LICENSE.txt (original)
+++ manifoldcf/branches/dev_1x/lib-license/LICENSE.txt Thu Apr 2 07:14:08 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)
