You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ol...@apache.org on 2005/02/04 21:58:59 UTC
svn commit: r151416 -
jakarta/commons/proper/httpclient/trunk/build.properties.sample
jakarta/commons/proper/httpclient/trunk/build.xml
Author: olegk
Date: Fri Feb 4 12:58:57 2005
New Revision: 151416
URL: http://svn.apache.org/viewcvs?view=rev&rev=151416
Log:
build.xml cleaned up
Modified:
jakarta/commons/proper/httpclient/trunk/build.properties.sample
jakarta/commons/proper/httpclient/trunk/build.xml
Modified: jakarta/commons/proper/httpclient/trunk/build.properties.sample
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/httpclient/trunk/build.properties.sample?view=diff&r1=151415&r2=151416
==============================================================================
--- jakarta/commons/proper/httpclient/trunk/build.properties.sample (original)
+++ jakarta/commons/proper/httpclient/trunk/build.properties.sample Fri Feb 4 12:58:57 2005
@@ -4,7 +4,7 @@
# Make a copy this file named "build.properties",
# and customize it to your environment and preferences.
#
-# $Id: build.properties.sample,v 1.13 2004/01/06 20:15:09 olegk Exp $
+# $Id$
# ===================================================================
# ===================================================================
@@ -14,77 +14,28 @@
# The base directory for libraries used by HttpClient
lib.dir=./lib
-# Commons Logging (See http://jakarta.apache.org/commons/logging.html)
-# Required to compile and run.
+# Required compile and runtime dependencies.
commons-logging.jar=${lib.dir}/commons-logging.jar
commons-codec.jar=${lib.dir}/commons-codec.jar
-# JUnit Version 3.8(+?) (see http://www.junit.org/ )
# Required to compile and run the unit tests.
junit.jar=${lib.dir}/junit.jar
# A JSSE implementation (see http://java.sun.com/products/jsse):
# Required to compile, only needed at runtime if you're using HTTPS.
-base.path=/java
-jsse.home=${base.path}/jsse-1.0.3_01
-jsse.lib=${jsse.home}/lib
-jcert.jar=${jsse.lib}/jcert-1.0.3_01.jar
-jnet.jar=${jsse.lib}/jnet-1.0.3_01.jar
-jsse.jar=${jsse.lib}/jsse-1.0.3_01.jar
-
# A JCE implementation (see http://java.sun.com/products/jce):
-# Required to compile, only needed at runtime if you're using HTTPS.
-jce.lib=${base.path}/Programs/sun/jce1.2.2/lib
-jce.jar=${jce.lib}/jce-1.2.2.jar
+# Required to compile, only needed at runtime if you're using NTLM.
-# The Servlet API (See http://java.sun.com/products/servlet)
-# Required to compile the test webapp.
-servlet.jar=${base.path}/jakarta-tomcat/lib/servlet.jar
+# Both JSSE and JCE are expected to be present and configured in
+# the JDK/JRE
# ===================================================================
# Test Properties - used to configure the test cases
# ===================================================================
-# httpclient.log
# - indicates which log writer to use (optional)
httpclient.test.log=org.apache.commons.logging.impl.SimpleLog
#httpclient.test.log=org.apache.commons.logging.impl.Log4JCategoryLog
#httpclient.test.log=org.apache.commons.logging.impl.NoOpLog
-# httpclient.test.*
-# - various properties used to override defaults within
-# the JUnit tests
-
-# the host name for the "local" webserver
-#httpclient.test.localHost=127.0.0.1
-
-# the port for the "local" webserver
-#httpclient.test.localPort=8080
-
-# the context to which the test webapp is deployed
-#httpclient.test.webappContext=httpclienttest
-
-# ===================================================================
-# Build Properties
-# ===================================================================
-
-# where to build the test-webapp to
-#test-webapp.dest=${dist.home}
-#test-webapp.dest=/java/jakarta-tomcat-4.0-b7/webapps
-
-
-# ===================================================================
-# Anakia Properties (used by the xdoc target)
-# ===================================================================
-
-velocity.jar=/cvs/jakarta/jakarta-site2/lib/velocity-1.3-dev.jar
-jdom.jar=/cvs/jakarta/jakarta-site2/lib/jdom-b7.jar
-xerces.jar=/cvs/jakarta/jakarta-site2/lib/xerces-1.4.3.jar
-
-# Note: Building the docs won't work if you have an earlier version of
-# velocity.jar (eg 1.0.1) than that specified here. A symptom of this is when
-# your generated HTML contains "[Element: <p/>]"
-
-# set this property to keep xdoc from fetching .vsl file from cvs
-#localstylesheet=true
Modified: jakarta/commons/proper/httpclient/trunk/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/httpclient/trunk/build.xml?view=diff&r1=151415&r2=151416
==============================================================================
--- jakarta/commons/proper/httpclient/trunk/build.xml (original)
+++ jakarta/commons/proper/httpclient/trunk/build.xml Fri Feb 4 12:58:57 2005
@@ -1,7 +1,7 @@
<project name="HttpClient" default="compile" basedir=".">
<!--
"HttpClient" component of the Jakarta Commons Subproject
- $Id: build.xml,v 1.35 2004/12/11 22:38:35 olegk Exp $
+ $Id$
author: Remy Maucherat ( mailto:remm@apache.org )
author: Rod Waldhoff ( mailto:rwaldhoff@apache.org )
author: Vincent Massol ( mailto:vmassol@apache.org )
@@ -43,9 +43,6 @@
<!-- ========== Properties: Source Directories ============================ -->
<!-- The base directory for component configuration files -->
- <property name="src.home" value="src"/>
-
- <!-- The base directory for component configuration files -->
<property name="conf.home" value="src/conf"/>
<!-- The base directory for component sources -->
@@ -54,7 +51,6 @@
<!-- The base directory for documenation -->
<property name="docs.home" value="docs"/>
-
<!-- ========== Properties: Test Configuration ============================ -->
<!-- The base directory for unit test sources -->
@@ -66,12 +62,6 @@
<!-- The commons-logging friendly logger class to use for tests -->
<property name="httpclient.test.log" value="org.apache.commons.logging.impl.SimpleLog"/>
- <!-- The base directory for test webapp sources -->
- <property name="test-webapp.source.home" value="src/test-webapp/src"/>
-
- <!-- The base directory for test webapp configuration files -->
- <property name="test-webapp.conf.home" value="src/test-webapp/conf"/>
-
<!-- ========== Properties: Destination Directories ======================= -->
<!-- The base directory for compilation targets -->
@@ -80,13 +70,10 @@
<!-- The base directory for distribution targets -->
<property name="dist.home" value="dist"/>
- <!-- The build destination for the test webapp -->
- <property name="test-webapp.dest" value="${build.home}"/>
-
<!-- ========== Compiler Defaults ========================================= -->
<!-- Should Java compilations set the 'debug' compiler option? -->
- <property name="compile.debug" value="true"/>
+ <property name="compile.debug" value="false"/>
<!-- Should Java compilations set the 'deprecation' compiler option? -->
<property name="compile.deprecation" value="true"/>
@@ -97,11 +84,6 @@
<!-- Construct compile classpath -->
<path id="compile.classpath">
<pathelement location="${build.home}/classes"/>
- <pathelement location="${junit.jar}"/>
- <pathelement location="${jsse.jar}"/>
- <pathelement location="${jce.jar}"/>
- <pathelement location="${jcert.jar}"/>
- <pathelement location="${jnet.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-codec.jar}"/>
</path>
@@ -113,14 +95,9 @@
<pathelement location="${build.home}/classes"/>
<pathelement location="${build.home}/tests"/>
<pathelement location="${junit.jar}"/>
- <pathelement location="${jsse.jar}"/>
- <pathelement location="${jce.jar}"/>
- <pathelement location="${jcert.jar}"/>
- <pathelement location="${jnet.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-codec.jar}"/>
<pathelement location="${conf.home}"/>
- <pathelement location="${servlet.jar}"/>
</path>
<!-- Should all tests fail if one does? -->
@@ -128,24 +105,7 @@
<!-- The root test to execute -->
<property name="test.runner" value="junit.textui.TestRunner"/>
- <property name="test.entry" value="org.apache.commons.httpclient.TestAll"/>
- <property name="test-local.entry" value="org.apache.commons.httpclient.TestAllLocal"/>
- <property name="test-external.entry" value="org.apache.commons.httpclient.TestAllExternal"/>
- <property name="test-nohost.entry" value="org.apache.commons.httpclient.TestNoHost"/>
-
- <!-- HTTPS protocol handler, needed for HTTPS unit tests -->
- <property name="java.protocol.handler.pkgs" value="com.sun.net.ssl.internal.www.protocol"/>
-
- <!-- The default context name for the test webapp -->
- <property name="httpclient.test.webappContext" value="httpclienttest"/>
- <!-- host and port for running local test -->
- <property name="httpclient.test.localHost" value="localhost" />
- <property name="httpclient.test.localPort" value="8080" />
-
- <!-- Anakia props -->
-
- <property name="docs.src" value="./xdocs"/>
- <property name="docs.dest" value="./docs"/>
+ <property name="test.entry" value="org.apache.commons.httpclient.TestNoHost"/>
<!-- ========== Targets =================================================== -->
@@ -167,10 +127,6 @@
<mkdir dir="${build.home}/docs/api"/>
<mkdir dir="${build.home}/tests"/>
<mkdir dir="${build.home}/examples"/>
- <mkdir dir="${test-webapp.dest}"/>
- <mkdir dir="${test-webapp.dest}/${httpclient.test.webappContext}"/>
- <mkdir dir="${test-webapp.dest}/${httpclient.test.webappContext}/WEB-INF"/>
- <mkdir dir="${test-webapp.dest}/${httpclient.test.webappContext}/WEB-INF/classes"/>
</target>
<target name="static" depends="prepare"
@@ -219,11 +175,6 @@
<target name="all" depends="clean,compile"
description="Clean and compile all components"/>
- <target name="clean.test-webapp"
- description="Clean test web app directories">
- <delete dir="${test-webapp.dest}/${httpclient.test.webappContext}"/>
- </target>
-
<!-- ========== Targets: "External" Targets: Compilation ================== -->
<target name="compile" depends="static"
@@ -254,44 +205,10 @@
<classpath refid="test.classpath"/>
</javac>
<copy todir="${build.home}/tests" filtering="on">
- <fileset dir="${test.home}" excludes="**/*.java **/*.keystore"/>
- </copy>
- <copy todir="${build.home}/tests">
- <fileset dir="${test.home}" includes="**/*.keystore"/>
- </copy>
- </target>
-
- <target name="compile.examples" depends="compile"
- description="Compile the examples">
- <javac srcdir ="${src.home}/examples"
- destdir ="${build.home}/examples"
- debug ="true"
- deprecation ="true"
- optimize ="false">
- <classpath refid="test.classpath"/>
- </javac>
- <copy todir="${build.home}/examples" filtering="on">
- <fileset dir="${src.home}/examples" excludes="**/*.java"/>
- </copy>
- </target>
-
- <target name="compile.test-webapp"
- description="Compile test webapp used by unit tests">
- <mkdir dir="${test-webapp.dest}/${httpclient.test.webappContext}/WEB-INF/classes"/>
- <javac srcdir ="${test-webapp.source.home}"
- destdir ="${test-webapp.dest}/${httpclient.test.webappContext}/WEB-INF/classes"
- debug ="${compile.debug}"
- deprecation ="${compile.deprecation}"
- optimize ="${compile.optimize}">
- <classpath refid="test.classpath"/>
- </javac>
- <copy todir="${test-webapp.dest}/${httpclient.test.webappContext}/WEB-INF/classes"
- filtering="off">
- <fileset dir="${test-webapp.source.home}" excludes="**/*.java"/>
+ <fileset dir="${test.home}" includes="**/*.properties" />
</copy>
- <copy todir="${test-webapp.dest}/${httpclient.test.webappContext}/WEB-INF/"
- filtering="off">
- <fileset dir="${test-webapp.conf.home}"/>
+ <copy todir="${build.home}/tests" filtering="off">
+ <fileset dir="${test.home}" includes="**/*.keystore" />
</copy>
</target>
@@ -300,65 +217,12 @@
<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="-Djava.protocol.handler.pkgs=${java.protocol.handler.pkgs}"/>
<jvmarg value="-Dorg.apache.commons.logging.Log=${httpclient.test.log}"/>
- <jvmarg value="-Dhttpclient.test.webappContext=${httpclient.test.webappContext}" />
<arg value="${test.entry}"/>
<classpath refid="test.classpath"/>
</java>
</target>
- <target name="test-nohost" depends="compile.tests" if="test-nohost.entry"
- description="Run all test cases that run in the local VM only.">
- <java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
- <jvmarg value="-Djava.protocol.handler.pkgs=${java.protocol.handler.pkgs}"/>
- <jvmarg value="-Dorg.apache.commons.logging.Log=${httpclient.test.log}"/>
- <jvmarg value="-Dorg.apache.commons.logging.simplelog.defaultlog=info"/>
- <arg value="${test-nohost.entry}"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test-local" depends="compile.tests" if="test-local.entry"
- description="Run all test cases that depend upon the local webserver">
- <java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
- <jvmarg value="-Djava.protocol.handler.pkgs=${java.protocol.handler.pkgs}"/>
- <jvmarg value="-Dorg.apache.commons.logging.Log=${httpclient.test.log}"/>
- <jvmarg value="-Dhttpclient.test.localHost=${httpclient.test.localHost}"/>
- <jvmarg value="-Dhttpclient.test.localPort=${httpclient.test.localPort}" />
- <jvmarg value="-Dhttpclient.test.webappContext=${httpclient.test.webappContext}" />
- <arg value="${test-local.entry}"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test-external" depends="compile.tests" if="test-external.entry"
- description="Run all test cases that depend upon an external internet connection.">
- <java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
- <jvmarg value="-Djava.protocol.handler.pkgs=${java.protocol.handler.pkgs}"/>
- <jvmarg value="-Dorg.apache.commons.logging.Log=${httpclient.test.log}"/>
- <arg value="${test-external.entry}"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
-<!-- ========== Targets: "External" Targets: Packaging ===================== -->
- <target name="test-webapp-war" depends="compile.test-webapp">
- <war warfile="${test-webapp.dest}/httpclienttest.war"
- webxml="${test-webapp.conf.home}/web.xml"
- basedir="${test-webapp.dest}/httpclienttest/WEB-INF"
- excludes="classes/,*.xml">
- <classes dir="${test-webapp.dest}/${httpclient.test.webappContext}/WEB-INF/classes"/>
- </war>
- </target>
-
- <target name="test-webapp-ear" depends="compile.test-webapp,test-webapp-war">
- <ear earfile="${test-webapp.dest}/httpclienttest.ear"
- appxml="${test-webapp.conf.home}/application.xml">
- <fileset dir="${test-webapp.dest}" includes="*.jar,*.war"/>
- </ear>
- </target>
-
<!-- ========== Targets: "External" Targets: Documenation ================= -->
<target name="doc" depends="javadoc"
@@ -383,78 +247,12 @@
version ="true"
doctitle ="<h1>${component.title}</h1>"
windowtitle ="${component.title} (Version ${component.version})"
- bottom ="Copyright (c) 1999-2002 - Apache Software Foundation"
+ bottom ="Copyright (c) 1999-2005 - Apache Software Foundation"
>
<classpath refid="test.classpath"/>
<link href="${javadoc.j2sdk.link}"/>
<link href="${javadoc.logging.link}"/>
</javadoc>
- </target>
-
- <target name="xdoc.fetch-stylesheet" unless="localstylesheet">
- <echo>
- ####################################################################
- #
- # Fetching the latest stylesheet from jakarta-site2
- #
- # NOTE : As this build target is meant for developers, this requires
- # a properly setup CVS. But you are encouraged to use this to
- # experiment with Anakia - if the fetch fails, it may be because
- # you haven't yet logged into CVS. The way to do it, assuming you
- # have a resonable CVS client setup is
- #
- # $ cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic login
- # password: anoncvs
- #
- # and that should solve it.
- #
- # See http://jakarta.apache.org/site/cvsindex.html for more
- # information, or http://www.cvshome.org/
- #
- # Ant really is the bee's knees. http://jakarta.apache.org/ant/
- #
- ######################################################################
- </echo>
-
- <cvs cvsRoot=":pserver:anoncvs@cvs.apache.org:/home/cvspublic"
- command="checkout -p jakarta-site2/xdocs/stylesheets/site.vsl"
- output="${docs.src}/stylesheets/site.vsl"
- />
- </target>
-
- <target name="xdoc" depends="xdoc.fetch-stylesheet"
- description="Generates HTML documentation from XML source">
- <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask">
- <classpath location="${velocity.jar}"/>
- <classpath location="${jdom.jar}"/>
- <classpath location="${xerces.jar}"/>
- </taskdef>
-
- <echo>
- #######################################################
- #
- # Now using Anakia to transform our XML documentation
- # to HTML.
- #
- #######################################################
- </echo>
-
- <anakia basedir="${docs.src}" destdir="${docs.dest}/"
- extension=".html" style="./site.vsl"
- projectFile="stylesheets/project.xml"
- excludes="**/stylesheets/** empty.xml"
- includes="**/*.xml"
- lastModifiedCheck="true"
- templatePath="xdocs/stylesheets">
- </anakia>
-
- <copy todir="${docs.dest}/images" filtering="no">
- <fileset dir="${docs.src}/images">
- <include name="**/*.gif"/>
- <include name="**/*.jpeg"/>
- <include name="**/*.jpg"/>
- </fileset>
- </copy>
</target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org