gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r943129 - in /gump/metadata/project: directory-apacheds.xml jetty-parent.xml jetty.xml
Date Tue, 11 May 2010 14:39:23 GMT
Author: bodewig
Date: Tue May 11 14:39:22 2010
New Revision: 943129

URL: http://svn.apache.org/viewvc?rev=943129&view=rev
Log:
try to build jetty - the reactor build doesn't work, so try splitting the projects manually

Modified:
    gump/metadata/project/directory-apacheds.xml
    gump/metadata/project/jetty-parent.xml
    gump/metadata/project/jetty.xml

Modified: gump/metadata/project/directory-apacheds.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/directory-apacheds.xml?rev=943129&r1=943128&r2=943129&view=diff
==============================================================================
--- gump/metadata/project/directory-apacheds.xml (original)
+++ gump/metadata/project/directory-apacheds.xml Tue May 11 14:39:22 2010
@@ -216,7 +216,7 @@
     <jar name="http-integration/target/apacheds-http-integration-*[0-9T].jar"/>
 
     <option project="apacheds-i18n"/>
-    <option project="jetty"/>
+    <option project="org.mortbay.jetty"/>
   </project>
 
   <project name="apacheds-i18n">

Modified: gump/metadata/project/jetty-parent.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jetty-parent.xml?rev=943129&r1=943128&r2=943129&view=diff
==============================================================================
--- gump/metadata/project/jetty-parent.xml (original)
+++ gump/metadata/project/jetty-parent.xml Tue May 11 14:39:22 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
+  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
@@ -26,5 +26,10 @@
   
   <project name="jetty-parent">
     <jar name="pom.xml"/>
+
+    <!-- enough to have most of maven's dependencies around -->
+    <option project="commons-logging"/>
+    <option project="slf4j"/>
+    <option project="velocity-engine"/>
   </project>
 </module>

Modified: gump/metadata/project/jetty.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jetty.xml?rev=943129&r1=943128&r2=943129&view=diff
==============================================================================
--- gump/metadata/project/jetty.xml (original)
+++ gump/metadata/project/jetty.xml Tue May 11 14:39:22 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
+  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
@@ -24,98 +24,380 @@
   <redistributable/>
 
   <svn repository="eclipse" dir="org.eclipse.jetty/jetty/trunk"/>
-  
+
   <project name="jetty-project">
     <jar name="pom.xml"/>
+
+    <option project="jaf"/>
+    <option project="javamail"/>
+    <option project="javax.servlet"/>
+    <option project="junit"/>
+    <option project="slf4j"/>
+
+    <depend project="jetty-parent"/>
+  </project>
+
+  <project name="jetty-aggregate-project" groupId="org.eclipse.jetty.aggregate">
+    <jar name="jetty-aggregate/pom.xml"/>
+    <depend project="jetty-project"/>
   </project>
 
   <project name="jetty">
+    <option project="jetty-all"/>
+  </project>
+
+  <project name="jetty-all" groupId="org.eclipse.jetty.aggregate">
     <package>org.eclipse.jetty</package>
+    <depend project="jetty-aggregate-project"/>
+    <mvn basedir="jetty-aggregate/jetty-all"/>
+    <jar name="jetty-aggregate/jetty-all/target/jetty-all-*[0-9T].jar"/>
 
-    <mvn>
-      <property name="maven.test.skip.exec" value="true"/>
-    </mvn>
+    <option project="asm"/>
+    <depend project="jetty-ajp"/>
+    <depend project="jetty-annotations"/>
+    <depend project="jetty-client"/>
+    <depend project="jetty-deploy"/>
+    <depend project="jetty-jaspi"/>
+    <depend project="jetty-jmx"/>
+    <depend project="jetty-jndi"/>
+    <depend project="jetty-jsp-2.1"/>
+    <depend project="jetty-plus"/>
+    <depend project="jetty-rewrite"/>
+    <depend project="jetty-servlets"/>
+  </project>
 
-    <depend project="jetty-parent"/>
-    <depend project="jetty-project"/>
+  <project name="jetty-all-server" groupId="org.eclipse.jetty.aggregate">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-aggregate-project"/>
+    <mvn basedir="jetty-aggregate/jetty-all-server"/>
+    <jar name="jetty-aggregate/jetty-all-server/target/jetty-all-server-*[0-9T].jar" />
 
