[jboss-cvs] JBossAS SVN: r61565 - trunk/connector/src/main/org/jboss/resource/deployers/builder.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 22 01:31:56 EDT 2007
Author: weston.price at jboss.com
Date: 2007-03-22 01:31:56 -0400 (Thu, 22 Mar 2007)
New Revision: 61565
Modified:
trunk/connector/src/main/org/jboss/resource/deployers/builder/AbstractBuilder.java
trunk/connector/src/main/org/jboss/resource/deployers/builder/ConnectionFactoryBindingBuilder.java
trunk/connector/src/main/org/jboss/resource/deployers/builder/ConnectionManagerBuilder.java
trunk/connector/src/main/org/jboss/resource/deployers/builder/ManagedConnectionFactoryBuilder.java
trunk/connector/src/main/org/jboss/resource/deployers/builder/ManagedConnectionPoolBuilder.java
trunk/connector/src/main/org/jboss/resource/deployers/builder/MetaDataTypeMappingBuilder.java
Log:
[JBAS-1425] Programmatic deployment improvements and cleanup.
Modified: trunk/connector/src/main/org/jboss/resource/deployers/builder/AbstractBuilder.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/builder/AbstractBuilder.java 2007-03-22 05:31:37 UTC (rev 61564)
+++ trunk/connector/src/main/org/jboss/resource/deployers/builder/AbstractBuilder.java 2007-03-22 05:31:56 UTC (rev 61565)
@@ -21,6 +21,7 @@
*/
package org.jboss.resource.deployers.builder;
+import java.util.ArrayList;
import java.util.List;
import javax.management.ObjectName;
@@ -28,6 +29,7 @@
import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentMetaData;
import org.jboss.system.metadata.ServiceAttributeMetaData;
import org.jboss.system.metadata.ServiceConstructorMetaData;
+import org.jboss.system.metadata.ServiceDependencyMetaData;
import org.jboss.system.metadata.ServiceDependencyValueMetaData;
import org.jboss.system.metadata.ServiceMetaData;
import org.jboss.system.metadata.ServiceTextValueMetaData;
@@ -43,7 +45,7 @@
//TODO make this simple string in anticipation of move to MC
public abstract ObjectName buildObjectName(ManagedConnectionFactoryDeploymentMetaData md);
public abstract String getCode(ManagedConnectionFactoryDeploymentMetaData md);
-
+
public ServiceMetaData buildService(ManagedConnectionFactoryDeploymentMetaData mcfmd)
{
ServiceMetaData md = new ServiceMetaData();
@@ -62,7 +64,10 @@
{
ServiceMetaData md = buildService(mcfmd);
List<ServiceAttributeMetaData> attributes = buildAttributes(mcfmd);
- md.setAttributes(attributes);
+ md.setAttributes(attributes);
+ List<ServiceDependencyMetaData> dependencies = buildDependencies(mcfmd);
+ md.setDependencies(dependencies);
+
return md;
}
@@ -89,12 +94,28 @@
}
+ public ServiceDependencyMetaData buildDependency(String dependencyName)
+ {
+ ServiceDependencyMetaData dependency = new ServiceDependencyMetaData();
+ dependency.setIDependOn(dependencyName);
+ return dependency;
+
+ }
+
+ public List<ServiceDependencyMetaData> buildDependencies(ManagedConnectionFactoryDeploymentMetaData md)
+ {
+ return new ArrayList<ServiceDependencyMetaData>();
+ }
+
public ServiceAttributeMetaData buildDependencyAttribute(String name, String dependency)
{
ServiceAttributeMetaData att = new ServiceAttributeMetaData();
ServiceDependencyValueMetaData dep = new ServiceDependencyValueMetaData();
dep.setDependency(dependency);
- att.setName(name);
+
+ if(name != null)
+ att.setName(name);
+
att.setValue(dep);
return att;
Modified: trunk/connector/src/main/org/jboss/resource/deployers/builder/ConnectionFactoryBindingBuilder.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/builder/ConnectionFactoryBindingBuilder.java 2007-03-22 05:31:37 UTC (rev 61564)
+++ trunk/connector/src/main/org/jboss/resource/deployers/builder/ConnectionFactoryBindingBuilder.java 2007-03-22 05:31:56 UTC (rev 61565)
@@ -51,14 +51,12 @@
{
List<ServiceAttributeMetaData> attributes = new ArrayList<ServiceAttributeMetaData>();
ServiceAttributeMetaData attribute = new ServiceAttributeMetaData();
- attribute.setName("JndiName");
- attribute.setValue(new ServiceTextValueMetaData(md.getJndiName()));
- attributes.add(attribute);
- attribute = new ServiceAttributeMetaData();
- attribute.setName("UseJavaContext");
- attribute.setValue(new ServiceTextValueMetaData(String.valueOf(md.isUseJavaContext())));
+ attribute = buildSimpleAttribute("JndiName", md.getJndiName());
attributes.add(attribute);
+
+ attribute = buildSimpleAttribute("UseJavaContext", String.valueOf(md.isUseJavaContext()));
+ attributes.add(attribute);
if(!md.isUseJavaContext())
{
@@ -67,6 +65,7 @@
}
attribute = buildDependencyAttribute("ConnectionManager", buildCMName(md));
+ attributes.add(attribute);
return attributes;
}
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-22 05:31:37 UTC (rev 61564)
+++ trunk/connector/src/main/org/jboss/resource/deployers/builder/ConnectionManagerBuilder.java 2007-03-22 05:31:56 UTC (rev 61565)
@@ -45,6 +45,7 @@
private static final String CCM_JMX = "jboss.jca:service=CachedConnectionManager";
private static final String JAAS_JMX = "jboss.security:service=JaasSecurityManager";
private static final String TM_JMX = "jboss:service=TransactionManager";
+ private static final String POOL_JMX = "jboss.jca:service=ManagedConnectionPool,name=";
@Override
public List<ServiceAttributeMetaData> buildAttributes(ManagedConnectionFactoryDeploymentMetaData md)
@@ -61,6 +62,9 @@
attribute = buildDependencyAttribute("JaasSecurityManagerService", JAAS_JMX);
attributes.add(attribute);
+ attribute = buildDependencyAttribute("ManagedConnectionPool", POOL_JMX + md.getJndiName());
+ attributes.add(attribute);
+
if(!md.getTransactionSupportMetaData().equals(ManagedConnectionFactoryTransactionSupportMetaData.NONE))
{
attribute = buildDependencyAttribute("TransactionManagerService", TM_JMX);
@@ -77,7 +81,8 @@
// attribute = buildSimpleAttribute("XAResourceTransactionTimeout", String.valueOf(md.getX))
}
}
-
+
+
return attributes;
}
Modified: trunk/connector/src/main/org/jboss/resource/deployers/builder/ManagedConnectionFactoryBuilder.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/builder/ManagedConnectionFactoryBuilder.java 2007-03-22 05:31:37 UTC (rev 61564)
+++ trunk/connector/src/main/org/jboss/resource/deployers/builder/ManagedConnectionFactoryBuilder.java 2007-03-22 05:31:56 UTC (rev 61565)
@@ -32,6 +32,7 @@
import org.jboss.resource.metadata.repository.JCAMetaDataRepository;
import org.jboss.system.metadata.ServiceAttributeMetaData;
import org.jboss.system.metadata.ServiceConstructorMetaData;
+import org.jboss.system.metadata.ServiceDependencyMetaData;
import org.jboss.system.metadata.ServiceDependencyValueMetaData;
/**
@@ -42,11 +43,17 @@
*/
public class ManagedConnectionFactoryBuilder extends AbstractBuilder
{
- private JCAMetaDataRepository repository;
+
private static final String MCF = "org.jboss.resource.connectionmanager.ManagedConnectionFactoryDeployment";
private static final String RAR_JMX = "jboss.jca:service=RARDeployment,name='";
private static final String MCF_JMX = "jboss.jca:service=ManagedConnectionFactory,name=";
+
+ private JCAMetaDataRepository repository;
+ public JCAMetaDataRepository getMetaDataRepository()
+ {
+ return this.repository;
+ }
public void setMetaDataRepository(JCAMetaDataRepository repository)
{
this.repository = repository;
@@ -63,7 +70,7 @@
{
List<ServiceAttributeMetaData> attributes = new ArrayList<ServiceAttributeMetaData>();
ServiceAttributeMetaData attribute = buildDependencyAttribute("OldRarDeployment", RAR_JMX + deployment.getRarName() + "'");
- attributes.add(attribute);
+ attributes.add(attribute);
return attributes;
}
@@ -79,6 +86,22 @@
}
@Override
+ public List<ServiceDependencyMetaData> buildDependencies(ManagedConnectionFactoryDeploymentMetaData md)
+ {
+ List<String> dependsNames = md.getDependsNames();
+ List<ServiceDependencyMetaData> dependencies = new ArrayList<ServiceDependencyMetaData>();
+
+ for (String string : dependsNames)
+ {
+ ServiceDependencyMetaData depends = buildDependency(string);
+ dependencies.add(depends);
+ }
+
+ return dependencies;
+
+ }
+
+ @Override
public String getCode(ManagedConnectionFactoryDeploymentMetaData md)
{
return MCF;
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-22 05:31:37 UTC (rev 61564)
+++ trunk/connector/src/main/org/jboss/resource/deployers/builder/ManagedConnectionPoolBuilder.java 2007-03-22 05:31:56 UTC (rev 61565)
@@ -50,7 +50,7 @@
securityTypeMap.put(SecurityDeploymentType.NONE, "ByNothing");
securityTypeMap.put(SecurityDeploymentType.APPLICATION, "ByApplication");
securityTypeMap.put(SecurityDeploymentType.DOMAIN, "ByContainer");
- securityTypeMap.put(SecurityDeploymentType.APPLICATION, "ByContainerAndApplication");
+ securityTypeMap.put(SecurityDeploymentType.DOMAIN_AND_APPLICATION, "ByContainerAndApplication");
}
@Override
@@ -86,10 +86,10 @@
poolAttribute = buildSimpleAttribute("IdleTimeoutMinutes", String.valueOf(md.getIdleTimeoutMinutes()));
poolAttributes.add(poolAttribute);
- poolAttribute = buildSimpleAttribute("BackgroundValidation", String.valueOf(md.isBackgroundValidation()));
+ poolAttribute = buildSimpleAttribute("BackGroundValidation", String.valueOf(md.isBackgroundValidation()));
poolAttributes.add(poolAttribute);
- poolAttribute = buildSimpleAttribute("BackgroundValidationMinutes", String.valueOf(md.getBackgroundValidationMinutes()));
+ poolAttribute = buildSimpleAttribute("BackGroundValidationMinutes", String.valueOf(md.getBackgroundValidationMinutes()));
poolAttributes.add(poolAttribute);
poolAttribute = buildSimpleAttribute("PreFill", String.valueOf(md.isPrefill()));
@@ -99,13 +99,8 @@
poolAttributes.add(poolAttribute);
poolAttribute = buildSimpleAttribute("StatisticsFormatter", md.getStatisticsFormatter());
-
-
-// poolAttribute = new ServiceAttributeMetaData();
-// poolAttribute.setName("UseFastFail");
-// poolAttribute.setValue(new ServiceTextValueMetaData(String.valueOf(pmd.isUseFastFail())));
-// poolAttributes.add(poolAttribute);
-
+ poolAttributes.add(poolAttribute);
+
poolAttribute = buildSimpleAttribute("Criteria", String.valueOf(getCriteria(md.getSecurityMetaData().getSecurityDeploymentType())));
poolAttributes.add(poolAttribute);
Modified: trunk/connector/src/main/org/jboss/resource/deployers/builder/MetaDataTypeMappingBuilder.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/builder/MetaDataTypeMappingBuilder.java 2007-03-22 05:31:37 UTC (rev 61564)
+++ trunk/connector/src/main/org/jboss/resource/deployers/builder/MetaDataTypeMappingBuilder.java 2007-03-22 05:31:56 UTC (rev 61565)
@@ -75,7 +75,15 @@
@Override
public ObjectName buildObjectName(ManagedConnectionFactoryDeploymentMetaData md)
{
- return ObjectNameFactory.create(BINDING_JMX + md.getJndiName());
+ ObjectName on = null;
+
+ if(md.getTypeMapping() != null)
+ {
+ on = ObjectNameFactory.create(BINDING_JMX + md.getJndiName());
+
+ }
+
+ return on;
}
@Override
More information about the jboss-cvs-commits
mailing list