gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r328743 - /gump/metadata/project/smartfrog.xml
Date Wed, 26 Oct 2005 21:29:50 GMT
Author: stevel
Date: Wed Oct 26 14:29:46 2005
New Revision: 328743

URL: http://svn.apache.org/viewcvs?rev=328743&view=rev
Log:
fully refactored build file; www, tomcat and jetty are split out.

Modified:
    gump/metadata/project/smartfrog.xml

Modified: gump/metadata/project/smartfrog.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/smartfrog.xml?rev=328743&r1=328742&r2=328743&view=diff
==============================================================================
--- gump/metadata/project/smartfrog.xml (original)
+++ gump/metadata/project/smartfrog.xml Wed Oct 26 14:29:46 2005
@@ -221,7 +221,6 @@
     <work nested="components/ssh/build/classes"/>
     <work nested="components/net/build/classes"/>
     <work nested="components/emailer/build/classes"/>
-    <work nested="components/jetty/build/classes"/>
     <work nested="components/slp/build/classes"/>
     <work nested="components/scripting/build/classes"/>
     <work nested="components/utils/build/classes"/>
@@ -230,8 +229,6 @@
     <jar name="components/utils/dist/lib/sf-utils-@@DATE@@.jar" id="sf-utils"/>
     <jar name="components/ssh/dist/lib/sf-ssh-@@DATE@@.jar" id="sf-ssh"/>
     <jar name="components/net/dist/lib/sf-net-@@DATE@@.jar" id="sf-net"/>
-    <jar name="components/www/dist/lib/sf-www-@@DATE@@.jar" id="sf-www"/>
-    <jar name="components/www/dist/lib/sf-testwar-@@DATE@@.jar" id="sf-testwar"/>
     <jar name="components/emailer/dist/lib/sf-emailer-@@DATE@@.jar" id="sf-emailer"/>
     <jar name="components/slp/dist/lib/sf-slplib-@@DATE@@.jar" id="sf-slplib"/>
     <jar name="components/scripting/dist/lib/sf-scripting-@@DATE@@.jar" 
@@ -246,7 +243,8 @@
       <regexp subject="[Gump:Smartfrog] smartfrog-components build failure"/>
     </nag>
   </project>
-  
+
+
   <project name="smartfrog-junit">
     <package>org.smartfrog.services.junit</package>
     <ant basedir="components/junit" target="gump">   
@@ -271,15 +269,14 @@
       <regexp subject="[Gump:Smartfrog:Junit] smartfrog test failure"/>
     </nag>
   </project>
-  
 
-  
+
   <!-- XML processing -->
   <project name="smartfrog-xml">
     <package>org.smartfrog.services.xml</package>
-    <ant basedir="components/xml" target="gump">   
+    <ant basedir="components/xml" target="gump">
       <property name="env.SFHOME" path="smartfrog/dist" project="smartfrog"/>
-      <property name="system.tests" value="false" /> 
+      <property name="system.tests" value="false"/>
       <property name="junit.jar" project="junit" reference="jarpath"/>
     </ant>
     <depend project="ant" runtime="false"/>
@@ -289,18 +286,107 @@
     <depend project="smartfrog-tasks" runtime="true"/>
     <depend project="smartfrog-testharness" runtime="true"/>
     <depend project="xom" runtime="true"/>
-    <work nested="components/xml/build/classes"/> 
+    <work nested="components/xml/build/classes"/>
     <work nested="components/xml/build/test/classes"/>
     <xmlreport nested="components/xml/build/test/reports"/>
     <home nested="components/xml/dist/lib"/>
-    <jar name="sf-xml-@@DATE@@.jar" id="smartfrog-xml" />    
-    
+    <jar name="sf-xml-@@DATE@@.jar" id="smartfrog-xml"/>
+
     <nag from="Smartfrog &lt;smartfrog@users.sf.net&gt;"
-        to="smartfrog@users.sf.net">
+         to="smartfrog@users.sf.net">
       <regexp subject="[Gump:Smartfrog:XML] failure"/>
     </nag>
-  </project>  
+  </project>
+
+  <!-- WWWL processing -->
+  <project name="smartfrog-www">
+    <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="smartfrog" runtime="true"/>
+    <depend project="smartfrog-tasks" runtime="true"/>
+    <depend project="smartfrog-testharness" runtime="true"/>
+    <!--get the servlet API-->
+    <depend project="jakarta-servletapi" runtime="true"/>
+    <work nested="components/www/build/classes"/>
+    <!--<work nested="components/www/build/test/classes"/>-->
+    <xmlreport nested="components/xml/build/test/reports"/>
+    <home nested="components/www/dist/lib"/>
+    <jar name="components/www/dist/lib/sf-www-@@DATE@@.jar" id="sf-www"/>
+    <jar name="components/www/dist/lib/sf-testwar-@@DATE@@.jar"
+         id="sf-testwar"/>
+
+    <nag from="Smartfrog &lt;smartfrog@users.sf.net&gt;"
+         to="steve.loughran@gmail.com">
+      <regexp subject="[Gump:Smartfrog:WWW] failure"/>
+    </nag>
+  </project>
+
+  <!-- Jetty component is an instantiation of the abstract
+       deployment stuff in sf-www, on which it depends -->
+  <project name="smartfrog-jetty">
+    <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="junit" 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="sf-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"/>-->
+    <home nested="components/jetty/dist/lib"/>
+    <jar name="components/jetty/dist/lib/sf-jetty-@@DATE@@.jar" id="sf-jetty"/>
+
+    <nag from="Smartfrog &lt;smartfrog@users.sf.net&gt;"
+         to="steve.loughran@gmail.com">
+      <regexp subject="[Gump:Smartfrog:WWW] failure"/>
+    </nag>
+  </project>
   
+  <!-- Tomcat component is an instantiation of the abstract
+    deployment stuff in sf-www, on which it depends -->
+  <project name="smartfrog-tomcat">
+    <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="smartfrog" runtime="true"/>
+    <depend project="smartfrog-tasks" runtime="true"/>
+    <depend project="smartfrog-testharness" runtime="true"/>
+    <depend project="sf-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"/>-->
+    <home nested="components/tomcat/dist/lib"/>
+    <jar name="components/tomcat/dist/lib/sf-tomcat-@@DATE@@.jar" id="sf-tomcat"/>
+
+    <nag from="Smartfrog &lt;smartfrog@users.sf.net&gt;"
+         to="steve.loughran@gmail.com">
+      <regexp subject="[Gump:Smartfrog:WWW] failure"/>
+    </nag>
+  </project>
+
+
+
   <!-- CDL language: the XML representation -->
 <!-- Java 1.5+ only 
   <project name="smartfrog-cdl">



Mime
View raw message