You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/06/30 17:06:38 UTC
svn commit: rev 22337 - in avalon/trunk: central/system planet planet/facilities/finder/impl planet/facilities/finder/test runtime tools/magic/src/main/org/apache/avalon/tools/tasks
Author: mcconnell
Date: Wed Jun 30 08:06:37 2004
New Revision: 22337
Removed:
avalon/trunk/central/system/KEYS
avalon/trunk/runtime/KEYS
Modified:
avalon/trunk/planet/facilities/finder/impl/build.xml
avalon/trunk/planet/facilities/finder/test/build.xml
avalon/trunk/planet/index.xml
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ReactorTask.java
Log:
Modified: avalon/trunk/planet/facilities/finder/impl/build.xml
==============================================================================
--- avalon/trunk/planet/facilities/finder/impl/build.xml (original)
+++ avalon/trunk/planet/facilities/finder/impl/build.xml Wed Jun 30 08:06:37 2004
@@ -7,10 +7,6 @@
<import file="${project.system}/build/standard.xml"/>
<target name="build" depends="standard.build">
- <x:block name="finder">
- <x:component name="finder"
- class="org.apache.avalon.finder.impl.DefaultFinder"/>
- </x:block>
<x:block name="finder" embed="MAIN">
<x:component name="finder"
class="org.apache.avalon.finder.impl.DefaultFinder"/>
Modified: avalon/trunk/planet/facilities/finder/test/build.xml
==============================================================================
--- avalon/trunk/planet/facilities/finder/test/build.xml (original)
+++ avalon/trunk/planet/facilities/finder/test/build.xml Wed Jun 30 08:06:37 2004
@@ -7,7 +7,7 @@
<import file="${project.system}/build/standard.xml"/>
<target name="build" depends="standard.build">
- <x:block name="test" embed="MAIN">
+ <x:block name="test" embed="MAIN" standalone="false">
<x:component name="finder"
class="org.apache.avalon.finder.impl.DefaultFinder"/>
</x:block>
Modified: avalon/trunk/planet/index.xml
==============================================================================
--- avalon/trunk/planet/index.xml (original)
+++ avalon/trunk/planet/index.xml Wed Jun 30 08:06:37 2004
@@ -288,7 +288,7 @@
</info>
<dependencies>
<include key="avalon-db-api"/>
- <include key="avalon-composition-api"/>
+ <include key="avalon-composition-api" runtime="false"/>
<include key="concurrent"/>
<include key="hsqldb"/>
</dependencies>
@@ -431,7 +431,7 @@
<name>hello</name>
</info>
<dependencies>
- <include key="avalon-framework-api"/>
+ <include key="avalon-framework-api" runtime="false"/>
</dependencies>
<plugins>
<include key="avalon-meta-tools"/>
@@ -444,10 +444,8 @@
<name>dynamics</name>
</info>
<dependencies>
- <include key="avalon-framework-api"/>
+ <include key="avalon-composition-api" runtime="false"/>
<include key="avalon-framework-impl"/>
- <include key="avalon-composition-api"/>
- <include key="avalon-meta-api"/>
</dependencies>
<plugins>
<include key="avalon-meta-tools"/>
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ReactorTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ReactorTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ReactorTask.java Wed Jun 30 08:06:37 2004
@@ -131,7 +131,14 @@
project.setProperty( "reactor.key", def.getKey() );
project.setProperty( "reactor.name", def.getInfo().getName() );
project.setProperty( "reactor.group", def.getInfo().getGroup() );
- project.setProperty( "reactor.version", def.getInfo().getVersion() );
+ if( null == def.getInfo().getVersion() )
+ {
+ project.setProperty( "reactor.version", "" );
+ }
+ else
+ {
+ project.setProperty( "reactor.version", def.getInfo().getVersion() );
+ }
project.setProperty( "reactor.basedir", def.getBaseDir().toString() );
project.setProperty( "reactor.path", def.getInfo().getPath() );
project.setProperty( "reactor.uri", def.getInfo().getURI() );
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org