Return-Path: 
 <commits-return-3545-apmail-manifoldcf-commits-archive=manifoldcf.apache.org@manifoldcf.apache.org>
X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org
Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 62E8AD788
	for <apmail-manifoldcf-commits-archive@www.apache.org>;
 Sun,  9 Dec 2012 18:13:56 +0000 (UTC)
Received: (qmail 22028 invoked by uid 500); 9 Dec 2012 18:13:56 -0000
Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org
Received: (qmail 21995 invoked by uid 500); 9 Dec 2012 18:13:56 -0000
Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@manifoldcf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@manifoldcf.apache.org>
List-Post: <mailto:commits@manifoldcf.apache.org>
List-Id: <commits.manifoldcf.apache.org>
Reply-To: dev@manifoldcf.apache.org
Delivered-To: mailing list commits@manifoldcf.apache.org
Received: (qmail 21988 invoked by uid 99); 9 Dec 2012 18:13:56 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Dec 2012 18:13:56 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Dec 2012 18:13:52 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 141E223888E7;
	Sun,  9 Dec 2012 18:13:31 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r1419063 - in /manifoldcf/trunk: CHANGES.txt build.xml
 connectors/connector-build.xml framework/build.xml mvn-bootstrap.bat
 mvn-bootstrap.sh tests/test-build.xml
Date: Sun, 09 Dec 2012 18:13:30 -0000
To: commits@manifoldcf.apache.org
From: kwright@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121209181331.141E223888E7@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kwright
Date: Sun Dec  9 18:13:29 2012
New Revision: 1419063

URL: http://svn.apache.org/viewvc?rev=1419063&view=rev
Log:
Temporarily revert CONNECTORS-580 changes, because OpenSearchServer and ElasticSearch connectors have dependencies I didn't know about.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/connectors/connector-build.xml
    manifoldcf/trunk/framework/build.xml
    manifoldcf/trunk/mvn-bootstrap.bat
    manifoldcf/trunk/mvn-bootstrap.sh
    manifoldcf/trunk/tests/test-build.xml

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1419063&r1=1419062&r2=1419063&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sun Dec  9 18:13:29 2012
@@ -6,10 +6,6 @@ $Id$
 CONNECTORS-563: Augment LDAP authority to include new features.
 (Maciej Li¿ewski)
 
-CONNECTORS-580: Remove build of commons-httpclient-mcf, and all
-ant and maven dependencies.
-(Karl Wright)
-
 CONNECTORS-579: Add untrusted, unverified https support to the RSS
 connector.
 (David Morana, Karl Wright)

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1419063&r1=1419062&r2=1419063&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Sun Dec  9 18:13:29 2012
@@ -3059,6 +3059,33 @@ Use Apache Forrest version forrest-0.9-d
             <param name="artifact-name" value="commons-logging"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
+        <!-- Download and build patched version of commons-httpclient 3.1 -->
+        <mkdir dir="build/download"/>
+        <delete dir="build/download/commons-httpclient"/>
+        <antcall target="checkout-source-via-svn">
+            <param name="root-dir" value="build/download"/>
+            <param name="svn-url" value="http://svn.apache.org/repos/asf/httpcomponents/oac.hc3x/tags/HTTPCLIENT_3_1"/>
+            <param name="dir-name" value="commons-httpclient"/>
+        </antcall>
+        <!-- Apply cumulative post-3.1 fixes patch -->
+        <antcall target="patch-source">
+            <param name="root-dir" value="build/download"/>
+            <param name="diff-file" value="../../upstream-diffs/commons-httpclient-3.1.cumulative.patch"/>
+            <param name="dir-name" value="commons-httpclient"/>
+        </antcall>
+        <!-- Apply mcf-specific features and fixes patch -->
+        <antcall target="patch-source">
+            <param name="root-dir" value="build/download"/>
+            <param name="diff-file" value="../../upstream-diffs/commons-httpclient-3.1.mcf.patch"/>
+            <param name="dir-name" value="commons-httpclient"/>
+        </antcall>
+        <!-- Supply dependencies -->
+        <mkdir dir="build/download/commons-httpclient/lib"/>
+        <copy todir="build/download/commons-httpclient/lib" file="lib/commons-logging.jar"/>
+        <copy todir="build/download/commons-httpclient/lib" file="lib/commons-codec.jar"/>
+        <!-- Build it -->
+        <ant dir="build/download/commons-httpclient" target="dist"/>
+        <copy todir="lib" file="build/download/commons-httpclient/dist/commons-httpclient.jar"/>
     </target>
   
     <target name="download-slf4j">

Modified: manifoldcf/trunk/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/connector-build.xml?rev=1419063&r1=1419062&r2=1419063&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/connector-build.xml (original)
+++ manifoldcf/trunk/connectors/connector-build.xml Sun Dec  9 18:13:29 2012
@@ -36,6 +36,7 @@
             <include name="commons-collections*.jar"/>
             <include name="commons-el*.jar"/>
             <include name="commons-fileupload*.jar"/>
+            <include name="commons-httpclient*.jar"/>
             <include name="httpcore*.jar"/>
             <include name="httpclient*.jar"/>
             <include name="commons-io*.jar"/>

Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1419063&r1=1419062&r2=1419063&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Sun Dec  9 18:13:29 2012
@@ -37,6 +37,7 @@
             <include name="commons-collections*.jar"/>
             <include name="commons-el*.jar"/>
             <include name="commons-fileupload*.jar"/>
+            <include name="commons-httpclient*.jar"/>
             <include name="httpcore*.jar"/>
             <include name="httpclient*.jar"/>
             <include name="commons-io*.jar"/>
