[jboss-cvs] JBossAS SVN: r76860 - in projects/microcontainer/trunk/kernel/src: tests/org/jboss/test/kernel/deployment/test and 1 other directory.

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

Author: alesj
Date: 2008-08-10 09:12:49 -0400 (Sun, 10 Aug 2008)
New Revision: 76860

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueMetaData.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/StringValueMetaData.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/MockServiceBindingTestCase.java
Log:
Optional JMXObjectNameFix usage.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueMetaData.java	2008-08-10 12:38:38 UTC (rev 76859)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueMetaData.java	2008-08-10 13:12:49 UTC (rev 76860)
@@ -80,11 +80,17 @@
 
    public void setValue(Object value)
    {
-      Object jmxHack = JMXObjectNameFix.needsAnAlias(value);
-      if (jmxHack != null)
-         this.value = jmxHack;
-      else
-         this.value = value;
+      if (isUseJMXObjectNameFix())
+      {
+         Object jmxHack = JMXObjectNameFix.needsAnAlias(value);
+         if (jmxHack != null)
+         {
+            this.value = jmxHack;
+            flushJBossObjectCache();
+            return;
+         }
+      }
+      this.value = value;
       flushJBossObjectCache();
    }
 
@@ -93,6 +99,16 @@
       return value;
    }
 
+   /**
+    * Do we use jmx object name fix.
+    *
+    * @return do we use jmx object name fix
+    */
+   protected boolean isUseJMXObjectNameFix()
+   {
+      return true;
+   }
+
    public Object getValue(TypeInfo info, ClassLoader cl) throws Throwable
    {
       return info != null ? info.convertValue(value) : value;

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/StringValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/StringValueMetaData.java	2008-08-10 12:38:38 UTC (rev 76859)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/StringValueMetaData.java	2008-08-10 13:12:49 UTC (rev 76860)
@@ -74,6 +74,11 @@
       super(value);
    }
 
+   protected boolean isUseJMXObjectNameFix()
+   {
+      return false;
+   }
+
    @Override
    public String getValue()
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/MockServiceBindingTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/MockServiceBindingTestCase.java	2008-08-10 12:38:38 UTC (rev 76859)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/MockServiceBindingTestCase.java	2008-08-10 13:12:49 UTC (rev 76860)
@@ -55,8 +55,7 @@
    {
       MockServiceBinding binding = (MockServiceBinding)getBean("ServiceBinding");
       assertNotNull(binding);
-      // it's canonicalized due to AbstractValueMetaData::setValue --> JMXObjectNameFix::needsAnAlias
-      assertEquals("jboss.remoting:protocol=rmi,service=JMXConnectorServer", binding.getServiceName());
+      assertEquals("jboss.remoting:service=JMXConnectorServer,protocol=rmi", binding.getServiceName());
       assertEquals("SomeJBossBindAddress", binding.getHostName());
       assertEquals(1090, binding.getPort());
    }