[jboss-cvs] JBossAS SVN: r61625 - trunk/ejb3/src/main/org/jboss/ejb3/metamodel.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 22 20:16:03 EDT 2007
Author: bdecoste
Date: 2007-03-22 20:16:03 -0400 (Thu, 22 Mar 2007)
New Revision: 61625
Modified:
trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
Log:
replaced SystemPropertiesService with StringPropertyReplacer
Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java 2007-03-23 00:12:59 UTC (rev 61624)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java 2007-03-23 00:16:03 UTC (rev 61625)
@@ -24,10 +24,6 @@
import java.io.IOException;
import java.net.URL;
-import javax.management.ObjectName;
-
-import org.jboss.ejb3.KernelAbstraction;
-import org.jboss.ejb3.KernelAbstractionFactory;
import org.jboss.logging.Logger;
import org.jboss.metadata.SecurityRoleRefMetaData;
import org.jboss.metamodel.descriptor.DDObjectFactory;
@@ -43,6 +39,7 @@
import org.jboss.metamodel.descriptor.RunAs;
import org.jboss.metamodel.descriptor.SecurityRole;
import org.jboss.util.xml.JBossEntityResolver;
+import org.jboss.util.StringPropertyReplacer;
import org.jboss.ws.integration.ServiceRefMetaData;
import org.jboss.xb.binding.JBossXBException;
import org.jboss.xb.binding.ObjectModelFactory;
@@ -1485,26 +1482,15 @@
}
}
+ // may want to run StringPropertyReplacer on the whole descriptor at once
protected String getValue(String name, String value)
{
if (value.startsWith("${") && value.endsWith("}"))
{
- try
- {
- String propertyName = value.substring(2, value.length() - 1);
- ObjectName propertyServiceON = new ObjectName("jboss:type=Service,name=SystemProperties");
- KernelAbstraction kernelAbstraction = KernelAbstractionFactory.getInstance();
- String propertyValue = (String)kernelAbstraction.invoke(propertyServiceON, "get", new Object[] { propertyName }, new String[] { "java.lang.String" });
- log.debug("Replaced ejb-jar.xml element " + name + " with value " + propertyValue);
- return propertyValue;
- }
- catch (Exception e)
- {
- log.warn("Unable to look up property service for ejb-jar.xml element " + name + " with value " + value + ". Caused by " + e.getClass() + " "
- + e.getMessage());
- }
+ String replacement = StringPropertyReplacer.replaceProperties(value);
+ if (replacement != null)
+ value = replacement;
}
-
return value;
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java 2007-03-23 00:12:59 UTC (rev 61624)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java 2007-03-23 00:16:03 UTC (rev 61625)
@@ -24,10 +24,6 @@
import java.io.IOException;
import java.net.URL;
-import javax.management.ObjectName;
-
-import org.jboss.ejb3.KernelAbstraction;
-import org.jboss.ejb3.KernelAbstractionFactory;
import org.jboss.logging.Logger;
import org.jboss.metadata.SecurityRoleMetaData;
import org.jboss.metamodel.descriptor.DDObjectFactory;
@@ -39,6 +35,7 @@
import org.jboss.metamodel.descriptor.NameValuePair;
import org.jboss.metamodel.descriptor.ResourceEnvRef;
import org.jboss.metamodel.descriptor.ResourceRef;
+import org.jboss.util.StringPropertyReplacer;
import org.jboss.util.xml.JBossEntityResolver;
import org.jboss.ws.integration.ServiceRefMetaData;
import org.jboss.xb.binding.JBossXBException;
@@ -1086,27 +1083,15 @@
}
}
+ // may want to run StringPropertyReplacer on the whole descriptor at once
protected String getValue(String name, String value)
{
if (value.startsWith("${") && value.endsWith("}"))
{
- try
- {
- String propertyName = value.substring(2, value.length() - 1);
- ObjectName propertyServiceON = new ObjectName("jboss:type=Service,name=SystemProperties");
- KernelAbstraction kernelAbstraction = KernelAbstractionFactory.getInstance();
- String propertyValue = (String)kernelAbstraction.invoke(propertyServiceON, "get", new Object[] { propertyName }, new String[] { "java.lang.String" });
- log.debug("Replaced jboss.xml element " + name + " with value " + propertyValue);
- return propertyValue;
- }
- catch (Exception e)
- {
- log
- .warn("Unable to look up property service for jboss.xml element " + name + " with value " + value + ". Caused by " + e.getClass() + " "
- + e.getMessage());
- }
+ String replacement = StringPropertyReplacer.replaceProperties(value);
+ if (replacement != null)
+ value = replacement;
}
-
return value;
}
}
More information about the jboss-cvs-commits
mailing list