[jboss-cvs] JBossAS SVN: r66487 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/ejb/jboss and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 26 07:30:45 EDT 2007
Author: wolfc
Date: 2007-10-26 07:30:45 -0400 (Fri, 26 Oct 2007)
New Revision: 66487
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/common/ejb/IEjbJarMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar2xMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorsMetaData.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
Log:
JBAS-4506: added interceptors on IEjbJarMetaData
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/common/ejb/IEjbJarMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/common/ejb/IEjbJarMetaData.java 2007-10-26 11:03:11 UTC (rev 66486)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/common/ejb/IEjbJarMetaData.java 2007-10-26 11:30:45 UTC (rev 66487)
@@ -21,6 +21,7 @@
*/
package org.jboss.metadata.common.ejb;
+import org.jboss.metadata.ejb.spec.InterceptorsMetaData;
import org.jboss.metadata.ejb.spec.RelationsMetaData;
/**
@@ -47,4 +48,5 @@
public void setRelationships(RelationsMetaData relationships);
public A getAssemblyDescriptor();
public void setAssemblyDescriptor(A assemblyDescriptor);
+ InterceptorsMetaData getInterceptors();
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java 2007-10-26 11:03:11 UTC (rev 66486)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java 2007-10-26 11:30:45 UTC (rev 66487)
@@ -30,6 +30,7 @@
import org.jboss.metadata.common.jboss.LoaderRepositoryMetaData;
import org.jboss.metadata.ejb.spec.EjbJarMetaData;
import org.jboss.metadata.ejb.spec.EnterpriseBeansMetaData;
+import org.jboss.metadata.ejb.spec.InterceptorsMetaData;
import org.jboss.metadata.ejb.spec.RelationsMetaData;
import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
@@ -102,6 +103,9 @@
/** The container configurations */
private ContainerConfigurationsMetaData containerConfigurations;
+ /** The interceptors */
+ private InterceptorsMetaData interceptors;
+
/**
* Create a new JBossMetaData.
*/
@@ -152,6 +156,12 @@
return dtdSystemId;
}
+ @XmlTransient
+ public InterceptorsMetaData getInterceptors()
+ {
+ return interceptors;
+ }
+
/**
* Get the jboss.xml version.
*
@@ -583,6 +593,8 @@
invokerProxyBindings.merge(override.invokerProxyBindings);
if(this.webservices == null)
webservices = new WebservicesMetaData();
+ if(this.interceptors == null)
+ interceptors = new InterceptorsMetaData();
if(original != null)
{
@@ -602,6 +614,11 @@
if(override != null && override.resourceManagers != null)
resourceManagers.merge(override.resourceManagers);
+ if(override != null && override.interceptors != null)
+ interceptors.merge(override.interceptors);
+ else if(original != null && original.getInterceptors() != null)
+ interceptors.merge(original.getInterceptors());
+
if(override != null)
{
if(override.jaccContextID != null)
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar2xMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar2xMetaData.java 2007-10-26 11:03:11 UTC (rev 66486)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar2xMetaData.java 2007-10-26 11:30:45 UTC (rev 66487)
@@ -60,4 +60,10 @@
{
super.setVersion(version);
}
+
+ public InterceptorsMetaData getInterceptors()
+ {
+ // EJB 2.1 descriptor can't have interceptors
+ return null;
+ }
}
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-10-26 11:03:11 UTC (rev 66486)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorsMetaData.java 2007-10-26 11:30:45 UTC (rev 66487)
@@ -46,4 +46,10 @@
{
super("interceptor class");
}
+
+ public void merge(InterceptorsMetaData interceptors)
+ {
+ super.merge(interceptors, null);
+ addAll(interceptors);
+ }
}
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-10-26 11:03:11 UTC (rev 66486)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java 2007-10-26 11:30:45 UTC (rev 66487)
@@ -26,6 +26,7 @@
import junit.framework.Test;
import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.common.ejb.IEjbJarMetaData;
import org.jboss.metadata.common.ejb.IEnterpriseBeansMetaData;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.jboss.metadata.ejb.spec.ApplicationExceptionMetaData;
@@ -339,7 +340,7 @@
return mdb;
}
- private void assertInterceptors(EjbJar3xMetaData ejbJarMetaData, Mode mode)
+ protected void assertInterceptors(IEjbJarMetaData<?, ?, ?, ?> ejbJarMetaData, Mode mode)
{
InterceptorsMetaData interceptorsMetaData = ejbJarMetaData.getInterceptors();
assertNotNull(interceptorsMetaData);
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 2007-10-26 11:03:11 UTC (rev 66486)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java 2007-10-26 11:30:45 UTC (rev 66487)
@@ -29,6 +29,9 @@
import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
+import org.jboss.metadata.ejb.spec.InterceptorMetaData;
+import org.jboss.metadata.ejb.spec.InterceptorsMetaData;
+import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest.Mode;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
@@ -78,6 +81,8 @@
// Create the merged view
jbossMetaData.merge(null, ejbJarMetaData);
+ ejbJar.assertInterceptors(jbossMetaData, Mode.JBOSS);
+
JBossEnterpriseBeanMetaData ejb = jbossMetaData.getEnterpriseBean("session1EjbName");
assertNotNull(ejb);
JBossSessionBeanMetaData jejb = (JBossSessionBeanMetaData) ejb;
More information about the jboss-cvs-commits
mailing list