You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by st...@apache.org on 2006/02/21 17:01:01 UTC
svn commit: r379509 - in /gump/metadata/project: antbook.xml ggf-cddlm.xml
smartfrog.xml
Author: stevel
Date: Tue Feb 21 08:00:58 2006
New Revision: 379509
URL: http://svn.apache.org/viewcvs?rev=379509&view=rev
Log:
steve misreads which element inherit=runtime goes to; thought it was a kind of what-to-export declaration. Fixed.
Modified:
gump/metadata/project/antbook.xml
gump/metadata/project/ggf-cddlm.xml
gump/metadata/project/smartfrog.xml
Modified: gump/metadata/project/antbook.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/antbook.xml?rev=379509&r1=379508&r2=379509&view=diff
==============================================================================
--- gump/metadata/project/antbook.xml (original)
+++ gump/metadata/project/antbook.xml Tue Feb 21 08:00:58 2006
@@ -35,7 +35,7 @@
<!-- =========================================== -->
<!-- Core diary module -->
<!-- =========================================== -->
- <project name="antbook-diary-core" inherit="runtime">
+ <project name="antbook-diary-core" >
<home nested="diary/core/"/>
<work nested="diary/core/build/classes"/>
<package>d1.core</package>
Modified: gump/metadata/project/ggf-cddlm.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/ggf-cddlm.xml?rev=379509&r1=379508&r2=379509&view=diff
==============================================================================
--- gump/metadata/project/ggf-cddlm.xml (original)
+++ gump/metadata/project/ggf-cddlm.xml Tue Feb 21 08:00:58 2006
@@ -28,7 +28,7 @@
<!-- =========================================== -->
<!-- CDDLM jar -->
<!-- =========================================== -->
- <project name="cddlm" inherit="runtime">
+ <project name="cddlm">
<package>org.ggf.cddlm</package>
<mkdir dir="build"/>
Modified: gump/metadata/project/smartfrog.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/smartfrog.xml?rev=379509&r1=379508&r2=379509&view=diff
==============================================================================
--- gump/metadata/project/smartfrog.xml (original)
+++ gump/metadata/project/smartfrog.xml Tue Feb 21 08:00:58 2006
@@ -28,7 +28,7 @@
<!-- =========================================== -->
<!-- smartfrog core -->
<!-- =========================================== -->
- <project name="smartfrog" inherit="runtime">
+ <project name="smartfrog" >
<package>org.smartfrog</package>
<mkdir dir="smartfrog/build"/>
@@ -36,7 +36,7 @@
<property name="Version" value="@@DATE@@"/>
<property name="ant.home" reference="home" project="ant"/>
</ant>
- <depend project="ant" runtime="false"/>
+ <depend project="ant" runtime="false" inherit="runtime"/>
<depend project="commons-logging" runtime="true"/>
<depend project="junit" runtime="false"/>
<depend project="javacc" runtime="false"/>
@@ -58,7 +58,7 @@
<!-- =========================================== -->
<!-- ant tasks -->
<!-- =========================================== -->
- <project name="smartfrog-tasks" inherit="runtime">
+ <project name="smartfrog-tasks" >
<package>org.smartfrog.tools.ant</package>
<ant basedir="extras/ant" target="dist">
<property name="ant.home" reference="home" project="ant"/>
@@ -66,7 +66,7 @@
</ant>
<depend project="ant" runtime="false"/>
<depend project="junit" runtime="false"/>
- <depend project="smartfrog" runtime="true"/>
+ <depend project="smartfrog" runtime="true" inherit="runtime"/>
<work nested="extras/ant/build/classes"/>
<home nested="extras/ant/dist/lib"/>
@@ -93,7 +93,7 @@
<depend project="ant" runtime="true"/>
<depend project="ant-testutil" runtime="true"/>
<depend project="junit" runtime="true"/>
- <depend project="smartfrog" runtime="true"/>
+ <depend project="smartfrog" runtime="true" inherit="runtime"/>
<depend project="smartfrog-tasks" runtime="true"/>
<work nested="extras/ant/build/test/classes"/>
@@ -122,7 +122,7 @@
</ant>
<depend project="ant" runtime="false"/>
<depend project="junit" runtime="true"/>
- <depend project="smartfrog" runtime="true"/>
+ <depend project="smartfrog" runtime="true" inherit="runtime"/>
<depend project="smartfrog-tasks" runtime="true"/>
<work nested="testharness/build/classes"/>
@@ -177,11 +177,11 @@
</ant>
<depend project="ant" runtime="false"/>
<depend project="junit" runtime="true"/>
- <depend project="smartfrog" runtime="true"/>
+ <depend project="smartfrog" runtime="true" inherit="runtime"/>
<depend project="smartfrog-tasks" runtime="true"/>
<!-- logging -->
- <depend project="commons-logging" runtime="true"/>
- <depend project="logging-log4j" runtime="true"/>
+ <depend project="commons-logging" runtime="true" inherit="runtime"/>
+ <depend project="logging-log4j" runtime="true" inherit="runtime"/>
<depend project="smartfrog-testharness" runtime="true"/>
<!-- emailer wants email -->
@@ -257,9 +257,9 @@
</ant>
<depend project="ant" runtime="false"/>
<depend project="junit" runtime="true"/>
- <depend project="smartfrog" runtime="true"/>
+ <depend project="smartfrog" runtime="true" inherit="runtime"/>
<depend project="smartfrog-tasks" runtime="true"/>
- <depend project="smartfrog-testharness" runtime="true"/>
+ <depend project="smartfrog-testharness" runtime="true" inherit="runtime"/>
<work nested="components/junit/build/classes"/>
<work nested="components/junit/build/test/classes"/>
@@ -286,7 +286,7 @@
<depend project="junit" runtime="false"/>
<depend project="packaged-jaxen" runtime="true"/>
<depend project="maven2-ant-tasks"/>
- <depend project="smartfrog" runtime="true"/>
+ <depend project="smartfrog" runtime="true" inherit="runtime"/>
<depend project="smartfrog-tasks" runtime="false"/>
<depend project="smartfrog-testharness" runtime="false"/>
<depend project="xalan" runtime="true"/>
@@ -307,7 +307,7 @@
</project>
<!-- WWWL processing -->
- <project name="smartfrog-www" inherit="runtime">
+ <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"/>
@@ -316,7 +316,7 @@
<depend project="ant" runtime="false"/>
<depend project="junit" runtime="false"/>
<depend project="maven2-ant-tasks" runtime="false"/>
- <depend project="smartfrog" runtime="true"/>
+ <depend project="smartfrog" runtime="true" inherit="runtime"/>
<depend project="smartfrog-tasks" runtime="false"/>
<depend project="smartfrog-testharness" runtime="true"/>
<!--get the servlet API-->
@@ -337,7 +337,7 @@
<!-- Jetty component is an instantiation of the abstract
deployment stuff in sf-www, on which it depends -->
- <project name="smartfrog-jetty" inherit="runtime">
+ <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"/>
@@ -348,10 +348,10 @@
<depend project="jetty4" runtime="true"/>
<depend project="junit" runtime="true"/>
<depend project="maven2-ant-tasks" runtime="false"/>
- <depend project="smartfrog" runtime="true"/>
+ <depend project="smartfrog" runtime="true" inherit="runtime"/>
<depend project="smartfrog-tasks" runtime="false"/>
<depend project="smartfrog-testharness" runtime="false"/>
- <depend project="smartfrog-www" runtime="true"/>
+ <depend project="smartfrog-www" runtime="true" inherit="runtime"/>
<work nested="components/jetty/build/classes"/>
<!--<work nested="components/jetty/build/test/classes"/>-->
@@ -367,7 +367,7 @@
<!-- Tomcat component is an instantiation of the abstract
deployment stuff in sf-www, on which it depends -->
- <project name="smartfrog-tomcat" inherit="runtime">
+ <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"/>
@@ -376,10 +376,10 @@
<depend project="ant" runtime="false"/>
<depend project="junit" runtime="false"/>
<depend project="maven2-ant-tasks" runtime="false"/>
- <depend project="smartfrog" runtime="true"/>
+ <depend project="smartfrog" runtime="true" inherit="runtime"/>
<depend project="smartfrog-tasks" runtime="false"/>
<depend project="smartfrog-testharness" runtime="false"/>
- <depend project="smartfrog-www" runtime="true"/>
+ <depend project="smartfrog-www" runtime="true" inherit="runtime"/>
<work nested="components/tomcat/build/classes"/>
<!--<work nested="components/tomcat/build/test/classes"/>-->
@@ -402,7 +402,7 @@
The actual XSD is hosted in sourceforge/deployment, which is
built by ggf-cddlm
-->
- <project name="smartfrog-cdl" inherit="runtime">
+ <project name="smartfrog-cdl">
<package>org.smartfrog.sfcore.languages.cdl</package>
<ant basedir="extras/cdl" target="gump">
<property name="env.SFHOME" path="smartfrog/dist" project="smartfrog"/>
@@ -410,14 +410,14 @@
<property name="junit.jar" project="junit" reference="jarpath"/>
</ant>
<depend project="ant" runtime="false"/>
- <depend project="cddlm" runtime="true"/>
+ <depend project="cddlm" runtime="true" inherit="runtime"/>
<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" runtime="true" inherit="runtime"/>
<depend project="smartfrog-tasks" runtime="false"/>
<depend project="smartfrog-testharness" runtime="false"/>
- <depend project="smartfrog-xml" runtime="true"/>
+ <depend project="smartfrog-xml" runtime="true" inherit="runtime"/>
<work nested="extras/cdl/test/classes"/>
<junitreport nested="extras/cdl/build/test/reports"/>
@@ -446,8 +446,7 @@
<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-jetty" runtime="true" inherit="runtime"/>
<depend project="smartfrog-cdl" runtime="true"/>
<home nested="extras/cdl/dist/lib"/>