-    <option project="ant"/>
-    <option project="bsh"/>
-    <option project="commons-beanutils"/>
-    <option project="commons-digester"/>
-    <option project="commons-httpclient"/>
-    <option project="jaf"/>
-    <option project="javax.servlet"/>
-    <option project="javamail"/>
-    <option project="jtidy"/>
-    <option project="junit"/>
-    <option project="mx4j"/>
-    <option project="mx4j-tools"/>
-    <option project="slf4j"/>
-    <option project="slide-webdavlib"/>
-    <option project="xml-apis"/>
-    <option project="xml-xerces"/>
-
-    <jar name="jetty-util/target/jetty-util-7.1.0-SNAPSHOT.jar"
-         id="jetty-util"/>
-    <jar name="jetty-io/target/jetty-io-7.1.0-SNAPSHOT.jar"
-         id="jetty-io"/>
-    <jar name="jetty-http/target/jetty-http-7.1.0-SNAPSHOT.jar"
-         id="jetty-http"/>
-    <jar name="jetty-continuation/target/jetty-continuation-7.1.0-SNAPSHOT.jar"
-         id="jetty-continuation"/>
-    <jar name="jetty-server/target/jetty-server-7.1.0-SNAPSHOT.jar"
+    <option project="asm"/>
+    <depend project="jetty-ajp"/>
+    <depend project="jetty-annotations"/>
+    <depend project="jetty-deploy"/>
+    <depend project="jetty-jaspi"/>
+    <depend project="jetty-jmx"/>
+    <depend project="jetty-jndi"/>
+    <depend project="jetty-jsp-2.1"/>
+    <depend project="jetty-plus"/>
+    <depend project="jetty-rewrite"/>
+    <depend project="jetty-servlets"/>
+  </project>
+
+  <project name="jetty-all-client" groupId="org.eclipse.jetty.aggregate">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-aggregate-project"/>
+    <mvn basedir="jetty-aggregate/jetty-client"/>
+    <jar name="jetty-aggregate/jetty-client/target/jetty-client-*[0-9T].jar"
+         id="jetty-client"/>
+
+    <depend project="jetty-client"/>
+  </project>
+
+  <project name="jetty-all-plus" groupId="org.eclipse.jetty.aggregate">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-aggregate-project"/>
+    <mvn basedir="jetty-aggregate/jetty-plus"/>
+    <jar name="jetty-aggregate/jetty-plus/target/jetty-plus-*[0-9T].jar"
+         id="jetty-plus"/>
+
+    <depend project="jetty-plus"/>
+  </project>
+
+  <project name="jetty-aggregate-server" groupId="org.eclipse.jetty.aggregate">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-aggregate-project"/>
+    <mvn basedir="jetty-aggregate/jetty-server"/>
+    <jar name="jetty-aggregate/jetty-server/target/jetty-server-*[0-9T].jar"
          id="jetty-server"/>
-    <jar name="jetty-websocket/target/jetty-websocket-7.1.0-SNAPSHOT.jar"
-         id="jetty-websocket"/>
-    <jar name="jetty-security/target/jetty-security-7.1.0-SNAPSHOT.jar"
-         id="jetty-security"/>
-    <jar name="jetty-servlet/target/jetty-servlet-7.1.0-SNAPSHOT.jar"
+
+    <depend project="jetty-server"/>
+  </project>
+
+  <project name="jetty-all-servlet" groupId="org.eclipse.jetty.aggregate">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-aggregate-project"/>
+    <mvn basedir="jetty-aggregate/jetty-servlet"/>
+    <jar name="jetty-aggregate/jetty-servlet/target/jetty-servlet-*[0-9T].jar"
          id="jetty-servlet"/>
-    <jar name="jetty-client/target/jetty-client-7.1.0-SNAPSHOT.jar"
-         id="jetty-client"/>
-    <jar name="jetty-xml/target/jetty-xml-7.1.0-SNAPSHOT.jar"
-         id="jetty-xml"/>
-    <jar name="jetty-jaspi/target/jetty-jaspi-7.1.0-SNAPSHOT.jar"
-         id="jetty-jaspi"/>
-    <jar name="jetty-webapp/target/jetty-webapp-7.1.0-SNAPSHOT.jar"
+
+    <depend project="jetty-servlet"/>
+  </project>
+
+  <project name="jetty-all-webapp" groupId="org.eclipse.jetty.aggregate">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-aggregate-project"/>
+    <mvn basedir="jetty-aggregate/jetty-webapp"/>
+    <jar name="jetty-aggregate/jetty-webapp/target/jetty-webapp-*[0-9T].jar"
          id="jetty-webapp"/>
