[jboss-cvs] JBossAS SVN: r64389 - in branches/Branch_4_2/ejb3/src: resources/test/propertyreplacement and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 31 16:53:00 EDT 2007
Author: bdecoste
Date: 2007-07-31 16:53:00 -0400 (Tue, 31 Jul 2007)
New Revision: 64389
Modified:
branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
branches/Branch_4_2/ejb3/src/resources/test/propertyreplacement/META-INF/jboss.xml
branches/Branch_4_2/ejb3/src/resources/test/propertyreplacement/propertyreplacement-service.xml
Log:
[EJBTHREE-1022] partial property replacement
Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java 2007-07-31 20:31:06 UTC (rev 64388)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java 2007-07-31 20:53:00 UTC (rev 64389)
@@ -1480,7 +1480,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/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java 2007-07-31 20:31:06 UTC (rev 64388)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java 2007-07-31 20:53:00 UTC (rev 64389)
@@ -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/Branch_4_2/ejb3/src/resources/test/propertyreplacement/META-INF/jboss.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/propertyreplacement/META-INF/jboss.xml 2007-07-31 20:31:06 UTC (rev 64388)
+++ branches/Branch_4_2/ejb3/src/resources/test/propertyreplacement/META-INF/jboss.xml 2007-07-31 20:53:00 UTC (rev 64389)
@@ -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/Branch_4_2/ejb3/src/resources/test/propertyreplacement/propertyreplacement-service.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/propertyreplacement/propertyreplacement-service.xml 2007-07-31 20:31:06 UTC (rev 64388)
+++ branches/Branch_4_2/ejb3/src/resources/test/propertyreplacement/propertyreplacement-service.xml 2007-07-31 20:53:00 UTC (rev 64389)
@@ -21,7 +21,7 @@
-->
<attribute name="Properties">
- slsb-jndi-binding=ReplacedBinding
+ slsb-jndi-binding=eplacedBindin
</attribute>
</mbean>
More information about the jboss-cvs-commits
mailing list