[jboss-cvs] JBossAS SVN: r69728 - in trunk: testsuite/src/main/org/jboss/test/profileservice/test and 1 other directory.

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

Author: alex.loubyansky at jboss.com
Date: 2008-02-08 04:53:19 -0500 (Fri, 08 Feb 2008)
New Revision: 69728

Modified:
   trunk/profileservice/src/main/org/jboss/profileservice/management/templates/JmsDestinationTemplate.java
   trunk/testsuite/src/main/org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.java
Log:
JBAS-4396 minor changes regarding Name, JNDIName managed attributes

Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/templates/JmsDestinationTemplate.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/templates/JmsDestinationTemplate.java	2008-02-08 09:19:03 UTC (rev 69727)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/templates/JmsDestinationTemplate.java	2008-02-08 09:53:19 UTC (rev 69728)
@@ -88,7 +88,7 @@
          destination.annotation =
             "@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)";
          destination.xmbeanDd = "xmdesc/Queue-xmbean.xml";
-         destination.jmxName = "jboss.messaging.destination:service=Queue,name=" + getProperty(info, "Name");
+         destination.jmxName = "jboss.messaging.destination:service=Queue,name=" + getProperty(info, "JNDIName");
       }
       else if("topic".equals(destinationType))
       {
@@ -96,7 +96,7 @@
          destination.annotation =
             "@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)";
          destination.xmbeanDd = "xmdesc/Topic-xmbean.xml";
-         destination.jmxName = "jboss.messaging.destination:service=Topic,name=" + getProperty(info, "Name");
+         destination.jmxName = "jboss.messaging.destination:service=Topic,name=" + getProperty(info, "JNDIName");
       }
       else
       {

Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.java	2008-02-08 09:19:03 UTC (rev 69727)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.java	2008-02-08 09:53:19 UTC (rev 69728)
@@ -54,9 +54,10 @@
 
    public void testCreateQueue() throws Exception
    {
+      Map<String, Serializable> propValues = new HashMap<String, Serializable>();
+      propValues.put("Name", getName() + "-service.xml");
       String jndiName = getName();
-      Map<String, Serializable> propValues = new HashMap<String, Serializable>();
-      propValues.put("Name", jndiName);
+      propValues.put("JNDIName", jndiName);
       createComponentTest("QueueTemplate", propValues, getName(),
          KnownComponentTypes.JMSDestination.Queue.getType(), jndiName);
    }
@@ -69,9 +70,10 @@
 
    public void testCreateTopic() throws Exception
    {
+      Map<String, Serializable> propValues = new HashMap<String, Serializable>();
+      propValues.put("Name", getName() + "-service.xml");
       String jndiName = getName();
-      Map<String, Serializable> propValues = new HashMap<String, Serializable>();
-      propValues.put("Name", jndiName);
+      propValues.put("JNDIName", jndiName);
       createComponentTest("TopicTemplate", propValues, getName(),
          KnownComponentTypes.JMSDestination.Topic.getType(), jndiName);
    }
@@ -86,5 +88,5 @@
    protected String getProfileName()
    {
       return "profileservice";
-   }
+   }   
 }