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/01/04 00:18:55 UTC
cvs commit: avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test AssemblyTestCase.java
mcconnell 2004/01/03 15:18:55
Modified: merlin/composition/api/src/java/org/apache/avalon/composition/model
Tag: Ver_3_4 ContainmentModel.java
merlin/composition/impl Tag: Ver_3_4 maven.xml
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
Tag: Ver_3_4 DefaultContainmentModel.java
Added: merlin/composition/impl/src/test/org/apache/avalon/composition/model/test
Tag: Ver_3_4 AssemblyTestCase.java
Log:
Add startup and shutdown sequence retrival to containment model.
Revision Changes Path
No revision
No revision
1.9.2.2 +11 -1 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java
Index: ContainmentModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- ContainmentModel.java 3 Jan 2004 15:38:50 -0000 1.9.2.1
+++ ContainmentModel.java 3 Jan 2004 23:18:55 -0000 1.9.2.2
@@ -72,6 +72,16 @@
{
public static String SEPERATOR = "/";
+ /**
+ * Get the startup sequence for the model.
+ */
+ Model[] getStartupGraph();
+
+ /**
+ * Get the shutdown sequence for the model.
+ */
+ Model[] getShutdownGraph();
+
/**
* Return the logging categories.
* @return the logging categories
No revision
No revision
1.1.1.1.2.2 +1 -1 avalon/merlin/composition/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/maven.xml,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- maven.xml 3 Jan 2004 22:08:21 -0000 1.1.1.1.2.1
+++ maven.xml 3 Jan 2004 23:18:55 -0000 1.1.1.1.2.2
@@ -51,7 +51,7 @@
</fileset>
</ant:delete>
- <ant:copy toDir="${basedir}/target/test-classes/repository/avalon-framework"
+ <ant:copy toDir="${basedir}/target/test-classes/repository/avalon-framework/jars"
file="${pom.getDependencyPath('avalon-framework:avalon-framework-impl')}"/>
<ant:copy toDir="${basedir}/target/test-classes/ext"
file="${pom.getDependencyPath('avalon-framework:avalon-framework-api')}"/>
No revision
No revision
1.13.2.5 +19 -1 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java
Index: DefaultContainmentModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java,v
retrieving revision 1.13.2.4
retrieving revision 1.13.2.5
diff -u -r1.13.2.4 -r1.13.2.5
--- DefaultContainmentModel.java 3 Jan 2004 22:08:21 -0000 1.13.2.4
+++ DefaultContainmentModel.java 3 Jan 2004 23:18:55 -0000 1.13.2.5
@@ -393,6 +393,22 @@
}
}
+ /**
+ * Get the startup sequence for the model.
+ */
+ public Model[] getStartupGraph()
+ {
+ return m_context.getDependencyGraph().getStartupGraph();
+ }
+
+ /**
+ * Get the shutdown sequence for the model.
+ */
+ public Model[] getShutdownGraph()
+ {
+ return m_context.getDependencyGraph().getShutdownGraph();
+ }
+
/**
* Return the logging categories.
* @return the logging categories
@@ -489,6 +505,7 @@
synchronized( repository )
{
repository.addModel( name, model );
+ m_context.getDependencyGraph().add( model );
CompositionEvent event = new CompositionEvent( this, model );
fireModelAddedEvent( event );
return model;
@@ -540,6 +557,7 @@
}
else
{
+ m_context.getDependencyGraph().add( model );
repository.removeModel( model );
CompositionEvent event = new CompositionEvent( this, model );
fireModelRemovedEvent( event );
No revision
No revision
1.1.2.1 +91 -0 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/Attic/AssemblyTestCase.java
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org