[jboss-svn-commits] JBL Code SVN: r14357 - in labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners: config and 1 other directories.

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

Author: tcunning
Date: 2007-08-18 19:47:53 -0400 (Sat, 18 Aug 2007)
New Revision: 14357

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/Configuration.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/ServiceMessageCounter.java
Log:
bug:JBESB-738
Add deployment name to ConfigTree.


Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java	2007-08-18 20:25:48 UTC (rev 14356)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java	2007-08-18 23:47:53 UTC (rev 14357)
@@ -57,6 +57,9 @@
 	/** Listeners */
 	public static final String LISTENER_CLASS_TAG            = "listenerClass";
     
+	/** Deployment */
+	public static final String DEPLOYMENT_NAME_TAG 			= "deployment";
+	
 	/** ActionProcessingPipeline */
     public static final String ACTION_ELEMENT_TAG		    = "action";
     public static final String ACTION_CLASS_TAG			    = "class";

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/Configuration.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/Configuration.java	2007-08-18 20:25:48 UTC (rev 14356)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/Configuration.java	2007-08-18 23:47:53 UTC (rev 14357)
@@ -28,11 +28,13 @@
 import java.net.URL;
 import java.util.List;
 
+import javax.management.ObjectName;
 import javax.xml.transform.stream.StreamSource;
 
 import org.jboss.internal.soa.esb.util.StreamUtils;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.listeners.LifecycleUtil;
+import org.jboss.soa.esb.listeners.ListenerTagNames;
 import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycle;
 import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleController;
 import org.jboss.soa.esb.util.ClassUtil;
@@ -70,7 +72,11 @@
       }
    }
 
-   public static ManagedLifecycleController create(String configXml)
+   public static ManagedLifecycleController create(String configXml) {
+	   return create (configXml, null);
+   }
+   
+   public static ManagedLifecycleController create(String configXml, ObjectName serviceName)
    {
       InputStream validationInputStream = ClassUtil.getResourceAsStream(JBOSSESB_XSD, Configuration.class);
       //if this fails try using the
@@ -94,6 +100,8 @@
             //System.out.println("*************** listenerBytes: " + new String(listenerBytes));
             ByteArrayInputStream listenerIs = new ByteArrayInputStream(listenerBytes);
             ConfigTree listenerConfig = ConfigTree.fromInputStream(listenerIs);
+            listenerConfig.setAttribute(ListenerTagNames.DEPLOYMENT_NAME_TAG, 
+            		serviceName.getKeyProperty(ListenerTagNames.DEPLOYMENT_NAME_TAG));
             List<ManagedLifecycle> instances = LifecycleUtil.getListeners(listenerConfig);
 
             byte[] gatewayBytes = gatewayXml.toByteArray();

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java	2007-08-18 20:25:48 UTC (rev 14356)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java	2007-08-18 23:47:53 UTC (rev 14357)
@@ -75,7 +75,7 @@
       try
       {
          Thread.currentThread().setContextClassLoader(classloader);
-         controller = Configuration.create(jbossEsbXml);
+         controller = Configuration.create(jbossEsbXml, serviceName);
          controller.start();
       }
       finally

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/ServiceMessageCounter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/ServiceMessageCounter.java	2007-08-18 20:25:48 UTC (rev 14356)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/ServiceMessageCounter.java	2007-08-18 23:47:53 UTC (rev 14357)
@@ -313,13 +313,12 @@
 	{
 		ObjectName listObjectName = null;
 		try {
-			String categoryName = m_config.getAttribute(ListenerTagNames.SERVICE_CATEGORY_NAME_TAG);
+			String deploymentName = m_config.getParent().getAttribute(ListenerTagNames.DEPLOYMENT_NAME_TAG);
 			String serviceName = m_config.getAttribute(ListenerTagNames.SERVICE_NAME_TAG);
-			String listenerName = m_config.getName();
 
 			StringBuffer objectName = new StringBuffer("category=MessageCounter");
-			if (categoryName != null) {
-				objectName.append(",").append(ListenerTagNames.SERVICE_CATEGORY_NAME_TAG).append("=").append(categoryName);
+			if (deploymentName != null) {
+				objectName.append(",").append(ListenerTagNames.DEPLOYMENT_NAME_TAG).append("=").append(deploymentName);
 			}
 			
 			if (serviceName != null) {
@@ -328,19 +327,7 @@
 				}
 				objectName.append(ListenerTagNames.SERVICE_NAME_TAG).append("=").append(serviceName);
 			}
-			
-			if (listenerName != null) {
-				if (objectName.length() > 0) {
-					objectName.append(",");
-				}
-				if ("true".equals(m_config.getAttribute(ListenerTagNames.IS_GATEWAY_TAG))) {
-					objectName.append("gateway-name=").append(listenerName);
-				} else {
-					objectName.append("listener-name=").append(listenerName);					
-				}
-				
-			}
-			
+						
 			listObjectName = new ObjectName("jboss.esb:" + objectName.toString());
 		} catch (MalformedObjectNameException e1) {
 			e1.printStackTrace();