[jboss-cvs] JBossAS SVN: r64335 - trunk/connector/src/main/org/jboss/resource/connectionmanager.

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

Author: scott.stark at jboss.org
Date: 2007-07-27 17:32:51 -0400 (Fri, 27 Jul 2007)
New Revision: 64335

Modified:
   trunk/connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java
Log:
JBAS-4585, do property replacement from within setMcfProperties for now

Modified: trunk/connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java	2007-07-27 20:24:01 UTC (rev 64334)
+++ trunk/connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java	2007-07-27 21:32:51 UTC (rev 64335)
@@ -60,6 +60,7 @@
 import org.jboss.system.ServiceDynamicMBeanSupport;
 import org.jboss.util.Classes;
 import org.jboss.util.NestedRuntimeException;
+import org.jboss.util.StringPropertyReplacer;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -500,6 +501,8 @@
                   + "skipping property");
             continue;
          }
+         // TODO: should happen in parsing layer?
+         value = StringPropertyReplacer.replaceProperties(value);
          log.debug("setting property: " + name + " to value " + value);
          try
          {
@@ -558,6 +561,8 @@
                   + "skipping property");
             continue;
          }
+         // TODO: should happen in parsing layer?
+         value = StringPropertyReplacer.replaceProperties(value);
          log.debug("setting property: " + name + " to value " + value);
          try
          {