gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r379464 - in /gump/metadata/project: antbook.xml ggf-cddlm.xml smartfrog.xml
Date Tue, 21 Feb 2006 14:45:29 GMT
Author: stevel
Date: Tue Feb 21 06:45:24 2006
New Revision: 379464

URL: http://svn.apache.org/viewcvs?rev=379464&view=rev
Log:
Now that we hava java1.5, I can add some more stuff. Expect this to take a few days to stabilise,
especially as I am exploring inherit="runtime" semantics.

Added:
    gump/metadata/project/antbook.xml
Modified:
    gump/metadata/project/ggf-cddlm.xml
    gump/metadata/project/smartfrog.xml

Added: gump/metadata/project/antbook.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/antbook.xml?rev=379464&view=auto
==============================================================================
--- gump/metadata/project/antbook.xml (added)
+++ gump/metadata/project/antbook.xml Tue Feb 21 06:45:24 2006
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+  Copyright 2005 The Apache Software Foundation
+
+  Licensed 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.
+-->
+    
+    
+    <!--
+    This project contains the different builds for the modules within
+    the examples of Java Development with Ant.
+    
+    -->
+<module name="antbook">
+
+  <url href="http://antbook.org/"/>
+  <description>
+    Examples to go with Java Development with Ant
+  </description>
+  <redistributable/>
+
+  <cvs repository="sourceforge" 
+      dir="antbook" module="examples"/>
+
+  <!-- =========================================== -->
+  <!-- Core diary module -->
+  <!-- =========================================== -->
+  <project name="antbook-diary-core" inherit="runtime">
+    <home nested="diary/core/"/>
+    <work nested="diary/core/build/classes"/>
+    <package>d1.core</package>
+
+    <ant basedir="diary/core/" target="default" >    
+      <property name="project.version" value="@@DATE@@"/>
+    </ant>
+    <depend project="ant" runtime="false"/>
+    <depend project="junit" runtime="false"/>
+
+    <jar name="dist/antbook-diary-@@DATE@@.jar" id="antbook-diary" />
+
+    <license name="LICENSE.txt"/>
+    
+    <nag from="Smartfrog &lt;smartfrog@users.sf.net&gt;"
+        to="steve.loughran@gmail.com"
+        subject="[Gump] Antbook Build Failure"/>
+
+  </project>
+
+</module>

Modified: gump/metadata/project/ggf-cddlm.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/ggf-cddlm.xml?rev=379464&r1=379463&r2=379464&view=diff
==============================================================================
--- gump/metadata/project/ggf-cddlm.xml (original)
+++ gump/metadata/project/ggf-cddlm.xml Tue Feb 21 06:45:24 2006
@@ -28,7 +28,7 @@
   <!-- =========================================== -->
   <!-- CDDLM jar -->
   <!-- =========================================== -->
-  <project name="cddlm">
+  <project name="cddlm" inherit="runtime">
     <package>org.ggf.cddlm</package>
 
     <mkdir dir="build"/>
@@ -36,13 +36,11 @@
       <property name="project.version" value="@@DATE@@"/>
     </ant>
     <depend project="ant" runtime="false"/>
-    <depend project="junit" runtime="true"/>
-    <depend project="xalan" runtime="true"/>
-    <depend project="xml-apis" runtime="true"/>
-    <depend project="xml-xerces" runtime="true"/>
-<!--     <depend project="xml-xmlbeans-v1" runtime="true"/> -->
-    <depend project="maven2-ant-tasks"/>
-    
+    <depend project="junit" runtime="false"/>
+    <depend project="xalan" runtime="false"/>
+    <depend project="xml-apis" runtime="false"/>
+    <depend project="xml-xerces" runtime="false"/>
+    <depend project="maven2-ant-tasks" runtime="false"/>
 
     <work nested="build/classes"/>
     <home nested="dist"/>

Modified: gump/metadata/project/smartfrog.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/smartfrog.xml?rev=379464&r1=379463&r2=379464&view=diff
==============================================================================
--- gump/metadata/project/smartfrog.xml (original)
+++ gump/metadata/project/smartfrog.xml Tue Feb 21 06:45:24 2006
@@ -28,7 +28,7 @@
   <!-- =========================================== -->
   <!-- smartfrog core -->
   <!-- =========================================== -->
-  <project name="smartfrog">
+  <project name="smartfrog" inherit="runtime">
     <package>org.smartfrog</package>
 
     <mkdir dir="smartfrog/build"/>
@@ -37,7 +37,8 @@
       <property name="ant.home" reference="home" project="ant"/>
     </ant>
     <depend project="ant" runtime="false"/>
-    <depend project="junit" runtime="true"/>
+    <depend project="commons-logging" runtime="true"/>
+    <depend project="junit" runtime="false"/>
     <depend project="javacc" runtime="false"/> 
 
     <work nested="smartfrog/build"/>
@@ -57,14 +58,14 @@
   <!-- =========================================== -->
   <!-- ant tasks -->
   <!-- =========================================== -->
