mcconnell 2003/02/27 23:05:20
Modified: assembly/src/java/org/apache/avalon/assembly/appliance
DependencyGraph.java
assembly/src/test/org/apache/avalon/assembly/engine
FactoryTestCase.java
assembly/src/test/org/apache/avalon/playground
TerminalComponent.xinfo
assembly/src/test/org/apache/avalon/playground/factory
CustomAppliance.xinfo
Log:
Updated testcases to handle appliance components with depedencies.
Revision Changes Path
1.7 +2 -1
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/appliance/DependencyGraph.java
Index: DependencyGraph.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/appliance/DependencyGraph.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DependencyGraph.java 15 Jan 2003 09:09:23 -0000 1.6
+++ DependencyGraph.java 28 Feb 2003 07:05:19 -0000 1.7
@@ -58,6 +58,7 @@
import java.util.ArrayList;
import org.apache.avalon.meta.info.DependencyDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
+import org.apache.avalon.meta.info.EntryDescriptor;
import org.apache.avalon.assembly.appliance.Appliance;
/**
1.3 +11 -0
avalon-sandbox/assembly/src/test/org/apache/avalon/assembly/engine/FactoryTestCase.java
Index: FactoryTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/test/org/apache/avalon/assembly/engine/FactoryTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FactoryTestCase.java 28 Feb 2003 03:46:03 -0000 1.2
+++ FactoryTestCase.java 28 Feb 2003 07:05:20 -0000 1.3
@@ -63,13 +63,24 @@
final String factory =
"org.apache.avalon.playground.factory.CustomApplianceFactory";
final String app = "org.apache.avalon.playground.factory.CustomAppliance";
final String classname =
"org.apache.avalon.playground.factory.CustomComponent";
+ final String basic = "org.apache.avalon.playground.basic.BasicComponent";
+ final String terminal = "org.apache.avalon.playground.TerminalComponent";
+ final String avalon =
"org.apache.avalon.assembly.lifecycle.context.AvalonContextualizer";
try
{
+
+ //
+ // register of the types we will need to execute this test
+ //
+
m_engine.register( locator );
m_engine.register( factory );
m_engine.register( app );
m_engine.register( classname );
+ m_engine.register( basic );
+ m_engine.register( terminal );
+ m_engine.register( avalon );
Type type = m_engine.getRepository().getTypeManager().getType(
classname );
Profile profile =
m_engine.getRepository().getProfileManager().getProfile( type );
1.5 +1 -3
avalon-sandbox/assembly/src/test/org/apache/avalon/playground/TerminalComponent.xinfo
Index: TerminalComponent.xinfo
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/test/org/apache/avalon/playground/TerminalComponent.xinfo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TerminalComponent.xinfo 8 Feb 2003 23:30:46 -0000 1.4
+++ TerminalComponent.xinfo 28 Feb 2003 07:05:20 -0000 1.5
@@ -10,9 +10,7 @@
</info>
<services>
- <service>
- <reference type="org.apache.avalon.playground.basic.BasicService"
version="1.1"/>
- </service>
+ <service type="org.apache.avalon.playground.basic.BasicService:1.1"/>
</services>
</type>
1.2 +5 -1
avalon-sandbox/assembly/src/test/org/apache/avalon/playground/factory/CustomAppliance.xinfo
Index: CustomAppliance.xinfo
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/test/org/apache/avalon/playground/factory/CustomAppliance.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CustomAppliance.xinfo 28 Feb 2003 03:46:03 -0000 1.1
+++ CustomAppliance.xinfo 28 Feb 2003 07:05:20 -0000 1.2
@@ -16,7 +16,7 @@
<type>
<info>
- <name>custom-appliance-factory</name>
+ <name>custom-appliance</name>
</info>
<context>
@@ -59,6 +59,10 @@
<services>
<service type="org.apache.avalon.assembly.appliance.Appliance"/>
</services>
+
+ <dependencies>
+ <dependency role="basic"
type="org.apache.avalon.playground.basic.BasicService:1.1"/>
+ </dependencies>
</type>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
