[jboss-cvs] JBossAS SVN: r64545 - in branches/JBPAPP_4_2/ejb3/src: resources/test/propertyreplacement and 1 other directories.

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

Author: bdecoste
Date: 2007-08-10 13:58:36 -0400 (Fri, 10 Aug 2007)
New Revision: 64545

Modified:
   branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
   branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
   branches/JBPAPP_4_2/ejb3/src/resources/test/propertyreplacement/META-INF/jboss.xml
   branches/JBPAPP_4_2/ejb3/src/resources/test/propertyreplacement/propertyreplacement-service.xml
Log:
[JBPAPP-261] merge of [EJBTHREE-1022]

Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java	2007-08-10 17:04:48 UTC (rev 64544)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java	2007-08-10 17:58:36 UTC (rev 64545)
@@ -1487,7 +1487,7 @@
    // may want to run StringPropertyReplacer on the whole descriptor at once
    protected String getValue(String name, String value)
    {
-      if (value.startsWith("${") && value.endsWith("}"))
+      if (value.contains("${"))
       {
          String replacement = StringPropertyReplacer.replaceProperties(value);
          if (replacement != null)

Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java	2007-08-10 17:04:48 UTC (rev 64544)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java	2007-08-10 17:58:36 UTC (rev 64545)
@@ -1075,7 +1075,7 @@
    // may want to run StringPropertyReplacer on the whole descriptor at once
    protected String getValue(String name, String value)
    {
-      if (value.startsWith("${") && value.endsWith("}"))
+      if (value.contains("${"))
       {
          String replacement = StringPropertyReplacer.replaceProperties(value);
          if (replacement != null)

Modified: branches/JBPAPP_4_2/ejb3/src/resources/test/propertyreplacement/META-INF/jboss.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test/propertyreplacement/META-INF/jboss.xml	2007-08-10 17:04:48 UTC (rev 64544)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/propertyreplacement/META-INF/jboss.xml	2007-08-10 17:58:36 UTC (rev 64545)
@@ -8,7 +8,7 @@
    <enterprise-beans>
       <session>
          <ejb-name>StatelessBean</ejb-name>
-         <jndi-name>${slsb-jndi-binding}</jndi-name>
+         <jndi-name>R${slsb-jndi-binding}g</jndi-name>
       </session>
    </enterprise-beans>
 </jboss>

Modified: branches/JBPAPP_4_2/ejb3/src/resources/test/propertyreplacement/propertyreplacement-service.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test/propertyreplacement/propertyreplacement-service.xml	2007-08-10 17:04:48 UTC (rev 64544)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/propertyreplacement/propertyreplacement-service.xml	2007-08-10 17:58:36 UTC (rev 64545)
@@ -21,7 +21,7 @@
     -->
     
     <attribute name="Properties">
-      slsb-jndi-binding=ReplacedBinding
+      slsb-jndi-binding=eplacedBindin
     </attribute>
   </mbean>