Corrected diff attached.
SJM
> -----Original Message-----
> From: Stephen McConnell [mailto:[EMAIL PROTECTED]
> Sent: 16 September 2004 09:27
> To: 'Avalon Developers List'
> Subject: RE: [patch] composition impl test blocks
>
>
> Woops - ignore this for a moment - will send an updated diff in a
moment
> or two.
>
> > -----Original Message-----
> > From: Stephen McConnell [mailto:[EMAIL PROTECTED]
> > Sent: 16 September 2004 08:27
> > To: Avalon Developers List
> > Subject: [patch] composition impl test blocks
> >
> >
> > The attached diff corrects the composition-impl test block
> definitions.
> > The definitions contained classic artifact references - however,
under
> > gump this breaks as the artifact is generated differently to capture
> the
> > gump named resources. Basically its just a case of adding a bunch
of
> > filters on artifact uri. Once applied the gump run on
> composition-impl
> > should be ok.
> >
> > Steve.
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
Index: etc/test/cyclicdeps.xml
===================================================================
--- etc/test/cyclicdeps.xml (revision 46160)
+++ etc/test/cyclicdeps.xml (working copy)
@@ -2,7 +2,7 @@
<container>
<classloader>
<classpath>
- <artifact>artifact:jar:avalon/test/avalon-test-testcyclic</artifact>
+ <artifact>@AVALON-TEST-CYCLIC-SPEC@</artifact>
</classpath>
</classloader>
<container name="sub">
Index: etc/test/context.xml
===================================================================
--- etc/test/context.xml (revision 46160)
+++ etc/test/context.xml (working copy)
@@ -4,7 +4,7 @@
<classloader>
<classpath>
- <artifact>artifact:jar:avalon/test/avalon-test-testa</artifact>
+ <artifact>@AVALON-TEST-A-SPEC@</artifact>
</classpath>
</classloader>
Index: etc/test/playground.xml
===================================================================
--- etc/test/playground.xml (revision 46160)
+++ etc/test/playground.xml (working copy)
@@ -9,7 +9,7 @@
<classloader>
<classpath>
- <artifact>artifact:jar:avalon/test/avalon-test-playground</artifact>
+ <artifact>@AVALON-TEST-PLAYGROUND@</artifact>
<artifact>@FRAMEWORK-IMPL-SPEC@</artifact>
</classpath>
</classloader>
Index: etc/test/includes.xml
===================================================================
--- etc/test/includes.xml (revision 46160)
+++ etc/test/includes.xml (working copy)
@@ -1,7 +1,7 @@
<container>
- <include name="test" id="avalon/test:avalon-test-includes">
+ <include name="test" artifact="@AVALON-TEST-INCLUDES-SPEC@">
<target path="primary/block/test">
<categories priority="INFO"/>
</target>
Index: etc/test/dynamics.xml
===================================================================
--- etc/test/dynamics.xml (revision 46160)
+++ etc/test/dynamics.xml (working copy)
@@ -2,7 +2,7 @@
<container name="test">
<classloader>
<classpath>
- <artifact>artifact:jar:avalon/test/avalon-test-dynamics</artifact>
+ <artifact>@AVALON-TEST-DYNAMICS-SPEC@</artifact>
</classpath>
</classloader>
</container>
Index: etc/test/targets.xml
===================================================================
--- etc/test/targets.xml (revision 46160)
+++ etc/test/targets.xml (working copy)
@@ -3,7 +3,7 @@
<classloader>
<classpath>
- <artifact>artifact:jar:avalon/test/avalon-test-testa</artifact>
+ <artifact>@AVALON-TEST-A-SPEC@</artifact>
</classpath>
</classloader>
Index: etc/test/test.properties
===================================================================
--- etc/test/test.properties (revision 0)
+++ etc/test/test.properties (revision 0)
@@ -0,0 +1,2 @@
+
+avalon.repository.online = false
Index: etc/test/dependency.xml
===================================================================
--- etc/test/dependency.xml (revision 46160)
+++ etc/test/dependency.xml (working copy)
@@ -4,9 +4,9 @@
<classloader>
<classpath>
- <artifact>artifact:jar:avalon/test/avalon-test-testa</artifact>
- <artifact>artifact:jar:avalon/test/avalon-test-testb</artifact>
- <artifact>artifact:jar:avalon/test/avalon-test-testc</artifact>
+ <artifact>@AVALON-TEST-A-SPEC@</artifact>
+ <artifact>@AVALON-TEST-B-SPEC@</artifact>
+ <artifact>@AVALON-TEST-C-SPEC@</artifact>
<!--
<fileset dir="ext">
<include>test-a.jar</include>
Index: build.xml
===================================================================
--- build.xml (revision 46160)
+++ build.xml (working copy)
@@ -13,6 +13,20 @@
token="AVALON-LOGGING-LOGKIT-SPEC"/>
<x:filter key="avalon-framework-impl" feature="uri"
token="FRAMEWORK-IMPL-SPEC"/>
+ <x:filter key="avalon-test-dynamics" feature="uri"
+ token="AVALON-TEST-DYNAMICS-SPEC"/>
+ <x:filter key="avalon-test-testa" feature="uri"
+ token="AVALON-TEST-A-SPEC"/>
+ <x:filter key="avalon-test-testb" feature="uri"
+ token="AVALON-TEST-B-SPEC"/>
+ <x:filter key="avalon-test-testc" feature="uri"
+ token="AVALON-TEST-C-SPEC"/>
+ <x:filter key="avalon-test-testcyclic" feature="uri"
+ token="AVALON-TEST-CYCLIC-SPEC"/>
+ <x:filter key="avalon-test-includes" feature="spec"
+ token="AVALON-TEST-INCLUDES-SPEC"/>
+ <x:filter key="avalon-test-playground" feature="uri"
+ token="AVALON-TEST-PLAYGROUND"/>
</target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
