[jboss-cvs] JBossAS SVN: r110807 - in projects/jboss-jca/trunk: deployers/src/main/java/org/jboss/jca/deployers/common and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 1 10:07:45 EST 2011
Author: jesper.pedersen
Date: 2011-03-01 10:07:44 -0500 (Tue, 01 Mar 2011)
New Revision: 110807
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/Connector.java
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/ManagementRepository.java
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/fungal/AbstractFungalRADeployer.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java
projects/jboss-jca/trunk/rhq/src/test/resources/xa.rar/META-INF/ironjacamar.xml
Log:
[JBJCA-500] Only activate management if the deployment is activated
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-01 13:37:03 UTC (rev 110806)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/AdminObject.java 2011-03-01 15:07:44 UTC (rev 110807)
@@ -72,4 +72,21 @@
return configProperties;
}
+
+ /**
+ * String representation
+ * @return The string
+ */
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("AdminObject@").append(Integer.toHexString(System.identityHashCode(this)));
+ sb.append("[instance=").append(getAdminObject());
+ sb.append(" configProperties=").append(configProperties);
+ sb.append("]");
+
+ return sb.toString();
+ }
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/Connector.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/Connector.java 2011-03-01 13:37:03 UTC (rev 110806)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/Connector.java 2011-03-01 15:07:44 UTC (rev 110807)
@@ -106,4 +106,23 @@
return adminObjects;
}
+
+ /**
+ * String representation
+ * @return The string
+ */
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("Connector@").append(Integer.toHexString(System.identityHashCode(this)));
+ sb.append("[uniqueId=").append(uniqueId);
+ sb.append(" resourceAdapter=").append(resourceAdapter);
+ sb.append(" managedConnectionFactories=").append(managedConnectionFactories);
+ sb.append(" adminObjects=").append(adminObjects);
+ sb.append("]");
+
+ return sb.toString();
+ }
}
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-01 13:37:03 UTC (rev 110806)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/ManagedConnectionFactory.java 2011-03-01 15:07:44 UTC (rev 110807)
@@ -131,4 +131,23 @@
{
this.poolConfiguration = new WeakReference<PoolConfiguration>(pc);
}
+
+ /**
+ * String representation
+ * @return The string
+ */
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("ManagedConnectionFactory@").append(Integer.toHexString(System.identityHashCode(this)));
+ sb.append("[instance=").append(getManagedConnectionFactory());
+ sb.append(" configProperties=").append(configProperties);
+ sb.append(" pool=").append(getPool());
+ sb.append(" poolconfiguration=").append(getPoolConfiguration());
+ sb.append("]");
+
+ return sb.toString();
+ }
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/ManagementRepository.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/ManagementRepository.java 2011-03-01 13:37:03 UTC (rev 110806)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/ManagementRepository.java 2011-03-01 15:07:44 UTC (rev 110807)
@@ -52,4 +52,20 @@
{
return connectors;
}
+
+ /**
+ * String representation
+ * @return The string
+ */
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("ManagementRepository@").append(Integer.toHexString(System.identityHashCode(this)));
+ sb.append("[connectors=").append(connectors);
+ sb.append("]");
+
+ return sb.toString();
+ }
}
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-01 13:37:03 UTC (rev 110806)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-03-01 15:07:44 UTC (rev 110807)
@@ -806,11 +806,14 @@
.getConfigProperties()));
beanValidationObjects.add(resourceAdapter);
- org.jboss.jca.core.api.management.ResourceAdapter mgtRa =
- new org.jboss.jca.core.api.management.ResourceAdapter(resourceAdapter);
+ if (activateDeployment)
+ {
+ org.jboss.jca.core.api.management.ResourceAdapter mgtRa =
+ new org.jboss.jca.core.api.management.ResourceAdapter(resourceAdapter);
- mgtRa.getConfigProperties().addAll(createManagementView(ra1516.getConfigProperties()));
- mgtConnector.setResourceAdapter(mgtRa);
+ mgtRa.getConfigProperties().addAll(createManagementView(ra1516.getConfigProperties()));
+ mgtConnector.setResourceAdapter(mgtRa);
+ }
}
}
}
@@ -1110,14 +1113,17 @@
pool.setName(poolName);
}
- org.jboss.jca.core.api.management.ManagedConnectionFactory mgtMcf =
- new org.jboss.jca.core.api.management.ManagedConnectionFactory(mcf);
+ if (activateDeployment)
+ {
+ org.jboss.jca.core.api.management.ManagedConnectionFactory mgtMcf =
+ new org.jboss.jca.core.api.management.ManagedConnectionFactory(mcf);
- mgtMcf.getConfigProperties().addAll(createManagementView(ra10.getConfigProperties()));
- mgtMcf.setPoolConfiguration(pc);
- mgtMcf.setPool(pool);
+ mgtMcf.getConfigProperties().addAll(createManagementView(ra10.getConfigProperties()));
+ mgtMcf.setPoolConfiguration(pc);
+ mgtMcf.setPool(pool);
- mgtConnector.getManagedConnectionFactories().add(mgtMcf);
+ mgtConnector.getManagedConnectionFactories().add(mgtMcf);
+ }
}
}
}
@@ -1439,15 +1445,18 @@
pool.setName(poolName);
}
- org.jboss.jca.core.api.management.ManagedConnectionFactory mgtMcf =
- new org.jboss.jca.core.api.management.ManagedConnectionFactory(mcf);
+ if (activateDeployment)
+ {
+ org.jboss.jca.core.api.management.ManagedConnectionFactory mgtMcf =
+ new org.jboss.jca.core.api.management.ManagedConnectionFactory(mcf);
+
+ mgtMcf.getConfigProperties().
+ addAll(createManagementView(cdMeta.getConfigProperties()));
+ mgtMcf.setPoolConfiguration(pc);
+ mgtMcf.setPool(pool);
- mgtMcf.getConfigProperties().
- addAll(createManagementView(cdMeta.getConfigProperties()));
- mgtMcf.setPoolConfiguration(pc);
- mgtMcf.setPool(pool);
-
- mgtConnector.getManagedConnectionFactories().add(mgtMcf);
+ mgtConnector.getManagedConnectionFactories().add(mgtMcf);
+ }
}
}
}
@@ -1462,7 +1471,7 @@
failures = initAdminObject(cmd, cl, archiveValidationObjects, beanValidationObjects, failures, url,
deploymentName, activateDeployment, raxml != null ? raxml.getAdminObjects() : null, ijmd != null
- ? ijmd.getAdminObjects() : null, aos, aoJndiNames, mgtConnector);
+ ? ijmd.getAdminObjects() : null, aos, aoJndiNames, activateDeployment ? mgtConnector : null);
}
// Archive validation
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java 2011-03-01 13:37:03 UTC (rev 110806)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java 2011-03-01 15:07:44 UTC (rev 110807)
@@ -302,8 +302,6 @@
if (server == null)
throw new IllegalArgumentException("MBeanServer is null");
- ((RAConfiguration)getConfiguration()).getManagementRepository().getConnectors().add(mgtConnector);
-
List<ObjectName> ons = new ArrayList<ObjectName>();
if (mgtConnector != null)
@@ -450,6 +448,10 @@
ons.add(aoON);
}
}
+
+ log.debugf("Adding management connector: %s", mgtConnector);
+
+ ((RAConfiguration)getConfiguration()).getManagementRepository().getConnectors().add(mgtConnector);
}
return ons;
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2011-03-01 13:37:03 UTC (rev 110806)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2011-03-01 15:07:44 UTC (rev 110807)
@@ -159,7 +159,9 @@
CommonDeployment c = createObjectsAndInjectValue(url, deploymentName, root, cl, cmd, ijmd);
- List<ObjectName> ons = registerManagementView(c.getConnector(), kernel.getMBeanServer());
+ List<ObjectName> ons = null;
+ if (c.isActivateDeployment())
+ ons = registerManagementView(c.getConnector(), kernel.getMBeanServer());
JndiStrategy jndiStrategy = ((RAConfiguration) getConfiguration()).getJndiStrategy();
MetadataRepository metadataRepository = ((RAConfiguration) getConfiguration()).getMetadataRepository();
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java 2011-03-01 13:37:03 UTC (rev 110806)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java 2011-03-01 15:07:44 UTC (rev 110807)
@@ -273,7 +273,9 @@
CommonDeployment c = createObjectsAndInjectValue(url, deploymentName, root, cl, cmd, ijmd, raxml);
- List<ObjectName> ons = registerManagementView(c.getConnector(), kernel.getMBeanServer());
+ List<ObjectName> ons = null;
+ if (c.isActivateDeployment())
+ ons = registerManagementView(c.getConnector(), kernel.getMBeanServer());
JndiStrategy jndiStrategy = ((RAConfiguration) getConfiguration()).getJndiStrategy();
MetadataRepository metadataRepository = ((RAConfiguration) getConfiguration()).getMetadataRepository();
Modified: projects/jboss-jca/trunk/rhq/src/test/resources/xa.rar/META-INF/ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/rhq/src/test/resources/xa.rar/META-INF/ironjacamar.xml 2011-03-01 13:37:03 UTC (rev 110806)
+++ projects/jboss-jca/trunk/rhq/src/test/resources/xa.rar/META-INF/ironjacamar.xml 2011-03-01 15:07:44 UTC (rev 110807)
@@ -31,15 +31,15 @@
<transaction-support>XATransaction</transaction-support>
<connection-definitions>
- <connection-definition class-name="org.jboss.jca.rhq.test.xa.XAManagedConnectionFactory"
- enabled="true" jndi-name="java:/eis/XA"
- use-java-context="true" pool-name="XA">
+ <connection-definition class-name="org.jboss.jca.rhq.rar.xa.XAManagedConnectionFactory"
+ enabled="true" jndi-name="java:/eis/XA"
+ use-java-context="true" pool-name="XA">
<config-property name="management">rhq</config-property>
</connection-definition>
</connection-definitions>
<admin-objects>
- <admin-object class-name="org.jboss.jca.rhq.test.xa.XAAdminObjectImpl" jndi-name="java:/XAAdminObjectImpl">
+ <admin-object class-name="org.jboss.jca.rhq.rar.xa.XAAdminObjectImpl" jndi-name="java:/XAAdminObjectImpl">
<config-property name="aoConfig">ao-config</config-property>
</admin-object>
</admin-objects>
More information about the jboss-cvs-commits
mailing list