You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2005/02/26 21:28:30 UTC
svn commit: r155576 - jakarta/httpclient/trunk/http-common/build.xml
Author: olegk
Date: Sat Feb 26 12:28:30 2005
New Revision: 155576
URL: http://svn.apache.org/viewcvs?view=rev&rev=155576
Log:
Post SVN COPY adjustments
Added:
jakarta/httpclient/trunk/http-common/build.xml
- copied, changed from r155567, jakarta/commons/proper/httpclient/trunk/build.xml
Copied: jakarta/httpclient/trunk/http-common/build.xml (from r155567, jakarta/commons/proper/httpclient/trunk/build.xml)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/build.xml?view=diff&rev=155576&p1=jakarta/commons/proper/httpclient/trunk/build.xml&r1=155567&p2=jakarta/httpclient/trunk/http-common/build.xml&r2=155576
==============================================================================
--- jakarta/commons/proper/httpclient/trunk/build.xml (original)
+++ jakarta/httpclient/trunk/http-common/build.xml Sat Feb 26 12:28:30 2005
@@ -1,15 +1,4 @@
-<project name="HttpClient" default="compile" basedir=".">
-<!--
- "HttpClient" component of the Jakarta Commons Subproject
- $Id$
- author: Remy Maucherat ( mailto:remm@apache.org )
- author: Rod Waldhoff ( mailto:rwaldhoff@apache.org )
- author: Vincent Massol ( mailto:vmassol@apache.org )
- author: dIon Gillard ( mailto:trongus@yahoo.com )
- author: Mark Paquette ( mailto:mpaquett@covansys.com )
- author: Jeff Dever ( mailto:jsdever@apache.org )
- author: Oleg Kalnichevski ( mailto:oleg@ural.ru )
--->
+<project name="http-common" default="compile" basedir=".">
<!-- ========== Properties: Property Files =============================== -->
@@ -21,30 +10,23 @@
<property name="lib.dir" value="./lib"/>
- <property name="commons-logging.jar" value="${lib.dir}/commons-logging.jar"/>
- <property name="commons-codec.jar" value="${lib.dir}/commons-codec.jar"/>
-
<!-- ========== Properties: Javadoc Properties ========================= -->
- <property name="javadoc.j2sdk.link" value="http://java.sun.com/products/jdk/1.2/docs/api/"/>
- <property name="javadoc.logging.link" value="http://jakarta.apache.org/commons/logging/apidocs/"/>
+ <property name="javadoc.j2sdk.link" value="http://java.sun.com/products/jdk/1.4/docs/api/"/>
<!-- ========== Properties: Component Declarations ======================== -->
<!-- The name of this component -->
- <property name="component.name" value="httpclient"/>
+ <property name="component.name" value="http-common"/>
<!-- The title of this component -->
- <property name="component.title" value="HttpClient Library"/>
+ <property name="component.title" value="Jakarta HttpClient (http-common)"/>
<!-- The current version number of this component -->
- <property name="component.version" value="3.0-rc1"/>
+ <property name="component.version" value="4.0-dev"/>
<!-- ========== Properties: Source Directories ============================ -->
- <!-- The base directory for component configuration files -->
- <property name="conf.home" value="src/conf"/>
-
<!-- The base directory for component sources -->
<property name="source.home" value="src"/>
@@ -59,9 +41,6 @@
<!-- The Junit test jarfile -->
<property name="junit.jar" value="${lib.dir}/junit.jar"/>
- <!-- The commons-logging friendly logger class to use for tests -->
- <property name="httpclient.test.log" value="org.apache.commons.logging.impl.SimpleLog"/>
-
<!-- ========== Properties: Destination Directories ======================= -->
<!-- The base directory for compilation targets -->
@@ -84,8 +63,6 @@
<!-- Construct compile classpath -->
<path id="compile.classpath">
<pathelement location="${build.home}/classes"/>
- <pathelement location="${commons-logging.jar}"/>
- <pathelement location="${commons-codec.jar}"/>
</path>
<!-- ========== Test Execution Defaults =================================== -->
@@ -95,9 +72,6 @@
<pathelement location="${build.home}/classes"/>
<pathelement location="${build.home}/tests"/>
<pathelement location="${junit.jar}"/>
- <pathelement location="${commons-logging.jar}"/>
- <pathelement location="${commons-codec.jar}"/>
- <pathelement location="${conf.home}"/>
</path>
<!-- Should all tests fail if one does? -->
@@ -105,7 +79,7 @@
<!-- The root test to execute -->
<property name="test.runner" value="junit.textui.TestRunner"/>
- <property name="test.entry" value="org.apache.commons.httpclient.TestNoHost"/>
+ <property name="test.entry" value="org.apache.http.TestAll"/>
<!-- ========== Targets =================================================== -->
@@ -126,42 +100,11 @@
<mkdir dir="${build.home}/docs"/>
<mkdir dir="${build.home}/docs/api"/>
<mkdir dir="${build.home}/tests"/>
- <mkdir dir="${build.home}/examples"/>
</target>
<target name="static" depends="prepare"
description="Copy static files to build directory">
<tstamp/>
- <copy todir="${build.home}/conf" filtering="on">
- <fileset dir="${conf.home}" includes="*.MF"/>
- <fileset dir="${conf.home}" includes="*.properties"/>
- </copy>
- </target>
-
-<!-- ========== Targets: "External" Targets =============================== -->
-
- <target name="dist" depends="compile,doc"
- description="Create binary distribution">
- <mkdir dir="${dist.home}"/>
- <copy file="LICENSE.txt" todir="${dist.home}"/>
- <copy file="build.xml" todir="${dist.home}"/>
- <copy file="build.properties.sample" todir="${dist.home}"/>
- <copy file="README.txt" todir="${dist.home}"/>
- <jar jarfile ="${dist.home}/commons-${component.name}.jar"
- basedir ="${build.home}/classes"
- manifest ="${build.home}/conf/MANIFEST.MF">
- <metainf dir="${dist.home}">
- <include name="LICENSE.txt"/>
- </metainf>
- </jar>
- <mkdir dir="${dist.home}/src"/>
- <copy todir="${dist.home}/src" filtering="on">
- <fileset dir="${source.home}"/>
- </copy>
- <mkdir dir="${dist.home}/lib"/>
- <copy todir="${dist.home}/lib">
- <fileset dir="lib"/>
- </copy>
</target>
<!-- ========== Targets: "External" Targets: Clean-up ===================== -->
@@ -186,13 +129,6 @@
optimize ="${compile.optimize}">
<classpath refid="compile.classpath"/>
</javac>
- <javac srcdir ="${source.home}/examples"
- destdir ="${build.home}/examples"
- debug ="${compile.debug}"
- deprecation ="${compile.deprecation}"
- optimize ="${compile.optimize}">
- <classpath refid="compile.classpath"/>
- </javac>
</target>
<target name="compile.tests" depends="compile"
@@ -207,9 +143,6 @@
<copy todir="${build.home}/tests" filtering="on">
<fileset dir="${test.home}" includes="**/*.properties" />
</copy>
- <copy todir="${build.home}/tests" filtering="off">
- <fileset dir="${test.home}" includes="**/*.keystore" />
- </copy>
</target>
<!-- ========== Targets: "External" Targets: Testing ====================== -->
@@ -217,7 +150,6 @@
<target name="test" depends="compile.tests" if="test.entry"
description="Run all unit test cases">
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
- <jvmarg value="-Dorg.apache.commons.logging.Log=${httpclient.test.log}"/>
<arg value="${test.entry}"/>
<classpath refid="test.classpath"/>
</java>
@@ -225,15 +157,6 @@
<!-- ========== Targets: "External" Targets: Documenation ================= -->
- <target name="doc" depends="javadoc"
- description="Create component documentation.">
- <mkdir dir="${dist.home}"/>
- <mkdir dir="${dist.home}/docs"/>
- <copy todir="${dist.home}/docs" filtering="off">
- <fileset dir="docs"/>
- </copy>
- </target>
-
<target name="javadoc" depends="compile"
description="Create component Javadoc documentation">
<mkdir dir="${dist.home}"/>
@@ -241,7 +164,7 @@
<mkdir dir="${dist.home}/docs/api"/>
<javadoc sourcepath ="${source.home}/java"
destdir ="${dist.home}/docs/api"
- packagenames ="org.apache.commons.*"
+ packagenames ="org.apache.http.*"
author ="true"
protected ="true"
version ="true"
@@ -251,7 +174,6 @@
>
<classpath refid="test.classpath"/>
<link href="${javadoc.j2sdk.link}"/>
- <link href="${javadoc.logging.link}"/>
</javadoc>
</target>