manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1559073 - in /manifoldcf/branches/release-1.5-branch: ./ connectors/solr/build.xml framework/build.xml
Date Fri, 17 Jan 2014 11:25:42 GMT
Author: kwright
Date: Fri Jan 17 11:25:42 2014
New Revision: 1559073

URL: http://svn.apache.org/r1559073
Log:
Pull up second part of CONNECTORS-860 fix

Modified:
    manifoldcf/branches/release-1.5-branch/   (props changed)
    manifoldcf/branches/release-1.5-branch/connectors/solr/build.xml
    manifoldcf/branches/release-1.5-branch/framework/build.xml

Propchange: manifoldcf/branches/release-1.5-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1559072

Modified: manifoldcf/branches/release-1.5-branch/connectors/solr/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/connectors/solr/build.xml?rev=1559073&r1=1559072&r2=1559073&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/connectors/solr/build.xml (original)
+++ manifoldcf/branches/release-1.5-branch/connectors/solr/build.xml Fri Jan 17 11:25:42 2014
@@ -24,7 +24,6 @@
         <fileset dir="../../lib">
             <include name="solr-solrj*.jar"/>
             <include name="httpmime*.jar"/>
-            <include name="zookeeper*.jar"/>
             <include name="wstx-asl*.jar"/>
             <include name="jcl-over-slf4j*.jar"/>
         </fileset>
@@ -36,7 +35,6 @@
             <fileset dir="../../lib">
                 <include name="solr-solrj*.jar"/>
                 <include name="httpmime*.jar"/>
-                <include name="zookeeper*.jar"/>
                 <include name="wstx-asl*.jar"/>
                 <include name="jcl-over-slf4j*.jar"/>
             </fileset>

Modified: manifoldcf/branches/release-1.5-branch/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/framework/build.xml?rev=1559073&r1=1559072&r2=1559073&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/framework/build.xml (original)
+++ manifoldcf/branches/release-1.5-branch/framework/build.xml Fri Jan 17 11:25:42 2014
@@ -866,6 +866,7 @@
                 <include name="xml-apis*.jar"/>
                 <include name="velocity*.jar"/>
                 <include name="slf4j*.jar"/>
+                <include name="mail*.jar"/>
             </fileset>
             <fileset dir="../lib">
                 <include name="postgresql*.jar"/>
@@ -907,6 +908,7 @@
                 <include name="xml-apis*.jar"/>
                 <include name="velocity*.jar"/>
                 <include name="slf4j*.jar"/>
+                <include name="mail*.jar"/>
             </fileset>
             <fileset dir="../lib">
                 <include name="postgresql*.jar"/>
@@ -949,7 +951,7 @@
         <mkdir dir="dist/multiprocess-file-example/lib"/>
         <copy todir="dist/multiprocess-file-example/lib">
             <fileset dir="../lib">
-                <!-- include name="zookeeper*.jar"/ -->
+                <include name="zookeeper*.jar"/>
                 <include name="json*.jar"/>
                 <include name="commons-logging*.jar"/>
                 <include name="log4j*.jar"/>
@@ -994,7 +996,7 @@
         <mkdir dir="dist/multiprocess-file-example-proprietary/lib"/>
         <copy todir="dist/multiprocess-file-example-proprietary/lib">
             <fileset dir="../lib">
-                <!-- include name="zookeeper*.jar"/ -->
+                <include name="zookeeper*.jar"/>
                 <include name="json*.jar"/>
                 <include name="commons-logging*.jar"/>
                 <include name="log4j*.jar"/>
@@ -1145,7 +1147,7 @@
         <mkdir dir="dist/example/lib"/>
         <copy todir="dist/example/lib">
             <fileset dir="../lib">
-                <!-- include name="zookeeper*.jar"/ -->
+                <include name="zookeeper*.jar"/>
                 <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
@@ -1260,7 +1262,8 @@
         <property name="manifest-cp-60" value="${manifest-cp-59} lib/httpcore.jar"/>
         <property name="manifest-cp-61" value="${manifest-cp-60} lib/httpclient.jar"/>
         <property name="manifest-cp-62" value="${manifest-cp-61} lib/mail.jar"/>
-        <property name="manifest-cp" value="${manifest-cp-62}"/>
+        <property name="manifest-cp-63" value="${manifest-cp-62} lib/zookeeper.jar"/>
+        <property name="manifest-cp" value="${manifest-cp-63}"/>
         <mkdir dir="build/example"/>
         <manifest file="build/example/manifest">
             <attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
@@ -1275,7 +1278,7 @@
         <mkdir dir="dist/example-proprietary/lib"/>
         <copy todir="dist/example-proprietary/lib">
             <fileset dir="../lib">
-                <!-- include name="zookeeper*.jar"/ -->
+                <include name="zookeeper*.jar"/>
                 <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
@@ -1398,7 +1401,8 @@
         <property name="manifest-cp-proprietary-62" value="${manifest-cp-proprietary-61}
lib/httpcore.jar"/>
         <property name="manifest-cp-proprietary-63" value="${manifest-cp-proprietary-62}
lib/httpclient.jar"/>
         <property name="manifest-cp-proprietary-64" value="${manifest-cp-proprietary-63}
lib/mail.jar"/>
-        <property name="manifest-cp-proprietary" value="${manifest-cp-proprietary-64}"/>
+        <property name="manifest-cp-proprietary-65" value="${manifest-cp-proprietary-63}
lib/zookeeper.jar"/>
+        <property name="manifest-cp-proprietary" value="${manifest-cp-proprietary-65}"/>
         <mkdir dir="build/example-proprietary"/>
         <manifest file="build/example-proprietary/manifest">
             <attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>



Mime
View raw message