-    <jar name="jetty-servlets/target/jetty-servlets-7.1.0-SNAPSHOT.jar"
-         id="jetty-servlets"/>
-    <jar name="jetty-deploy/target/jetty-deploy-7.1.0-SNAPSHOT.jar"
-         id="jetty-deploy"/>
-    <jar name="jetty-ajp/target/jetty-ajp-7.1.0-SNAPSHOT.jar"
-         id="jetty-ajp"/>
-    <jar name="jetty-jmx/target/jetty-jmx-7.1.0-SNAPSHOT.jar"
-         id="jetty-jmx"/>
-    <jar name="jetty-jndi/target/jetty-jndi-7.1.0-SNAPSHOT.jar"
-         id="jetty-jndi"/>
-    <jar name="jetty-plus/target/jetty-plus-7.1.0-SNAPSHOT.jar"
-         id="jetty-plus"/>
-    <jar name="jetty-annotations/target/jetty-annotations-7.1.0-SNAPSHOT.jar"
-         id="jetty-annotations"/>
-    <jar name="jetty-rewrite/target/jetty-rewrite-7.1.0-SNAPSHOT.jar"
-         id="jetty-rewrite"/>
-    <jar name="jetty-policy/target/jetty-policy-7.1.0-SNAPSHOT.jar"
-         id="jetty-policy"/>
-    <jar name="jetty-start/target/jetty-start-7.1.0-SNAPSHOT.jar"
-         id="jetty-start"/>
-    <jar name="jetty-osgi/jetty-osgi-boot/target/jetty-osgi-boot-7.1.0-SNAPSHOT.jar"
-         id="jetty-osgi-boot"/>
-    <jar name="jetty-osgi/jetty-osgi-boot-jsp/target/jetty-osgi-boot-jsp-7.1.0-SNAPSHOT.jar"
-         id="jetty-osgi-boot-jsp"/>
-    <jar name="jetty-osgi/jetty-osgi-boot-logback/target/jetty-osgi-boot-logback-7.1.0-SNAPSHOT.jar"
-         id="jetty-osgi-boot-logback"/>
-    <jar name="jetty-osgi/jetty-osgi-boot-warurl/target/jetty-osgi-boot-warurl-7.1.0-SNAPSHOT.jar"
-         id="jetty-osgi-boot-warurl"/>
-    <jar name="jetty-osgi/jetty-osgi-httpservice/target/jetty-httpservice-7.1.0-SNAPSHOT.jar"
-         id="jetty-httpservice"/>
-    <license name="LICENSE-APACHE-2.0.txt"/>
-    <license name="LICENSE-ECLIPSE-1.0.html"/>
-  </project>
-
-  <project name="jetty-test">
-    <depend project="jetty" inherit="all"/>
-    <mvn/>
+
+    <depend project="jetty-jsp-2.1"/>
+    <depend project="jetty-webapp"/>
+  </project>
+
+  <project name="jetty-ajp">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-ajp"/>
+    <jar name="jetty-ajp/target/jetty-ajp-*[0-9T].jar"/>
+
+    <option project="jetty-server"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="jetty-annotations">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-annotations"/>
+    <jar name="jetty-annotations/target/jetty-annotations-*[0-9T].jar"/>
+
+    <option project="asm"/>
+    <option project="jetty-jndi"/>
+    <option project="jetty-plus"/>
+    <option project="jetty-webapp"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="jetty-client">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-client"/>
+    <jar name="jetty-client/target/jetty-client-*[0-9T].jar"/>
+
+    <option project="jetty-http"/>
+    <option project="jetty-security"/>
+    <option project="jetty-server"/>
+    <option project="jetty-servlet"/>
+    <option project="jetty-websocket"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="jetty-ajp">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-ajp"/>
+    <jar name="jetty-ajp/target/jetty-ajp-*[0-9T].jar"/>
+
+    <option project="jetty-server"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="jetty-continuation">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-continuation"/>
+    <jar name="jetty-continuation/target/jetty-continuation-*[0-9T].jar"/>
+
+    <option project="jetty-util"/>
+  </project>
+
+  <project name="jetty-deploy">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-deploy"/>
+    <jar name="jetty-deploy/target/jetty-deploy-*[0-9T].jar"/>
+
+    <option project="jetty-webapp"/>
+    <option project="jetty-xml"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="jetty-http">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-http"/>
+    <jar name="jetty-http/target/jetty-http-*[0-9T].jar"/>
+
+    <option project="jetty-io"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="jetty-io">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-io"/>
+    <jar name="jetty-io/target/jetty-io-*[0-9T].jar"/>
+
+    <option project="jetty-util"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="jetty-jaspi">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-jaspi"/>
+    <jar name="jetty-jaspi/target/jetty-jaspi-*[0-9T].jar"/>
+
+    <option project="jetty-security"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="jetty-jmx">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-jmx"/>
+    <jar name="jetty-jmx/target/jetty-jmx-*[0-9T].jar"/>
+
+    <option project="jetty-webapp"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="jetty-jndi">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-jndi"/>
+    <jar name="jetty-jndi/target/jetty-jndi-*[0-9T].jar"/>
+
+    <option project="jetty-webapp"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="jetty-jsp-2.1">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-jsp-2.1"/>
+    <jar name="jetty-jsp-2.1/target/jetty-jsp-2.1-*[0-9T].jar"/>
+
+    <option project="jetty-util"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="jetty-plus">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-plus"/>
+    <jar name="jetty-plus/target/jetty-plus-*[0-9T].jar"/>
+
+    <option project="jetty-jndi"/>
+    <option project="jetty-webapp"/>
+    <option project="junit"/>
   </project>
