Author: mcconnell
Date: Thu Jun 10 03:23:54 2004
New Revision: 20987
Added:
avalon/trunk/runtime/meta/test/includes/
avalon/trunk/runtime/meta/test/includes/build.properties (contents, props
changed)
avalon/trunk/runtime/meta/test/includes/build.xml (contents, props changed)
avalon/trunk/runtime/meta/test/includes/src/
avalon/trunk/runtime/meta/test/includes/src/main/
avalon/trunk/runtime/meta/test/includes/src/main/BLOCK-INF/
avalon/trunk/runtime/meta/test/includes/src/main/BLOCK-INF/block.xml
(contents, props changed)
Modified:
avalon/trunk/runtime/meta/test/dynamics/src/main/org/apache/avalon/test/dynamics/DefaultGizmo.java
avalon/trunk/runtime/meta/test/dynamics/src/main/org/apache/avalon/test/dynamics/DefaultWidget.java
Log:
Updating test resources.
Modified:
avalon/trunk/runtime/meta/test/dynamics/src/main/org/apache/avalon/test/dynamics/DefaultGizmo.java
==============================================================================
---
avalon/trunk/runtime/meta/test/dynamics/src/main/org/apache/avalon/test/dynamics/DefaultGizmo.java
(original)
+++
avalon/trunk/runtime/meta/test/dynamics/src/main/org/apache/avalon/test/dynamics/DefaultGizmo.java
Thu Jun 10 03:23:54 2004
@@ -23,7 +23,7 @@
* A component that implements the Gizmo service.
*
* @avalon.component name="gizmo" lifestyle="singleton"
- * @avalon.service
type="org.apache.avalon.composition.model.test.dynamics.Gizmo"
+ * @avalon.service type="org.apache.avalon.test.dynamics.Gizmo"
*/
public class DefaultGizmo implements Gizmo
{
Modified:
avalon/trunk/runtime/meta/test/dynamics/src/main/org/apache/avalon/test/dynamics/DefaultWidget.java
==============================================================================
---
avalon/trunk/runtime/meta/test/dynamics/src/main/org/apache/avalon/test/dynamics/DefaultWidget.java
(original)
+++
avalon/trunk/runtime/meta/test/dynamics/src/main/org/apache/avalon/test/dynamics/DefaultWidget.java
Thu Jun 10 03:23:54 2004
@@ -23,7 +23,7 @@
* A component that implements the Gizmo service.
*
* @avalon.component name="widget" lifestyle="singleton"
- * @avalon.service
type="org.apache.avalon.composition.model.test.dynamics.Widget"
+ * @avalon.service type="org.apache.avalon.test.dynamics.Widget"
*/
public class DefaultWidget implements Widget
{
Added: avalon/trunk/runtime/meta/test/includes/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/test/includes/build.properties Thu Jun 10
03:23:54 2004
@@ -0,0 +1,2 @@
+project.name = avalon-test-includes
+project.home = ../../../../central/system
Added: avalon/trunk/runtime/meta/test/includes/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/test/includes/build.xml Thu Jun 10 03:23:54 2004
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-test-includes" default="dist" basedir="."
+ xmlns:x="antlib:org.apache.avalon.tools">
+
+ <property file="build.properties"/>
+ <import file="${project.home}/build/standard.xml"/>
+
+ <target name="init" depends="standard.init">
+ <x:filter key="avalon-framework-impl" feature="uri"
+ token="FRAMEWORK-IMPL-SPEC"/>
+ </target>
+
+</project>
Added: avalon/trunk/runtime/meta/test/includes/src/main/BLOCK-INF/block.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/test/includes/src/main/BLOCK-INF/block.xml
Thu Jun 10 03:23:54 2004
@@ -0,0 +1,46 @@
+
+
+<container name="test-block">
+
+ <services>
+ <service type="org.apache.avalon.test.testa.A">
+ <source>primary</source>
+ </service>
+ <service type="org.apache.avalon.test.testd.D">
+ <source>my-component</source>
+ </service>
+ </services>
+
+ <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>artifact:jar:avalon/test/avalon-test-testd</artifact>
+ <artifact>@FRAMEWORK-IMPL-SPEC@</artifact>
+ </classpath>
+ </classloader>
+
+ <component name="my-component" class="org.apache.avalon.test.testd.TestD"/>
+
+ <container name="primary">
+
+ <classloader>
+ <classpath>
+ <artifact>artifact:jar:avalon/test/avalon-test-teste</artifact>
+ </classpath>
+ </classloader>
+
+ <container name="block">
+ <component name="test" class="org.apache.avalon.test.teste.TestE">
+ <context>
+ <entry key="home">
+ <import key="urn:avalon:home"/>
+ </entry>
+ </context>
+ </component>
+ </container>
+
+ </container>
+
+</container>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
