svn commit: r1436931 - in /manifoldcf/branches/release-1.1-branch: ./ CHANGES.txt framework/build.xml

[kwright]

Author: kwright
Date: Tue Jan 22 14:02:43 2013
New Revision: 1436931

URL: http://svn.apache.org/viewvc?rev=1436931&view=rev
Log:
Pull up fix for CONNECTORS-619 from trunk.

Modified:
    manifoldcf/branches/release-1.1-branch/   (props changed)
    manifoldcf/branches/release-1.1-branch/CHANGES.txt
    manifoldcf/branches/release-1.1-branch/framework/build.xml

Propchange: manifoldcf/branches/release-1.1-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1436930

Modified: manifoldcf/branches/release-1.1-branch/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/CHANGES.txt?rev=1436931&r1=1436930&r2=1436931&view=diff
==============================================================================
--- manifoldcf/branches/release-1.1-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.1-branch/CHANGES.txt Tue Jan 22 14:02:43 2013
@@ -3,6 +3,10 @@ $Id$
 
 ======================= Release 1.1 =====================
 
+CONNECTORS-619: Include slf4j jars in multiprocess agents classpath.
+This was causing Solrj to not work on multiprocess deployments.
+(Erlend Garåsen, Karl Wright) 
+
 CONNECTORS-618: MySQL orders indexes so that NULL values are first.
 This is a problem for the stuffer query, which then must go through
 millions of rows before it finds the one it is looking for.

Modified: manifoldcf/branches/release-1.1-branch/framework/build.xml
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/framework/build.xml?rev=1436931&r1=1436930&r2=1436931&view=diff
==============================================================================
--- manifoldcf/branches/release-1.1-branch/framework/build.xml (original)
+++ manifoldcf/branches/release-1.1-branch/framework/build.xml Tue Jan 22 
14:02:43 2013
@@ -749,6 +749,7 @@
                 <include name="xercesImpl*.jar"/>
                 <include name="xml-apis*.jar"/>
                 <include name="velocity*.jar"/>
+                <include name="slf4j*.jar"/>
             </fileset>
             <fileset dir="../lib">
                 <include name="postgresql*.jar"/>
@@ -788,6 +789,7 @@
                 <include name="xercesImpl*.jar"/>
                 <include name="xml-apis*.jar"/>
                 <include name="velocity*.jar"/>
+                <include name="slf4j*.jar"/>
             </fileset>
             <fileset dir="../lib">
                 <include name="postgresql*.jar"/>