-  <project name="smartfrog-tasks">
+  <project name="smartfrog-tasks" inherit="runtime">
     <package>org.smartfrog.tools.ant</package>
     <ant basedir="extras/ant" target="dist">    
       <property name="ant.home" reference="home" project="ant"/>
       <property name="env.SFHOME" path="smartfrog/dist" project="smartfrog"/>
     </ant>
-    <depend project="ant" runtime="true"/>
-    <depend project="junit" runtime="true"/>
+    <depend project="ant" runtime="false"/>
+    <depend project="junit" runtime="false"/>
     <depend project="smartfrog" runtime="true"/> 
 
     <work nested="extras/ant/build/classes"/>
@@ -167,12 +168,7 @@
   </project>
 
  <!-- =========================================== -->
- <!-- 
-  CDDLM: Configuration, Deployment and Lifecycle Management
-  A project underway at the Global Grid Forum. 
-  This project will become the HPLaboratories release of the
-  implementation of the specifications. 
- -->  
+ 
  <!-- =========================================== -->
   <project name="smartfrog-components">
     <package>org.smartfrog.services.axis</package>
@@ -287,12 +283,17 @@
       <property name="junit.jar" project="junit" reference="jarpath"/>
     </ant>
     <depend project="ant" runtime="false"/>
-    <depend project="junit" runtime="true"/>
+    <depend project="junit" runtime="false"/>
+    <depend project="packaged-jaxen" runtime="true"/>
     <depend project="maven2-ant-tasks"/>
     <depend project="smartfrog" runtime="true"/>
-    <depend project="smartfrog-tasks" runtime="true"/>
-    <depend project="smartfrog-testharness" runtime="true"/>
+    <depend project="smartfrog-tasks" runtime="false"/>
+    <depend project="smartfrog-testharness" runtime="false"/>
+    <depend project="xalan" runtime="true"/>
     <depend project="xom" runtime="true"/>
+    <depend project="xml-apis" runtime="true"/>
+    <depend project="xml-xerces" runtime="true"/>
+
     <work nested="components/xml/build/classes"/>
     <work nested="components/xml/build/test/classes"/>
     <xmlreport nested="components/xml/build/test/reports"/>
@@ -306,17 +307,17 @@
   </project>
 
   <!-- WWWL processing -->
-  <project name="smartfrog-www">
+  <project name="smartfrog-www" inherit="runtime">
     <package>org.smartfrog.services.www</package>
     <ant basedir="components/www" target="gump">
       <property name="env.SFHOME" path="smartfrog/dist" project="smartfrog"/>
       <property name="system.tests" value="false"/>
     </ant>
     <depend project="ant" runtime="false"/>
-    <depend project="junit" runtime="true"/>
-    <depend project="maven2-ant-tasks"/>
+    <depend project="junit" runtime="false"/>
+    <depend project="maven2-ant-tasks" runtime="false"/>
     <depend project="smartfrog" runtime="true"/>
-    <depend project="smartfrog-tasks" runtime="true"/>
+    <depend project="smartfrog-tasks" runtime="false"/>
     <depend project="smartfrog-testharness" runtime="true"/>
     <!--get the servlet API-->
     <depend project="jakarta-servletapi" runtime="true"/>
@@ -336,21 +337,22 @@
 
   <!-- Jetty component is an instantiation of the abstract
        deployment stuff in sf-www, on which it depends -->
-  <project name="smartfrog-jetty">
+  <project name="smartfrog-jetty" inherit="runtime">
     <package>org.smartfrog.services.jetty</package>
     <ant basedir="components/jetty" target="gump">
       <property name="env.SFHOME" path="smartfrog/dist" project="smartfrog"/>
       <property name="system.tests" value="false"/>
     </ant>
+
     <depend project="ant" runtime="false"/>
+    <depend project="jetty4" runtime="true"/>
     <depend project="junit" runtime="true"/>
-    <depend project="maven2-ant-tasks"/>
+    <depend project="maven2-ant-tasks" runtime="false"/>
     <depend project="smartfrog" runtime="true"/>
-    <depend project="smartfrog-tasks" runtime="true"/>
-    <depend project="smartfrog-testharness" runtime="true"/>
+    <depend project="smartfrog-tasks" runtime="false"/>
+    <depend project="smartfrog-testharness" runtime="false"/>
     <depend project="smartfrog-www" runtime="true"/>
-    <!--get the servlet API-->
-    <depend project="jetty" runtime="true"/>
+
     <work nested="components/jetty/build/classes"/>
     <!--<work nested="components/jetty/build/test/classes"/>-->
     <!--<xmlreport nested="components/jetty/build/test/reports"/>-->
@@ -365,21 +367,20 @@
   
   <!-- Tomcat component is an instantiation of the abstract
     deployment stuff in sf-www, on which it depends -->
