You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xmlrpc-dev@ws.apache.org by "Daniel L. Rall" <dl...@collab.net> on 2005/04/28 09:50:06 UTC
Re: cvs commit: ws-xmlrpc maven.xml .classpath build.xml
default.properties README.txt
This is a pretty light-weight change log message for what's a fairly
large change to the build system and how it operates. I recommend being
a bit more verbose in the future.
On Fri, 2005-04-15 at 14:04 +0000, sgoeschl@apache.org wrote:
> sgoeschl 2005/04/15 07:04:50
>
> Modified: . .classpath build.xml default.properties README.txt
> Added: . maven.xml
> Log:
> Fixed ANT build
>
> Revision Changes Path
> 1.2 +4 -4 ws-xmlrpc/.classpath
>
> Index: .classpath
> ===================================================================
> RCS file: /home/cvs/ws-xmlrpc/.classpath,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- .classpath 17 Jun 2004 01:16:42 -0000 1.1
> +++ .classpath 15 Apr 2005 14:04:50 -0000 1.2
> @@ -3,10 +3,10 @@
> <classpathentry kind="src" path="examples/echo"/>
> <classpathentry kind="src" path="src/java"/>
> <classpathentry kind="src" path="src/test"/>
> - <classpathentry kind="lib" path="lib/commons-codec-1.2.jar"/>
> + <classpathentry kind="lib" path="lib/commons-codec-1.1.jar"/>
> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
> - <classpathentry kind="lib" path="lib/commons-httpclient-2.0.jar"/>
> - <classpathentry kind="lib" path="lib/servlet.jar"/>
> - <classpathentry kind="lib" path="lib/junit.jar"/>
> + <classpathentry kind="lib" path="lib/commons-httpclient-2.0.2.jar"/>
> + <classpathentry kind="lib" path="lib/servlet-2.2.jar"/>
> + <classpathentry kind="lib" path="lib/junit-3.8.1.jar"/>
> <classpathentry kind="output" path="bin"/>
> </classpath>
>
>
>
> 1.26 +37 -11 ws-xmlrpc/build.xml
>
> Index: build.xml
> ===================================================================
> RCS file: /home/cvs/ws-xmlrpc/build.xml,v
> retrieving revision 1.25
> retrieving revision 1.26
> diff -u -r1.25 -r1.26
> --- build.xml 21 May 2003 15:58:23 -0000 1.25
> +++ build.xml 15 Apr 2005 14:04:50 -0000 1.26
> @@ -27,10 +27,10 @@
> </path>
>
> <!-- ================================================================== -->
> - <!-- E N V I R O N M E N T -->
> + <!-- E N V I R O N M E N T -->
> <!-- ================================================================== -->
>
> - <target name="env">
> + <target name="env" description="Dumps the environment settings">
> <echo message="java.home = ${java.home}"/>
> <echo message="user.home = ${user.home}"/>
> <echo message="jsse.jar = ${jsse.jar}"/>
> @@ -44,6 +44,26 @@
> </target>
>
> <!-- ================================================================== -->
> + <!-- D E P E N D E N C I E S -->
> + <!-- ================================================================== -->
> +
> + <target name="copy-deps" description="Copy dependent JARs into the lib folder">
> + <mkdir dir="${lib.repo}"/>
> + <get dest="${lib.repo}/commons-httpclient-2.0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-httpclient/jars/commons-httpclient-2.0.2.jar">
> + </get>
> + <get dest="${lib.repo}/commons-logging-1.0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//commons-logging/jars/commons-logging-1.0.2.jar">
> + </get>
> + <get dest="${lib.repo}/commons-codec-1.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//commons-codec/jars/commons-codec-1.1.jar">
> + </get>
> + <get dest="${lib.repo}/servletapi-2.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//servletapi/jars/servletapi-2.2.jar">
> + </get>
> + <get dest="${lib.repo}/fesi-1.1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//fesi/jars/fesi-1.1.5.jar">
> + </get>
> + <get dest="${lib.repo}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//junit/jars/junit-3.8.1.jar">
> + </get>
> + </target>
> +
> + <!-- ================================================================== -->
> <!-- U S A G E -->
> <!-- ================================================================== -->
>
> @@ -55,7 +75,7 @@
> <!-- I N I T -->
> <!-- ================================================================== -->
>
> - <target name="init" depends="env">
> + <target name="init" depends="env,copy-deps">
> <available
> classname="com.sun.net.ssl.SSLContext"
> property="jsse.present"
> @@ -149,7 +169,7 @@
> <!-- C O M P I L E -->
> <!-- ================================================================== -->
>
> - <target name="compile" depends="prepare">
> + <target name="compile" depends="prepare" description="Compiles the source code">
> <javac
> srcdir="${src.dir}"
> destdir="${build.dest}"
> @@ -190,7 +210,7 @@
> <!-- J A V A D O C S -->
> <!-- ================================================================== -->
>
> - <target name="javadocs" depends="prepare">
> + <target name="javadocs" depends="prepare" description="Create the JavaDocs">
> <mkdir dir="${javadoc.destdir}"/>
> <javadoc
> sourcepath="${src.dir}/java"
> @@ -212,11 +232,15 @@
> <!-- C L E A N -->
> <!-- ================================================================== -->
>
> - <target name="clean">
> + <target name="clean" description="Deletes temporary files">
> <delete file="${final.name}.tar.gz"/>
> <delete file="${final.name}.zip"/>
> + <delete file="${final.name}-src.tar.gz"/>
> + <delete file="${final.name}-src.zip"/>
> <delete dir="${build.dir}"/>
> <delete dir="${test.reportsDirectory}"/>
> + <delete dir="${docs.dest}"/>
> + <delete dir="${lib.repo}"/>
> </target>
>
> <!-- ================================================================== -->
> @@ -364,7 +388,8 @@
>
> <target
> name="dist"
> - depends="jar,javadocs,docs">
> + depends="jar,javadocs,docs"
> + description="Build source and binary distribution">
>
> <property name="distDir" value="${build.dir}/${final.name}"/>
>
> @@ -377,10 +402,11 @@
> </echo>
>
> <mkdir dir="${distDir}"/>
> + <mkdir dir="${docs.dest}"/>
>
> <!-- Copy README and LICENSE -->
> <copy todir="${distDir}" file="README.txt"/>
> - <copy todir="${distDir}" file="LICENSE"/>
> + <copy todir="${distDir}" file="LICENSE.txt"/>
>
> <!-- Copy Jars -->
> <copy todir="${distDir}">
> @@ -390,8 +416,8 @@
> </copy>
>
> <!-- Copy documentation -->
> - <copy todir="${distDir}/docs">
> - <fileset dir="${docs.dest}">
> + <copy todir="${distDir}/docs/apidocs">
> + <fileset dir="${javadoc.destdir}">
> <include name="**"/>
> </fileset>
> </copy>
> @@ -427,7 +453,7 @@
> </fileset>
> </delete>
>
> - <copy todir="${distDir}" file="build.properties"/>
> + <copy todir="${distDir}" file="default.properties"/>
> <copy todir="${distDir}" file="build.xml"/>
>
> <!-- Copy Source -->
>
>
>
> 1.14 +4 -4 ws-xmlrpc/default.properties
>
> Index: default.properties
> ===================================================================
> RCS file: /home/cvs/ws-xmlrpc/default.properties,v
> retrieving revision 1.13
> retrieving revision 1.14
> diff -u -r1.13 -r1.14
> --- default.properties 21 May 2003 15:58:23 -0000 1.13
> +++ default.properties 15 Apr 2005 14:04:50 -0000 1.14
> @@ -23,18 +23,18 @@
> year = 1999-2002
> debug = off
> optimize = on
> -deprecation = on
> +deprecation = off
> final.name = ${project}-${version}
>
> # You must set these values here, or in your
> # ${user.home}/build.properties file in order
> # to build XmlRpc:
>
> -commons-httpclient.jar = ${lib.repo}/commons-httpclient-2.0.jar
> +commons-httpclient.jar = ${lib.repo}/commons-httpclient-2.0.2.jar
> commons-logging.jar = ${lib.repo}/commons-logging-1.0.2.jar
> commons-codec.jar = ${lib.repo}/commons-codec-1.1.jar
> jsse.jar = ${lib.repo}/jsse.jar
> jnet.jar = ${lib.repo}/jnet.jar
> jcert.jar = ${lib.repo}/jcert.jar
> -servlet.jar = ${lib.repo}/servlet.jar
> -junit.jar = ${lib.repo}/junit-3.7.jar
> +servlet.jar = ${lib.repo}/servlet-2.2.jar
> +junit.jar = ${lib.repo}/junit-3.8.1.jar
>
>
>
> 1.6 +4 -9 ws-xmlrpc/README.txt
>
> Index: README.txt
> ===================================================================
> RCS file: /home/cvs/ws-xmlrpc/README.txt,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -r1.5 -r1.6
> --- README.txt 17 Jun 2004 01:16:42 -0000 1.5
> +++ README.txt 15 Apr 2005 14:04:50 -0000 1.6
> @@ -11,7 +11,7 @@
> lib/ Final location of the jar files
> examples/ Some examples and instructions on how to run them.
> src/ Location of Java sources.
> -xdocs/ XmlRpc documention in DocBook format.
> +xdocs/ XmlRpc documention in XDOC format.
> docs/ The rendered documentation in HTML format.
>
>
> @@ -31,7 +31,7 @@
> You can build the core XmlRpc package with the classes provided
> using JDK 1.2+. If you wish to use the Servlet and/or SSL extensions
> than you must set the following properties in either your
> -${user.home}/build.properties file, or the build.properties
> +${user.home}/build.properties file, or the default.properties
> file provided in the XmlRpc build/ directory:
>
> jsse.jar
> @@ -42,13 +42,8 @@
> These properties define full paths to JARs files.
>
> If you are using the Eclipse IDE, Apache's XML-RPC package comes ready
> -with basic .classpath and .project files. Simply create a
> -sub-directory named "lib" and add the following files:
> -
> - commons-codec-1.2.jar
> - commons-httpclient-2.0.jar
> - junit.jar
> - servlet.jar
> +with basic .classpath and .project files. Simply run "ant copy-deps" to
> +populate the "lib" directory
>
>
> --------------------------------------------------------------------------
>
>
>
> 1.2 +7 -0 ws-xmlrpc/maven.xml
>
>
>
>
Re: cvs commit: ws-xmlrpc maven.xml .classpath build.xml default.properties
README.txt
Posted by Siegfried Goeschl <si...@it20one.at>.
Hi Daniel,
I did the mandatory reading and will improve the the commit messages ... :-)
Cheers,
Siegfried Goeschl
Daniel L. Rall wrote:
>Specifically, I'd recommend the "Writing log messages" section of the
>Subversion project's HACKING document
><http://svn.collab.net/repos/svn/trunk/HACKING>.
>
>On Thu, 2005-04-28 at 00:50 -0700, Daniel L. Rall wrote:
>
>
>>This is a pretty light-weight change log message for what's a fairly
>>large change to the build system and how it operates. I recommend being
>>a bit more verbose in the future.
>>
>>On Fri, 2005-04-15 at 14:04 +0000, sgoeschl@apache.org wrote:
>>
>>
>>>sgoeschl 2005/04/15 07:04:50
>>>
>>> Modified: . .classpath build.xml default.properties README.txt
>>> Added: . maven.xml
>>> Log:
>>> Fixed ANT build
>>>
>>> Revision Changes Path
>>> 1.2 +4 -4 ws-xmlrpc/.classpath
>>>
>>> Index: .classpath
>>> ===================================================================
>>> RCS file: /home/cvs/ws-xmlrpc/.classpath,v
>>> retrieving revision 1.1
>>> retrieving revision 1.2
>>> diff -u -r1.1 -r1.2
>>> --- .classpath 17 Jun 2004 01:16:42 -0000 1.1
>>> +++ .classpath 15 Apr 2005 14:04:50 -0000 1.2
>>> @@ -3,10 +3,10 @@
>>> <classpathentry kind="src" path="examples/echo"/>
>>> <classpathentry kind="src" path="src/java"/>
>>> <classpathentry kind="src" path="src/test"/>
>>> - <classpathentry kind="lib" path="lib/commons-codec-1.2.jar"/>
>>> + <classpathentry kind="lib" path="lib/commons-codec-1.1.jar"/>
>>> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
>>> - <classpathentry kind="lib" path="lib/commons-httpclient-2.0.jar"/>
>>> - <classpathentry kind="lib" path="lib/servlet.jar"/>
>>> - <classpathentry kind="lib" path="lib/junit.jar"/>
>>> + <classpathentry kind="lib" path="lib/commons-httpclient-2.0.2.jar"/>
>>> + <classpathentry kind="lib" path="lib/servlet-2.2.jar"/>
>>> + <classpathentry kind="lib" path="lib/junit-3.8.1.jar"/>
>>> <classpathentry kind="output" path="bin"/>
>>> </classpath>
>>>
>>>
>>>
>>> 1.26 +37 -11 ws-xmlrpc/build.xml
>>>
>>> Index: build.xml
>>> ===================================================================
>>> RCS file: /home/cvs/ws-xmlrpc/build.xml,v
>>> retrieving revision 1.25
>>> retrieving revision 1.26
>>> diff -u -r1.25 -r1.26
>>> --- build.xml 21 May 2003 15:58:23 -0000 1.25
>>> +++ build.xml 15 Apr 2005 14:04:50 -0000 1.26
>>> @@ -27,10 +27,10 @@
>>> </path>
>>>
>>> <!-- ================================================================== -->
>>> - <!-- E N V I R O N M E N T -->
>>> + <!-- E N V I R O N M E N T -->
>>> <!-- ================================================================== -->
>>>
>>> - <target name="env">
>>> + <target name="env" description="Dumps the environment settings">
>>> <echo message="java.home = ${java.home}"/>
>>> <echo message="user.home = ${user.home}"/>
>>> <echo message="jsse.jar = ${jsse.jar}"/>
>>> @@ -44,6 +44,26 @@
>>> </target>
>>>
>>> <!-- ================================================================== -->
>>> + <!-- D E P E N D E N C I E S -->
>>> + <!-- ================================================================== -->
>>> +
>>> + <target name="copy-deps" description="Copy dependent JARs into the lib folder">
>>> + <mkdir dir="${lib.repo}"/>
>>> + <get dest="${lib.repo}/commons-httpclient-2.0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-httpclient/jars/commons-httpclient-2.0.2.jar">
>>> + </get>
>>> + <get dest="${lib.repo}/commons-logging-1.0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//commons-logging/jars/commons-logging-1.0.2.jar">
>>> + </get>
>>> + <get dest="${lib.repo}/commons-codec-1.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//commons-codec/jars/commons-codec-1.1.jar">
>>> + </get>
>>> + <get dest="${lib.repo}/servletapi-2.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//servletapi/jars/servletapi-2.2.jar">
>>> + </get>
>>> + <get dest="${lib.repo}/fesi-1.1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//fesi/jars/fesi-1.1.5.jar">
>>> + </get>
>>> + <get dest="${lib.repo}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//junit/jars/junit-3.8.1.jar">
>>> + </get>
>>> + </target>
>>> +
>>> + <!-- ================================================================== -->
>>> <!-- U S A G E -->
>>> <!-- ================================================================== -->
>>>
>>> @@ -55,7 +75,7 @@
>>> <!-- I N I T -->
>>> <!-- ================================================================== -->
>>>
>>> - <target name="init" depends="env">
>>> + <target name="init" depends="env,copy-deps">
>>> <available
>>> classname="com.sun.net.ssl.SSLContext"
>>> property="jsse.present"
>>> @@ -149,7 +169,7 @@
>>> <!-- C O M P I L E -->
>>> <!-- ================================================================== -->
>>>
>>> - <target name="compile" depends="prepare">
>>> + <target name="compile" depends="prepare" description="Compiles the source code">
>>> <javac
>>> srcdir="${src.dir}"
>>> destdir="${build.dest}"
>>> @@ -190,7 +210,7 @@
>>> <!-- J A V A D O C S -->
>>> <!-- ================================================================== -->
>>>
>>> - <target name="javadocs" depends="prepare">
>>> + <target name="javadocs" depends="prepare" description="Create the JavaDocs">
>>> <mkdir dir="${javadoc.destdir}"/>
>>> <javadoc
>>> sourcepath="${src.dir}/java"
>>> @@ -212,11 +232,15 @@
>>> <!-- C L E A N -->
>>> <!-- ================================================================== -->
>>>
>>> - <target name="clean">
>>> + <target name="clean" description="Deletes temporary files">
>>> <delete file="${final.name}.tar.gz"/>
>>> <delete file="${final.name}.zip"/>
>>> + <delete file="${final.name}-src.tar.gz"/>
>>> + <delete file="${final.name}-src.zip"/>
>>> <delete dir="${build.dir}"/>
>>> <delete dir="${test.reportsDirectory}"/>
>>> + <delete dir="${docs.dest}"/>
>>> + <delete dir="${lib.repo}"/>
>>> </target>
>>>
>>> <!-- ================================================================== -->
>>> @@ -364,7 +388,8 @@
>>>
>>> <target
>>> name="dist"
>>> - depends="jar,javadocs,docs">
>>> + depends="jar,javadocs,docs"
>>> + description="Build source and binary distribution">
>>>
>>> <property name="distDir" value="${build.dir}/${final.name}"/>
>>>
>>> @@ -377,10 +402,11 @@
>>> </echo>
>>>
>>> <mkdir dir="${distDir}"/>
>>> + <mkdir dir="${docs.dest}"/>
>>>
>>> <!-- Copy README and LICENSE -->
>>> <copy todir="${distDir}" file="README.txt"/>
>>> - <copy todir="${distDir}" file="LICENSE"/>
>>> + <copy todir="${distDir}" file="LICENSE.txt"/>
>>>
>>> <!-- Copy Jars -->
>>> <copy todir="${distDir}">
>>> @@ -390,8 +416,8 @@
>>> </copy>
>>>
>>> <!-- Copy documentation -->
>>> - <copy todir="${distDir}/docs">
>>> - <fileset dir="${docs.dest}">
>>> + <copy todir="${distDir}/docs/apidocs">
>>> + <fileset dir="${javadoc.destdir}">
>>> <include name="**"/>
>>> </fileset>
>>> </copy>
>>> @@ -427,7 +453,7 @@
>>> </fileset>
>>> </delete>
>>>
>>> - <copy todir="${distDir}" file="build.properties"/>
>>> + <copy todir="${distDir}" file="default.properties"/>
>>> <copy todir="${distDir}" file="build.xml"/>
>>>
>>> <!-- Copy Source -->
>>>
>>>
>>>
>>> 1.14 +4 -4 ws-xmlrpc/default.properties
>>>
>>> Index: default.properties
>>> ===================================================================
>>> RCS file: /home/cvs/ws-xmlrpc/default.properties,v
>>> retrieving revision 1.13
>>> retrieving revision 1.14
>>> diff -u -r1.13 -r1.14
>>> --- default.properties 21 May 2003 15:58:23 -0000 1.13
>>> +++ default.properties 15 Apr 2005 14:04:50 -0000 1.14
>>> @@ -23,18 +23,18 @@
>>> year = 1999-2002
>>> debug = off
>>> optimize = on
>>> -deprecation = on
>>> +deprecation = off
>>> final.name = ${project}-${version}
>>>
>>> # You must set these values here, or in your
>>> # ${user.home}/build.properties file in order
>>> # to build XmlRpc:
>>>
>>> -commons-httpclient.jar = ${lib.repo}/commons-httpclient-2.0.jar
>>> +commons-httpclient.jar = ${lib.repo}/commons-httpclient-2.0.2.jar
>>> commons-logging.jar = ${lib.repo}/commons-logging-1.0.2.jar
>>> commons-codec.jar = ${lib.repo}/commons-codec-1.1.jar
>>> jsse.jar = ${lib.repo}/jsse.jar
>>> jnet.jar = ${lib.repo}/jnet.jar
>>> jcert.jar = ${lib.repo}/jcert.jar
>>> -servlet.jar = ${lib.repo}/servlet.jar
>>> -junit.jar = ${lib.repo}/junit-3.7.jar
>>> +servlet.jar = ${lib.repo}/servlet-2.2.jar
>>> +junit.jar = ${lib.repo}/junit-3.8.1.jar
>>>
>>>
>>>
>>> 1.6 +4 -9 ws-xmlrpc/README.txt
>>>
>>> Index: README.txt
>>> ===================================================================
>>> RCS file: /home/cvs/ws-xmlrpc/README.txt,v
>>> retrieving revision 1.5
>>> retrieving revision 1.6
>>> diff -u -r1.5 -r1.6
>>> --- README.txt 17 Jun 2004 01:16:42 -0000 1.5
>>> +++ README.txt 15 Apr 2005 14:04:50 -0000 1.6
>>> @@ -11,7 +11,7 @@
>>> lib/ Final location of the jar files
>>> examples/ Some examples and instructions on how to run them.
>>> src/ Location of Java sources.
>>> -xdocs/ XmlRpc documention in DocBook format.
>>> +xdocs/ XmlRpc documention in XDOC format.
>>> docs/ The rendered documentation in HTML format.
>>>
>>>
>>> @@ -31,7 +31,7 @@
>>> You can build the core XmlRpc package with the classes provided
>>> using JDK 1.2+. If you wish to use the Servlet and/or SSL extensions
>>> than you must set the following properties in either your
>>> -${user.home}/build.properties file, or the build.properties
>>> +${user.home}/build.properties file, or the default.properties
>>> file provided in the XmlRpc build/ directory:
>>>
>>> jsse.jar
>>> @@ -42,13 +42,8 @@
>>> These properties define full paths to JARs files.
>>>
>>> If you are using the Eclipse IDE, Apache's XML-RPC package comes ready
>>> -with basic .classpath and .project files. Simply create a
>>> -sub-directory named "lib" and add the following files:
>>> -
>>> - commons-codec-1.2.jar
>>> - commons-httpclient-2.0.jar
>>> - junit.jar
>>> - servlet.jar
>>> +with basic .classpath and .project files. Simply run "ant copy-deps" to
>>> +populate the "lib" directory
>>>
>>>
>>> --------------------------------------------------------------------------
>>>
>>>
>>>
>>> 1.2 +7 -0 ws-xmlrpc/maven.xml
>>>
>>>
>>>
>>>
>>>
>>>
>
>
>
>
Re: cvs commit: ws-xmlrpc maven.xml .classpath build.xml
default.properties README.txt
Posted by "Daniel L. Rall" <dl...@collab.net>.
Specifically, I'd recommend the "Writing log messages" section of the
Subversion project's HACKING document
<http://svn.collab.net/repos/svn/trunk/HACKING>.
On Thu, 2005-04-28 at 00:50 -0700, Daniel L. Rall wrote:
> This is a pretty light-weight change log message for what's a fairly
> large change to the build system and how it operates. I recommend being
> a bit more verbose in the future.
>
> On Fri, 2005-04-15 at 14:04 +0000, sgoeschl@apache.org wrote:
> > sgoeschl 2005/04/15 07:04:50
> >
> > Modified: . .classpath build.xml default.properties README.txt
> > Added: . maven.xml
> > Log:
> > Fixed ANT build
> >
> > Revision Changes Path
> > 1.2 +4 -4 ws-xmlrpc/.classpath
> >
> > Index: .classpath
> > ===================================================================
> > RCS file: /home/cvs/ws-xmlrpc/.classpath,v
> > retrieving revision 1.1
> > retrieving revision 1.2
> > diff -u -r1.1 -r1.2
> > --- .classpath 17 Jun 2004 01:16:42 -0000 1.1
> > +++ .classpath 15 Apr 2005 14:04:50 -0000 1.2
> > @@ -3,10 +3,10 @@
> > <classpathentry kind="src" path="examples/echo"/>
> > <classpathentry kind="src" path="src/java"/>
> > <classpathentry kind="src" path="src/test"/>
> > - <classpathentry kind="lib" path="lib/commons-codec-1.2.jar"/>
> > + <classpathentry kind="lib" path="lib/commons-codec-1.1.jar"/>
> > <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
> > - <classpathentry kind="lib" path="lib/commons-httpclient-2.0.jar"/>
> > - <classpathentry kind="lib" path="lib/servlet.jar"/>
> > - <classpathentry kind="lib" path="lib/junit.jar"/>
> > + <classpathentry kind="lib" path="lib/commons-httpclient-2.0.2.jar"/>
> > + <classpathentry kind="lib" path="lib/servlet-2.2.jar"/>
> > + <classpathentry kind="lib" path="lib/junit-3.8.1.jar"/>
> > <classpathentry kind="output" path="bin"/>
> > </classpath>
> >
> >
> >
> > 1.26 +37 -11 ws-xmlrpc/build.xml
> >
> > Index: build.xml
> > ===================================================================
> > RCS file: /home/cvs/ws-xmlrpc/build.xml,v
> > retrieving revision 1.25
> > retrieving revision 1.26
> > diff -u -r1.25 -r1.26
> > --- build.xml 21 May 2003 15:58:23 -0000 1.25
> > +++ build.xml 15 Apr 2005 14:04:50 -0000 1.26
> > @@ -27,10 +27,10 @@
> > </path>
> >
> > <!-- ================================================================== -->
> > - <!-- E N V I R O N M E N T -->
> > + <!-- E N V I R O N M E N T -->
> > <!-- ================================================================== -->
> >
> > - <target name="env">
> > + <target name="env" description="Dumps the environment settings">
> > <echo message="java.home = ${java.home}"/>
> > <echo message="user.home = ${user.home}"/>
> > <echo message="jsse.jar = ${jsse.jar}"/>
> > @@ -44,6 +44,26 @@
> > </target>
> >
> > <!-- ================================================================== -->
> > + <!-- D E P E N D E N C I E S -->
> > + <!-- ================================================================== -->
> > +
> > + <target name="copy-deps" description="Copy dependent JARs into the lib folder">
> > + <mkdir dir="${lib.repo}"/>
> > + <get dest="${lib.repo}/commons-httpclient-2.0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-httpclient/jars/commons-httpclient-2.0.2.jar">
> > + </get>
> > + <get dest="${lib.repo}/commons-logging-1.0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//commons-logging/jars/commons-logging-1.0.2.jar">
> > + </get>
> > + <get dest="${lib.repo}/commons-codec-1.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//commons-codec/jars/commons-codec-1.1.jar">
> > + </get>
> > + <get dest="${lib.repo}/servletapi-2.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//servletapi/jars/servletapi-2.2.jar">
> > + </get>
> > + <get dest="${lib.repo}/fesi-1.1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//fesi/jars/fesi-1.1.5.jar">
> > + </get>
> > + <get dest="${lib.repo}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//junit/jars/junit-3.8.1.jar">
> > + </get>
> > + </target>
> > +
> > + <!-- ================================================================== -->
> > <!-- U S A G E -->
> > <!-- ================================================================== -->
> >
> > @@ -55,7 +75,7 @@
> > <!-- I N I T -->
> > <!-- ================================================================== -->
> >
> > - <target name="init" depends="env">
> > + <target name="init" depends="env,copy-deps">
> > <available
> > classname="com.sun.net.ssl.SSLContext"
> > property="jsse.present"
> > @@ -149,7 +169,7 @@
> > <!-- C O M P I L E -->
> > <!-- ================================================================== -->
> >
> > - <target name="compile" depends="prepare">
> > + <target name="compile" depends="prepare" description="Compiles the source code">
> > <javac
> > srcdir="${src.dir}"
> > destdir="${build.dest}"
> > @@ -190,7 +210,7 @@
> > <!-- J A V A D O C S -->
> > <!-- ================================================================== -->
> >
> > - <target name="javadocs" depends="prepare">
> > + <target name="javadocs" depends="prepare" description="Create the JavaDocs">
> > <mkdir dir="${javadoc.destdir}"/>
> > <javadoc
> > sourcepath="${src.dir}/java"
> > @@ -212,11 +232,15 @@
> > <!-- C L E A N -->
> > <!-- ================================================================== -->
> >
> > - <target name="clean">
> > + <target name="clean" description="Deletes temporary files">
> > <delete file="${final.name}.tar.gz"/>
> > <delete file="${final.name}.zip"/>
> > + <delete file="${final.name}-src.tar.gz"/>
> > + <delete file="${final.name}-src.zip"/>
> > <delete dir="${build.dir}"/>
> > <delete dir="${test.reportsDirectory}"/>
> > + <delete dir="${docs.dest}"/>
> > + <delete dir="${lib.repo}"/>
> > </target>
> >
> > <!-- ================================================================== -->
> > @@ -364,7 +388,8 @@
> >
> > <target
> > name="dist"
> > - depends="jar,javadocs,docs">
> > + depends="jar,javadocs,docs"
> > + description="Build source and binary distribution">
> >
> > <property name="distDir" value="${build.dir}/${final.name}"/>
> >
> > @@ -377,10 +402,11 @@
> > </echo>
> >
> > <mkdir dir="${distDir}"/>
> > + <mkdir dir="${docs.dest}"/>
> >
> > <!-- Copy README and LICENSE -->
> > <copy todir="${distDir}" file="README.txt"/>
> > - <copy todir="${distDir}" file="LICENSE"/>
> > + <copy todir="${distDir}" file="LICENSE.txt"/>
> >
> > <!-- Copy Jars -->
> > <copy todir="${distDir}">
> > @@ -390,8 +416,8 @@
> > </copy>
> >
> > <!-- Copy documentation -->
> > - <copy todir="${distDir}/docs">
> > - <fileset dir="${docs.dest}">
> > + <copy todir="${distDir}/docs/apidocs">
> > + <fileset dir="${javadoc.destdir}">
> > <include name="**"/>
> > </fileset>
> > </copy>
> > @@ -427,7 +453,7 @@
> > </fileset>
> > </delete>
> >
> > - <copy todir="${distDir}" file="build.properties"/>
> > + <copy todir="${distDir}" file="default.properties"/>
> > <copy todir="${distDir}" file="build.xml"/>
> >
> > <!-- Copy Source -->
> >
> >
> >
> > 1.14 +4 -4 ws-xmlrpc/default.properties
> >
> > Index: default.properties
> > ===================================================================
> > RCS file: /home/cvs/ws-xmlrpc/default.properties,v
> > retrieving revision 1.13
> > retrieving revision 1.14
> > diff -u -r1.13 -r1.14
> > --- default.properties 21 May 2003 15:58:23 -0000 1.13
> > +++ default.properties 15 Apr 2005 14:04:50 -0000 1.14
> > @@ -23,18 +23,18 @@
> > year = 1999-2002
> > debug = off
> > optimize = on
> > -deprecation = on
> > +deprecation = off
> > final.name = ${project}-${version}
> >
> > # You must set these values here, or in your
> > # ${user.home}/build.properties file in order
> > # to build XmlRpc:
> >
> > -commons-httpclient.jar = ${lib.repo}/commons-httpclient-2.0.jar
> > +commons-httpclient.jar = ${lib.repo}/commons-httpclient-2.0.2.jar
> > commons-logging.jar = ${lib.repo}/commons-logging-1.0.2.jar
> > commons-codec.jar = ${lib.repo}/commons-codec-1.1.jar
> > jsse.jar = ${lib.repo}/jsse.jar
> > jnet.jar = ${lib.repo}/jnet.jar
> > jcert.jar = ${lib.repo}/jcert.jar
> > -servlet.jar = ${lib.repo}/servlet.jar
> > -junit.jar = ${lib.repo}/junit-3.7.jar
> > +servlet.jar = ${lib.repo}/servlet-2.2.jar
> > +junit.jar = ${lib.repo}/junit-3.8.1.jar
> >
> >
> >
> > 1.6 +4 -9 ws-xmlrpc/README.txt
> >
> > Index: README.txt
> > ===================================================================
> > RCS file: /home/cvs/ws-xmlrpc/README.txt,v
> > retrieving revision 1.5
> > retrieving revision 1.6
> > diff -u -r1.5 -r1.6
> > --- README.txt 17 Jun 2004 01:16:42 -0000 1.5
> > +++ README.txt 15 Apr 2005 14:04:50 -0000 1.6
> > @@ -11,7 +11,7 @@
> > lib/ Final location of the jar files
> > examples/ Some examples and instructions on how to run them.
> > src/ Location of Java sources.
> > -xdocs/ XmlRpc documention in DocBook format.
> > +xdocs/ XmlRpc documention in XDOC format.
> > docs/ The rendered documentation in HTML format.
> >
> >
> > @@ -31,7 +31,7 @@
> > You can build the core XmlRpc package with the classes provided
> > using JDK 1.2+. If you wish to use the Servlet and/or SSL extensions
> > than you must set the following properties in either your
> > -${user.home}/build.properties file, or the build.properties
> > +${user.home}/build.properties file, or the default.properties
> > file provided in the XmlRpc build/ directory:
> >
> > jsse.jar
> > @@ -42,13 +42,8 @@
> > These properties define full paths to JARs files.
> >
> > If you are using the Eclipse IDE, Apache's XML-RPC package comes ready
> > -with basic .classpath and .project files. Simply create a
> > -sub-directory named "lib" and add the following files:
> > -
> > - commons-codec-1.2.jar
> > - commons-httpclient-2.0.jar
> > - junit.jar
> > - servlet.jar
> > +with basic .classpath and .project files. Simply run "ant copy-deps" to
> > +populate the "lib" directory
> >
> >
> > --------------------------------------------------------------------------
> >
> >
> >
> > 1.2 +7 -0 ws-xmlrpc/maven.xml
> >
> >
> >
> >