gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r774684 - in /gump/metadata: profile/ project/
Date Thu, 14 May 2009 08:37:46 GMT
Author: bodewig
Date: Thu May 14 08:37:46 2009
New Revision: 774684

URL: http://svn.apache.org/viewvc?rev=774684&view=rev
Log:
get rid of ancient Jetty versions

Added:
    gump/metadata/project/org.mortbay.jetty.xml
      - copied, changed from r772621, gump/metadata/project/packaged-jetty6.xml
Removed:
    gump/metadata/project/jetty4.xml
    gump/metadata/project/packaged-jetty.xml
    gump/metadata/project/packaged-jetty6.xml
Modified:
    gump/metadata/profile/gump.xml
    gump/metadata/project/apollo.xml
    gump/metadata/project/commons-jelly.xml
    gump/metadata/project/htmlunit.xml
    gump/metadata/project/mx4j.xml
    gump/metadata/project/smartfrog.xml

Modified: gump/metadata/profile/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?rev=774684&r1=774683&r2=774684&view=diff
==============================================================================
--- gump/metadata/profile/gump.xml (original)
+++ gump/metadata/profile/gump.xml Thu May 14 08:37:46 2009
@@ -275,7 +275,6 @@
   <module href="project/jaxen.xml"/>
   <module href="project/jdbm.xml"/>
   <module href="project/jetty.xml"/>
-  <module href="project/jetty4.xml"/>
   <module href="project/jfor.xml"/>
   <module href="project/jgen.xml"/>
   <module href="project/jgroups.xml"/>
@@ -391,8 +390,7 @@
   <module href="project/multipartrequest.xml"/>
   <module href="project/packaged-jaxen.xml"/>
   <module href="project/packaged-jaxen-1.1-beta-4.xml" />
-  <module href="project/packaged-jetty.xml"/>
-  <module href="project/packaged-jetty6.xml"/>
+  <module href="project/org.mortbay.jetty.xml"/>
   <module href="project/packaged-dom4j.xml"/>
 
 <!-- CodeHaus -->
@@ -528,7 +526,6 @@
   <project name="jcharts"          package="jCharts-0.7.5"/>
   <project name="jcifs"            package="jcifs"/>
   <project name="jdbc"             package="jdbc2_0"/>
-  <project name="jetty4"           package="jetty-4.2.21"/>
   <project name="jimi"             package="Jimi"/>
   <project name="jisp"             package="jisp-2.5.1"/>
   <project name="jdepend"          package="jdepend-2.6"/>
@@ -579,10 +576,7 @@
   <project name="packaged-hsqldb"  package="hsqldb"/>
   <project name="packaged-jaxen"   package="jaxen-1.1-beta-6"/>
   <project name="packaged-jaxen-1.1-beta-4" package="jaxen-1.1-beta-4" />
-  <project name="packaged-jetty"   package="jetty-5.0.RC4"/>
-  <project name="packaged-jetty6"  package="jetty-6.1.5"/>
-  <project name="packaged-jetty-all"   package="jetty-5.0.RC4"/>
-  <project name="packaged-jetty-jaas"   package="jetty-5.0.RC4"/>
+  <project name="org.mortbay.jetty"  package="jetty6"/>
   <project name="packaged-jmock"   package="jmock"/>
   <project name="avalon-framework-api"
            package="avalon"/>

Modified: gump/metadata/project/apollo.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/apollo.xml?rev=774684&r1=774683&r2=774684&view=diff
==============================================================================
--- gump/metadata/project/apollo.xml (original)
+++ gump/metadata/project/apollo.xml Thu May 14 08:37:46 2009
@@ -31,8 +31,6 @@
         project="xml-xmlbeans-v1" reference="jarpath" id="xbean"/>
       <property name="maven.jar.commonj-twm-api" project="commonj"
         reference="jarpath"/>
-      <property name="maven.jar.org.mortbay.jetty" project="jetty"
-        reference="jarpath" id="jetty-server"/>
       <property name="maven.jar.geronimo-spec-servlet"
         reference="jarpath"
         project="jakarta-servletapi-5-servlet"/>
@@ -55,7 +53,7 @@
     <depend project="commons-logging" />
     <depend project="concurrent"/>    
     <depend project="j2ee-xbeans"/>
-    <depend project="jetty"/>
+    <depend project="org.mortbay.jetty"/>
     <depend project="jakarta-servletapi-5-servlet" />
     <depend project="velocity-engine" ids="velocity" />
     <depend project="jaxen" />

Modified: gump/metadata/project/commons-jelly.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/commons-jelly.xml?rev=774684&r1=774683&r2=774684&view=diff
==============================================================================
--- gump/metadata/project/commons-jelly.xml (original)
+++ gump/metadata/project/commons-jelly.xml Thu May 14 08:37:46 2009
@@ -909,7 +909,6 @@
       <property name="maven.final.name" value="commons-jelly-tags-jetty-@@DATE@@"/>
       
       <property project="commons-httpclient-2.0-branch" name="maven.jar.commons-httpclient"
reference="jarpath" />
-      <property project="jetty4" name="maven.jar.jetty" reference="jarpath" />
       <property project="jakarta-servletapi-5-servlet" name="maven.jar.servletapi" reference="jarpath"
