You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by ro...@apache.org on 2007/07/02 20:03:01 UTC
svn commit: r552552 - in /gump/metadata: profile/gump.xml
project/commons-httpclient-2.0-branch.xml project/httpcomponents.xml
project/jakarta-commons.xml
Author: rolandw
Date: Mon Jul 2 11:03:00 2007
New Revision: 552552
URL: http://svn.apache.org/viewvc?view=rev&rev=552552
Log:
Consolidating commons-httpclient projects in a new module for HttpComponents after the move of the source code in SVN. The 2.0 branch is no longer GUMPed but taken from SVN as a JAR. Boy I hope I didn't screw this one up...
Added:
gump/metadata/project/httpcomponents.xml (with props)
Removed:
gump/metadata/project/commons-httpclient-2.0-branch.xml
Modified:
gump/metadata/profile/gump.xml
gump/metadata/project/jakarta-commons.xml
Modified: gump/metadata/profile/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?view=diff&rev=552552&r1=552551&r2=552552
==============================================================================
--- gump/metadata/profile/gump.xml (original)
+++ gump/metadata/profile/gump.xml Mon Jul 2 11:03:00 2007
@@ -109,7 +109,7 @@
<module href="project/jakarta-commons-codec-11.xml"/>
<module href="project/commons-cli-1.0.x.xml"/>
<module href="project/commons-el-10.xml"/>
- <module href="project/commons-httpclient-2.0-branch.xml"/>
+ <module href="project/httpcomponents.xml"/>
<module href="project/jakarta-commons-sandbox.xml"/>
<module href="project/jakarta-commons-dormant.xml"/>
<module href="project/jakarta-ecs.xml"/>
Added: gump/metadata/project/httpcomponents.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/httpcomponents.xml?view=auto&rev=552552
==============================================================================
--- gump/metadata/project/httpcomponents.xml (added)
+++ gump/metadata/project/httpcomponents.xml Mon Jul 2 11:03:00 2007
@@ -0,0 +1,76 @@
+<?xml version="1.0" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<module name="httpcomponents">
+ <url href="http://jakarta.apache.org/httpcomponents/"/>
+ <description>
+ Jakarta HTTP Components, including Commons HttpClient
+ </description>
+
+ <svn repository="jakarta-svn" dir="httpcomponents/gump-trunk"/>
+
+
+ <!-- TODO: Add projects for httpcore and httpclient 4.0 -->
+
+
+ <!-- The 3.1 code line. Actual releases are compiled with JDK 1.2,
+ but GUMP uses a JDK 1.4 or later. Hence, JCE is available from
+ the JDK and does not need to be referenced as a dependency.
+ -->
+ <project name="commons-httpclient">
+ <package>org.apache.commons.httpclient</package>
+ <description>HTTP Client Library, version 3.1</description>
+ <url href="http://jakarta.apache.org/commons/httpclient/"/>
+ <ant basedir="oac.hc3x" target="dist"/>
+ <depend project="ant" inherit="runtime"/>
+ <depend project="xml-xerces"/>
+ <depend project="xml-apis"/>
+ <option project="jsse"/>
+ <depend project="commons-logging" runtime="true"/>
+ <depend project="commons-codec" runtime="true"/>
+ <!-- included in JDK 1.4 depend project="jce"/-->
+ <work nested="oac.hc3x/target/classes"/>
+ <home nested="oac.hc3x/dist"/>
+ <jar name="commons-httpclient.jar"/>
+ <javadoc nested="oac.hc3x/dist/docs/api"/>
+
+ <nag to="httpcomponents-dev@jakarta.apache.org"
+ from="GUMP <rolandw@apache.org>"/>
+ </project>
+
+
+
+ <!-- The 2.0 code line is no longer developed nor supported, but still used.
+ There is no point in rebuilding it, just reference the last release JAR.
+ Runtime dependencies are defined for transitive use.
+ -->
+ <project name="commons-httpclient-2.0-branch">
+ <package>org.apache.commons.httpclient</package>
+ <description>HTTP Client Library, version 2.0</description>
+
+ <depend project="commons-logging" runtime="true"/>
+ <depend project="commons-codec" runtime="true"/>
+
+ <home nested="2.0.2" />
+ <jar name="commons-httpclient-2.0.2.jar"/>
+ <license name="2.0.2/LICENSE.txt" />
+
+ <nag to="httpcomponents-dev@jakarta.apache.org"
+ from="GUMP <rolandw@apache.org>"/>
+ </project>
+
+</module>
Propchange: gump/metadata/project/httpcomponents.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: gump/metadata/project/httpcomponents.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: gump/metadata/project/httpcomponents.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: gump/metadata/project/jakarta-commons.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jakarta-commons.xml?view=diff&rev=552552&r1=552551&r2=552552
==============================================================================
--- gump/metadata/project/jakarta-commons.xml (original)
+++ gump/metadata/project/jakarta-commons.xml Mon Jul 2 11:03:00 2007
@@ -483,25 +483,10 @@
from="John McNally <jmcnally@collab.net>"/>
</project>
- <project name="commons-httpclient">
- <package>org.apache.commons.httpclient</package>
- <description>HTTP Client Library</description>
- <url href="http://jakarta.apache.org/commons/httpclient/"/>
- <ant basedir="httpclient" target="dist"/>
- <depend project="ant" inherit="runtime"/>
- <depend project="xml-xerces"/>
- <depend project="xml-apis"/>
- <option project="jsse"/>
- <depend project="commons-logging" runtime="true"/>
- <depend project="commons-codec" runtime="true"/>
- <!-- included in JDK 1.4 depend project="jce"/-->
- <work nested="httpclient/target/classes"/>
- <home nested="httpclient/dist"/>
- <jar name="commons-httpclient.jar"/>
- <javadoc nested="httpclient/dist/docs/api"/>
- <nag to="commons-httpclient-dev@jakarta.apache.org"
- from="Stefan Bodewig <bodewig@apache.org>"/>
- </project>
+ <!-- <project name="commons-httpclient">
+ moved to a separate module in httpcomponents.xml when
+ the sources in SVN moved from Commons to HttpComponents
+ -->
<project name="commons-io">
<package>org.apache.commons.io</package>