[jboss-cvs] JBossAS SVN: r67319 - in projects/metadata/trunk/src/main/java/org/jboss/metadata: ejb/jboss and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 21 01:14:05 EST 2007
Author: scott.stark at jboss.org
Date: 2007-11-21 01:14:03 -0500 (Wed, 21 Nov 2007)
New Revision: 67319
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/common/ejb/IAssemblyDescriptorMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/common/ejb/IEnterpriseBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossAssemblyDescriptorMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.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/EnterpriseBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorBindingsMetaData.java
Log:
Change the InterceptorBindingsMetaData from a map to a list as the ejb-name is not unique
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/common/ejb/IAssemblyDescriptorMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/common/ejb/IAssemblyDescriptorMetaData.java 2007-11-21 05:55:32 UTC (rev 67318)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/common/ejb/IAssemblyDescriptorMetaData.java 2007-11-21 06:14:03 UTC (rev 67319)
@@ -118,15 +118,6 @@
public void setInterceptorBindings(InterceptorBindingsMetaData interceptorBindings);
/**
- * Get the interceptor binding for an ejb
- *
- * @param ejbName the ejb name
- * @return the interceptor binding or null for no result
- * @throws IllegalArgumentException for a null ejb name
- */
- public InterceptorBindingMetaData getInterceptorBindingByEjbName(String ejbName);
-
- /**
* Get the messageDestinations.
*
* @return the messageDestinations.
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/common/ejb/IEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/common/ejb/IEnterpriseBeanMetaData.java 2007-11-21 05:55:32 UTC (rev 67318)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/common/ejb/IEnterpriseBeanMetaData.java 2007-11-21 06:14:03 UTC (rev 67319)
@@ -110,7 +110,6 @@
public ContainerTransactionsMetaData getContainerTransactions();;
public TransAttributeType getMethodTransactionType(String methodName, Class<?>[] params, MethodInterfaceType iface);
public TransAttributeType getMethodTransactionType(Method m, MethodInterfaceType iface);
- public InterceptorBindingMetaData getInterceptorBinding();;
public ExcludeListMetaData getExcludeList();
//public IEnterpriseBeansMetaData getEnterpriseBeansMetaData();
@XmlTransient
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossAssemblyDescriptorMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossAssemblyDescriptorMetaData.java 2007-11-21 05:55:32 UTC (rev 67318)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossAssemblyDescriptorMetaData.java 2007-11-21 06:14:03 UTC (rev 67319)
@@ -221,23 +221,6 @@
}
/**
- * Get the interceptor binding for an ejb
- *
- * @param ejbName the ejb name
- * @return the interceptor binding or null for no result
- * @throws IllegalArgumentException for a null ejb name
- */
- public InterceptorBindingMetaData getInterceptorBindingByEjbName(String ejbName)
- {
- if (ejbName == null)
- throw new IllegalArgumentException("Null ejbName");
-
- if (interceptorBindings == null)
- return null;
- return interceptorBindings.get(ejbName);
- }
-
- /**
* Get the excludeList.
*
* @return the excludeList.
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2007-11-21 05:55:32 UTC (rev 67318)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2007-11-21 06:14:03 UTC (rev 67319)
@@ -390,20 +390,6 @@
}
/**
- * Get the interceptor binding
- *
- * @return the interceptor binding or null for no result
- */
- @XmlTransient
- public InterceptorBindingMetaData getInterceptorBinding()
- {
- JBossAssemblyDescriptorMetaData assemblyDescriptor = getAssemblyDescriptor();
- if (assemblyDescriptor == null)
- return null;
- return assemblyDescriptor.getInterceptorBindingByEjbName(getEjbName());
- }
-
- /**
* Get the exclude list
*
* @return the exclude list or null for no result
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-11-21 05:55:32 UTC (rev 67318)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/AssemblyDescriptorMetaData.java 2007-11-21 06:14:03 UTC (rev 67319)
@@ -207,23 +207,6 @@
}
/**
- * Get the interceptor binding for an ejb
- *
- * @param ejbName the ejb name
- * @return the interceptor binding or null for no result
- * @throws IllegalArgumentException for a null ejb name
- */
- public InterceptorBindingMetaData getInterceptorBindingByEjbName(String ejbName)
- {
- if (ejbName == null)
- throw new IllegalArgumentException("Null ejbName");
-
- if (interceptorBindings == null)
- return null;
- return interceptorBindings.get(ejbName);
- }
-
- /**
* Get the messageDestinations.
*
* @return the messageDestinations.
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java 2007-11-21 05:55:32 UTC (rev 67318)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java 2007-11-21 06:14:03 UTC (rev 67319)
@@ -572,19 +572,6 @@
}
/**
- * Get the interceptor binding
- *
- * @return the interceptor binding or null for no result
- */
- public InterceptorBindingMetaData getInterceptorBinding()
- {
- org.jboss.metadata.common.ejb.IAssemblyDescriptorMetaData assemblyDescriptor = getAssemblyDescriptor();
- if (assemblyDescriptor == null)
- return null;
- return assemblyDescriptor.getInterceptorBindingByEjbName(getEjbName());
- }
-
- /**
* Get the exclude list
*
* @return the exclude list or null for no result
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-11-21 05:55:32 UTC (rev 67318)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorBindingsMetaData.java 2007-11-21 06:14:03 UTC (rev 67319)
@@ -21,7 +21,7 @@
*/
package org.jboss.metadata.ejb.spec;
-import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
+import java.util.ArrayList;
/**
* InterceptorBindingsMetaData.
@@ -29,16 +29,15 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public class InterceptorBindingsMetaData extends AbstractMappedMetaData<InterceptorBindingMetaData>
+public class InterceptorBindingsMetaData extends ArrayList<InterceptorBindingMetaData>
{
/** The serialVersionUID */
- private static final long serialVersionUID = 7802311372886754408L;
+ private static final long serialVersionUID = 1;
/**
* Create a new InterceptorBindingsMetaData.
*/
public InterceptorBindingsMetaData()
{
- super("ejb name for interceptor binding");
}
}
More information about the jboss-cvs-commits
mailing list