[jboss-cvs] JBossAS SVN: r90339 - in branches/dml-log-service-integration: connector/src/main/org/jboss/resource/deployers/management and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 17 12:10:06 EDT 2009
Author: david.lloyd at jboss.com
Date: 2009-06-17 12:10:05 -0400 (Wed, 17 Jun 2009)
New Revision: 90339
Modified:
branches/dml-log-service-integration/component-matrix/pom.xml
branches/dml-log-service-integration/connector/src/main/org/jboss/resource/deployers/management/AbstractNonXADataSourceICF.java
branches/dml-log-service-integration/connector/src/tests/org/jboss/tests/jca/managed/ManagedObjectTestCase.java
branches/dml-log-service-integration/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
Log:
Merge from trunk: -r90277:90338
Modified: branches/dml-log-service-integration/component-matrix/pom.xml
===================================================================
--- branches/dml-log-service-integration/component-matrix/pom.xml 2009-06-17 16:06:39 UTC (rev 90338)
+++ branches/dml-log-service-integration/component-matrix/pom.xml 2009-06-17 16:10:05 UTC (rev 90339)
@@ -66,13 +66,13 @@
<version.org.jboss.common.core>2.2.12.GA</version.org.jboss.common.core>
<version.org.jboss.deployers>2.0.5.GA</version.org.jboss.deployers>
<version.org.jboss.ejb3.common.client>1.0.0</version.org.jboss.ejb3.common.client>
- <version.org.jboss.ejb3.core.client>1.1.6</version.org.jboss.ejb3.core.client>
+ <version.org.jboss.ejb3.core.client>1.1.7</version.org.jboss.ejb3.core.client>
<version.org.jboss.ejb3.endpoint.deployer>0.1.3</version.org.jboss.ejb3.endpoint.deployer>
<version.org.jboss.ejb3.proxy.impl.client>1.0.2</version.org.jboss.ejb3.proxy.impl.client>
<version.org.jboss.ejb3.proxy.spi.client>1.0.0</version.org.jboss.ejb3.proxy.spi.client>
<version.org.jboss.ejb3.proxy.clustered.client>1.0.1</version.org.jboss.ejb3.proxy.clustered.client>
<version.org.jboss.ejb3.security.client>1.0.0</version.org.jboss.ejb3.security.client>
- <version.org.jboss.ejb3>1.1.6</version.org.jboss.ejb3>
+ <version.org.jboss.ejb3>1.1.7</version.org.jboss.ejb3>
<version.org.jboss.integration>5.1.0.SP1</version.org.jboss.integration>
<version.org.jboss.jbossxb>2.0.0.GA</version.org.jboss.jbossxb>
<version.org.jboss.jpa>1.0.0</version.org.jboss.jpa>
Modified: branches/dml-log-service-integration/connector/src/main/org/jboss/resource/deployers/management/AbstractNonXADataSourceICF.java
===================================================================
--- branches/dml-log-service-integration/connector/src/main/org/jboss/resource/deployers/management/AbstractNonXADataSourceICF.java 2009-06-17 16:06:39 UTC (rev 90338)
+++ branches/dml-log-service-integration/connector/src/main/org/jboss/resource/deployers/management/AbstractNonXADataSourceICF.java 2009-06-17 16:10:05 UTC (rev 90339)
@@ -31,6 +31,7 @@
import org.jboss.metatype.api.types.SimpleMetaType;
import org.jboss.metatype.api.values.MapCompositeValueSupport;
import org.jboss.metatype.api.values.MetaValue;
+import org.jboss.metatype.api.values.SimpleValue;
import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.resource.metadata.mcf.DataSourceConnectionPropertyMetaData;
import org.jboss.resource.metadata.mcf.NonXADataSourceDeploymentMetaData;
@@ -75,6 +76,11 @@
}
value = mapValue;
}
+ else if("interleaving".equals(property.getName()))
+ {
+ Boolean interleaving = attachment.isInterleaving();
+ value = SimpleValueSupport.wrap(interleaving);
+ }
else
{
value = super.getValue(beanInfo, property, metaData, attachment);
Modified: branches/dml-log-service-integration/connector/src/tests/org/jboss/tests/jca/managed/ManagedObjectTestCase.java
===================================================================
--- branches/dml-log-service-integration/connector/src/tests/org/jboss/tests/jca/managed/ManagedObjectTestCase.java 2009-06-17 16:06:39 UTC (rev 90338)
+++ branches/dml-log-service-integration/connector/src/tests/org/jboss/tests/jca/managed/ManagedObjectTestCase.java 2009-06-17 16:10:05 UTC (rev 90339)
@@ -38,6 +38,7 @@
import org.jboss.metatype.api.types.CompositeMetaType;
import org.jboss.metatype.api.types.EnumMetaType;
import org.jboss.metatype.api.types.MetaType;
+import org.jboss.metatype.api.types.SimpleMetaType;
import org.jboss.metatype.api.values.CompositeValue;
import org.jboss.metatype.api.values.CompositeValueSupport;
import org.jboss.metatype.api.values.EnumValue;
@@ -277,6 +278,12 @@
missingNames, extraNames);
fail("Extra properties: "+extraNames+", missing properties: "+missingNames);
}
+ // interleaving
+ ManagedProperty interleaving = mo.getProperty("interleaving");
+ assertNotNull(interleaving);
+ MetaType interleavingType = interleaving.getMetaType();
+ assertEquals("interleaving.type", SimpleMetaType.BOOLEAN, interleavingType);
+
// Validate the connection-properties type
ManagedProperty connectionProperties = mo.getProperty("connection-properties");
MetaType cpType = connectionProperties.getMetaType();
Modified: branches/dml-log-service-integration/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- branches/dml-log-service-integration/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java 2009-06-17 16:06:39 UTC (rev 90338)
+++ branches/dml-log-service-integration/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java 2009-06-17 16:10:05 UTC (rev 90339)
@@ -33,11 +33,11 @@
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.deployment.security.JaccPolicyUtil;
import org.jboss.deployment.spi.DeploymentEndpointResolver;
-import org.jboss.ejb.deployers.MergedJBossMetaDataDeployer;
import org.jboss.ejb3.DeploymentScope;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.cache.CacheFactoryRegistry;
import org.jboss.ejb3.cache.persistence.PersistenceManagerFactoryRegistry;
+import org.jboss.ejb3.common.deployers.spi.AttachmentNames;
import org.jboss.ejb3.common.registrar.plugin.mc.Ejb3McRegistrar;
import org.jboss.ejb3.common.registrar.spi.Ejb3Registrar;
import org.jboss.ejb3.common.registrar.spi.Ejb3RegistrarLocator;
@@ -87,9 +87,9 @@
// let the super deployer do the necessary stuff
// to add JBossMetaData as a requirement
super(JBossMetaData.class);
- // we also want this merged metadata for processing.
+ // we also want post processed metadata for processing.
// Using addInput ensures ordering http://www.jboss.org/index.html?module=bb&op=viewtopic&t=156725
- addInput(MergedJBossMetaDataDeployer.EJB_MERGED_ATTACHMENT_NAME);
+ addInput(AttachmentNames.PROCESSED_METADATA);
// TODO: should we really output this
setOutput(Ejb3Deployment.class);
// JBossASKernel install output
Modified: branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
===================================================================
--- branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java 2009-06-17 16:06:39 UTC (rev 90338)
+++ branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java 2009-06-17 16:10:05 UTC (rev 90339)
@@ -235,6 +235,14 @@
}
}
+ public void test() throws Exception
+ {
+ ManagementView mgtView = getManagementView();
+ ManagedDeployment aop = mgtView.getDeployment("ejb3-interceptors-aop.xml");
+ assertNotNull(aop);
+ log.info(aop);
+ }
+
/**
* Test the expected template names
* @throws Exception
@@ -547,6 +555,13 @@
// Validate more details on specific properties
+ ManagedProperty interleaving = props.get("interleaving");
+ assertNotNull("interleaving", interleaving);
+ assertNotNull("interleaving.value", interleaving.getValue());
+ ManagedProperty poolJndiName = props.get("poolJndiName");
+ assertNotNull("poolJndiName", poolJndiName);
+ assertNotNull("poolJndiName.value", poolJndiName.getValue());
+
ManagedProperty securityDomain = props.get("security-domain");
assertNotNull("security-domain", securityDomain);
MetaType securityDomainType = securityDomain.getMetaType();
@@ -865,6 +880,26 @@
}
+ /**
+ * Validate that there is only 1 DefaultDS ManagedComponent
+ * @throws Exception
+ */
+ public void testJTAComponentCount()
+ throws Exception
+ {
+ ManagementView mgtView = getManagementView();
+ ComponentType type = new ComponentType("MCBean", "JTA");
+ Set<ManagedComponent> comps = mgtView.getComponentsForType(type);
+ int count = comps.size();
+ assertEquals("There is 1 MCBean:JTA ManagedComponent", 1, 1);
+ ManagedComponent comp = comps.iterator().next();
+ Map<String, ManagedProperty> props = comp.getProperties();
+ for(ManagedProperty prop : props.values())
+ {
+ log.info(prop+", : "+prop.getValue());
+ }
+ }
+
// Private and protected
private void addNonXaDsProperties(Map<String, MetaValue> propValues,
More information about the jboss-cvs-commits
mailing list