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 2012/11/07 19:15:04 UTC
svn commit: r1406746 - in /manifoldcf/branches/CONNECTORS-120: build.xml
connectors/connector-build.xml framework/build.xml tests/test-build.xml
Author: kwright
Date: Wed Nov 7 18:15:04 2012
New Revision: 1406746
URL: http://svn.apache.org/viewvc?rev=1406746&view=rev
Log:
Down httpcomponents and include it everywhare commons-httpclient is included
Modified:
manifoldcf/branches/CONNECTORS-120/build.xml
manifoldcf/branches/CONNECTORS-120/connectors/connector-build.xml
manifoldcf/branches/CONNECTORS-120/framework/build.xml
manifoldcf/branches/CONNECTORS-120/tests/test-build.xml
Modified: manifoldcf/branches/CONNECTORS-120/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-120/build.xml?rev=1406746&r1=1406745&r2=1406746&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-120/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-120/build.xml Wed Nov 7 18:15:04 2012
@@ -23,7 +23,7 @@
<!-- Spot check a few of the dependent jars; no point including ALL of them here... -->
<available file="lib/derby.jar" property="derby-found"/>
<available file="lib/jetty-server.jar" property="jetty-found"/>
- <available file="lib/commons-httpclient.jar" property="httpclient-found"/>
+ <available file="lib/httpclient.jar" property="httpclient-found"/>
<available file="lib/xercesImpl.jar" property="xerces-found"/>
<available file="lib/fop.jar" property="fop-found"/>
<condition property="downloaded">
@@ -2792,6 +2792,24 @@ Use Apache Forrest version forrest-0.9-d
</java>
</target>
+ <target name="download-httpcomponents">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven">
+ <param name="project-path" value=" org/apache/httpcomponents"/>
+ <param name="artifact-version" value="4.2.2"/>
+ <param name="target" value="lib"/>
+ <param name="artifact-name" value="httpcore"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="project-path" value=" org/apache/httpcomponents"/>
+ <param name="artifact-version" value="4.2.2"/>
+ <param name="target" value="lib"/>
+ <param name="artifact-name" value="httpclient"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
<target name="download-json">
<mkdir dir="lib"/>
<antcall target="download-via-maven">
@@ -3532,7 +3550,7 @@ Use Apache Forrest version forrest-0.9-d
</copy>
</target>
- <target name="make-core-deps" depends="download-json,download-hsqldb,download-xerces,download-commons,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-wstx-asl,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-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj">
+ <target name="make-core-deps" depends="download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-wstx-asl,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-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj">
<copy todir="lib">
<fileset dir="lib-license" includes="*.txt"/>
</copy>
Modified: manifoldcf/branches/CONNECTORS-120/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-120/connectors/connector-build.xml?rev=1406746&r1=1406745&r2=1406746&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-120/connectors/connector-build.xml (original)
+++ manifoldcf/branches/CONNECTORS-120/connectors/connector-build.xml Wed Nov 7 18:15:04 2012
@@ -37,6 +37,8 @@
<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"/>
<include name="commons-lang*.jar"/>
<include name="commons-logging*.jar"/>
Modified: manifoldcf/branches/CONNECTORS-120/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-120/framework/build.xml?rev=1406746&r1=1406745&r2=1406746&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-120/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-120/framework/build.xml Wed Nov 7 18:15:04 2012
@@ -38,6 +38,8 @@
<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"/>
<include name="commons-lang*.jar"/>
<include name="commons-logging*.jar"/>
@@ -313,6 +315,8 @@
<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"/>
<include name="commons-lang*.jar"/>
<include name="commons-logging*.jar"/>
@@ -349,6 +353,8 @@
<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"/>
<include name="commons-lang*.jar"/>
<include name="commons-logging*.jar"/>
@@ -390,6 +396,8 @@
<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"/>
<include name="commons-lang*.jar"/>
<include name="commons-logging*.jar"/>
@@ -427,6 +435,8 @@
<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"/>
<include name="commons-lang*.jar"/>
<include name="commons-logging*.jar"/>
@@ -470,6 +480,8 @@
<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"/>
<include name="commons-lang*.jar"/>
<include name="commons-logging*.jar"/>
@@ -515,6 +527,8 @@
<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"/>
<include name="commons-lang*.jar"/>
<include name="commons-logging*.jar"/>
@@ -567,6 +581,8 @@
<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"/>
<include name="commons-lang*.jar"/>
<include name="commons-logging*.jar"/>
@@ -614,6 +630,8 @@
<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"/>
<include name="commons-lang*.jar"/>
<include name="commons-logging*.jar"/>
@@ -729,6 +747,8 @@
<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"/>
<include name="commons-lang*.jar"/>
<include name="commons-logging*.jar"/>
@@ -767,6 +787,8 @@
<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"/>
<include name="commons-lang*.jar"/>
<include name="commons-logging*.jar"/>
@@ -888,6 +910,8 @@
<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"/>
<include name="commons-lang*.jar"/>
<include name="commons-logging*.jar"/>
@@ -916,6 +940,8 @@
<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"/>
<include name="commons-lang*.jar"/>
<include name="commons-logging*.jar"/>
@@ -1020,7 +1046,9 @@
<property name="manifest-cp-57" value="${manifest-cp-56} lib/jetty-xml.jar"/>
<property name="manifest-cp-58" value="${manifest-cp-57} lib/slf4j-api.jar"/>
<property name="manifest-cp-59" value="${manifest-cp-58} lib/slf4j-simple.jar"/>
- <property name="manifest-cp" value="${manifest-cp-59}"/>
+ <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" value="${manifest-cp-61}"/>
<mkdir dir="build/example"/>
<manifest file="build/example/manifest">
<attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
@@ -1041,6 +1069,8 @@
<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"/>
<include name="commons-lang*.jar"/>
<include name="commons-logging*.jar"/>
@@ -1153,7 +1183,9 @@
<property name="manifest-cp-proprietary-59" value="${manifest-cp-proprietary-58} lib/jetty-xml.jar"/>
<property name="manifest-cp-proprietary-60" value="${manifest-cp-proprietary-59} lib/slf4j-api.jar"/>
<property name="manifest-cp-proprietary-61" value="${manifest-cp-proprietary-60} lib/slf4j-simple.jar"/>
- <property name="manifest-cp-proprietary" value="${manifest-cp-proprietary-61}"/>
+ <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" value="${manifest-cp-proprietary-63}"/>
<mkdir dir="build/example-proprietary"/>
<manifest file="build/example-proprietary/manifest">
<attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
Modified: manifoldcf/branches/CONNECTORS-120/tests/test-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-120/tests/test-build.xml?rev=1406746&r1=1406745&r2=1406746&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-120/tests/test-build.xml (original)
+++ manifoldcf/branches/CONNECTORS-120/tests/test-build.xml Wed Nov 7 18:15:04 2012
@@ -36,6 +36,8 @@
<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"/>
<include name="commons-lang*.jar"/>
<include name="commons-logging*.jar"/>