[jboss-cvs] JBossAS SVN: r110391 - in projects/jboss-jca/trunk: core/src/main/java/org/jboss/jca/core/api and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 17 11:36:09 EST 2011
Author: jesper.pedersen
Date: 2011-01-17 11:36:08 -0500 (Mon, 17 Jan 2011)
New Revision: 110391
Added:
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/
Removed:
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/management/
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/ConfigProperty.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/core/src/main/java/org/jboss/jca/core/api/management/ResourceAdapter.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/common/CommonDeployment.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalDeployment.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/RAActivator.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivatorDeployment.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAConfiguration.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/RADeployment.java
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/RaXmlDeployment.java
projects/jboss-jca/trunk/embedded/src/main/resources/jca.xml
projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/jca.xml
Log:
[JBJCA-492] Enable management repository (Part 1)
Copied: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management (from rev 110388, projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/management)
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/management/AdminObject.java 2011-01-17 13:31:15 UTC (rev 110388)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/AdminObject.java 2011-01-17 16:36:08 UTC (rev 110391)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.jca.core.management;
+package org.jboss.jca.core.api.management;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/ConfigProperty.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/management/ConfigProperty.java 2011-01-17 13:31:15 UTC (rev 110388)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/ConfigProperty.java 2011-01-17 16:36:08 UTC (rev 110391)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.jca.core.management;
+package org.jboss.jca.core.api.management;
/**
* Represents a config property
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/management/Connector.java 2011-01-17 13:31:15 UTC (rev 110388)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/Connector.java 2011-01-17 16:36:08 UTC (rev 110391)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.jca.core.management;
+package org.jboss.jca.core.api.management;
import java.util.ArrayList;
import java.util.List;
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/management/ManagedConnectionFactory.java 2011-01-17 13:31:15 UTC (rev 110388)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/ManagedConnectionFactory.java 2011-01-17 16:36:08 UTC (rev 110391)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.jca.core.management;
+package org.jboss.jca.core.api.management;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
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/management/ManagementRepository.java 2011-01-17 13:31:15 UTC (rev 110388)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/ManagementRepository.java 2011-01-17 16:36:08 UTC (rev 110391)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.jca.core.management;
+package org.jboss.jca.core.api.management;
import java.util.ArrayList;
import java.util.Collections;
@@ -33,38 +33,23 @@
*/
public class ManagementRepository
{
- /** The instance */
- private static final ManagementRepository INSTANCE = new ManagementRepository();
-
/** Resource adapter archives */
private List<Connector> connectors;
/**
* Constructor
*/
- private ManagementRepository()
+ public ManagementRepository()
{
this.connectors = Collections.synchronizedList(new ArrayList<Connector>(1));
}
/**
- * Get the instance
- * @return The instance
- */
- public ManagementRepository getInstance()
- {
- return INSTANCE;
- }
-
- /**
* Get the list of connectors
* @return The value
*/
public List<Connector> getConnectors()
{
- if (connectors == null)
- connectors = new ArrayList<Connector>(1);
-
return connectors;
}
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/ResourceAdapter.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/management/ResourceAdapter.java 2011-01-17 13:31:15 UTC (rev 110388)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/ResourceAdapter.java 2011-01-17 16:36:08 UTC (rev 110391)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.jca.core.management;
+package org.jboss.jca.core.api.management;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
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-01-17 15:41:02 UTC (rev 110390)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-01-17 16:36:08 UTC (rev 110391)
@@ -588,7 +588,7 @@
List<org.jboss.jca.common.api.metadata.common.CommonAdminObject> aosRaXml,
List<org.jboss.jca.common.api.metadata.common.CommonAdminObject> aosIronJacamar,
Object[] aos, String[] aoJndiNames,
- org.jboss.jca.core.management.Connector mgtConnector)
+ org.jboss.jca.core.api.management.Connector mgtConnector)
throws DeployException
{
// AdminObject
@@ -674,8 +674,8 @@
aos[i] = ao;
aoJndiNames[i] = jndiName;
- org.jboss.jca.core.management.AdminObject mgtAo =
- new org.jboss.jca.core.management.AdminObject(ao);
+ org.jboss.jca.core.api.management.AdminObject mgtAo =
+ new org.jboss.jca.core.api.management.AdminObject(ao);
mgtAo.getConfigProperties().
addAll(createManagementView(aoMeta.getConfigProperties()));
@@ -759,8 +759,8 @@
if (mgtUniqueId.indexOf("/") != -1)
mgtUniqueId = mgtUniqueId.substring(mgtUniqueId.lastIndexOf("/") + 1);
- org.jboss.jca.core.management.Connector mgtConnector =
- new org.jboss.jca.core.management.Connector(mgtUniqueId);
+ org.jboss.jca.core.api.management.Connector mgtConnector =
+ new org.jboss.jca.core.api.management.Connector(mgtUniqueId);
ResourceAdapter resourceAdapter = null;
List<Validate> archiveValidationObjects = new ArrayList<Validate>();
@@ -805,8 +805,8 @@
.getConfigProperties()));
beanValidationObjects.add(resourceAdapter);
- org.jboss.jca.core.management.ResourceAdapter mgtRa =
- new org.jboss.jca.core.management.ResourceAdapter(resourceAdapter);
+ 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);
@@ -1081,8 +1081,8 @@
pool.setName(poolName);
}
- org.jboss.jca.core.management.ManagedConnectionFactory mgtMcf =
- new org.jboss.jca.core.management.ManagedConnectionFactory(mcf);
+ 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);
@@ -1385,8 +1385,8 @@
pool.setName(poolName);
}
- org.jboss.jca.core.management.ManagedConnectionFactory mgtMcf =
- new org.jboss.jca.core.management.ManagedConnectionFactory(mcf);
+ org.jboss.jca.core.api.management.ManagedConnectionFactory mgtMcf =
+ new org.jboss.jca.core.api.management.ManagedConnectionFactory(mcf);
mgtMcf.getConfigProperties().
addAll(createManagementView(cdMeta.getConfigProperties()));
@@ -1526,16 +1526,17 @@
* @param cps The config property's
* @return The management view of these
*/
- private List<org.jboss.jca.core.management.ConfigProperty> createManagementView(List<? extends ConfigProperty> cps)
+ private List<org.jboss.jca.core.api.management.ConfigProperty>
+ createManagementView(List<? extends ConfigProperty> cps)
{
- List<org.jboss.jca.core.management.ConfigProperty> result =
- new ArrayList<org.jboss.jca.core.management.ConfigProperty>();
+ List<org.jboss.jca.core.api.management.ConfigProperty> result =
+ new ArrayList<org.jboss.jca.core.api.management.ConfigProperty>();
if (cps != null)
{
for (ConfigProperty cp : cps)
{
- org.jboss.jca.core.management.ConfigProperty mgtCp = null;
+ org.jboss.jca.core.api.management.ConfigProperty mgtCp = null;
if (cp instanceof org.jboss.jca.common.api.metadata.ra.ra16.ConfigProperty16)
{
@@ -1551,14 +1552,14 @@
confidential = Boolean.FALSE;
mgtCp =
- new org.jboss.jca.core.management.ConfigProperty(
+ new org.jboss.jca.core.api.management.ConfigProperty(
cp.getConfigPropertyName().getValue(),
dynamic.booleanValue(), confidential.booleanValue());
}
else
{
mgtCp =
- new org.jboss.jca.core.management.ConfigProperty(
+ new org.jboss.jca.core.api.management.ConfigProperty(
cp.getConfigPropertyName().getValue());
}
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/CommonDeployment.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/CommonDeployment.java 2011-01-17 15:41:02 UTC (rev 110390)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/CommonDeployment.java 2011-01-17 16:36:08 UTC (rev 110391)
@@ -21,7 +21,7 @@
*/
package org.jboss.jca.deployers.common;
-import org.jboss.jca.core.management.Connector;
+import org.jboss.jca.core.api.management.Connector;
import java.net.URL;
import java.util.Arrays;
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalDeployment.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalDeployment.java 2011-01-17 15:41:02 UTC (rev 110390)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalDeployment.java 2011-01-17 16:36:08 UTC (rev 110391)
@@ -22,6 +22,8 @@
package org.jboss.jca.deployers.fungal;
+import org.jboss.jca.core.api.management.Connector;
+import org.jboss.jca.core.api.management.ManagementRepository;
import org.jboss.jca.core.spi.mdr.MetadataRepository;
import org.jboss.jca.core.spi.mdr.NotFoundException;
import org.jboss.jca.core.spi.naming.JndiStrategy;
@@ -78,6 +80,12 @@
/** The JNDI names of the admin objects */
protected String[] aoJndis;
+ /** The management repository */
+ protected ManagementRepository managementRepository;
+
+ /** The management connector */
+ protected Connector connector;
+
/** The MBeanServer */
protected MBeanServer server;
@@ -99,6 +107,8 @@
* @param cfJndis The JNDI names of the connection factories
* @param aos The admin objects
* @param aoJndis The JNDI names of the admin objects
+ * @param managementRepository The management repository
+ * @param connector The management connector instance
* @param server The MBeanServer
* @param objectNames The ObjectNames
* @param cl The classloader for the deployment
@@ -108,6 +118,7 @@
JndiStrategy jndiStrategy, MetadataRepository metadataRepository,
Object[] cfs, String[] cfJndis,
Object[] aos, String[] aoJndis,
+ ManagementRepository managementRepository, Connector connector,
MBeanServer server, List<ObjectName> objectNames,
ClassLoader cl, Logger log)
{
@@ -121,6 +132,8 @@
this.cfJndis = cfJndis;
this.aos = aos;
this.aoJndis = aoJndis;
+ this.managementRepository = managementRepository;
+ this.connector = connector;
this.server = server;
this.objectNames = objectNames;
this.cl = cl;
@@ -171,6 +184,9 @@
}
}
+ if (managementRepository != null && connector != null)
+ managementRepository.getConnectors().remove(connector);
+
if (mdr != null && cfs != null && cfJndis != null)
{
for (int i = 0; i < cfs.length; i++)
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-01-17 15:41:02 UTC (rev 110390)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java 2011-01-17 16:36:08 UTC (rev 110391)
@@ -286,13 +286,15 @@
* @return The ObjectName's generated for this connector
* @exception JMException Thrown in case of an error
*/
- protected List<ObjectName> registerManagementView(org.jboss.jca.core.management.Connector mgtConnector,
+ protected List<ObjectName> registerManagementView(org.jboss.jca.core.api.management.Connector mgtConnector,
MBeanServer server)
throws JMException
{
if (server == null)
throw new IllegalArgumentException("MBeanServer is null");
+ ((RAConfiguration)getConfiguration()).getManagementRepository().getConnectors().add(mgtConnector);
+
List<ObjectName> ons = new ArrayList<ObjectName>();
if (mgtConnector != null)
@@ -301,14 +303,14 @@
if (mgtConnector.getResourceAdapter() != null)
{
- org.jboss.jca.core.management.ResourceAdapter mgtRa = mgtConnector.getResourceAdapter();
+ org.jboss.jca.core.api.management.ResourceAdapter mgtRa = mgtConnector.getResourceAdapter();
if (mgtRa.getResourceAdapter() != null)
{
Set<String> writeable = new HashSet<String>();
Set<String> excludeAttributes = new HashSet<String>();
- for (org.jboss.jca.core.management.ConfigProperty mgtCp : mgtRa.getConfigProperties())
+ 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)
@@ -338,7 +340,7 @@
}
}
- for (org.jboss.jca.core.management.ManagedConnectionFactory mgtMcf :
+ for (org.jboss.jca.core.api.management.ManagedConnectionFactory mgtMcf :
mgtConnector.getManagedConnectionFactories())
{
if (mgtMcf.getManagedConnectionFactory() != null)
@@ -346,7 +348,7 @@
Set<String> writeable = new HashSet<String>();
Set<String> excludeAttributes = new HashSet<String>();
- for (org.jboss.jca.core.management.ConfigProperty mgtCp : mgtMcf.getConfigProperties())
+ 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)
@@ -403,14 +405,14 @@
}
}
- for (org.jboss.jca.core.management.AdminObject mgtAo : mgtConnector.getAdminObjects())
+ for (org.jboss.jca.core.api.management.AdminObject mgtAo : mgtConnector.getAdminObjects())
{
if (mgtAo.getAdminObject() != null)
{
Set<String> writeable = new HashSet<String>();
Set<String> excludeAttributes = new HashSet<String>();
- for (org.jboss.jca.core.management.ConfigProperty mgtCp : mgtAo.getConfigProperties())
+ 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)
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java 2011-01-17 15:41:02 UTC (rev 110390)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java 2011-01-17 16:36:08 UTC (rev 110391)
@@ -268,7 +268,9 @@
JndiStrategy jndiStrategy = ((RAConfiguration) getConfiguration()).getJndiStrategy();
return new RAActivatorDeployment(c.getURL(), c.getDeploymentName(), c.getResourceAdapter(), jndiStrategy,
metadataRepository, c.getCfs(), c.getCfJndiNames(),
- c.getAos(), c.getAoJndiNames(),
+ c.getAos(), c.getAoJndiNames(),
+ ((RAConfiguration)getConfiguration()).getManagementRepository(),
+ c.getConnector(),
kernel.getMBeanServer(), ons,
c.getCl(), c.getLog());
}
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivatorDeployment.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivatorDeployment.java 2011-01-17 15:41:02 UTC (rev 110390)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivatorDeployment.java 2011-01-17 16:36:08 UTC (rev 110391)
@@ -22,6 +22,8 @@
package org.jboss.jca.deployers.fungal;
+import org.jboss.jca.core.api.management.Connector;
+import org.jboss.jca.core.api.management.ManagementRepository;
import org.jboss.jca.core.spi.mdr.MetadataRepository;
import org.jboss.jca.core.spi.naming.JndiStrategy;
@@ -51,6 +53,8 @@
* @param cfJndis The JNDI names for the connection factories
* @param aos The admin objects
* @param aoJndis The JNDI names for the admin objects
+ * @param managementRepository The management repository
+ * @param connector The management connector instance
* @param server The MBeanServer
* @param objectNames The ObjectNames
* @param cl The classloader for the deployment
@@ -60,10 +64,11 @@
MetadataRepository mdr,
Object[] cfs, String[] cfJndis,
Object[] aos, String[] aoJndis,
+ ManagementRepository managementRepository, Connector connector,
MBeanServer server, List<ObjectName> objectNames,
ClassLoader cl, Logger log)
{
super(deployment, deploymentName, true, ra, jndiStrategy, mdr,
- cfs, cfJndis, aos, aoJndis, server, objectNames, cl, log);
+ cfs, cfJndis, aos, aoJndis, managementRepository, connector, server, objectNames, cl, log);
}
}
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAConfiguration.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAConfiguration.java 2011-01-17 15:41:02 UTC (rev 110390)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAConfiguration.java 2011-01-17 16:36:08 UTC (rev 110391)
@@ -23,6 +23,7 @@
package org.jboss.jca.deployers.fungal;
import org.jboss.jca.core.api.bootstrap.CloneableBootstrapContext;
+import org.jboss.jca.core.api.management.ManagementRepository;
import org.jboss.jca.core.spi.mdr.MetadataRepository;
import org.jboss.jca.core.spi.naming.JndiStrategy;
import org.jboss.jca.deployers.common.Configuration;
@@ -78,6 +79,9 @@
/** Metadata repository */
private MetadataRepository mdr = null;
+ /** The management repository */
+ private ManagementRepository managementRepository;
+
/**
* Constructor
*/
@@ -296,6 +300,24 @@
}
/**
+ * Set the management repository
+ * @param value The value
+ */
+ public void setManagementRepository(ManagementRepository value)
+ {
+ managementRepository = value;
+ }
+
+ /**
+ * Get the management repository
+ * @return The handle
+ */
+ public ManagementRepository getManagementRepository()
+ {
+ return managementRepository;
+ }
+
+ /**
* Start
*/
public void start()
@@ -311,5 +333,8 @@
if (mdr == null)
throw new IllegalStateException("MetadataRepository not defined");
+
+ if (managementRepository == null)
+ throw new IllegalStateException("ManagementRepository not defined");
}
}
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-01-17 15:41:02 UTC (rev 110390)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2011-01-17 16:36:08 UTC (rev 110391)
@@ -164,7 +164,9 @@
MetadataRepository metadataRepository = ((RAConfiguration) getConfiguration()).getMetadataRepository();
return new RADeployment(c.getURL(), c.getDeploymentName(), c.isActivateDeployment(), c.getResourceAdapter(),
jndiStrategy, metadataRepository, c.getCfs(), c.getCfJndiNames(),
- c.getAos(), c.getAoJndiNames(), destination, kernel.getMBeanServer(), ons,
+ c.getAos(), c.getAoJndiNames(), destination,
+ ((RAConfiguration)getConfiguration()).getManagementRepository(), c.getConnector(),
+ kernel.getMBeanServer(), ons,
c.getCl(), c.getLog());
}
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployment.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployment.java 2011-01-17 15:41:02 UTC (rev 110390)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployment.java 2011-01-17 16:36:08 UTC (rev 110391)
@@ -22,6 +22,8 @@
package org.jboss.jca.deployers.fungal;
+import org.jboss.jca.core.api.management.Connector;
+import org.jboss.jca.core.api.management.ManagementRepository;
import org.jboss.jca.core.spi.mdr.MetadataRepository;
import org.jboss.jca.core.spi.naming.JndiStrategy;
@@ -60,6 +62,8 @@
* @param aos The admin objects
* @param aoJndis The JNDI names of the admin objects
* @param tmpDirectory The temporary directory
+ * @param managementRepository The management repository
+ * @param connector The management connector instance
* @param server The MBeanServer
* @param objectNames The ObjectNames
* @param cl The classloader for the deployment
@@ -70,11 +74,12 @@
Object[] cfs, String[] cfJndis,
Object[] aos, String[] aoJndis,
File tmpDirectory,
+ ManagementRepository managementRepository, Connector connector,
MBeanServer server, List<ObjectName> objectNames,
ClassLoader cl, Logger log)
{
super(deployment, deploymentName, activator, ra, jndiStrategy, mdr,
- cfs, cfJndis, aos, aoJndis, server, objectNames, cl, log);
+ cfs, cfJndis, aos, aoJndis, managementRepository, connector, server, objectNames, cl, log);
this.tmpDirectory = tmpDirectory;
}
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-01-17 15:41:02 UTC (rev 110390)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java 2011-01-17 16:36:08 UTC (rev 110391)
@@ -278,7 +278,9 @@
MetadataRepository metadataRepository = ((RAConfiguration) getConfiguration()).getMetadataRepository();
return new RaXmlDeployment(c.getURL(), deployment, c.getDeploymentName(), c.getResourceAdapter(),
jndiStrategy, metadataRepository, c.getCfs(), c.getCfJndiNames(),
- c.getAos(), c.getAoJndiNames(), kernel.getMBeanServer(), ons,
+ c.getAos(), c.getAoJndiNames(),
+ ((RAConfiguration)getConfiguration()).getManagementRepository(), c.getConnector(),
+ kernel.getMBeanServer(), ons,
c.getCl(), c.getLog());
}
catch (DeployException de)
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployment.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployment.java 2011-01-17 15:41:02 UTC (rev 110390)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployment.java 2011-01-17 16:36:08 UTC (rev 110391)
@@ -22,6 +22,8 @@
package org.jboss.jca.deployers.fungal;
+import org.jboss.jca.core.api.management.Connector;
+import org.jboss.jca.core.api.management.ManagementRepository;
import org.jboss.jca.core.spi.mdr.MetadataRepository;
import org.jboss.jca.core.spi.mdr.NotFoundException;
import org.jboss.jca.core.spi.naming.JndiStrategy;
@@ -56,6 +58,8 @@
* @param cfJndis The JNDI names of the connection factories
* @param aos The admin objects
* @param aoJndis The JNDI names of the admin objects
+ * @param managementRepository The management repository
+ * @param connector The management connector instance
* @param server The MBeanServer
* @param objectNames The ObjectNames
* @param cl The classloader for the deployment
@@ -65,11 +69,12 @@
JndiStrategy jndiStrategy, MetadataRepository mdr,
Object[] cfs, String[] cfJndis,
Object[] aos, String[] aoJndis,
+ ManagementRepository managementRepository, Connector connector,
MBeanServer server, List<ObjectName> objectNames,
ClassLoader cl, Logger log)
{
super(deployment, deploymentName, true, ra, jndiStrategy, mdr,
- cfs, cfJndis, aos, aoJndis, server, objectNames, cl, log);
+ cfs, cfJndis, aos, aoJndis, managementRepository, connector, server, objectNames, cl, log);
this.raDeployment = raDeployment;
}
Modified: projects/jboss-jca/trunk/embedded/src/main/resources/jca.xml
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/resources/jca.xml 2011-01-17 15:41:02 UTC (rev 110390)
+++ projects/jboss-jca/trunk/embedded/src/main/resources/jca.xml 2011-01-17 16:36:08 UTC (rev 110391)
@@ -139,6 +139,10 @@
interface="org.jboss.jca.core.spi.mdr.MetadataRepository"
class="org.jboss.jca.core.mdr.SimpleMetadataRepository"/>
+ <!-- Management repository -->
+ <bean name="ManagementRepository"
+ class="org.jboss.jca.core.api.management.ManagementRepository"/>
+
<!-- Deployer configuration -->
<bean name="DeployerConfiguration"
class="org.jboss.jca.deployers.fungal.RAConfiguration">
@@ -151,6 +155,7 @@
<property name="JndiStrategy"><inject bean="ExplicitJndiStrategy"/></property>
<property name="TransactionManager"><inject bean="RealTransactionManager"/></property>
<property name="MetadataRepository"><inject bean="MDR"/></property>
+ <property name="ManagementRepository"><inject bean="ManagementRepository"/></property>
</bean>
<!-- Activator configuration -->
@@ -165,6 +170,7 @@
<property name="JndiStrategy"><inject bean="SimpleJndiStrategy"/></property>
<property name="TransactionManager"><inject bean="RealTransactionManager"/></property>
<property name="MetadataRepository"><inject bean="MDR"/></property>
+ <property name="ManagementRepository"><inject bean="ManagementRepository"/></property>
</bean>
<!-- RA deployer -->
Modified: projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/jca.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/jca.xml 2011-01-17 15:41:02 UTC (rev 110390)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/jca.xml 2011-01-17 16:36:08 UTC (rev 110391)
@@ -142,6 +142,10 @@
interface="org.jboss.jca.core.spi.mdr.MetadataRepository"
class="org.jboss.jca.core.mdr.SimpleMetadataRepository"/>
+ <!-- Management repository -->
+ <bean name="ManagementRepository"
+ class="org.jboss.jca.core.api.management.ManagementRepository"/>
+
<!-- Deployer configuration -->
<bean name="DeployerConfiguration"
class="org.jboss.jca.deployers.fungal.RAConfiguration">
@@ -154,6 +158,7 @@
<property name="JndiStrategy"><inject bean="ExplicitJndiStrategy"/></property>
<property name="TransactionManager"><inject bean="RealTransactionManager"/></property>
<property name="MetadataRepository"><inject bean="MDR"/></property>
+ <property name="ManagementRepository"><inject bean="ManagementRepository"/></property>
</bean>
<!-- Activator configuration -->
@@ -168,6 +173,7 @@
<property name="JndiStrategy"><inject bean="SimpleJndiStrategy"/></property>
<property name="TransactionManager"><inject bean="RealTransactionManager"/></property>
<property name="MetadataRepository"><inject bean="MDR"/></property>
+ <property name="ManagementRepository"><inject bean="ManagementRepository"/></property>
</bean>
<!-- RA deployer -->
More information about the jboss-cvs-commits
mailing list