You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2003/05/22 14:48:15 UTC
cvs commit: avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/tools/test build.xml
bloritsch 2003/05/22 05:48:15
Modified: fortress/src/tools/org/apache/avalon/fortress/tools
ComponentMetaInfoCollector.java
Added: fortress/src/test/org/apache/avalon/fortress/tools/test
build.xml
Log:
Add test for incorrect dag violation, and its fix. Thanks again, Anton.
Revision Changes Path
1.18 +5 -1 avalon-excalibur/fortress/src/tools/org/apache/avalon/fortress/tools/ComponentMetaInfoCollector.java
Index: ComponentMetaInfoCollector.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/fortress/src/tools/org/apache/avalon/fortress/tools/ComponentMetaInfoCollector.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ComponentMetaInfoCollector.java 15 May 2003 18:56:28 -0000 1.17
+++ ComponentMetaInfoCollector.java 22 May 2003 12:48:14 -0000 1.18
@@ -137,6 +137,10 @@
{
throw new BuildException( e.toString(), e );
}
+ finally
+ {
+ Component.m_repository.clear();
+ }
}
/**
1.1 avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/tools/test/build.xml
Index: build.xml
===================================================================
<?xml version="1.0"?>
<project name="Test Excalibur Fortress collect-meta double invocation" default="main">
<taskdef name="collect-meta"
classname="org.apache.avalon.fortress.tools.ComponentMetaInfoCollector"
classpath="${cp}"/>
<target name="main">
<property name="destination"
value="${build.testclasses}/org/apache/avalon/fortress/tools/test"/>
<property name="meta-dir-1"
value="${destination}/meta1"/>
<property name="meta-dir-2"
value="${destination}/meta2"/>
<mkdir dir="${meta-dir-1}"/>
<mkdir dir="${meta-dir-2}"/>
<copy todir="${meta-dir-1}">
<fileset dir="${build.testsrc}">
<include name="**/data"/>
</fileset>
</copy>
<copy todir="${meta-dir-2}">
<fileset dir="${build.testsrc}">
<include name="**/data"/>
</fileset>
</copy>
<collect-meta destdir="${meta-dir-1}">
<fileset dir="${build.testsrc}">
<include name="**/Component1.java"/>
</fileset>
</collect-meta>
<collect-meta destdir="${meta-dir-2}">
<fileset dir="${build.testsrc}">
<include name="**/Component2.java"/>
</fileset>
</collect-meta>
</target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org