/>
       <property project="xml-xerces" name="maven.jar.xerces" reference="jarpath" />
     </maven>
@@ -925,7 +924,7 @@
     <depend project="dom4j" />
     <depend project="jakarta-servletapi-5-servlet" />
     <depend project="jaxen" />
-    <depend project="jetty4" />
+    <depend project="org.mortbay.jetty" />
     <depend project="xml-apis" />
     <depend project="xml-xerces" />
     
@@ -937,8 +936,8 @@
 
     <junitreport nested="jelly-tags/jetty/target/test-reports" />
   
-    <nag from="commons-jelly-tags-jetty development &lt;dev@commons.apache.org&gt;"
-         to="dev@commons.apache.org"/>
+    <!--nag from="commons-jelly-tags-jetty development &lt;dev@commons.apache.org&gt;"
+         to="dev@commons.apache.org"/-->
   </project>
     
   <project name="commons-jelly-tags-swt">

Modified: gump/metadata/project/htmlunit.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/htmlunit.xml?rev=774684&r1=774683&r2=774684&view=diff
==============================================================================
--- gump/metadata/project/htmlunit.xml (original)
+++ gump/metadata/project/htmlunit.xml Thu May 14 08:37:46 2009
@@ -34,8 +34,6 @@
                 project="xml-apis" id="xml-apis"/>
       <property name="maven.jar.js" reference="jarpath"
                 project="rhino"/>
-      <property name="maven.jar.org.mortbay.jetty" reference="jarpath"
-                project="jetty" id="jetty"/>
       <property name="maven.jar.servlet-api" reference="jarpath"
                 project="jakarta-servletapi-5-servlet"/>
       <property name="maven.jar.xercesImpl" reference="jarpath"
@@ -57,7 +55,7 @@
     <depend project="dom4j" />
     <depend project="gsbase" />
     <depend project="jakarta-servletapi-5-servlet"/>
-    <depend project="jetty"/>
+    <depend project="org.mortbay.jetty"/>
     <depend project="junit" />
     <depend project="junitperf" />
     <depend project="nekohtml" />

Modified: gump/metadata/project/mx4j.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/mx4j.xml?rev=774684&r1=774683&r2=774684&view=diff
==============================================================================
--- gump/metadata/project/mx4j.xml (original)
+++ gump/metadata/project/mx4j.xml Thu May 14 08:37:46 2009
@@ -135,7 +135,7 @@
     <depend project="jakarta-servletapi-5-servlet"/>
     <depend project="mx4j" inherit="all"/>
     <depend project="mx4j-remote" inherit="all" />
-    <depend project="packaged-jetty"/>
+    <depend project="org.mortbay.jetty"/>
     <depend project="xalan"/>
 
     <work nested="classes/core"/>

Copied: gump/metadata/project/org.mortbay.jetty.xml (from r772621, gump/metadata/project/packaged-jetty6.xml)
URL: http://svn.apache.org/viewvc/gump/metadata/project/org.mortbay.jetty.xml?p2=gump/metadata/project/org.mortbay.jetty.xml&p1=gump/metadata/project/packaged-jetty6.xml&r1=772621&r2=774684&rev=774684&view=diff
==============================================================================
--- gump/metadata/project/packaged-jetty6.xml (original)
+++ gump/metadata/project/org.mortbay.jetty.xml Thu May 14 08:37:46 2009
@@ -15,19 +15,17 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module name="packaged-jetty6">
+<module name="org.mortbay.jetty">
 
   <url  href="http://jetty.mortbay.org/jetty/index.html"/>
   <description>
     Java HTTP Servlet Server
   </description>
 
-  <project name="packaged-jetty6">
+  <project name="org.mortbay.jetty">
     <package>org.mortbay.jetty</package>
 
-    <jar name="lib/jetty-6.1.5.jar" id="jetty"/>
-    <jar name="lib/jetty-util-6.1.5.jar" id="jetty-util"/>
-    <license name="LICENSES/LICENSE.txt"/>
+    <jar name="jetty-6.1.9.jar" id="jetty"/>
   </project>
 
 </module>

Modified: gump/metadata/project/smartfrog.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/smartfrog.xml?rev=774684&r1=774683&r2=774684&view=diff
==============================================================================
--- gump/metadata/project/smartfrog.xml (original)
+++ gump/metadata/project/smartfrog.xml Thu May 14 08:37:46 2009
@@ -195,7 +195,7 @@
     
 
     <!-- jetty component uses jetty -->
-    <option project="jetty" runtime="false"/>
+    <option project="org.mortbay.jetty" runtime="false"/>
     
     <!-- net -->
     <depend project="commons-net" runtime="false"/>
@@ -388,7 +388,7 @@
     </ant>
 
     <depend project="ant" runtime="false"/>
-    <depend project="jetty4" runtime="true"/>
+    <depend project="org.mortbay.jetty" runtime="true"/>
     <depend project="junit3" runtime="false"/>
     <depend project="smartfrog" runtime="true" inherit="runtime"/>
     <depend project="smartfrog-tasks" runtime="false"/>



Mime
View raw message