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/12/18 09:51:47 UTC
svn commit: r1646407 - in /manifoldcf/branches/release-1.8-branch: ./
CHANGES.txt dist-license/LICENSE.txt framework/ framework/build.xml
framework/buildfiles/connector-build.xml lib-license/LICENSE.txt
Author: kwright
Date: Thu Dec 18 08:51:47 2014
New Revision: 1646407
URL: http://svn.apache.org/r1646407
Log:
Pull up fix for CONNECTORS-1125 from dev_1x branch
Modified:
manifoldcf/branches/release-1.8-branch/ (props changed)
manifoldcf/branches/release-1.8-branch/CHANGES.txt
manifoldcf/branches/release-1.8-branch/dist-license/LICENSE.txt
manifoldcf/branches/release-1.8-branch/framework/ (props changed)
manifoldcf/branches/release-1.8-branch/framework/build.xml
manifoldcf/branches/release-1.8-branch/framework/buildfiles/connector-build.xml
manifoldcf/branches/release-1.8-branch/lib-license/LICENSE.txt
Propchange: manifoldcf/branches/release-1.8-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 08:51:47 2014
@@ -118,5 +118,5 @@
/manifoldcf/branches/CONNECTORS-981:1605049-1605773
/manifoldcf/branches/CONNECTORS-989:1611600-1612101
/manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/branches/dev_1x:1646136,1646323
-/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,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,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,1634155,1634188,163
4202,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
+/manifoldcf/branches/dev_1x:1646136,1646323,1646405
+/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,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,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,1634155,1634188,163
4202,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,1646403
Modified: manifoldcf/branches/release-1.8-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/CHANGES.txt?rev=1646407&r1=1646406&r2=1646407&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.8-branch/CHANGES.txt Thu Dec 18 08:51:47 2014
@@ -3,6 +3,10 @@ $Id$
======================= Release 1.8 =====================
+CONNECTORS-1125: Make sure xz jar is delivered to where Tika needs
+it.
+(Kamil Żyta, Karl Wright)
+
CONNECTORS-1123: Reduce the maximum number of zookeeper lock
nodes, by hashing the lock names that correspond to documents.
(Aeham Abushwashi, Karl Wright)
Modified: manifoldcf/branches/release-1.8-branch/dist-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/dist-license/LICENSE.txt?rev=1646407&r1=1646406&r2=1646407&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/dist-license/LICENSE.txt (original)
+++ manifoldcf/branches/release-1.8-branch/dist-license/LICENSE.txt Thu Dec 18 08:51:47 2014
@@ -380,6 +380,9 @@ License: Apache 2 (http://www.apache.org
This product includes an isoparser.jar.
License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+This product includes an xz.jar.
+License: Public domain
+
This product includes a jetty-server.jar, jetty-servlet.jar, jetty-io.jar, jetty-jndi.jar, jetty-webapp.jar,
jetty-plus.jar, jetty-util.jar, jetty-http.jar, jetty-security.jar, jetty-continuation.jar, jetty-xml.jar,
jetty-jsp-jdt.jar, and jetty-schemas.jar.
Propchange: manifoldcf/branches/release-1.8-branch/framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 08:51:47 2014
@@ -112,6 +112,6 @@
/manifoldcf/branches/CONNECTORS-981/framework:1605049-1605773
/manifoldcf/branches/CONNECTORS-989/framework:1611600-1612101
/manifoldcf/branches/CONNECTORS-990/framework:1610284-1610707
-/manifoldcf/branches/dev_1x/framework:1646136,1646323
+/manifoldcf/branches/dev_1x/framework:1646136,1646323,1646405
/manifoldcf/trunk:1629122
-/manifoldcf/trunk/framework: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,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,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,1632013,1632289,1632844,1633108,1633193,1633202,1633348,1633364,1634145,1634148,1634155,1634264,1634373,1634530,1635438,1635809,1636146,1636180,1636207,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1639593,1639600,1640018,1640101,1640199,1640314,1640319,1640749,1640772,1640925,1640941,1641222,1641557,1641559,1641724,1641911,1
642163,1642255,1642318,1644197,1644399,1646317
+/manifoldcf/trunk/framework: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,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,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,1632013,1632289,1632844,1633108,1633193,1633202,1633348,1633364,1634145,1634148,1634155,1634264,1634373,1634530,1635438,1635809,1636146,1636180,1636207,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1639593,1639600,1640018,1640101,1640199,1640314,1640319,1640749,1640772,1640925,1640941,1641222,1641557,1641559,1641724,1641911,1
642163,1642255,1642318,1644197,1644399,1646317,1646403
Modified: manifoldcf/branches/release-1.8-branch/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/framework/build.xml?rev=1646407&r1=1646406&r2=1646407&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/framework/build.xml (original)
+++ manifoldcf/branches/release-1.8-branch/framework/build.xml Thu Dec 18 08:51:47 2014
@@ -118,6 +118,7 @@
<include name="jhighlight*.jar"/>
<include name="jmatio*.jar"/>
<include name="java-libpst*.jar"/>
+ <include name="xz*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="castor*.jar"/>
@@ -1399,6 +1400,7 @@
<include name="jhighlight*.jar"/>
<include name="jmatio*.jar"/>
<include name="java-libpst*.jar"/>
+ <include name="xz*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="castor*.jar"/>
Modified: manifoldcf/branches/release-1.8-branch/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/framework/buildfiles/connector-build.xml?rev=1646407&r1=1646406&r2=1646407&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/release-1.8-branch/framework/buildfiles/connector-build.xml Thu Dec 18 08:51:47 2014
@@ -181,6 +181,7 @@
<include name="jhighlight*.jar"/>
<include name="jmatio*.jar"/>
<include name="java-libpst*.jar"/>
+ <include name="xz*.jar"/>
</fileset>
<fileset dir="${mcf-dist}/connector-common-lib">
<include name="axis*.jar"/>
Modified: manifoldcf/branches/release-1.8-branch/lib-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/lib-license/LICENSE.txt?rev=1646407&r1=1646406&r2=1646407&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/lib-license/LICENSE.txt (original)
+++ manifoldcf/branches/release-1.8-branch/lib-license/LICENSE.txt Thu Dec 18 08:51:47 2014
@@ -380,6 +380,9 @@ License: Apache 2 (http://www.apache.org
This product includes an isoparser.jar.
License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+This product includes an xz.jar.
+License: Public domain
+
This product includes a jetty-server.jar, jetty-servlet.jar, jetty-io.jar, jetty-jndi.jar, jetty-webapp.jar,
jetty-plus.jar, jetty-util.jar, jetty-http.jar, jetty-security.jar, jetty-continuation.jar, jetty-xml.jar,
jetty-jsp-jdt.jar, and jetty-schemas.jar.