geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/plan CreateMBeanInstance.java
Date Mon, 18 Aug 2003 22:03:38 GMT
dain        2003/08/18 15:03:38

  Modified:    modules/core/src/java/org/apache/geronimo/deployment/plan
                        CreateMBeanInstance.java
  Log:
  Added code to declare a dependency from an MBean to its parent deployment unit.
  
  Revision  Changes    Path
  1.7       +4 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/plan/CreateMBeanInstance.java
  
  Index: CreateMBeanInstance.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/plan/CreateMBeanInstance.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CreateMBeanInstance.java	16 Aug 2003 23:16:24 -0000	1.6
  +++ CreateMBeanInstance.java	18 Aug 2003 22:03:38 -0000	1.7
  @@ -113,6 +113,7 @@
           }
   
           Set relationships = metadata.getRelationships();
  +        List relationTypeNames = relationService.getAllRelationTypeNames();
           for (Iterator i = relationships.iterator(); i.hasNext();) {
               MBeanRelationship relationship = (MBeanRelationship) i.next();
   
  @@ -121,7 +122,7 @@
               if (!relationService.hasRelation(relationshipName).booleanValue()) {
                   // check if the relationship type has been registered
                   String relationshipType = relationship.getType();
  -                if (!relationService.getAllRelationTypeNames().contains(relationshipType))
{
  +                if (!relationTypeNames.contains(relationshipType)) {
                       log.trace("Cannot run because relationship type is not registered:
relationType=" + relationshipType);
                       canRun = false;
                   }
  @@ -182,6 +183,7 @@
                       dependencies.add(new ObjectName(dependency.getName()));
                   }
                   dependencyService.addStartDependencies(actualName, dependencies);
  +                dependencyService.addStartDependency(actualName, metadata.getParentName());
                   dependencyService.addRelationships(actualName, metadata.getRelationships());
               } catch (MalformedObjectNameException e) {
                   throw new DeploymentException(e);
  
  
  

Mime
View raw message