+
+  <project name="jetty-policy">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-policy"/>
+    <jar name="jetty-policy/target/jetty-policy-*[0-9T].jar"/>
+
+    <option project="jetty-util"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="jetty-rewrite">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-rewrite"/>
+    <jar name="jetty-rewrite/target/jetty-rewrite-*[0-9T].jar"/>
+
+    <option project="jetty-server"/>
+    <option project="junit"/>
+    <option project="test-jetty-servlet"/>
+  </project>
+
+  <project name="jetty-security">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-security"/>
+    <jar name="jetty-security/target/jetty-security-*[0-9T].jar"/>
+
+    <option project="jetty-server"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="jetty-server">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-server"/>
+    <jar name="jetty-server/target/jetty-server-*[0-9T].jar"/>
+
+    <option project="jetty-continuation"/>
+    <option project="jetty-http"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="jetty-servlet">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-servlet"/>
+    <jar name="jetty-servlet/target/jetty-servlet-*[0-9T].jar"/>
+
+    <option project="jetty-security"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="jetty-servlets">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-servlets"/>
+    <jar name="jetty-servlets/target/jetty-servlets-*[0-9T].jar"/>
+
+    <option project="jetty-client"/>
+    <option project="jetty-continuation"/>
+    <option project="jetty-util"/>
+    <option project="jetty-webapp"/>
+    <option project="junit"/>
+    <option project="test-jetty-servlet"/>
+  </project>
+
+  <project name="jetty-start">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-start"/>
+    <jar name="jetty-start/target/jetty-start-*[0-9T].jar"/>
+
+    <option project="junit"/>
+  </project>
+
+  <project name="jetty-util">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-util"/>
+    <jar name="jetty-util/target/jetty-util-*[0-9T].jar"/>
+
+    <option project="junit"/>
+    <option project="slf4j"/>
+  </project>
+
+  <project name="jetty-webapp">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-webapp"/>
+    <jar name="jetty-webapp/target/jetty-webapp-*[0-9T].jar"/>
+
+    <option project="jetty-servlet"/>
+    <option project="jetty-xml"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="jetty-websocket">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-websocket"/>
+    <jar name="jetty-websocket/target/jetty-websocket-*[0-9T].jar"/>
+
+    <option project="jetty-server"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="jetty-xml">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-xml"/>
+    <jar name="jetty-xml/target/jetty-xml-*[0-9T].jar"/>
+
+    <option project="jetty-util"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="test-jetty-servlet">
+    <package>org.eclipse.jetty</package>
+    <depend project="jetty-project"/>
+    <mvn basedir="jetty-servlet"/>
+    <jar name="jetty-servlet/target/jetty-servlet-*[0-9T].jar"/>
+
+    <option project="jetty-webapp"/>
+    <option project="junit"/>
+  </project>
+
 </module>



Mime
View raw message