-  <project name="smartfrog-tomcat">
+  <project name="smartfrog-tomcat" inherit="runtime">
     <package>org.smartfrog.services.www.tomcat</package>
     <ant basedir="components/tomcat" target="gump">
       <property name="env.SFHOME" path="smartfrog/dist" project="smartfrog"/>
       <property name="system.tests" value="false"/>
     </ant>
     <depend project="ant" runtime="false"/>
-    <depend project="junit" runtime="true"/>
-    <depend project="maven2-ant-tasks"/>
+    <depend project="junit" runtime="false"/>
+    <depend project="maven2-ant-tasks" runtime="false"/>
     <depend project="smartfrog" runtime="true"/>
-    <depend project="smartfrog-tasks" runtime="true"/>
-    <depend project="smartfrog-testharness" runtime="true"/>
+    <depend project="smartfrog-tasks" runtime="false"/>
+    <depend project="smartfrog-testharness" runtime="false"/>
     <depend project="smartfrog-www" runtime="true"/>
-    <!--get the servlet API-->
-    <depend project="jakarta-tomcat-5" runtime="true"/>
+    
     <work nested="components/tomcat/build/classes"/>
     <!--<work nested="components/tomcat/build/test/classes"/>-->
     <!--<xmlreport nested="components/tomcat/build/test/reports"/>-->
@@ -392,11 +393,16 @@
     </nag>
   </project>
 
-
-
-  <!-- CDL language: the XML representation -->
-<!-- Java 1.5+ only 
-  <project name="smartfrog-cdl">
+  <!-- 
+    CDDLM: Configuration, Deployment and Lifecycle Management
+    A project underway at the Global Grid Forum. 
+    This project is the HPLaboratories release of the
+    implementation of the specifications. 
+    
+    The actual XSD is hosted in sourceforge/deployment, which is
+    built by ggf-cddlm
+  -->
+  <project name="smartfrog-cdl" inherit="runtime">
     <package>org.smartfrog.sfcore.languages.cdl</package>
     <ant basedir="extras/cdl" target="gump">   
       <property name="env.SFHOME" path="smartfrog/dist" project="smartfrog"/>
@@ -404,24 +410,53 @@
       <property name="junit.jar" project="junit" reference="jarpath"/>
     </ant>
     <depend project="ant" runtime="false"/>
+    <depend project="cddlm" runtime="true"/>
+    <depend project="commons-logging" runtime="true"/>
     <depend project="junit" runtime="true"/>
+    <depend project="maven2-ant-tasks" runtime="false"/>
     <depend project="smartfrog" runtime="true"/>
-    <depend project="smartfrog-tasks" runtime="true"/>
-    <depend project="smartfrog-testharness" runtime="true"/>
+    <depend project="smartfrog-tasks" runtime="false"/>
+    <depend project="smartfrog-testharness" runtime="false"/>
     <depend project="smartfrog-xml" runtime="true"/>
-    <depend project="xom" runtime="true"/>
-    <depend project="packaged-jaxen" runtime="true"/>
     
     <work nested="extras/cdl/test/classes"/>
     <junitreport nested="extras/cdl/build/test/reports"/>
-    <home nested="extras/cdl/dist/lib"/>
+    <home nested="components/deployapi/dist/lib"/>
     <jar name="sf-cdl-@@DATE@@.jar" id="smartfrog-cdl" />
     
     <nag from="Smartfrog &lt;smartfrog@users.sf.net&gt;"
-        to="smartfrog-checkins@lists.sourceforge.net">
+        to="deployment-cvs@lists.sourceforge.net">
       <regexp subject="[Gump:Smartfrog:CDL] failure"/>
     </nag>
-  </project>  
- 
-   -->
+  </project>
+
+
+  <!--
+    SOAP/WSRF based API for deployment; depends on lots and lots
+    of other things
+  -->
+  <project name="smartfrog-deployapi">
+    <package>org.smartfrog.sfcore.languages.cdl</package>
+    <ant basedir="extras/cdl" target="gump">
+      <property name="env.SFHOME" path="smartfrog/dist" project="smartfrog"/>
+      <property name="system.tests" value="false"/>
+      <property name="junit.jar" project="junit" reference="jarpath"/>
+    </ant>
+    <depend project="ant" runtime="false"/>
+    <depend project="junit" runtime="false"/>
+    <depend project="maven2-ant-tasks" runtime="false"/>
+
+    <depend project="smartfrog-jetty" runtime="true"/>
+    <depend project="smartfrog-jetty" runtime="true"/>
+    <depend project="smartfrog-cdl" runtime="true"/>
+
+    <home nested="extras/cdl/dist/lib"/>
+    <jar name="sf-cdl-@@DATE@@.jar" id="smartfrog-deployapi"/>
+
+    <nag from="Smartfrog &lt;smartfrog@users.sf.net&gt;"
+        to="deployment-cvs@lists.sourceforge.net">
+      <regexp subject="[Gump:Smartfrog:CDL] failure"/>
+    </nag>
+  </project>
+  
 </module>



Mime
View raw message