[jboss-svn-commits] JBL Code SVN: r15444 - labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config.

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2007-09-28 14:43:40 -0400 (Fri, 28 Sep 2007)
New Revision: 15444

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
Log:
Make jbossesb.esb dependency implicit: JBESB-1081

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java	2007-09-28 18:25:31 UTC (rev 15443)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java	2007-09-28 18:43:40 UTC (rev 15444)
@@ -56,6 +56,9 @@
 
    private ServiceControllerMBean serviceController;
    
+   private static final String PREFIX_CANONICAL_NAME = "jboss.esb:deployment=" ;
+   private static final String ESB_CANONICAL_NAME = PREFIX_CANONICAL_NAME + "jbossesb.esb" ;
+   
    /**
     * Default CTOR used to set default values to the Suffixes and RelativeOrder
     * attributes. Those are read at subdeployer registration time by the MainDeployer
@@ -215,6 +218,7 @@
       {
          ArrayList<ObjectName> deps = new ArrayList<ObjectName>();
          InputStream in = di.localCl.getResourceAsStream("META-INF/deployment.xml");
+         boolean includesESB = false ;
          if (in != null)
          {
             try
@@ -229,6 +233,10 @@
                   {
                      Element depend = (Element)depends.next();
                      ObjectName depOn = new ObjectName(MetaData.getElementContent(depend));
+                     if (!includesESB && ESB_CANONICAL_NAME.equals(depOn.getCanonicalName()))
+                     {
+                         includesESB = true ;
+                     }
                      deps.add(depOn);
                   }
                }
@@ -245,8 +253,13 @@
          inputStream.close();
          JBoss4ESBDeployment deployment = new JBoss4ESBDeployment(jbossEsbXml, di.shortName);
          deployment.setClassloader(di.ucl);
-         String name = "jboss.esb:deployment=" + di.shortName;
+         String name = PREFIX_CANONICAL_NAME + di.shortName;
          ObjectName on = ObjectNameConverter.convert(name);
+         if (!includesESB && !ESB_CANONICAL_NAME.equals(on.getCanonicalName()))
+         {
+             final ObjectName esbOn = new ObjectName(ESB_CANONICAL_NAME) ;
+             deps.add(esbOn) ;
+         }
          // Check that the name is not registered
          if (server.isRegistered(on) == true)
          {