[jboss-svn-commits] JBL Code SVN: r30101 - in labs/jbossesb/trunk/product/rosetta: tests/src/org/jboss/soa/esb/listeners/deployers/mc and 1 other directory.

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

Author: kevin.conner at jboss.com
Date: 2009-11-11 07:04:48 -0500 (Wed, 11 Nov 2009)
New Revision: 30101

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParser.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParserUnitTest.java
Log:
Add implicit dependency on jbossesb.esb: JBESB-2970

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParser.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParser.java	2009-11-11 10:09:58 UTC (rev 30100)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParser.java	2009-11-11 12:04:48 UTC (rev 30101)
@@ -32,8 +32,6 @@
 
 import org.apache.log4j.Logger;
 import org.jboss.deployers.spi.deployer.DeploymentStages;
-import org.jboss.deployers.spi.deployer.helpers.AbstractParsingDeployer;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.deployment.DeploymentException;
@@ -109,6 +107,11 @@
     private String esbDeploymentPrefix = "jboss.esb:deployment=";
     
     /**
+     * The simple name of the jbossesb.esb deployment.
+     */
+    private String esbArtifactName = "jbossesb" ;
+    
+    /**
      * Deployment prefix for war deployments. The are for the war declared in the 'esb-depends' section
      * of deployment.xml.
      */
@@ -280,25 +283,28 @@
     private Set<ObjectName> getActionDependencies(final String deploymentName, final ModelAdapter model, final Properties actionArtifactProperties) throws DeploymentException
     {
         final Set<ObjectName> deps = new HashSet<ObjectName>();
-        if (actionArtifactProperties == null)
+        
+        final Set<String> artifacts = new HashSet<String>() ;
+        
+        if (!deploymentName.equals(esbArtifactName))
         {
-            // Return empty dependencies.
-            return deps;
+            artifacts.add(esbArtifactName + EsbConstants.ESB_ARCHIVE_SUFFIX) ;
         }
         
-        final Set<String> artifacts = new HashSet<String>() ;
-    
         final Set<String> actionClasses = model.getActions() ;
           
-        final int numActionClasses = (actionClasses == null ? 0 : actionClasses.size()) ;
-        if (numActionClasses > 0)
+        if (actionArtifactProperties != null)
         {
-            for(final String actionClass: actionClasses)
+            final int numActionClasses = (actionClasses == null ? 0 : actionClasses.size()) ;
+            if (numActionClasses > 0)
             {
-                final String artifact = (String) actionArtifactProperties.get(actionClass) ;
-                if (artifact != null)
+                for(final String actionClass: actionClasses)
                 {
-                    artifacts.add(artifact) ;
+                    final String artifact = (String) actionArtifactProperties.get(actionClass) ;
+                    if (artifact != null)
+                    {
+                        artifacts.add(artifact) ;
+                    }
                 }
             }
         }
@@ -343,6 +349,11 @@
         this.esbDeploymentPrefix = deploymentPrefix;
     }
     
+    public void setEsbArtifactName(final String esbArtifactName)
+    {
+        this.esbArtifactName = esbArtifactName;
+    }
+    
     public void setWarDeploymentPrefix(final String deploymentPrefix)
     {
         this.warDeploymentPrefix = deploymentPrefix;

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParserUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParserUnitTest.java	2009-11-11 10:09:58 UTC (rev 30100)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParserUnitTest.java	2009-11-11 12:04:48 UTC (rev 30101)
@@ -56,10 +56,11 @@
         
         Set<ObjectName> deps = esbMetaData.getDependencies();
         
-        assertEquals(3, deps.size());
+        assertEquals(4, deps.size());
         assertTrue(deps.contains(new ObjectName("jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_esb")));
         assertTrue(deps.contains(new ObjectName("jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_gw")));
         assertTrue(deps.contains(new ObjectName("jboss.web.deployment:war=/test2")));
+        assertTrue(deps.contains(new ObjectName("jboss.esb:deployment=jbossesb.esb")));
     }
     
     public void testGetDependenciesFromDeploymentUnit() throws Exception