Return-Path: 
 <commits-return-336-apmail-gump-commits-archive=www.apache.org@gump.apache.org>
Delivered-To: apmail-gump-commits-archive@www.apache.org
Received: (qmail 12413 invoked from network); 26 Oct 2004 12:54:26 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 26 Oct 2004 12:54:26 -0000
Received: (qmail 38837 invoked by uid 500); 26 Oct 2004 12:54:13 -0000
Mailing-List: contact commits-help@gump.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@gump.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@gump.apache.org>
List-Post: <mailto:commits@gump.apache.org>
List-Id: <commits.gump.apache.org>
Reply-To: dev@gump.apache.org
Delivered-To: mailing list commits@gump.apache.org
Delivered-To: moderator for commits@gump.apache.org
Received: (qmail 7695 invoked by uid 500); 26 Oct 2004 12:45:20 -0000
Delivered-To: apmail-gump-cvs@apache.org
X-ASF-Spam-Status: No, hits=-10.0 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Date: 26 Oct 2004 12:45:18 -0000
Message-ID: <20041026124518.5350.qmail@minotaur.apache.org>
From: stevel@apache.org
To: gump-cvs@apache.org
Subject: cvs commit: gump/project smartfrog.xml
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

stevel      2004/10/26 05:45:18

  Modified:    project  smartfrog.xml
  Log:
  split test into testharness jar and the test run, to get classpath setup working under gump.
  
  Revision  Changes    Path
  1.24      +98 -7     gump/project/smartfrog.xml
  
  Index: smartfrog.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/smartfrog.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- smartfrog.xml	14 Oct 2004 13:26:32 -0000	1.23
  +++ smartfrog.xml	26 Oct 2004 12:45:18 -0000	1.24
  @@ -25,6 +25,9 @@
     <cvs repository="sourceforge" 
     		dir="smartfrog" module="core"/>
   
  +	<!-- =========================================== -->
  +	<!-- smartfrog core -->
  +	<!-- =========================================== -->
     <project name="smartfrog">
       <package>org.smartfrog</package>
   
  @@ -50,7 +53,9 @@
   
     </project>
   
  +	<!-- =========================================== -->
     <!-- ant tasks -->
  +	<!-- =========================================== -->
     <project name="smartfrog-tasks">
       <package>org.smartfrog.tools.ant</package>
       <ant basedir="extras/ant" target="dist">		
  @@ -73,7 +78,9 @@
       </nag>
     </project>
   
  +	<!-- =========================================== -->
     <!-- test that the ant tasks work; uses ant's test harness -->
  +	<!-- =========================================== -->
     <project name="smartfrog-tasks-test">
       <package>org.smartfrog.tools.ant</package>
       <ant basedir="extras/ant" target="test" >
  @@ -82,15 +89,14 @@
         <property name="system.tests" value="false" /> 
       </ant>    
       <depend project="ant" runtime="true"/>
  -    <depend project="xml-xerces"/>
       <depend project="ant-testutil" runtime="true"/>
       <depend project="junit" runtime="true"/>
       <depend project="smartfrog" runtime="true"/>
       <depend project="smartfrog-tasks" runtime="true"/>
   
       <work nested="extras/ant/build/test/classes"/>
  -    <!-- <javadoc nested="doc/javadocs"/> -->
  -    <junitreport nested="extras/ant/build/test/reports"/>
  +    <home nested="extras/ant/build/dist/lib"/>
  +    <jar name="smartfrog-tasks.jar" id="smartfrog-tasks" />
       
       <nag from="Smartfrog &lt;smartfrog@users.sf.net&gt;"
           to="smartfrog-developer@lists.sourceforge.net">
  @@ -98,12 +104,44 @@
       </nag>
     </project>
     
  +	
  +	<!-- =========================================== -->
  +  <!-- 
  +		build the testharness for smartfrog tests
  +		smartfrog components that want to do functional testing
  +		also need to depend on this
  +      -->
  +	<!-- =========================================== -->
  +  <project name="smartfrog-testharness">
  +    <package>org.smartfrog</package>
  +    <ant basedir="testharness" target="test">		
  +      <property name="ant.home" reference="home" project="ant"/>
  +      <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="smartfrog" runtime="true"/>
  +    <depend project="smartfrog-tasks" runtime="true"/>
  +		
  +    <work nested="testharness/build/classes"/>
  +    <home nested="extras/ant/build/dist/lib"/>
  +    <jar name="sf-testharness.jar" id="smartfrog-testharness" />
  +    
  +    <nag from="Smartfrog &lt;smartfrog@users.sf.net&gt;"
  +        to="smartfrog-developer@lists.sourceforge.net">
  +      <regexp subject="[Gump:Smartfrog] Build Failure"/>
  +    </nag>
  +  </project>
  +	
  +	<!-- =========================================== -->
     <!-- test that smartfrog works (needs ant tasks) -->
     <!-- important: full tests here are functional and bring up an RMI server
         on port 3800 that let people download and run stuff; unless
         security in enabled -that means *anybody*. You must disable the tests
         if that is not what you want. 
         -->
  +	<!-- =========================================== -->
     <project name="smartfrog-test">
       <package>org.smartfrog</package>
       <ant basedir="testharness" target="test">		
  @@ -111,18 +149,71 @@
         <property name="env.SFHOME" path="smartfrog/dist" project="smartfrog"/>
         <property name="system.tests" value="false" /> 
       </ant>
  -    <depend project="ant" runtime="true"/>
  -    <depend project="xml-xerces"/>
  -    <depend project="ant-testutil" runtime="true"/>
  +    <depend project="ant" runtime="false"/>
       <depend project="junit" runtime="true"/>
       <depend project="smartfrog" runtime="true"/>
       <depend project="smartfrog-tasks" runtime="true"/>
  -
  +		<depend project="smartfrog-testharness" runtime="true"/>
  +		
       <work nested="testharness/build/test/classes"/>
       <junitreport nested="testharness/build/test/reports"/>
       
       <nag from="Smartfrog &lt;smartfrog@users.sf.net&gt;"
           to="smartfrog-developer@lists.sourceforge.net">
  +      <regexp subject="[Gump:Smartfrog] Build Failure"/>
  +    </nag>
  +  </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>
  +    <ant basedir="components" target="dist" >
  +      <property name="system.tests" value="false" /> 
  +    </ant>
  +    <depend project="junit" runtime="true"/>
  +    <depend project="smartfrog" runtime="true"/>
  +    <depend project="smartfrog-tasks" runtime="true"/>
  +    <!-- logging -->
  +    <depend project="commons-logging" runtime="true"/>
  +    <option project="logging-log4j"/>
  +		<depend project="smartfrog-testharness" runtime="true"/>		
  +    
  +    <!-- xml -->
  +    <depend project="xml-xerces"/>    
  +    <depend project="xml-apis"/>
  +    
  +    <!-- jetty component uses jetty -->
  +    <option project="jetty" />
  +    
  +    <!-- CDDLM sub project is SOAPy -->
  +    <option project="ws-axis" />
  +    <option project="xom" />
  +    
  +    <!-- junit -->
  +    <depend project="junit" />
  +    
  +    <!-- net -->
  +    <option project="commons-net" />
  +
  +    <!-- jsch -->
  +    <option project="jsch" />
  +
  +    
  +    <work nested="component/build/classes"/>
  +    <home nested="component/build/dist/lib"/>
  +    <jar name="cddlm.jar" id="smartfrog" />
  +
  +    <license name="smartfrog/LICENSE.txt"/>
  +    
  +    <nag from="Smartfrog &lt;smartfrog@users.sf.net&gt;"
  +        to="smartfrog-developer@lists.sourceforge.net.">
         <regexp subject="[Gump:Smartfrog] Build Failure"/>
       </nag>
     </project>