[jboss-cvs] JBossAS SVN: r110906 - in projects/jboss-jca/trunk: deployers/src/main/java/org/jboss/jca/deployers/common and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 14 07:24:39 EDT 2011
Author: jeff.zhang
Date: 2011-03-14 07:24:39 -0400 (Mon, 14 Mar 2011)
New Revision: 110906
Modified:
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/AdminObject.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/ManagedConnectionFactory.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceComponent.java
projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceDiscoveryComponent.java
projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml
projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java
Log:
[JBJCA-521] add jndiName into management api and use it as tree item in the inventory tree
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/AdminObject.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/AdminObject.java 2011-03-14 09:50:13 UTC (rev 110905)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/AdminObject.java 2011-03-14 11:24:39 UTC (rev 110906)
@@ -38,6 +38,9 @@
/** The config property's */
private List<ConfigProperty> configProperties;
+
+ /** jndi name */
+ private String jndiName;
/**
* Constructor
@@ -74,6 +77,26 @@
}
/**
+ * Get the jndiName.
+ *
+ * @return the jndiName.
+ */
+ public String getJndiName()
+ {
+ return jndiName;
+ }
+
+ /**
+ * Set the jndiName.
+ *
+ * @param jndiName The jndiName to set.
+ */
+ public void setJndiName(String jndiName)
+ {
+ this.jndiName = jndiName;
+ }
+
+ /**
* String representation
* @return The string
*/
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/ManagedConnectionFactory.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/ManagedConnectionFactory.java 2011-03-14 09:50:13 UTC (rev 110905)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/ManagedConnectionFactory.java 2011-03-14 11:24:39 UTC (rev 110906)
@@ -48,6 +48,9 @@
/** The pool configuration instance */
private WeakReference<PoolConfiguration> poolConfiguration;
+ /** jndi name */
+ private String jndiName;
+
/**
* Constructor
* @param mcf The managed connection factory instance
@@ -132,7 +135,28 @@
this.poolConfiguration = new WeakReference<PoolConfiguration>(pc);
}
+
/**
+ * Get the jndiName.
+ *
+ * @return the jndiName.
+ */
+ public String getJndiName()
+ {
+ return jndiName;
+ }
+
+ /**
+ * Set the jndiName.
+ *
+ * @param jndiName The jndiName to set.
+ */
+ public void setJndiName(String jndiName)
+ {
+ this.jndiName = jndiName;
+ }
+
+ /**
* String representation
* @return The string
*/
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-03-14 09:50:13 UTC (rev 110905)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-03-14 11:24:39 UTC (rev 110906)
@@ -687,6 +687,7 @@
mgtAo.getConfigProperties().
addAll(createManagementView(aoMeta.getConfigProperties()));
+ mgtAo.setJndiName(jndiName);
mgtConnector.getAdminObjects().add(mgtAo);
}
Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceComponent.java 2011-03-14 09:50:13 UTC (rev 110905)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceComponent.java 2011-03-14 11:24:39 UTC (rev 110906)
@@ -76,7 +76,7 @@
// jndi name
// interface_class_name
- PropertySimple intfClsNameProp = new PropertySimple("interface_class_name", jcaClsName);
+ PropertySimple intfClsNameProp = new PropertySimple("interface-class-name", jcaClsName);
config.put(intfClsNameProp);
// use-ra-association
Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceDiscoveryComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceDiscoveryComponent.java 2011-03-14 09:50:13 UTC (rev 110905)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceDiscoveryComponent.java 2011-03-14 11:24:39 UTC (rev 110906)
@@ -70,7 +70,8 @@
Object aoObj = ao.getAdminObject();
Class<?> aoCls = aoObj.getClass();
String key = rarUniqueId + "#" + aoCls.getName();
- String name = aoCls.getSimpleName();
+ //String name = aoCls.getSimpleName();
+ String name = ao.getJndiName();
DiscoveredResourceDetails mcfRes = new DiscoveredResourceDetails(context.getResourceType(), key, name, null,
"Admin Objects", context.getDefaultPluginConfiguration(), null);
result.add(mcfRes);
Modified: projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml 2011-03-14 09:50:13 UTC (rev 110905)
+++ projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml 2011-03-14 11:24:39 UTC (rev 110906)
@@ -466,8 +466,8 @@
<resource-configuration>
<c:group name="general" displayName="General">
- <c:simple-property name="jndi_name" displayName="JNDI Name"/>
- <c:simple-property name="interface_class_name" displayName="interface class name" description="the interface class name of the admin object" readOnly="true"/>
+ <c:simple-property name="jndi-name" displayName="JNDI Name"/>
+ <c:simple-property name="interface-class-name" displayName="interface class name" description="the interface class name of the admin object" readOnly="true"/>
<c:simple-property name="use-ra-association" displayName="Use ResourceAdapterAssociation" type="boolean" readOnly="true" />
</c:group>
<c:group name="ConfigProperties" displayName="All Config Properties">
Modified: projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java 2011-03-14 09:50:13 UTC (rev 110905)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java 2011-03-14 11:24:39 UTC (rev 110906)
@@ -118,7 +118,7 @@
}
if (res.getName().equals("XAAdminObjectImpl"))
{
- String aoCls = config.getSimpleValue("interface_class_name", null);
+ String aoCls = config.getSimpleValue("interface-class-name", null);
assertEquals("org.jboss.jca.rhq.rar.xa.XAAdminObjectImpl", aoCls);
assertEquals("true", config.getSimpleValue("use-ra-association", "null"));
}
More information about the jboss-cvs-commits
mailing list