[jboss-cvs] JBossAS SVN: r109639 - trunk/connector/src/main/java/org/jboss/resource/metadata/mcf.

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

Author: jeff.zhang
Date: 2010-12-01 21:13:30 -0500 (Wed, 01 Dec 2010)
New Revision: 109639

Modified:
   trunk/connector/src/main/java/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java
   trunk/connector/src/main/java/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
Log:
[JBAS-8344] system properties could be parsed in ds.xml, include jndiName, rarName, connectionDefinition and jmxInvokeName

Modified: trunk/connector/src/main/java/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java	2010-12-02 01:25:12 UTC (rev 109638)
+++ trunk/connector/src/main/java/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java	2010-12-02 02:13:30 UTC (rev 109639)
@@ -321,7 +321,8 @@
    @ManagementPropertyFactory(ConnectionFactoryProperty.class)
    public List<ManagedConnectionFactoryPropertyMetaData> getManagedConnectionFactoryProperties()
    {
-      List<ManagedConnectionFactoryPropertyMetaData> properties = new ArrayList<ManagedConnectionFactoryPropertyMetaData>();
+      List<ManagedConnectionFactoryPropertyMetaData> properties = super.getManagedConnectionFactoryProperties();
+
       ManagedConnectionFactoryPropertyMetaData property = null;
             
       if(getUserName() != null)

Modified: trunk/connector/src/main/java/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java	2010-12-02 01:25:12 UTC (rev 109638)
+++ trunk/connector/src/main/java/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java	2010-12-02 02:13:30 UTC (rev 109639)
@@ -44,8 +44,8 @@
 import org.jboss.managed.api.annotation.ViewUse;
 import org.jboss.resource.deployers.management.ConnectionFactoryProperty;
 import org.jboss.system.metadata.ServiceMetaData;
+import org.jboss.util.StringPropertyReplacer;
 
-
 /**
  * A ManagedConnectionFactoryDeployment.
  * 
@@ -211,6 +211,10 @@
    @ManagementObjectID(type="DataSource")
    public String getJndiName()
    {
+      if (jndiName.indexOf("${") >= 0 && jndiName.indexOf('}') >=0)
+      {
+         jndiName = StringPropertyReplacer.replaceProperties(jndiName);
+      }
       return jndiName;
    }
 
@@ -268,20 +272,6 @@
    }
 
    /**
-    * Get the managedConnectionFactoryProperties.
-    * 
-    * @return the managedConnectionFactoryProperties.
-    */
-   @ManagementProperty(name="config-property",
-         description="The connection factory config properties",
-         managed=true, includeInTemplate=true)
-   @ManagementPropertyFactory(ConnectionFactoryProperty.class)
-   public List<ManagedConnectionFactoryPropertyMetaData> getManagedConnectionFactoryProperties()
-   {
-      return managedConnectionFactoryProperties;
-   }
-
-   /**
     * Set the managedConnectionFactoryProperties.
     * 
     * @param managedConnectionFactoryProperties The managedConnectionFactoryProperties to set.
@@ -655,4 +645,53 @@
    {
       this.dbmsMetaData = dbmsMetaData;
    }
+   
+   /**
+    * Get the managedConnectionFactoryProperties.
+    * 
+    * @return the managedConnectionFactoryProperties.
+    */
+   @ManagementProperty(name="config-property",
+         description="The connection factory config properties",
+         managed=true, includeInTemplate=true)
+   @ManagementPropertyFactory(ConnectionFactoryProperty.class)
+   public List<ManagedConnectionFactoryPropertyMetaData> getManagedConnectionFactoryProperties()
+   {
+      List<ManagedConnectionFactoryPropertyMetaData> properties = managedConnectionFactoryProperties;
+      ManagedConnectionFactoryPropertyMetaData property = null;
+      
+      if(getJndiName() != null)
+      {
+         property = new ManagedConnectionFactoryPropertyMetaData();
+         property.setName("JndiName");
+         property.setValue(getJndiName());
+         properties.add(property);
+      }
+      
+      if(getRarName() != null)
+      {
+         property = new ManagedConnectionFactoryPropertyMetaData();
+         property.setName("RarName");
+         property.setValue(getRarName());
+         properties.add(property);
+      }
+      
+      if(getConnectionDefinition() != null)
+      {
+         property = new ManagedConnectionFactoryPropertyMetaData();
+         property.setName("ConnectionDefinition");
+         property.setValue(getConnectionDefinition());
+         properties.add(property);
+      }
+      
+      if(getJmxInvokerName() != null)
+      {
+         property = new ManagedConnectionFactoryPropertyMetaData();
+         property.setName("JmxInvokerName");
+         property.setValue(getJmxInvokerName());
+         properties.add(property);
+      }
+      
+      return properties;
+   }
 }