[jboss-cvs] JBossAS SVN: r67878 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/javaee/spec and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 4 08:52:41 EST 2007
Author: wolfc
Date: 2007-12-04 08:52:41 -0500 (Tue, 04 Dec 2007)
New Revision: 67878
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/AnnotationMergedView.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ApplicationExceptionsMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/AssemblyDescriptorMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ContainerTransactionsMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ExcludeListMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorBindingsMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorsMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MethodPermissionsMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MethodsMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationsMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/merge/MergeUtil.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/RunAsUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
Log:
JBAS-4506: merging of assembly descriptors
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/AnnotationMergedView.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/AnnotationMergedView.java 2007-12-04 12:44:06 UTC (rev 67877)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/AnnotationMergedView.java 2007-12-04 13:52:41 UTC (rev 67878)
@@ -32,7 +32,7 @@
*/
public class AnnotationMergedView
{
- public static void merge(EjbJarMetaData merged, EjbJarMetaData xml, EjbJarMetaData annotation)
+ public static void merge(EjbJar3xMetaData merged, EjbJar3xMetaData xml, EjbJar3xMetaData annotation)
{
// EnterpriseBeansMetaData first
EnterpriseBeansMetaData enterpriseBeans = new EnterpriseBeansMetaData();
@@ -59,6 +59,13 @@
// Version
if(xml.getVersion() != null)
merged.setVersion(xml.getVersion());
+ merged.setMetadataComplete(xml.isMetadataComplete());
+ if(xml.getInterceptors() != null || annotation.getInterceptors() != null)
+ {
+ InterceptorsMetaData interceptors = new InterceptorsMetaData();
+ interceptors.merge(xml.getInterceptors(), annotation.getInterceptors());
+ merged.setInterceptors(interceptors);
+ }
}
private static void merge(AssemblyDescriptorMetaData merged,
@@ -80,6 +87,8 @@
HashMap<String, String> ejbClassToName = new HashMap<String, String>();
if(xml != null)
{
+ if(xml.getId() != null)
+ merged.setId(xml.getId());
for(EnterpriseBeanMetaData bean : xml)
{
String className = bean.getEjbClass();
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ApplicationExceptionsMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ApplicationExceptionsMetaData.java 2007-12-04 12:44:06 UTC (rev 67877)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ApplicationExceptionsMetaData.java 2007-12-04 13:52:41 UTC (rev 67878)
@@ -22,6 +22,7 @@
package org.jboss.metadata.ejb.spec;
import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
+import org.jboss.metadata.merge.MergeUtil;
/**
* ApplicationExceptionsMetaData.
@@ -41,4 +42,10 @@
{
super("application exception class");
}
+
+ public void merge(ApplicationExceptionsMetaData override, ApplicationExceptionsMetaData original)
+ {
+ super.merge(override, original);
+ MergeUtil.merge(this, override, original);
+ }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/AssemblyDescriptorMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/AssemblyDescriptorMetaData.java 2007-12-04 12:44:06 UTC (rev 67877)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/AssemblyDescriptorMetaData.java 2007-12-04 13:52:41 UTC (rev 67878)
@@ -306,4 +306,53 @@
throw new IllegalArgumentException("Null applicationExceptions");
this.applicationExceptions = applicationExceptions;
}
+
+ public void merge(AssemblyDescriptorMetaData override, AssemblyDescriptorMetaData original)
+ {
+ super.merge(override, original);
+
+ if((override != null && override.applicationExceptions != null) || (original != null && original.applicationExceptions != null))
+ {
+ applicationExceptions = new ApplicationExceptionsMetaData();
+ applicationExceptions.merge(override != null ? override.applicationExceptions : null, original != null ? original.applicationExceptions : null);
+ }
+
+ if((override != null && override.containerTransactions != null) || (original != null && original.containerTransactions != null))
+ {
+ containerTransactions = new ContainerTransactionsMetaData();
+ containerTransactions.merge(override != null ? override.containerTransactions : null, original != null ? original.containerTransactions : null);
+ }
+
+ if((override != null && override.excludeList != null) || (original != null && original.excludeList != null))
+ {
+ excludeList = new ExcludeListMetaData();
+ excludeList.merge(override != null ? override.excludeList : null, original != null ? original.excludeList : null);
+ }
+
+ if((override != null && override.interceptorBindings != null) || (original != null && original.interceptorBindings != null))
+ {
+ interceptorBindings = new InterceptorBindingsMetaData();
+ interceptorBindings.merge(override != null ? override.interceptorBindings : null, original != null ? original.interceptorBindings : null);
+ }
+
+ if((override != null && override.messageDestinations != null) || (original != null && original.messageDestinations != null))
+ {
+ messageDestinations = new MessageDestinationsMetaData();
+ messageDestinations.merge(override != null ? override.messageDestinations : null, original != null ? original.messageDestinations : null);
+ }
+
+ if((override != null && override.methodPermissions != null) || (original != null && original.methodPermissions != null))
+ {
+ methodPermissions = new MethodPermissionsMetaData();
+ methodPermissions.merge(override != null ? override.methodPermissions : null, original != null ? original.methodPermissions : null);
+ }
+
+ if((override != null && override.securityRoles != null) || (original != null && original.securityRoles != null))
+ {
+ securityRoles = new SecurityRolesMetaData();
+ securityRoles.merge(override != null ? override.securityRoles : null, original != null ? original.securityRoles : null);
+ }
+
+
+ }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ContainerTransactionsMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ContainerTransactionsMetaData.java 2007-12-04 12:44:06 UTC (rev 67877)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ContainerTransactionsMetaData.java 2007-12-04 13:52:41 UTC (rev 67878)
@@ -23,6 +23,8 @@
import java.util.ArrayList;
+import org.jboss.metadata.merge.MergeUtil;
+
/**
* ContainerTransactionsMetaData.
*
@@ -70,4 +72,9 @@
}
return result;
}
+
+ public void merge(ContainerTransactionsMetaData override, ContainerTransactionsMetaData original)
+ {
+ MergeUtil.merge(this, override, original);
+ }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ExcludeListMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ExcludeListMetaData.java 2007-12-04 12:44:06 UTC (rev 67877)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ExcludeListMetaData.java 2007-12-04 13:52:41 UTC (rev 67878)
@@ -21,10 +21,11 @@
*/
package org.jboss.metadata.ejb.spec;
-import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptions;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptions;
+
/**
* ExcludeListMetaData.
*
@@ -116,4 +117,14 @@
{
return (ExcludeListMetaData) super.clone();
}
+
+ public void merge(ExcludeListMetaData override, ExcludeListMetaData original)
+ {
+ super.merge(override, original);
+
+ // TODO: can't merge myself
+
+ methods = new MethodsMetaData();
+ methods.merge(override != null ? override.methods : null, original != null ? original.methods : null);
+ }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorBindingsMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorBindingsMetaData.java 2007-12-04 12:44:06 UTC (rev 67877)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorBindingsMetaData.java 2007-12-04 13:52:41 UTC (rev 67878)
@@ -23,6 +23,8 @@
import java.util.ArrayList;
+import org.jboss.metadata.merge.MergeUtil;
+
/**
* InterceptorBindingsMetaData.
*
@@ -40,4 +42,9 @@
public InterceptorBindingsMetaData()
{
}
+
+ public void merge(InterceptorBindingsMetaData override, InterceptorBindingsMetaData original)
+ {
+ MergeUtil.merge(this, override, original);
+ }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorsMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorsMetaData.java 2007-12-04 12:44:06 UTC (rev 67877)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorsMetaData.java 2007-12-04 13:52:41 UTC (rev 67878)
@@ -22,6 +22,7 @@
package org.jboss.metadata.ejb.spec;
import org.jboss.metadata.javaee.support.MappedMetaDataWithDescriptions;
+import org.jboss.metadata.merge.MergeUtil;
import org.jboss.xb.annotations.JBossXmlChild;
import javax.xml.bind.annotation.XmlType;
@@ -52,4 +53,10 @@
super.merge(interceptors, null);
addAll(interceptors);
}
+
+ public void merge(InterceptorsMetaData override, InterceptorsMetaData original)
+ {
+ super.merge(override, original);
+ MergeUtil.merge(this, override, original);
+ }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MethodPermissionsMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MethodPermissionsMetaData.java 2007-12-04 12:44:06 UTC (rev 67877)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MethodPermissionsMetaData.java 2007-12-04 13:52:41 UTC (rev 67878)
@@ -24,6 +24,7 @@
import java.util.ArrayList;
import org.jboss.metadata.javaee.support.IdMetaData;
+import org.jboss.metadata.merge.MergeUtil;
/**
* MethodPermissionsMetaData.
@@ -87,4 +88,9 @@
}
return result;
}
+
+ public void merge(MethodPermissionsMetaData override, MethodPermissionsMetaData original)
+ {
+ MergeUtil.merge(this, override, original);
+ }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MethodsMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MethodsMetaData.java 2007-12-04 12:44:06 UTC (rev 67877)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/MethodsMetaData.java 2007-12-04 13:52:41 UTC (rev 67878)
@@ -23,6 +23,8 @@
import java.util.ArrayList;
+import org.jboss.metadata.merge.MergeUtil;
+
/**
* MethodsMetaData.
*
@@ -164,4 +166,9 @@
}
return out;
}
+
+ public void merge(MethodsMetaData override, MethodsMetaData original)
+ {
+ MergeUtil.merge(this, override, original);
+ }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationsMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationsMetaData.java 2007-12-04 12:44:06 UTC (rev 67877)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationsMetaData.java 2007-12-04 13:52:41 UTC (rev 67878)
@@ -23,6 +23,7 @@
import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
import org.jboss.metadata.javaee.support.JavaEEMetaDataUtil;
+import org.jboss.metadata.merge.MergeUtil;
/**
* MessageDestinationsMetaData.
@@ -68,4 +69,10 @@
super("message destination name");
}
+ public void merge(MessageDestinationsMetaData override, MessageDestinationsMetaData original)
+ {
+ // TODO: duplicated merge methods?
+ super.merge(override, original);
+ MergeUtil.merge(this, override, original);
+ }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/merge/MergeUtil.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/merge/MergeUtil.java 2007-12-04 12:44:06 UTC (rev 67877)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/merge/MergeUtil.java 2007-12-04 13:52:41 UTC (rev 67878)
@@ -21,11 +21,12 @@
*/
package org.jboss.metadata.merge;
+import java.util.Collection;
+
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.spec.EjbJarMetaData;
import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
-import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
@@ -128,4 +129,11 @@
return merged;
}
+ public static <T> void merge(Collection<T> merged, Collection<T> override, Collection<T> original)
+ {
+ if(original != null)
+ merged.addAll(original);
+ if(override != null)
+ merged.addAll(override);
+ }
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java 2007-12-04 12:44:06 UTC (rev 67877)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java 2007-12-04 13:52:41 UTC (rev 67878)
@@ -52,7 +52,7 @@
import org.jboss.metadata.ejb.spec.EjbJar20MetaData;
import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
-import org.jboss.metadata.ejb.spec.EjbJarMetaData;
+import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
import org.jboss.metadata.ejb.spec.EntityBeanMetaData;
import org.jboss.metadata.ejb.spec.ExcludeListMetaData;
@@ -82,12 +82,13 @@
import org.jboss.test.metadata.annotation.ejb3.multiview.Multiview21Remote;
import org.jboss.test.metadata.annotation.ejb3.multiview.Multiview3Remote;
import org.jboss.test.metadata.annotation.ejb3.multiview.MultiviewHome;
-import org.jboss.test.metadata.annotation.ejb3.runas.InterMediate;
import org.jboss.test.metadata.annotation.ejb3.runas.InterMediateBean;
import org.jboss.test.metadata.common.PackageScanner;
import org.jboss.test.metadata.common.ScanPackage;
import org.jboss.test.metadata.common.SetHelper;
+import org.jboss.test.metadata.ejb.EjbJar3xEverythingUnitTestCase;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest.Mode;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
@@ -504,8 +505,8 @@
AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
EjbJar30Creator creator = new EjbJar30Creator(finder);
EjbJar30MetaData metaData = creator.create(classes);
- EjbJarMetaData specMetaData = unmarshal(EjbJarMetaData.class);
- EjbJarMetaData merged = new EjbJar30MetaData();
+ EjbJar3xMetaData specMetaData = unmarshal(EjbJar3xMetaData.class);
+ EjbJar3xMetaData merged = new EjbJar30MetaData();
AnnotationMergedView.merge(merged, specMetaData, metaData);
// Validate the merged InterMediateBean
@@ -552,5 +553,22 @@
InitMethodMetaData initMethod = initMethods.get(0);
assertEquals("create", initMethod.getBeanMethod().getMethodName());
}
+
+ /**
+ * Test that we don't lose anything because of an annotation merge.
+ *
+ * @throws Exception
+ */
+ public void testEjbJar3xEverything() throws Exception
+ {
+ EjbJar3xEverythingUnitTestCase ejbJar = new EjbJar3xEverythingUnitTestCase("ejb-jar");
+ EjbJar3xMetaData specMetaData = unmarshal("/org/jboss/test/metadata/ejb/EjbJar3xEverything_testEverything.xml", EjbJar30MetaData.class);
+ //ejbJar.assertEverythingWithAppMetaData(specMetaData, Mode.SPEC);
+
+ EjbJar3xMetaData metaData = new EjbJar30MetaData();
+ EjbJar3xMetaData merged = new EjbJar30MetaData();
+ AnnotationMergedView.merge(merged, specMetaData, metaData);
+ ejbJar.assertEverythingWithAppMetaData(merged, Mode.SPEC);
+ }
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/RunAsUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/RunAsUnitTestCase.java 2007-12-04 12:44:06 UTC (rev 67877)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/RunAsUnitTestCase.java 2007-12-04 13:52:41 UTC (rev 67878)
@@ -23,7 +23,6 @@
import java.lang.reflect.AnnotatedElement;
import java.util.Arrays;
-import java.util.Collection;
import java.util.List;
import java.util.Set;
@@ -38,17 +37,12 @@
import org.jboss.metadata.ejb.spec.EjbJar20MetaData;
import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
-import org.jboss.metadata.ejb.spec.EjbJarMetaData;
+import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
-import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
-import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader;
import org.jboss.metadata.plugins.repository.basic.BasicMetaDataRepository;
-import org.jboss.metadata.spi.MetaData;
-import org.jboss.metadata.spi.scope.CommonLevels;
-import org.jboss.metadata.spi.scope.ScopeKey;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
@@ -99,8 +93,8 @@
AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
EjbJar30Creator creator = new EjbJar30Creator(finder);
EjbJar30MetaData metaData = creator.create(classes);
- EjbJarMetaData specMetaData = unmarshal("ejb-jar.xml", EjbJarMetaData.class, null);
- EjbJarMetaData specMerged = new EjbJar30MetaData();
+ EjbJar3xMetaData specMetaData = unmarshal("ejb-jar.xml", EjbJar3xMetaData.class, null);
+ EjbJar3xMetaData specMerged = new EjbJar30MetaData();
AnnotationMergedView.merge(specMerged, specMetaData, metaData);
// First parse the jboss xml and merge with the spec xml
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 2007-12-04 12:44:06 UTC (rev 67877)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java 2007-12-04 13:52:41 UTC (rev 67878)
@@ -732,7 +732,7 @@
protected void assertMethodPermissions(String ejbName, String prefix, int size, int limit, MethodPermissionsMetaData methodPermissionsMetaData)
{
- assertNotNull(methodPermissionsMetaData);
+ assertNotNull("method permissions is null", methodPermissionsMetaData);
assertEquals(size, methodPermissionsMetaData.size());
int count = 1;
for (MethodPermissionMetaData methodPermissionMetaData : methodPermissionsMetaData)
@@ -953,7 +953,7 @@
protected void assertContainerTransactions(String ejbName, int size, int limit, ContainerTransactionsMetaData containerTransactionsMetaData)
{
- assertNotNull(containerTransactionsMetaData);
+ assertNotNull("container transactions is null", containerTransactionsMetaData);
assertEquals(size, containerTransactionsMetaData.size());
int count = 1;
String prefix;
@@ -1013,7 +1013,7 @@
protected void assertExcludeList(String ejbName, int size, int limit, ExcludeListMetaData excludeListMetaData)
{
- assertNotNull(excludeListMetaData);
+ assertNotNull("exclude list is null", excludeListMetaData);
assertId("excludeList", excludeListMetaData);
assertDescriptions("excludeList", excludeListMetaData.getDescriptions());
if (ejbName != null)
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 2007-12-04 12:44:06 UTC (rev 67877)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java 2007-12-04 13:52:41 UTC (rev 67878)
@@ -344,7 +344,7 @@
protected void assertInterceptors(IEjbJarMetaData<?, ?, ?, ?> ejbJarMetaData, Mode mode)
{
InterceptorsMetaData interceptorsMetaData = ejbJarMetaData.getInterceptors();
- assertNotNull(interceptorsMetaData);
+ assertNotNull("interceptors is null", interceptorsMetaData);
assertId("interceptors", interceptorsMetaData);
assertDescriptions("interceptors", interceptorsMetaData.getDescriptions());
assertEquals(2, interceptorsMetaData.size());
@@ -392,7 +392,7 @@
void assertInterceptorBindings(int size, InterceptorBindingsMetaData interceptorBindingsMetaData)
{
- assertNotNull(interceptorBindingsMetaData);
+ assertNotNull("interceptor bindings is null", interceptorBindingsMetaData);
assertEquals(size, interceptorBindingsMetaData.size());
int count = 1;
for (InterceptorBindingMetaData interceptorBindingMetaData : interceptorBindingsMetaData)
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java 2007-12-04 12:44:06 UTC (rev 67877)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java 2007-12-04 13:52:41 UTC (rev 67878)
@@ -196,7 +196,7 @@
protected void assertSecurityRoles(int size, SecurityRolesMetaData securityRolesMetaData)
{
- assertNotNull(securityRolesMetaData);
+ assertNotNull("security roles is null", securityRolesMetaData);
assertEquals(securityRolesMetaData.getId(), size, securityRolesMetaData.size());
int count = 1;
for (SecurityRoleMetaData securityRoleMetaData : securityRolesMetaData)
@@ -251,7 +251,7 @@
protected void assertMessageDestinations(int size, MessageDestinationsMetaData messageDestinationsMetaData)
{
- assertNotNull(messageDestinationsMetaData);
+ assertNotNull("message destinations is null", messageDestinationsMetaData);
assertEquals(size, messageDestinationsMetaData.size());
int count = 1;
for (MessageDestinationMetaData messageDestinationMetaData : messageDestinationsMetaData)
More information about the jboss-cvs-commits
mailing list