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 jo...@apache.org on 2005/04/26 11:55:57 UTC
cvs commit: ws-xmlrpc .cvsignore .classpath build.xml
jochen 2005/04/26 02:55:57
Modified: . .cvsignore .classpath build.xml
Log:
Completed upgrade to commons-codec-1.3. (Still problems when running test suite from within Ant, but it seems common sense doing so.) Added the ability to suppress fetching jar files from within Ant.
Revision Changes Path
1.10 +1 -0 ws-xmlrpc/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/ws-xmlrpc/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 30 Jun 2004 06:37:57 -0000 1.9
+++ .cvsignore 26 Apr 2005 09:55:57 -0000 1.10
@@ -3,3 +3,4 @@
*~
maven.log
build.properties
+lib
1.4 +2 -2 ws-xmlrpc/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/ws-xmlrpc/.classpath,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .classpath 15 Apr 2005 19:52:38 -0000 1.3
+++ .classpath 26 Apr 2005 09:55:57 -0000 1.4
@@ -24,11 +24,11 @@
<attributes>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="lib/commons-codec-1.2.jar">
+ <classpathentry kind="lib" path="lib/servletapi-2.2.jar">
<attributes>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="lib/servletapi-2.2.jar">
+ <classpathentry kind="lib" path="lib/commons-codec-1.3.jar">
<attributes>
</attributes>
</classpathentry>
1.30 +13 -1 ws-xmlrpc/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ws-xmlrpc/build.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- build.xml 26 Apr 2005 09:46:05 -0000 1.29
+++ build.xml 26 Apr 2005 09:55:57 -0000 1.30
@@ -48,7 +48,8 @@
<!-- D E P E N D E N C I E S -->
<!-- ================================================================== -->
- <target name="copy-deps" description="Copy dependent JARs into the lib folder">
+ <target name="copy-deps" description="Copy dependent JARs into the lib folder"
+ unless="have.deps" depends="setup.proxy">
<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>
@@ -64,6 +65,17 @@
</get>
</target>
+ <target name="setup.proxy" depends="setup.proxy.if,setup.proxy.unless"/>
+
+ <target name="setup.proxy.if" if="http.proxyHost">
+ <echo>Using proxy server ${http.proxyHost} at port ${http.proxyPort}</echo>
+ <setproxy proxyhost="${http.proxyHost}" proxyport="${http.proxyPort}"/>
+ </target>
+
+ <target name="setup.proxy.unless" unless="http.proxyHost">
+ <echo>Property http.proxyHost not set, using no proxy</echo>
+ </target>
+
<!-- ================================================================== -->
<!-- U S A G E -->
<!-- ================================================================== -->
Re: cvs commit: ws-xmlrpc .cvsignore .classpath build.xml
Posted by Siegfried Goeschl <si...@it20one.at>.
Hi Jochen,
I'm just digging around to fix the problem .... ;-)
Siegfried Goeschl
jochen@apache.org wrote:
>jochen 2005/04/26 02:55:57
>
> Modified: . .cvsignore .classpath build.xml
> Log:
> Completed upgrade to commons-codec-1.3. (Still problems when running test suite from within Ant, but it seems common sense doing so.) Added the ability to suppress fetching jar files from within Ant.
>
> Revision Changes Path
> 1.10 +1 -0 ws-xmlrpc/.cvsignore
>
> Index: .cvsignore
> ===================================================================
> RCS file: /home/cvs/ws-xmlrpc/.cvsignore,v
> retrieving revision 1.9
> retrieving revision 1.10
> diff -u -r1.9 -r1.10
> --- .cvsignore 30 Jun 2004 06:37:57 -0000 1.9
> +++ .cvsignore 26 Apr 2005 09:55:57 -0000 1.10
> @@ -3,3 +3,4 @@
> *~
> maven.log
> build.properties
> +lib
>
>
>
> 1.4 +2 -2 ws-xmlrpc/.classpath
>
> Index: .classpath
> ===================================================================
> RCS file: /home/cvs/ws-xmlrpc/.classpath,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- .classpath 15 Apr 2005 19:52:38 -0000 1.3
> +++ .classpath 26 Apr 2005 09:55:57 -0000 1.4
> @@ -24,11 +24,11 @@
> <attributes>
> </attributes>
> </classpathentry>
> - <classpathentry kind="lib" path="lib/commons-codec-1.2.jar">
> + <classpathentry kind="lib" path="lib/servletapi-2.2.jar">
> <attributes>
> </attributes>
> </classpathentry>
> - <classpathentry kind="lib" path="lib/servletapi-2.2.jar">
> + <classpathentry kind="lib" path="lib/commons-codec-1.3.jar">
> <attributes>
> </attributes>
> </classpathentry>
>
>
>
> 1.30 +13 -1 ws-xmlrpc/build.xml
>
> Index: build.xml
> ===================================================================
> RCS file: /home/cvs/ws-xmlrpc/build.xml,v
> retrieving revision 1.29
> retrieving revision 1.30
> diff -u -r1.29 -r1.30
> --- build.xml 26 Apr 2005 09:46:05 -0000 1.29
> +++ build.xml 26 Apr 2005 09:55:57 -0000 1.30
> @@ -48,7 +48,8 @@
> <!-- D E P E N D E N C I E S -->
> <!-- ================================================================== -->
>
> - <target name="copy-deps" description="Copy dependent JARs into the lib folder">
> + <target name="copy-deps" description="Copy dependent JARs into the lib folder"
> + unless="have.deps" depends="setup.proxy">
> <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>
> @@ -64,6 +65,17 @@
> </get>
> </target>
>
> + <target name="setup.proxy" depends="setup.proxy.if,setup.proxy.unless"/>
> +
> + <target name="setup.proxy.if" if="http.proxyHost">
> + <echo>Using proxy server ${http.proxyHost} at port ${http.proxyPort}</echo>
> + <setproxy proxyhost="${http.proxyHost}" proxyport="${http.proxyPort}"/>
> + </target>
> +
> + <target name="setup.proxy.unless" unless="http.proxyHost">
> + <echo>Property http.proxyHost not set, using no proxy</echo>
> + </target>
> +
> <!-- ================================================================== -->
> <!-- U S A G E -->
> <!-- ================================================================== -->
>
>
>
>
>
>