[jboss-cvs] JBossAS SVN: r61556 - in trunk/connector/src/main/org/jboss/resource: deployers/builder and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 21 16:03:52 EDT 2007
Author: weston.price at jboss.com
Date: 2007-03-21 16:03:52 -0400 (Wed, 21 Mar 2007)
New Revision: 61556
Modified:
trunk/connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java
trunk/connector/src/main/org/jboss/resource/deployers/builder/ConnectionManagerBuilder.java
trunk/connector/src/main/org/jboss/resource/deployers/builder/ManagedConnectionPoolBuilder.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/ConnectionPoolMetaData.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionEmptyContentAdapter.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
trunk/connector/src/main/org/jboss/resource/metadata/repository/JCAMetaDataRepository.java
Log:
[JBAS-1425] New deployment module representing an MCF deployment.
Modified: trunk/connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java 2007-03-21 18:15:43 UTC (rev 61555)
+++ trunk/connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java 2007-03-21 20:03:52 UTC (rev 61556)
@@ -313,81 +313,6 @@
return mcf;
}
-// protected void startService() throws Exception
-// {
-// if (mcf != null)
-// throw new org.jboss.deployers.spi.DeploymentException("Stop the RARDeployment before restarting it");
-//
-// ConnectorMetaData cmd = null;
-// ConnectionDefinitionMetaData cdmd = null;
-// ResourceAdapter resourceAdapter = null;
-// ManagedConnectionFactoryDeployment deployment = null;
-//
-// JCAMetaDataRepository repository = JCAMetaDataRepository.getInstance();
-//
-// List<JCAMetaDataRepositoryEntry> candidates = repository.getMetaDataForConnectionDefinitionAndJndiName(connectionDefinition, jndiName);
-//
-// if(candidates.size() > 1 || candidates.size() <= 0)
-// {
-// //We will have to throw here as the MD cannot be determined
-// }
-// JCAMetaDataRepositoryEntry entry = candidates.get(0);
-// cmd = entry.getRARMetaData();
-// cdmd = cmd.getConnectionDefinition(connectionDefinition);
-//
-// //Should optimized
-// List<JCAManagedDeployment> temp = entry.getDeployments();
-// deployment = (ManagedConnectionFactoryDeployment)temp.get(0).getRealDeployment();
-//
-// if(cdmd == null)
-// {
-// //Should never get here
-// }
-//
-// //TODO set all the other properties
-// setManagedConnectionFactoryClass(cdmd.getManagedConnectionFactoryClass());
-// setReauthenticationSupport(cmd.getReauthenticationSupport());
-//
-// try
-// {
-// mcfClass = Thread.currentThread().getContextClassLoader().loadClass(managedConnectionFactoryClass);
-// mcf = (ManagedConnectionFactory) mcfClass.newInstance();
-//
-// }catch(ClassNotFoundException e)
-// {
-// log.error("Could not find ManagedConnectionFactory class: " + managedConnectionFactoryClass, e);
-// throw new org.jboss.deployers.spi.DeploymentException("Could not find ManagedConnectionFactory class: "
-// + managedConnectionFactoryClass);
-// }
-// catch (Exception e)
-// {
-// log.error("Could not instantiate ManagedConnectionFactory: " + managedConnectionFactoryClass, e);
-// throw new org.jboss.deployers.spi.DeploymentException("Could not instantiate ManagedConnectionFactory: "
-// + managedConnectionFactoryClass);
-// }
-//
-// if (cmd != null)
-// {
-// // Set the resource adapter properties
-// setMcfProperties(cmd.getProperties(), false);
-// // Set the connection definition properties
-// setMcfProperties(cdmd.getProperties(), true);
-//
-// setManagedConnectionFactoryProperties(deployment.getManagedConnectionFactoryProperties());
-//
-// }
-//
-// if(mcf instanceof ResourceAdapterAssociation)
-// {
-// resourceAdapter = (ResourceAdapter) getServer().getAttribute(new ObjectName(entry.getName()), "ResourceAdapter");
-// ResourceAdapterAssociation ras = (ResourceAdapterAssociation)mcf;
-// ras.setResourceAdapter(resourceAdapter);
-//
-// }
-//
-// }
-//
-
protected void startService() throws Exception
{
if (mcf != null)
Modified: trunk/connector/src/main/org/jboss/resource/deployers/builder/ConnectionManagerBuilder.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/builder/ConnectionManagerBuilder.java 2007-03-21 18:15:43 UTC (rev 61555)
+++ trunk/connector/src/main/org/jboss/resource/deployers/builder/ConnectionManagerBuilder.java 2007-03-21 20:03:52 UTC (rev 61556)
@@ -30,15 +30,9 @@
import org.jboss.resource.connectionmanager.NoTxConnectionManager;
import org.jboss.resource.connectionmanager.TxConnectionManager;
import org.jboss.resource.metadata.mcf.DataSourceDeploymentMetaData;
-import org.jboss.resource.metadata.mcf.LocalDataSourceDeploymentMetaData;
import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentMetaData;
import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryTransactionSupportMetaData;
-import org.jboss.resource.metadata.repository.JCAMetaDataRepository;
import org.jboss.system.metadata.ServiceAttributeMetaData;
-import org.jboss.system.metadata.ServiceConstructorMetaData;
-import org.jboss.system.metadata.ServiceDependencyValueMetaData;
-import org.jboss.system.metadata.ServiceMetaData;
-import org.jboss.system.metadata.ServiceTextValueMetaData;
/**
* A ConnectionManagerBuilder.
@@ -77,6 +71,11 @@
attribute = buildSimpleAttribute("TrackConnectionByTx", String.valueOf(md.isTrackConnectionByTransaction()));
attributes.add(attribute);
+
+ if(md.getTransactionSupportMetaData().equals(ManagedConnectionFactoryTransactionSupportMetaData.XA))
+ {
+// attribute = buildSimpleAttribute("XAResourceTransactionTimeout", String.valueOf(md.getX))
+ }
}
return attributes;
Modified: trunk/connector/src/main/org/jboss/resource/deployers/builder/ManagedConnectionPoolBuilder.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/builder/ManagedConnectionPoolBuilder.java 2007-03-21 18:15:43 UTC (rev 61555)
+++ trunk/connector/src/main/org/jboss/resource/deployers/builder/ManagedConnectionPoolBuilder.java 2007-03-21 20:03:52 UTC (rev 61556)
@@ -32,8 +32,6 @@
import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentMetaData;
import org.jboss.resource.metadata.mcf.SecurityDeploymentType;
import org.jboss.system.metadata.ServiceAttributeMetaData;
-import org.jboss.system.metadata.ServiceDependencyValueMetaData;
-import org.jboss.system.metadata.ServiceTextValueMetaData;
/**
* A ManagedConnectionPoolBuilder.
@@ -45,6 +43,7 @@
{
private static final String POOL = "org.jboss.resource.connectionmanager.JBossManagedConnectionPool";
private static final Map<SecurityDeploymentType, String> securityTypeMap = new HashMap<SecurityDeploymentType, String>();
+ private static final String MCF_JMX = "jboss.jca:service=ManagedConnectionFactory,name=";
static
{
@@ -81,67 +80,45 @@
poolAttribute = buildSimpleAttribute("MaxSize", String.valueOf(md.getMaxSize()));
poolAttributes.add(poolAttribute);
- poolAttribute = new ServiceAttributeMetaData();
- poolAttribute.setName("BlockingTimeoutMillis");
- poolAttribute.setValue(new ServiceTextValueMetaData(String.valueOf(md.getBlockingTimeoutMilliSeconds())));
+ poolAttribute = buildSimpleAttribute("BlockingTimeoutMillis", String.valueOf(md.getBlockingTimeoutMilliSeconds()));
poolAttributes.add(poolAttribute);
- poolAttribute = new ServiceAttributeMetaData();
- poolAttribute.setName("IdleTimeoutMinutes");
- poolAttribute.setValue(new ServiceTextValueMetaData(String.valueOf(md.getIdleTimeoutMinutes())));
+ poolAttribute = buildSimpleAttribute("IdleTimeoutMinutes", String.valueOf(md.getIdleTimeoutMinutes()));
poolAttributes.add(poolAttribute);
- poolAttribute = new ServiceAttributeMetaData();
- poolAttribute.setName("BackGroundValidation");
- poolAttribute.setValue(new ServiceTextValueMetaData(String.valueOf(md.isBackgroundValidation())));
+ poolAttribute = buildSimpleAttribute("BackgroundValidation", String.valueOf(md.isBackgroundValidation()));
poolAttributes.add(poolAttribute);
- poolAttribute = new ServiceAttributeMetaData();
- poolAttribute.setName("BackGroundValidationMinutes");
- poolAttribute.setValue(new ServiceTextValueMetaData(String.valueOf(md.getBackgroundValidationMinutes())));
+ poolAttribute = buildSimpleAttribute("BackgroundValidationMinutes", String.valueOf(md.getBackgroundValidationMinutes()));
poolAttributes.add(poolAttribute);
- poolAttribute = new ServiceAttributeMetaData();
- poolAttribute.setName("PreFill");
- poolAttribute.setValue(new ServiceTextValueMetaData(String.valueOf(md.isPrefill())));
+ poolAttribute = buildSimpleAttribute("PreFill", String.valueOf(md.isPrefill()));
poolAttributes.add(poolAttribute);
-
- //TODO strict min
-// poolAttribute = new ServiceAttributeMetaData();
-// poolAttribute.setName("StrictMin");
-// poolAttribute.setValue(new ServiceTextValueMetaData(String.valueOf(pmd.isStrictMin())));
-// poolAttributes.add(poolAttribute);
+ poolAttribute = buildSimpleAttribute("StrictMin", String.valueOf(md.isUseStrictMin()));
+ poolAttributes.add(poolAttribute);
+
+ poolAttribute = buildSimpleAttribute("StatisticsFormatter", md.getStatisticsFormatter());
+
+
// poolAttribute = new ServiceAttributeMetaData();
-// poolAttribute.setName("StatisticsFormatter");
-// poolAttribute.setValue(new ServiceTextValueMetaData(String.valueOf(deployment.get)));
-// poolAttributes.add(poolAttribute);
-//
-// poolAttribute = new ServiceAttributeMetaData();
// poolAttribute.setName("UseFastFail");
// poolAttribute.setValue(new ServiceTextValueMetaData(String.valueOf(pmd.isUseFastFail())));
// poolAttributes.add(poolAttribute);
- poolAttribute = new ServiceAttributeMetaData();
- poolAttribute.setName("Criteria");
- poolAttribute.setValue(new ServiceTextValueMetaData(getCriteria(md.getSecurityMetaData().getSecurityDeploymentType())));
+ poolAttribute = buildSimpleAttribute("Criteria", String.valueOf(getCriteria(md.getSecurityMetaData().getSecurityDeploymentType())));
poolAttributes.add(poolAttribute);
- ServiceDependencyValueMetaData dependValue = new ServiceDependencyValueMetaData();
- dependValue.setObjectName(ObjectNameFactory.create("jboss.jca:service=ManagedConnectionFactory,name=" + md.getJndiName()));
- ServiceAttributeMetaData attribute = new ServiceAttributeMetaData();
- attribute.setName("ManagedConnectionFactoryName");
- attribute.setValue(dependValue);
- poolAttributes.add(attribute);
-
+ poolAttribute = buildDependencyAttribute("ManagedConnectionFactoryName", MCF_JMX + md.getJndiName());
+ poolAttributes.add(poolAttribute);
+
return poolAttributes;
}
private String getCriteria(SecurityDeploymentType type)
{
- return securityTypeMap.get(type);
-
+ return securityTypeMap.get(type);
}
}
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/ConnectionPoolMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/ConnectionPoolMetaData.java 2007-03-21 18:15:43 UTC (rev 61555)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ConnectionPoolMetaData.java 2007-03-21 20:03:52 UTC (rev 61556)
@@ -50,7 +50,9 @@
public void setBackgroundValidationMinutes(int interval);
public int getBackgroundValidationMinutes();
-// public void setValidateOnMatch(boolean validateOnMatch);
-// public boolean isValidateOnMatch();
+ public void setValidateOnMatch(boolean validateOnMatch);
+ public boolean isValidateOnMatch();
+
+
}
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionEmptyContentAdapter.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionEmptyContentAdapter.java 2007-03-21 18:15:43 UTC (rev 61555)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionEmptyContentAdapter.java 2007-03-21 20:03:52 UTC (rev 61556)
@@ -42,7 +42,7 @@
if (e.getNodeName().equals("track-connection-by-tx") || e.getNodeName().equals("no-tx-separate-pools")
- || e.getNodeName().equals("local-transaction"))
+ || e.getNodeName().equals("local-transaction") || e.getNodeName().equals("use-strict-min"))
{
results = Boolean.TRUE;
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2007-03-21 18:15:43 UTC (rev 61555)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2007-03-21 20:03:52 UTC (rev 61556)
@@ -90,7 +90,14 @@
@XmlElement(name="validate-on-match")
private boolean validateOnMatch = true;
-
+
+ @XmlJavaTypeAdapter(ManagedConnectionEmptyContentAdapter.class)
+ @XmlElement(name="use-strict-min")
+ private boolean useStrictMin;
+
+ @XmlElement(name="statistics-formatter")
+ private String statisticsFormatter = "org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter";
+
@XmlElement(name="isSameRM-override-value")
private Boolean isSameRMOverrideValue;
@@ -449,7 +456,7 @@
this.validateOnMatch = validateOnMatch;
}
- public boolean getValidateOnMatch()
+ public boolean isValidateOnMatch()
{
return this.validateOnMatch;
@@ -484,6 +491,26 @@
{
this.localTransactions = localTransactions;
}
+
+ public boolean isUseStrictMin()
+ {
+ return useStrictMin;
+ }
+
+ public void setUseStrictMin(boolean useStrictMin)
+ {
+ this.useStrictMin = useStrictMin;
+ }
+
+ public String getStatisticsFormatter()
+ {
+ return statisticsFormatter;
+ }
+
+ public void setStatisticsFormatter(String statisticsFormatter)
+ {
+ this.statisticsFormatter = statisticsFormatter;
+ }
Modified: trunk/connector/src/main/org/jboss/resource/metadata/repository/JCAMetaDataRepository.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/repository/JCAMetaDataRepository.java 2007-03-21 18:15:43 UTC (rev 61555)
+++ trunk/connector/src/main/org/jboss/resource/metadata/repository/JCAMetaDataRepository.java 2007-03-21 20:03:52 UTC (rev 61556)
@@ -41,22 +41,14 @@
*/
public class JCAMetaDataRepository
{
-
- private static JCAMetaDataRepository instance = new JCAMetaDataRepository();
-
+
private Map<JCAConnectorMetaDataKey, JCAConnectorMetaDataEntry> connectors = new ConcurrentHashMap<JCAConnectorMetaDataKey, JCAConnectorMetaDataEntry>();
private Map<JCADeploymentMetaDataEntry, Object> pendingDeployments = new ConcurrentHashMap<JCADeploymentMetaDataEntry, Object>();
- private JCAMetaDataRepository()
+ public JCAMetaDataRepository()
{
}
-
- public static JCAMetaDataRepository getInstance()
- {
- return instance;
- }
-
public void addConnectorMetaData(String name, ConnectorMetaData cmd)
{
JCAConnectorMetaDataKey key = new JCAConnectorMetaDataKey(name);
More information about the jboss-cvs-commits
mailing list