[jboss-cvs] JBossAS SVN: r81926 - in projects/metadata/trunk/src: main/resources/schema and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 1 17:34:19 EST 2008
Author: alex.loubyansky at jboss.com
Date: 2008-12-01 17:34:18 -0500 (Mon, 01 Dec 2008)
New Revision: 81926
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java
projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverythingDTD.xml
Log:
JBMETA-151
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java 2008-12-01 22:01:41 UTC (rev 81925)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java 2008-12-01 22:34:18 UTC (rev 81926)
@@ -40,12 +40,12 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="message-driven-beanType", propOrder={"descriptionGroup", "ejbName", "destinationJndiName", "localJndiName",
+ at XmlType(name="message-driven-beanType", propOrder={"descriptionGroup", "ejbName", "activationConfig", "destinationJndiName", "localJndiName",
"jndiBindingPolicy", "mdbUser", "mdbPassword", "mdbClientId", "mdbSubscriptionId", "resourceAdapterName",
"exceptionOnRollback", "timerPersistence", "configurationName", "invokerBindings", "securityProxy",
"jndiEnvironmentRefsGroup", "securityIdentity", "securityDomain", "methodAttributes", "depends", "iorSecurityConfig",
"ejbTimeoutIdentity", "annotations", "ignoreDependency", "aopDomainName", "poolConfig",
- "jndiRefs", "activationConfig", "defaultActivationConfig", "createDestination"})
+ "jndiRefs", "createDestination"})
public class JBossMessageDrivenBeanMetaData extends JBossEnterpriseBeanMetaData implements ITimeoutTarget
{
/** The serialVersionUID */
@@ -542,6 +542,7 @@
*
* @return the defaultActivationConfig.
*/
+ @Deprecated
public ActivationConfigMetaData getDefaultActivationConfig()
{
return defaultActivationConfig;
@@ -553,6 +554,7 @@
* @param defaultActivationConfig the defaultActivationConfig.
* @throws IllegalArgumentException for a null defaultActivationConfig
*/
+ @Deprecated
public void setDefaultActivationConfig(ActivationConfigMetaData defaultActivationConfig)
{
if (defaultActivationConfig == null)
Modified: projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2008-12-01 22:01:41 UTC (rev 81925)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2008-12-01 22:34:18 UTC (rev 81926)
@@ -418,6 +418,7 @@
<xsd:sequence>
<xsd:group ref="jboss:descriptionGroup"/>
<xsd:element name="ejb-name" type="javaee:ejb-nameType"/>
+ <xsd:element name="activation-config" type="jboss:activation-configType" minOccurs="0"/>
<xsd:element name="destination-jndi-name" type="jboss:destination-jndi-nameType"
minOccurs="0"/>
<xsd:element name="local-jndi-name" type="jboss:local-jndi-nameType" minOccurs="0"/>
@@ -458,8 +459,6 @@
<xsd:element name="aop-domain-name" type="jboss:aop-domain-nameType" minOccurs="0"/>
<xsd:element name="pool-config" type="jboss:pool-configType" minOccurs="0"/>
<xsd:element name="jndi-ref" type="jboss:jndi-refType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="activation-config" type="jboss:activation-configType" minOccurs="0"/>
- <xsd:element name="default-activation-config" type="jboss:activation-configType" minOccurs="0"/>
<xsd:element name="create-destination" type="xsd:boolean" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
@@ -556,7 +555,7 @@
type="javaee:descriptionType"
minOccurs="0"
maxOccurs="unbounded"/>
- <xsd:element name="default-activation-config-property"
+ <xsd:element name="activation-config-property"
type="jboss:activation-config-propertyType"
maxOccurs="unbounded"/>
</xsd:sequence>
@@ -802,7 +801,6 @@
<xsd:element name="pool-config" type="jboss:pool-configType" minOccurs="0"/>
<xsd:element name="jndi-ref" type="jboss:jndi-refType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="activation-config" type="jboss:activation-configType" minOccurs="0"/>
- <xsd:element name="default-activation-config" type="jboss:activation-configType" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java 2008-12-01 22:01:41 UTC (rev 81925)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java 2008-12-01 22:34:18 UTC (rev 81926)
@@ -534,21 +534,23 @@
return mdb;
}
- protected void assertActivationConfig(String prefix, ActivationConfigMetaData activationConfigMetaData)
+ protected void assertActivationConfig(String prefix, ActivationConfigMetaData activationConfigMetaData, Mode mode)
{
assertNotNull(activationConfigMetaData);
- assertId(prefix + "ActivationConfig", activationConfigMetaData);
- assertActivationConfigProperties(prefix, 2, activationConfigMetaData.getActivationConfigProperties());
+ if(mode != Mode.JBOSS_DTD)
+ assertId(prefix + "ActivationConfig", activationConfigMetaData);
+ assertActivationConfigProperties(prefix, 2, activationConfigMetaData.getActivationConfigProperties(), mode);
}
- private void assertActivationConfigProperties(String prefix, int size, ActivationConfigPropertiesMetaData activationConfigPropertiesMetaData)
+ private void assertActivationConfigProperties(String prefix, int size, ActivationConfigPropertiesMetaData activationConfigPropertiesMetaData, Mode mode)
{
assertNotNull(activationConfigPropertiesMetaData);
assertEquals(size, activationConfigPropertiesMetaData.size());
int count = 1;
for (ActivationConfigPropertyMetaData property : activationConfigPropertiesMetaData)
{
- assertId(prefix + "ActivationConfigProperty" + count, property);
+ if(mode != Mode.JBOSS_DTD)
+ assertId(prefix + "ActivationConfigProperty" + count, property);
assertEquals(prefix + "ActivationConfigProperty" + count + "Name", property.getActivationConfigPropertyName());
assertEquals(prefix + "ActivationConfigProperty" + count + "Value", property.getValue());
++count;
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java 2008-12-01 22:01:41 UTC (rev 81925)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java 2008-12-01 22:34:18 UTC (rev 81926)
@@ -263,7 +263,7 @@
assertEquals(TransactionManagementType.CONTAINER, mdb.getTransactionType());
assertEquals(ejbName + "MessageDestinationType", mdb.getMessageDestinationType());
assertEquals(ejbName + "MessageDestinationLink", mdb.getMessageDestinationLink());
- assertActivationConfig(ejbName, mdb.getActivationConfig());
+ assertActivationConfig(ejbName, mdb.getActivationConfig(), mode);
assertEnvironment(ejbName, mdb.getJndiEnvironmentRefsGroup(), true, mode);
assertContainerTransactions(ejbName, 6, 6, mdb.getContainerTransactions());
assertMethodPermissions(ejbName, ejbName + "MethodPermission", 3, 3, mdb.getMethodPermissions());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java 2008-12-01 22:01:41 UTC (rev 81925)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java 2008-12-01 22:34:18 UTC (rev 81926)
@@ -330,7 +330,7 @@
assertEquals(TransactionManagementType.CONTAINER, mdb.getTransactionType());
assertEquals(ejbName + "MessageDestinationType", mdb.getMessageDestinationType());
assertEquals(ejbName + "MessageDestinationLink", mdb.getMessageDestinationLink());
- assertActivationConfig(ejbName, mdb.getActivationConfig());
+ assertActivationConfig(ejbName, mdb.getActivationConfig(), mode);
assertAroundInvokes(ejbName, 2, mdb.getAroundInvokes());
assertEnvironment(ejbName, mdb.getJndiEnvironmentRefsGroup(), true, mode);
assertContainerTransactions(ejbName, 6, 6, mdb.getContainerTransactions());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java 2008-12-01 22:01:41 UTC (rev 81925)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java 2008-12-01 22:34:18 UTC (rev 81926)
@@ -118,7 +118,7 @@
{
JBossMessageDrivenBeanMetaData mdb = (JBossMessageDrivenBeanMetaData) jbossMetaData.getEnterpriseBean("mdb1EjbName");
- ejbJar.assertActivationConfig("mdb1", mdb.getActivationConfig());
+ ejbJar.assertActivationConfig("mdb1", mdb.getActivationConfig(), Mode.JBOSS);
}
ejbJar.assertInterceptorBindings(3, jbossMetaData.getAssemblyDescriptor().getInterceptorBindings());
@@ -160,7 +160,7 @@
{
JBossMessageDrivenBeanMetaData mdb = (JBossMessageDrivenBeanMetaData) mergedMetaData.getEnterpriseBean("mdb1EjbName");
- ejbJar.assertActivationConfig("mdb1", mdb.getActivationConfig());
+ ejbJar.assertActivationConfig("mdb1", mdb.getActivationConfig(), Mode.JBOSS);
}
ejbJar.assertInterceptorBindings(3, mergedMetaData.getAssemblyDescriptor().getInterceptorBindings());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2008-12-01 22:01:41 UTC (rev 81925)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2008-12-01 22:34:18 UTC (rev 81926)
@@ -811,7 +811,6 @@
assertEquals(prefix + "AOPDomain", mdb.getAopDomainName());
assertJndiRefs(prefix, 2, mdb.getJndiRefs(), mode);
assertMethodAttributes(prefix, mdb.getMethodAttributes(), mode);
- assertActivationConfig(prefix + "Default", mdb.getDefaultActivationConfig());
}
assertEquals(prefix + "DestinationJndiName", mdb.getDestinationJndiName());
@@ -847,7 +846,9 @@
assertSecurityIdentity(prefix, "EjbTimeoutIdentity", mdb.getEjbTimeoutIdentity(), false, mode);
- // TODO DOM pool-config
+ // TODO DOM pool-config
+
+ assertActivationConfig(prefix, mdb.getActivationConfig(), mode);
}
private void assertNullMessageDrivenBean(String prefix, JBossMetaData jbossMetaData)
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml 2008-12-01 22:01:41 UTC (rev 81925)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml 2008-12-01 22:34:18 UTC (rev 81926)
@@ -1014,6 +1014,17 @@
<ejb-name>mdb1EjbName</ejb-name>
+ <activation-config id="mdb1ActivationConfig-id">
+ <activation-config-property id="mdb1ActivationConfigProperty1-id">
+ <activation-config-property-name>mdb1ActivationConfigProperty1Name</activation-config-property-name>
+ <activation-config-property-value>mdb1ActivationConfigProperty1Value</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property id="mdb1ActivationConfigProperty2-id">
+ <activation-config-property-name>mdb1ActivationConfigProperty2Name</activation-config-property-name>
+ <activation-config-property-value>mdb1ActivationConfigProperty2Value</activation-config-property-value>
+ </activation-config-property>
+ </activation-config>
+
<destination-jndi-name>mdb1DestinationJndiName</destination-jndi-name>
<local-jndi-name>mdb1LocalJndiName</local-jndi-name>
<mdb-user>mdb1User</mdb-user>
@@ -1404,18 +1415,6 @@
<injection-target-name>mdb1JndiRef2Injection2Name</injection-target-name>
</injection-target>
</jndi-ref>
-
- <default-activation-config id="mdb1DefaultActivationConfig-id">
- <activation-config-property id="mdb1DefaultActivationConfigProperty1-id">
- <activation-config-property-name>mdb1DefaultActivationConfigProperty1Name</activation-config-property-name>
- <activation-config-property-value>mdb1DefaultActivationConfigProperty1Value</activation-config-property-value>
- </activation-config-property>
- <activation-config-property id="mdb1DefaultActivationConfigProperty2-id">
- <activation-config-property-name>mdb1DefaultActivationConfigProperty2Name</activation-config-property-name>
- <activation-config-property-value>mdb1DefaultActivationConfigProperty2Value</activation-config-property-value>
- </activation-config-property>
- </default-activation-config>
-
</message-driven>
<message-driven id="mdb2-id">
@@ -1440,6 +1439,17 @@
<ejb-name>mdb2EjbName</ejb-name>
+ <activation-config id="mdb2ActivationConfig-id">
+ <activation-config-property id="mdb2ActivationConfigProperty1-id">
+ <activation-config-property-name>mdb2ActivationConfigProperty1Name</activation-config-property-name>
+ <activation-config-property-value>mdb2ActivationConfigProperty1Value</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property id="mdb2ActivationConfigProperty2-id">
+ <activation-config-property-name>mdb2ActivationConfigProperty2Name</activation-config-property-name>
+ <activation-config-property-value>mdb2ActivationConfigProperty2Value</activation-config-property-value>
+ </activation-config-property>
+ </activation-config>
+
<destination-jndi-name>mdb2DestinationJndiName</destination-jndi-name>
<local-jndi-name>mdb2LocalJndiName</local-jndi-name>
<mdb-user>mdb2User</mdb-user>
@@ -1829,18 +1839,6 @@
<injection-target-name>mdb2JndiRef2Injection2Name</injection-target-name>
</injection-target>
</jndi-ref>
-
- <default-activation-config id="mdb2DefaultActivationConfig-id">
- <activation-config-property id="mdb2DefaultActivationConfigProperty1-id">
- <activation-config-property-name>mdb2DefaultActivationConfigProperty1Name</activation-config-property-name>
- <activation-config-property-value>mdb2DefaultActivationConfigProperty1Value</activation-config-property-value>
- </activation-config-property>
- <activation-config-property id="mdb2DefaultActivationConfigProperty2-id">
- <activation-config-property-name>mdb2DefaultActivationConfigProperty2Name</activation-config-property-name>
- <activation-config-property-value>mdb2DefaultActivationConfigProperty2Value</activation-config-property-value>
- </activation-config-property>
- </default-activation-config>
-
</message-driven>
</enterprise-beans>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverythingDTD.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverythingDTD.xml 2008-12-01 22:01:41 UTC (rev 81925)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverythingDTD.xml 2008-12-01 22:34:18 UTC (rev 81926)
@@ -616,6 +616,17 @@
<message-driven id="mdb1-id">
<ejb-name>mdb1EjbName</ejb-name>
+ <activation-config>
+ <activation-config-property>
+ <activation-config-property-name>mdb1ActivationConfigProperty1Name</activation-config-property-name>
+ <activation-config-property-value>mdb1ActivationConfigProperty1Value</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>mdb1ActivationConfigProperty2Name</activation-config-property-name>
+ <activation-config-property-value>mdb1ActivationConfigProperty2Value</activation-config-property-value>
+ </activation-config-property>
+ </activation-config>
+
<destination-jndi-name>mdb1DestinationJndiName</destination-jndi-name>
<local-jndi-name>mdb1LocalJndiName</local-jndi-name>
<mdb-user>mdb1User</mdb-user>
@@ -733,6 +744,17 @@
<message-driven id="mdb2-id">
<ejb-name>mdb2EjbName</ejb-name>
+ <activation-config>
+ <activation-config-property>
+ <activation-config-property-name>mdb2ActivationConfigProperty1Name</activation-config-property-name>
+ <activation-config-property-value>mdb2ActivationConfigProperty1Value</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>mdb2ActivationConfigProperty2Name</activation-config-property-name>
+ <activation-config-property-value>mdb2ActivationConfigProperty2Value</activation-config-property-value>
+ </activation-config-property>
+ </activation-config>
+
<destination-jndi-name>mdb2DestinationJndiName</destination-jndi-name>
<local-jndi-name>mdb2LocalJndiName</local-jndi-name>
<mdb-user>mdb2User</mdb-user>
More information about the jboss-cvs-commits
mailing list