[jboss-cvs] JBossAS SVN: r111656 - in projects/jboss-jca/branches/Branch_1_0: embedded/src/main/java/org/jboss/jca/embedded and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 23 08:35:16 EDT 2011
Author: jesper.pedersen
Date: 2011-06-23 08:35:15 -0400 (Thu, 23 Jun 2011)
New Revision: 111656
Modified:
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java
projects/jboss-jca/branches/Branch_1_0/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java
projects/jboss-jca/branches/Branch_1_0/sjc/src/main/java/org/jboss/jca/sjc/Main.java
projects/jboss-jca/branches/Branch_1_0/web/src/main/java/org/jboss/jca/web/console/Server.java
Log:
Disable JMX in embedded mode, and use platform MBeanServer
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java 2011-06-22 21:05:51 UTC (rev 111655)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java 2011-06-23 12:35:15 UTC (rev 111656)
@@ -403,244 +403,245 @@
MBeanServer server)
throws JMException
{
- if (server == null)
- throw new IllegalArgumentException("MBeanServer is null");
+ List<ObjectName> ons = null;
- List<ObjectName> ons = new ArrayList<ObjectName>();
-
if (mgtConnector != null)
{
- String baseName = server.getDefaultDomain() + ":deployment=" + mgtConnector.getUniqueId();
-
- if (mgtConnector.getResourceAdapter() != null)
+ if (server != null)
{
- org.jboss.jca.core.api.management.ResourceAdapter mgtRa = mgtConnector.getResourceAdapter();
+ ons = new ArrayList<ObjectName>();
+ String baseName = server.getDefaultDomain() + ":deployment=" + mgtConnector.getUniqueId();
- if (mgtRa.getResourceAdapter() != null)
+ if (mgtConnector.getResourceAdapter() != null)
{
- Set<String> writeable = new HashSet<String>();
- Set<String> excludeAttributes = new HashSet<String>();
+ org.jboss.jca.core.api.management.ResourceAdapter mgtRa = mgtConnector.getResourceAdapter();
- for (org.jboss.jca.core.api.management.ConfigProperty mgtCp : mgtRa.getConfigProperties())
+ if (mgtRa.getResourceAdapter() != null)
{
- String mgtCpName = mgtCp.getName().substring(0, 1).toUpperCase(Locale.US);
- if (mgtCp.getName().length() > 1)
- mgtCpName += mgtCp.getName().substring(1);
+ Set<String> writeable = new HashSet<String>();
+ Set<String> excludeAttributes = new HashSet<String>();
- if (mgtCp.isDynamic())
- writeable.add(mgtCpName);
+ for (org.jboss.jca.core.api.management.ConfigProperty mgtCp : mgtRa.getConfigProperties())
+ {
+ String mgtCpName = mgtCp.getName().substring(0, 1).toUpperCase(Locale.US);
+ if (mgtCp.getName().length() > 1)
+ mgtCpName += mgtCp.getName().substring(1);
- if (mgtCp.isConfidential())
- excludeAttributes.add(mgtCpName);
- }
+ if (mgtCp.isDynamic())
+ writeable.add(mgtCpName);
- String raName = baseName + ",type=ResourceAdapter,class=" +
- getClassName(mgtRa.getResourceAdapter().getClass().getName());
+ if (mgtCp.isConfidential())
+ excludeAttributes.add(mgtCpName);
+ }
- DynamicMBean raDMB = JMX.createMBean(mgtRa.getResourceAdapter(),
- "Resource adapter",
- writeable,
- null,
- excludeAttributes,
- null);
- ObjectName raON = new ObjectName(raName);
-
- server.registerMBean(raDMB, raON);
-
- ons.add(raON);
-
- if (mgtRa.getStatistics() != null)
- {
- String raSName = baseName + ",type=ResourceAdapterStatistics,class=" +
+ String raName = baseName + ",type=ResourceAdapter,class=" +
getClassName(mgtRa.getResourceAdapter().getClass().getName());
- Set<String> writeStatAttributes = new HashSet<String>();
- writeStatAttributes.add("Enabled");
- Set<String> excludeStatAttributes = new HashSet<String>();
- excludeStatAttributes.add("Names");
- Set<String> excludeStatOperations = new HashSet<String>();
- excludeStatOperations.add("delta(.)*");
+ DynamicMBean raDMB = JMX.createMBean(mgtRa.getResourceAdapter(),
+ "Resource adapter",
+ writeable,
+ null,
+ excludeAttributes,
+ null);
+ ObjectName raON = new ObjectName(raName);
- DynamicMBean raSDMB = JMX.createMBean(mgtRa.getStatistics(),
- "Resource adapter statistics",
- writeStatAttributes, null,
- excludeStatAttributes, excludeStatOperations);
- ObjectName raSON = new ObjectName(raSName);
+ server.registerMBean(raDMB, raON);
- server.registerMBean(raSDMB, raSON);
+ ons.add(raON);
- ons.add(raSON);
+ if (mgtRa.getStatistics() != null)
+ {
+ String raSName = baseName + ",type=ResourceAdapterStatistics,class=" +
+ getClassName(mgtRa.getResourceAdapter().getClass().getName());
+
+ Set<String> writeStatAttributes = new HashSet<String>();
+ writeStatAttributes.add("Enabled");
+ Set<String> excludeStatAttributes = new HashSet<String>();
+ excludeStatAttributes.add("Names");
+ Set<String> excludeStatOperations = new HashSet<String>();
+ excludeStatOperations.add("delta(.)*");
+
+ DynamicMBean raSDMB = JMX.createMBean(mgtRa.getStatistics(),
+ "Resource adapter statistics",
+ writeStatAttributes, null,
+ excludeStatAttributes, excludeStatOperations);
+ ObjectName raSON = new ObjectName(raSName);
+
+ server.registerMBean(raSDMB, raSON);
+
+ ons.add(raSON);
+ }
}
}
- }
- for (org.jboss.jca.core.api.management.ConnectionFactory mgtCf :
- mgtConnector.getConnectionFactories())
- {
- if (mgtCf.getManagedConnectionFactory() != null)
+ for (org.jboss.jca.core.api.management.ConnectionFactory mgtCf :
+ mgtConnector.getConnectionFactories())
{
- org.jboss.jca.core.api.management.ManagedConnectionFactory mgtMcf = mgtCf.getManagedConnectionFactory();
- Set<String> writeable = new HashSet<String>();
- Set<String> excludeAttributes = new HashSet<String>();
-
- for (org.jboss.jca.core.api.management.ConfigProperty mgtCp : mgtMcf.getConfigProperties())
+ if (mgtCf.getManagedConnectionFactory() != null)
{
- String mgtCpName = mgtCp.getName().substring(0, 1).toUpperCase(Locale.US);
- if (mgtCp.getName().length() > 1)
- mgtCpName += mgtCp.getName().substring(1);
+ org.jboss.jca.core.api.management.ManagedConnectionFactory mgtMcf = mgtCf.getManagedConnectionFactory();
+ Set<String> writeable = new HashSet<String>();
+ Set<String> excludeAttributes = new HashSet<String>();
- if (mgtCp.isDynamic())
- writeable.add(mgtCpName);
+ for (org.jboss.jca.core.api.management.ConfigProperty mgtCp : mgtMcf.getConfigProperties())
+ {
+ String mgtCpName = mgtCp.getName().substring(0, 1).toUpperCase(Locale.US);
+ if (mgtCp.getName().length() > 1)
+ mgtCpName += mgtCp.getName().substring(1);
- if (mgtCp.isConfidential())
- excludeAttributes.add(mgtCpName);
- }
+ if (mgtCp.isDynamic())
+ writeable.add(mgtCpName);
- String mcfName = baseName + ",type=ManagedConnectionFactory,class=" +
- getClassName(mgtMcf.getManagedConnectionFactory().getClass().getName());
+ if (mgtCp.isConfidential())
+ excludeAttributes.add(mgtCpName);
+ }
- DynamicMBean mcfDMB = JMX.createMBean(mgtMcf.getManagedConnectionFactory(),
- "Managed connection factory",
- writeable,
- null,
- excludeAttributes,
- null);
- ObjectName mcfON = new ObjectName(mcfName);
+ String mcfName = baseName + ",type=ManagedConnectionFactory,class=" +
+ getClassName(mgtMcf.getManagedConnectionFactory().getClass().getName());
- server.registerMBean(mcfDMB, mcfON);
+ DynamicMBean mcfDMB = JMX.createMBean(mgtMcf.getManagedConnectionFactory(),
+ "Managed connection factory",
+ writeable,
+ null,
+ excludeAttributes,
+ null);
+ ObjectName mcfON = new ObjectName(mcfName);
- ons.add(mcfON);
+ server.registerMBean(mcfDMB, mcfON);
- if (mgtMcf.getStatistics() != null)
- {
- String mcfSName = baseName + ",type=ManagedConnectionFactoryStatistics,class=" +
- getClassName(mgtMcf.getManagedConnectionFactory().getClass().getName());
+ ons.add(mcfON);
- Set<String> writeStatAttributes = new HashSet<String>();
- writeStatAttributes.add("Enabled");
- Set<String> excludeStatAttributes = new HashSet<String>();
- excludeStatAttributes.add("Names");
- Set<String> excludeStatOperations = new HashSet<String>();
- excludeStatOperations.add("delta(.)*");
+ if (mgtMcf.getStatistics() != null)
+ {
+ String mcfSName = baseName + ",type=ManagedConnectionFactoryStatistics,class=" +
+ getClassName(mgtMcf.getManagedConnectionFactory().getClass().getName());
- DynamicMBean mcfSDMB = JMX.createMBean(mgtMcf.getStatistics(),
- "Managed connection factory statistics",
- writeStatAttributes, null,
- excludeStatAttributes, excludeStatOperations);
- ObjectName mcfSON = new ObjectName(mcfSName);
+ Set<String> writeStatAttributes = new HashSet<String>();
+ writeStatAttributes.add("Enabled");
+ Set<String> excludeStatAttributes = new HashSet<String>();
+ excludeStatAttributes.add("Names");
+ Set<String> excludeStatOperations = new HashSet<String>();
+ excludeStatOperations.add("delta(.)*");
+
+ DynamicMBean mcfSDMB = JMX.createMBean(mgtMcf.getStatistics(),
+ "Managed connection factory statistics",
+ writeStatAttributes, null,
+ excludeStatAttributes, excludeStatOperations);
+ ObjectName mcfSON = new ObjectName(mcfSName);
+
+ server.registerMBean(mcfSDMB, mcfSON);
- server.registerMBean(mcfSDMB, mcfSON);
+ ons.add(mcfSON);
+ }
+ }
- ons.add(mcfSON);
+ if (mgtCf.getPoolConfiguration() != null)
+ {
+ String mcfPCName = baseName + ",type=ConnectionFactory,class=" +
+ getClassName(mgtCf.getConnectionFactory().getClass().getName()) +
+ ",subcategory=PoolConfiguration";
+
+ DynamicMBean mcfPCDMB = JMX.createMBean(mgtCf.getPoolConfiguration(), "Pool configuration");
+ ObjectName mcfPCON = new ObjectName(mcfPCName);
+
+ server.registerMBean(mcfPCDMB, mcfPCON);
+
+ ons.add(mcfPCON);
}
- }
- if (mgtCf.getPoolConfiguration() != null)
- {
- String mcfPCName = baseName + ",type=ConnectionFactory,class=" +
- getClassName(mgtCf.getConnectionFactory().getClass().getName()) +
- ",subcategory=PoolConfiguration";
-
- DynamicMBean mcfPCDMB = JMX.createMBean(mgtCf.getPoolConfiguration(), "Pool configuration");
- ObjectName mcfPCON = new ObjectName(mcfPCName);
-
- server.registerMBean(mcfPCDMB, mcfPCON);
-
- ons.add(mcfPCON);
- }
-
- if (mgtCf.getPool() != null)
- {
- String cfPName = baseName + ",type=ConnectionFactory,class=" +
- getClassName(mgtCf.getConnectionFactory().getClass().getName()) + ",subcategory=Pool";
-
- DynamicMBean cfPDMB = JMX.createMBean(mgtCf.getPool(), "Pool");
- ObjectName cfPON = new ObjectName(cfPName);
-
- server.registerMBean(cfPDMB, cfPON);
-
- ons.add(cfPON);
-
- if (mgtCf.getPool().getStatistics() != null)
+ if (mgtCf.getPool() != null)
{
- String cfPSName = baseName + ",type=ConnectionFactory,class=" +
- getClassName(mgtCf.getConnectionFactory().getClass().getName()) + ",subcategory=PoolStatistics";
+ String cfPName = baseName + ",type=ConnectionFactory,class=" +
+ getClassName(mgtCf.getConnectionFactory().getClass().getName()) + ",subcategory=Pool";
+
+ DynamicMBean cfPDMB = JMX.createMBean(mgtCf.getPool(), "Pool");
+ ObjectName cfPON = new ObjectName(cfPName);
+
+ server.registerMBean(cfPDMB, cfPON);
+
+ ons.add(cfPON);
+
+ if (mgtCf.getPool().getStatistics() != null)
+ {
+ String cfPSName = baseName + ",type=ConnectionFactory,class=" +
+ getClassName(mgtCf.getConnectionFactory().getClass().getName()) + ",subcategory=PoolStatistics";
- Set<String> writeStatAttributes = new HashSet<String>();
- writeStatAttributes.add("Enabled");
- Set<String> excludeStatAttributes = new HashSet<String>();
- excludeStatAttributes.add("Names");
- Set<String> excludeStatOperations = new HashSet<String>();
- excludeStatOperations.add("delta(.)*");
+ Set<String> writeStatAttributes = new HashSet<String>();
+ writeStatAttributes.add("Enabled");
+ Set<String> excludeStatAttributes = new HashSet<String>();
+ excludeStatAttributes.add("Names");
+ Set<String> excludeStatOperations = new HashSet<String>();
+ excludeStatOperations.add("delta(.)*");
- DynamicMBean cfPSDMB = JMX.createMBean(mgtCf.getPool().getStatistics(), "Pool statistics",
- writeStatAttributes, null,
- excludeStatAttributes, excludeStatOperations);
- ObjectName cfPSON = new ObjectName(cfPSName);
+ DynamicMBean cfPSDMB = JMX.createMBean(mgtCf.getPool().getStatistics(), "Pool statistics",
+ writeStatAttributes, null,
+ excludeStatAttributes, excludeStatOperations);
+ ObjectName cfPSON = new ObjectName(cfPSName);
- server.registerMBean(cfPSDMB, cfPSON);
-
- ons.add(cfPSON);
+ server.registerMBean(cfPSDMB, cfPSON);
+
+ ons.add(cfPSON);
+ }
}
}
- }
- for (org.jboss.jca.core.api.management.AdminObject mgtAo : mgtConnector.getAdminObjects())
- {
- if (mgtAo.getAdminObject() != null)
+ for (org.jboss.jca.core.api.management.AdminObject mgtAo : mgtConnector.getAdminObjects())
{
- Set<String> writeable = new HashSet<String>();
- Set<String> excludeAttributes = new HashSet<String>();
-
- for (org.jboss.jca.core.api.management.ConfigProperty mgtCp : mgtAo.getConfigProperties())
+ if (mgtAo.getAdminObject() != null)
{
- String mgtCpName = mgtCp.getName().substring(0, 1).toUpperCase(Locale.US);
- if (mgtCp.getName().length() > 1)
- mgtCpName += mgtCp.getName().substring(1);
+ Set<String> writeable = new HashSet<String>();
+ Set<String> excludeAttributes = new HashSet<String>();
- if (mgtCp.isDynamic())
- writeable.add(mgtCpName);
+ for (org.jboss.jca.core.api.management.ConfigProperty mgtCp : mgtAo.getConfigProperties())
+ {
+ String mgtCpName = mgtCp.getName().substring(0, 1).toUpperCase(Locale.US);
+ if (mgtCp.getName().length() > 1)
+ mgtCpName += mgtCp.getName().substring(1);
- if (mgtCp.isConfidential())
- excludeAttributes.add(mgtCpName);
- }
+ if (mgtCp.isDynamic())
+ writeable.add(mgtCpName);
- String aoName = baseName + ",type=AdminObject,class=" +
- getClassName(mgtAo.getAdminObject().getClass().getName());
+ if (mgtCp.isConfidential())
+ excludeAttributes.add(mgtCpName);
+ }
- DynamicMBean aoDMB = JMX.createMBean(mgtAo.getAdminObject(),
- "Admin object",
- writeable,
- null,
- excludeAttributes,
- null);
- ObjectName aoON = new ObjectName(aoName);
+ String aoName = baseName + ",type=AdminObject,class=" +
+ getClassName(mgtAo.getAdminObject().getClass().getName());
- server.registerMBean(aoDMB, aoON);
+ DynamicMBean aoDMB = JMX.createMBean(mgtAo.getAdminObject(),
+ "Admin object",
+ writeable,
+ null,
+ excludeAttributes,
+ null);
+ ObjectName aoON = new ObjectName(aoName);
- ons.add(aoON);
-
- if (mgtAo.getStatistics() != null)
- {
- String aoSName = baseName + ",type=AdminObjectStatistics,class=" +
- getClassName(mgtAo.getAdminObject().getClass().getName());
+ server.registerMBean(aoDMB, aoON);
+
+ ons.add(aoON);
+
+ if (mgtAo.getStatistics() != null)
+ {
+ String aoSName = baseName + ",type=AdminObjectStatistics,class=" +
+ getClassName(mgtAo.getAdminObject().getClass().getName());
- Set<String> writeStatAttributes = new HashSet<String>();
- writeStatAttributes.add("Enabled");
- Set<String> excludeStatAttributes = new HashSet<String>();
- excludeStatAttributes.add("Names");
- Set<String> excludeStatOperations = new HashSet<String>();
- excludeStatOperations.add("delta(.)*");
+ Set<String> writeStatAttributes = new HashSet<String>();
+ writeStatAttributes.add("Enabled");
+ Set<String> excludeStatAttributes = new HashSet<String>();
+ excludeStatAttributes.add("Names");
+ Set<String> excludeStatOperations = new HashSet<String>();
+ excludeStatOperations.add("delta(.)*");
- DynamicMBean aoSDMB = JMX.createMBean(mgtAo.getStatistics(),
- "Admin object statistics",
- writeStatAttributes, null,
- excludeStatAttributes, excludeStatOperations);
- ObjectName aoSON = new ObjectName(aoSName);
-
- server.registerMBean(aoSDMB, aoSON);
-
- ons.add(aoSON);
+ DynamicMBean aoSDMB = JMX.createMBean(mgtAo.getStatistics(),
+ "Admin object statistics",
+ writeStatAttributes, null,
+ excludeStatAttributes, excludeStatOperations);
+ ObjectName aoSON = new ObjectName(aoSName);
+
+ server.registerMBean(aoSDMB, aoSON);
+
+ ons.add(aoSON);
+ }
}
}
}
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java 2011-06-22 21:05:51 UTC (rev 111655)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java 2011-06-23 12:35:15 UTC (rev 111656)
@@ -372,48 +372,69 @@
MBeanServer server)
throws JMException
{
- if (server == null)
- throw new IllegalArgumentException("MBeanServer is null");
+ List<ObjectName> ons = null;
- List<ObjectName> ons = new ArrayList<ObjectName>();
-
if (mgtDses != null)
{
- for (org.jboss.jca.core.api.management.DataSource mgtDs : mgtDses)
+ if (server != null)
{
- String jndiName = mgtDs.getJndiName();
- if (jndiName.indexOf("/") != -1)
- jndiName = jndiName.substring(jndiName.lastIndexOf("/") + 1);
+ ons = new ArrayList<ObjectName>();
+ for (org.jboss.jca.core.api.management.DataSource mgtDs : mgtDses)
+ {
+ String jndiName = mgtDs.getJndiName();
+ if (jndiName.indexOf("/") != -1)
+ jndiName = jndiName.substring(jndiName.lastIndexOf("/") + 1);
- String baseName = server.getDefaultDomain() + ":deployment=" + jndiName;
+ String baseName = server.getDefaultDomain() + ":deployment=" + jndiName;
- if (mgtDs.getPoolConfiguration() != null)
- {
- String dsPCName = baseName + ",type=PoolConfigutation";
+ if (mgtDs.getPoolConfiguration() != null)
+ {
+ String dsPCName = baseName + ",type=PoolConfigutation";
- DynamicMBean dsPCDMB = JMX.createMBean(mgtDs.getPoolConfiguration(), "Pool configuration");
- ObjectName dsPCON = new ObjectName(dsPCName);
+ DynamicMBean dsPCDMB = JMX.createMBean(mgtDs.getPoolConfiguration(), "Pool configuration");
+ ObjectName dsPCON = new ObjectName(dsPCName);
- server.registerMBean(dsPCDMB, dsPCON);
+ server.registerMBean(dsPCDMB, dsPCON);
- ons.add(dsPCON);
- }
+ ons.add(dsPCON);
+ }
- if (mgtDs.getPool() != null)
- {
- String dsPName = baseName + ",type=Pool";
+ if (mgtDs.getPool() != null)
+ {
+ String dsPName = baseName + ",type=Pool";
- DynamicMBean dsPDMB = JMX.createMBean(mgtDs.getPool(), "Pool");
- ObjectName dsPON = new ObjectName(dsPName);
+ DynamicMBean dsPDMB = JMX.createMBean(mgtDs.getPool(), "Pool");
+ ObjectName dsPON = new ObjectName(dsPName);
- server.registerMBean(dsPDMB, dsPON);
+ server.registerMBean(dsPDMB, dsPON);
- ons.add(dsPON);
+ ons.add(dsPON);
- if (mgtDs.getPool().getStatistics() != null)
+ if (mgtDs.getPool().getStatistics() != null)
+ {
+ String dsPSName = baseName + ",type=PoolStatistics";
+
+ Set<String> writeAttributes = new HashSet<String>();
+ writeAttributes.add("Enabled");
+ Set<String> excludeAttributes = new HashSet<String>();
+ excludeAttributes.add("Names");
+ Set<String> excludeOperations = new HashSet<String>();
+ excludeOperations.add("delta(.)*");
+
+ DynamicMBean dsPSDMB = JMX.createMBean(mgtDs.getPool().getStatistics(), "PoolStatistics",
+ writeAttributes, null,
+ excludeAttributes, excludeOperations);
+ ObjectName dsPSON = new ObjectName(dsPSName);
+
+ server.registerMBean(dsPSDMB, dsPSON);
+
+ ons.add(dsPSON);
+ }
+ }
+
+ if (mgtDs.getStatistics() != null)
{
- String dsPSName = baseName + ",type=PoolStatistics";
-
+ String dsSName = baseName + ",type=Statistics";
Set<String> writeAttributes = new HashSet<String>();
writeAttributes.add("Enabled");
Set<String> excludeAttributes = new HashSet<String>();
@@ -421,34 +442,15 @@
Set<String> excludeOperations = new HashSet<String>();
excludeOperations.add("delta(.)*");
- DynamicMBean dsPSDMB = JMX.createMBean(mgtDs.getPool().getStatistics(), "PoolStatistics",
- writeAttributes, null, excludeAttributes, excludeOperations);
- ObjectName dsPSON = new ObjectName(dsPSName);
+ DynamicMBean dsSDMB = JMX.createMBean(mgtDs.getStatistics(), "Statistics",
+ writeAttributes, null, excludeAttributes, excludeOperations);
+ ObjectName dsSON = new ObjectName(dsSName);
- server.registerMBean(dsPSDMB, dsPSON);
-
- ons.add(dsPSON);
+ server.registerMBean(dsSDMB, dsSON);
+
+ ons.add(dsSON);
}
}
-
- if (mgtDs.getStatistics() != null)
- {
- String dsSName = baseName + ",type=Statistics";
- Set<String> writeAttributes = new HashSet<String>();
- writeAttributes.add("Enabled");
- Set<String> excludeAttributes = new HashSet<String>();
- excludeAttributes.add("Names");
- Set<String> excludeOperations = new HashSet<String>();
- excludeOperations.add("delta(.)*");
-
- DynamicMBean dsSDMB = JMX.createMBean(mgtDs.getStatistics(), "Statistics",
- writeAttributes, null, excludeAttributes, excludeOperations);
- ObjectName dsSON = new ObjectName(dsSName);
-
- server.registerMBean(dsSDMB, dsSON);
-
- ons.add(dsSON);
- }
}
}
Modified: projects/jboss-jca/branches/Branch_1_0/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java 2011-06-22 21:05:51 UTC (rev 111655)
+++ projects/jboss-jca/branches/Branch_1_0/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java 2011-06-23 12:35:15 UTC (rev 111656)
@@ -100,6 +100,7 @@
kernelConfiguration = kernelConfiguration.name("iron.jacamar");
kernelConfiguration = kernelConfiguration.home(null);
kernelConfiguration = kernelConfiguration.classLoader(ClassLoaderFactory.TYPE_PARENT_FIRST);
+ kernelConfiguration = kernelConfiguration.management(false);
kernelConfiguration = kernelConfiguration.parallelDeploy(false);
kernelConfiguration = kernelConfiguration.remoteAccess(false);
kernelConfiguration = kernelConfiguration.hotDeployment(false);
Modified: projects/jboss-jca/branches/Branch_1_0/sjc/src/main/java/org/jboss/jca/sjc/Main.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/sjc/src/main/java/org/jboss/jca/sjc/Main.java 2011-06-22 21:05:51 UTC (rev 111655)
+++ projects/jboss-jca/branches/Branch_1_0/sjc/src/main/java/org/jboss/jca/sjc/Main.java 2011-06-23 12:35:15 UTC (rev 111656)
@@ -71,6 +71,7 @@
KernelConfiguration kernelConfiguration = new KernelConfiguration();
kernelConfiguration = kernelConfiguration.name("iron.jacamar");
kernelConfiguration = kernelConfiguration.classLoader(ClassLoaderFactory.TYPE_PARENT_FIRST);
+ kernelConfiguration = kernelConfiguration.management(true);
kernelConfiguration = kernelConfiguration.parallelDeploy(false);
kernelConfiguration = kernelConfiguration.remoteAccess(true);
kernelConfiguration = kernelConfiguration.eventListener(new PreClassLoaderEventListener());
@@ -78,6 +79,7 @@
kernelConfiguration = kernelConfiguration.command(new Shutdown());
kernelConfiguration = kernelConfiguration.deploymentOrder(new DeploymentOrder(order));
kernelConfiguration = kernelConfiguration.remoteJmxAccess(true);
+ kernelConfiguration = kernelConfiguration.usePlatformMBeanServer(true);
String home = SecurityActions.getSystemProperty("iron.jacamar.home");
if (home != null)
Modified: projects/jboss-jca/branches/Branch_1_0/web/src/main/java/org/jboss/jca/web/console/Server.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/web/src/main/java/org/jboss/jca/web/console/Server.java 2011-06-22 21:05:51 UTC (rev 111655)
+++ projects/jboss-jca/branches/Branch_1_0/web/src/main/java/org/jboss/jca/web/console/Server.java 2011-06-23 12:35:15 UTC (rev 111656)
@@ -24,6 +24,7 @@
import java.beans.IntrospectionException;
import java.beans.PropertyEditor;
import java.beans.PropertyEditorManager;
+import java.lang.management.ManagementFactory;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -57,19 +58,24 @@
private static Logger log = Logger.getLogger(Server.class);
private static boolean trace = log.isTraceEnabled();
- private static final String DOMAIN = "iron.jacamar";
-
private static MBeanServer mbeanServer = null;
/**
- * Get the MBeanServer instance
+ * Get the platform MBeanServer instance
* @return The instance
*/
public static MBeanServer getMBeanServer()
{
- if (mbeanServer != null)
- return mbeanServer;
+ return ManagementFactory.getPlatformMBeanServer();
+ }
+ /**
+ * Get the MBeanServer instance
+ * @param domain The domain
+ * @return The instance
+ */
+ public static MBeanServer getMBeanServer(String domain)
+ {
try
{
ArrayList<MBeanServer> l = MBeanServerFactory.findMBeanServer(null);
@@ -84,9 +90,8 @@
{
for (String d : domains)
{
- if (DOMAIN.equals(d))
+ if (domain.equals(d))
{
- mbeanServer = ms;
return ms;
}
}
More information about the jboss-cvs-commits
mailing list