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 2003/09/09 04:14:41 UTC
cvs commit: avalon-sandbox/merlin/activation-spi/src/java/org/apache/avalon/activation/appliance Appliance.java DependencyGraph.java
mcconnell 2003/09/08 19:14:41
Modified: merlin/activation-spi project.xml
merlin/activation-spi/src/java/org/apache/avalon/activation/appliance
Appliance.java DependencyGraph.java
Log:
Addition of JMX Server key.
Revision Changes Path
1.6 +2 -0 avalon-sandbox/merlin/activation-spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/activation-spi/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 31 Aug 2003 14:37:48 -0000 1.5
+++ project.xml 9 Sep 2003 02:14:40 -0000 1.6
@@ -19,6 +19,8 @@
<dependencies>
+ <!-- avalon dependecies -->
+
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
1.2 +3 -1 avalon-sandbox/merlin/activation-spi/src/java/org/apache/avalon/activation/appliance/Appliance.java
Index: Appliance.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/activation-spi/src/java/org/apache/avalon/activation/appliance/Appliance.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Appliance.java 7 Aug 2003 17:09:15 -0000 1.1
+++ Appliance.java 9 Sep 2003 02:14:40 -0000 1.2
@@ -89,6 +89,8 @@
*/
public interface Appliance extends Deployable, Home
{
+ static final String MBEAN_SERVER_KEY = "urn:avalon:mbean-server";
+
/**
* Return the model backing the appliance.
* @return the model that the appliance is managing
1.2 +8 -11 avalon-sandbox/merlin/activation-spi/src/java/org/apache/avalon/activation/appliance/DependencyGraph.java
Index: DependencyGraph.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/activation-spi/src/java/org/apache/avalon/activation/appliance/DependencyGraph.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DependencyGraph.java 7 Aug 2003 17:09:20 -0000 1.1
+++ DependencyGraph.java 9 Sep 2003 02:14:40 -0000 1.2
@@ -281,10 +281,10 @@
* It is expected that the specified components have passed
* verification tests and are well formed.
*
- * @param providers true if forward dependencys traced, false if dependencies reversed
+ * @param direction true if forward dependencys traced, false if dependencies reversed
* @return the ordered node names
*/
- private Appliance[] walkGraph( final boolean providers )
+ private Appliance[] walkGraph( final boolean direction )
{
final ArrayList result = new ArrayList();
final ArrayList done = new ArrayList();
@@ -296,7 +296,7 @@
(Appliance) m_appliances.get( i );
visitcomponent( appliance,
- providers,
+ direction,
done,
result );
}
@@ -309,27 +309,24 @@
* Visit a appliance when traversing dependencies.
*
* @param appliance the appliance
- * @param providers true if walking tree looking for providers, else false
+ * @param direction true if walking tree looking for providers, else false
* @param done those nodes already traversed
* @param order the order in which nodes have already been
* traversed
*/
private void visitcomponent( final Appliance appliance,
- final boolean providers,
+ final boolean direction,
final ArrayList done,
final ArrayList order )
{
//If already visited this appliance return
- if( done.contains( appliance ) )
- {
- return;
- }
+ if( done.contains( appliance ) ) return;
done.add( appliance );
- if( providers )
+ if( direction )
{
visitProviders( appliance, done, order );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org