@@ -313,6 +314,7 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -350,6 +352,7 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -392,6 +395,7 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -430,6 +434,7 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -474,6 +479,7 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -520,6 +526,7 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -573,6 +580,7 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -621,6 +629,7 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -737,6 +746,7 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -776,6 +786,7 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -898,6 +909,7 @@
                 <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -927,6 +939,7 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -981,7 +994,8 @@
         <property name="manifest-cp-3" value="${manifest-cp-2} lib/commons-collections.jar"/>
         <property name="manifest-cp-4" value="${manifest-cp-3} lib/commons-el.jar"/>
         <property name="manifest-cp-5" value="${manifest-cp-4} lib/commons-fileupload.jar"/>
-        <property name="manifest-cp-7" value="${manifest-cp-5} lib/commons-io.jar"/>
+        <property name="manifest-cp-6" value="${manifest-cp-5} lib/commons-httpclient.jar"/>
+        <property name="manifest-cp-7" value="${manifest-cp-6} lib/commons-io.jar"/>
         <property name="manifest-cp-8" value="${manifest-cp-7} lib/commons-logging.jar"/>
         <property name="manifest-cp-9" value="${manifest-cp-8} lib/hsqldb.jar"/>
         <property name="manifest-cp-10" value="${manifest-cp-9} lib/derbyclient.jar"/>
@@ -1054,6 +1068,7 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="httpcore*.jar"/>
                 <include name="httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
@@ -1113,7 +1128,8 @@
         <property name="manifest-cp-proprietary-3" value="${manifest-cp-proprietary-2} lib/commons-collections.jar"/>
         <property name="manifest-cp-proprietary-4" value="${manifest-cp-proprietary-3} lib/commons-el.jar"/>
         <property name="manifest-cp-proprietary-5" value="${manifest-cp-proprietary-4} lib/commons-fileupload.jar"/>
-        <property name="manifest-cp-proprietary-7" value="${manifest-cp-proprietary-5} lib/commons-io.jar"/>
+        <property name="manifest-cp-proprietary-6" value="${manifest-cp-proprietary-5} lib/commons-httpclient.jar"/>
+        <property name="manifest-cp-proprietary-7" value="${manifest-cp-proprietary-6} lib/commons-io.jar"/>
         <property name="manifest-cp-proprietary-8" value="${manifest-cp-proprietary-7} lib/commons-logging.jar"/>
         <property name="manifest-cp-proprietary-9" value="${manifest-cp-proprietary-8} lib/hsqldb.jar"/>
         <property name="manifest-cp-proprietary-10" value="${manifest-cp-proprietary-9} lib/derbyclient.jar"/>

Modified: manifoldcf/trunk/mvn-bootstrap.bat
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/mvn-bootstrap.bat?rev=1419063&r1=1419062&r2=1419063&view=diff
==============================================================================
--- manifoldcf/trunk/mvn-bootstrap.bat (original)
+++ manifoldcf/trunk/mvn-bootstrap.bat Sun Dec  9 18:13:29 2012
@@ -18,6 +18,7 @@ cmd /c ant make-deps
 
 cmd /c mvn install:install-file -Dfile=lib/jdbcpool.jar -DgroupId=com.bitmechanic -DartifactId=jdbcpool -Dversion=0.99 -Dpackaging=jar
 
+cmd /c mvn install:install-file -Dfile=lib/commons-httpclient.jar -DgroupId=commons-httpclient -DartifactId=commons-httpclient -Dversion=3.1-mcf-1  -Dpackaging=jar
 cmd /c mvn install:install-file -Dfile=lib/xercesImpl.jar -DgroupId=xerces -DartifactId=xercesImpl -Dversion=2.9.1-mcf-1  -Dpackaging=jar
 cmd /c mvn install:install-file -Dfile=connectors/jcifs/lib-proprietary/jcifs.jar -DgroupId=org.samba.jcifs -DartifactId=jcifs -Dversion=1.3.17  -Dpackaging=jar
 

Modified: manifoldcf/trunk/mvn-bootstrap.sh
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/mvn-bootstrap.sh?rev=1419063&r1=1419062&r2=1419063&view=diff
==============================================================================
--- manifoldcf/trunk/mvn-bootstrap.sh (original)
+++ manifoldcf/trunk/mvn-bootstrap.sh Sun Dec  9 18:13:29 2012
@@ -25,6 +25,7 @@ ant make-deps
 
 mvn install:install-file -Dfile=lib/jdbcpool.jar -DgroupId=com.bitmechanic -DartifactId=jdbcpool -Dversion=0.99 -Dpackaging=jar
 
+mvn install:install-file -Dfile=lib/commons-httpclient.jar -DgroupId=commons-httpclient -DartifactId=commons-httpclient -Dversion=3.1-mcf-1  -Dpackaging=jar
 mvn install:install-file -Dfile=lib/xercesImpl.jar -DgroupId=xerces -DartifactId=xercesImpl -Dversion=2.9.1-mcf-1  -Dpackaging=jar
 mvn install:install-file -Dfile=connectors/jcifs/lib-proprietary/jcifs.jar -DgroupId=org.samba.jcifs -DartifactId=jcifs -Dversion=1.3.17  -Dpackaging=jar
 

Modified: manifoldcf/trunk/tests/test-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/test-build.xml?rev=1419063&r1=1419062&r2=1419063&view=diff
==============================================================================
--- manifoldcf/trunk/tests/test-build.xml (original)
+++ manifoldcf/trunk/tests/test-build.xml Sun Dec  9 18:13:29 2012
@@ -35,6 +35,7 @@
             <include name="commons-collections*.jar"/>
             <include name="commons-el*.jar"/>
             <include name="commons-fileupload*.jar"/>
+            <include name="commons-httpclient*.jar"/>
             <include name="httpcore*.jar"/>
             <include name="httpclient*.jar"/>
             <include name="commons-io*.jar"/>