[jboss-cvs] JBossAS SVN: r77151 - in projects/ejb3/trunk: core/src/main/java/org/jboss/ejb3/cluster/metadata and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 18 06:44:52 EDT 2008
Author: wolfc
Date: 2008-08-18 06:44:52 -0400 (Mon, 18 Aug 2008)
New Revision: 77151
Added:
projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/SameMethodNameBean.java
projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/SameMethodNameSuper.java
Modified:
projects/ejb3/trunk/core/pom.xml
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cluster/metadata/ClusteredMetaDataBridge.java
projects/ejb3/trunk/interceptors/pom.xml
projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/lang/ClassHelper.java
projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/AdditiveBeanInterceptorMetaDataBridge.java
projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/BeanInterceptorMetaDataBridge.java
projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/EnvironmentInterceptorMetaDataBridge.java
projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/InterceptorMetaDataBridge.java
projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/unit/InheritanceTestCase.java
projects/ejb3/trunk/interceptors/src/test/resources/inheritance/META-INF/ejb-jar.xml
projects/ejb3/trunk/security/pom.xml
projects/ejb3/trunk/security/src/main/java/org/jboss/ejb3/security/bridge/SecurityDomainMetaDataBridge.java
projects/ejb3/trunk/transactions/pom.xml
projects/ejb3/trunk/transactions/src/main/java/org/jboss/ejb3/tx/metadata/ApplicationExceptionMetaDataBridge.java
Log:
EJBTHREE-1459: refactored onto the new meta data bridge
Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml 2008-08-18 10:44:12 UTC (rev 77150)
+++ projects/ejb3/trunk/core/pom.xml 2008-08-18 10:44:52 UTC (rev 77151)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>0.13.13</version>
+ <version>0.13.14-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
@@ -105,6 +105,16 @@
</build>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<!-- Dependencies -->
<dependencies>
@@ -335,7 +345,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-security</artifactId>
- <version>0.13.0</version>
+ <version>0.13.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -353,13 +363,13 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-interceptors</artifactId>
- <version>0.13.3</version>
+ <version>0.13.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-metadata</artifactId>
- <version>0.12.2</version>
+ <version>0.13.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -378,7 +388,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-transactions</artifactId>
- <version>0.13.4</version>
+ <version>0.13.5-SNAPSHOT</version>
</dependency>
<dependency>
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cluster/metadata/ClusteredMetaDataBridge.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cluster/metadata/ClusteredMetaDataBridge.java 2008-08-18 10:44:12 UTC (rev 77150)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cluster/metadata/ClusteredMetaDataBridge.java 2008-08-18 10:44:52 UTC (rev 77151)
@@ -26,11 +26,11 @@
import org.jboss.ejb3.annotation.Clustered;
import org.jboss.ejb3.annotation.impl.ClusteredImpl;
import org.jboss.ejb3.metadata.MetaDataBridge;
-import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
import org.jboss.logging.Logger;
import org.jboss.metadata.ejb.jboss.ClusterConfigMetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
+import org.jboss.metadata.spi.signature.DeclaredMethodSignature;
/**
* Creates a ClusteredImpl to match a ClusterConfigMetaData.
@@ -79,7 +79,7 @@
return null;
}
- public <A extends Annotation> A retrieveAnnotation(Class<A> annotationClass, JBossEnterpriseBeanMetaData metaData, ClassLoader classLoader, String methodName, String... parameterNames)
+ public <A extends Annotation> A retrieveAnnotation(Class<A> annotationClass, JBossEnterpriseBeanMetaData metaData, ClassLoader classLoader, DeclaredMethodSignature method)
{
return null;
}
Modified: projects/ejb3/trunk/interceptors/pom.xml
===================================================================
--- projects/ejb3/trunk/interceptors/pom.xml 2008-08-18 10:44:12 UTC (rev 77150)
+++ projects/ejb3/trunk/interceptors/pom.xml 2008-08-18 10:44:52 UTC (rev 77151)
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-metadata</artifactId>
- <version>0.12.2</version>
+ <version>0.13.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/lang/ClassHelper.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/lang/ClassHelper.java 2008-08-18 10:44:12 UTC (rev 77150)
+++ projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/lang/ClassHelper.java 2008-08-18 10:44:52 UTC (rev 77151)
@@ -22,6 +22,7 @@
package org.jboss.ejb3.interceptors.lang;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -169,6 +170,8 @@
public static boolean isOverridden(Class<?> icptr, Method method)
{
+ if(Modifier.isPrivate(method.getModifiers()))
+ return false;
try
{
Method bottomMethod = getMethod(icptr, method.getName(), method.getParameterTypes());
Modified: projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/AdditiveBeanInterceptorMetaDataBridge.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/AdditiveBeanInterceptorMetaDataBridge.java 2008-08-18 10:44:12 UTC (rev 77150)
+++ projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/AdditiveBeanInterceptorMetaDataBridge.java 2008-08-18 10:44:52 UTC (rev 77151)
@@ -69,10 +69,4 @@
}
return super.retrieveAnnotation(annotationClass, beanMetaData, classLoader);
}
-
- @Override
- public <A extends Annotation> A retrieveAnnotation(Class<A> annotationClass, JBossEnterpriseBeanMetaData beanMetaData, ClassLoader classLoader, String methodName, String... parameterNames)
- {
- return super.retrieveAnnotation(annotationClass, beanMetaData, classLoader, methodName, parameterNames);
- }
}
Modified: projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/BeanInterceptorMetaDataBridge.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/BeanInterceptorMetaDataBridge.java 2008-08-18 10:44:12 UTC (rev 77150)
+++ projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/BeanInterceptorMetaDataBridge.java 2008-08-18 10:44:52 UTC (rev 77151)
@@ -60,9 +60,8 @@
import org.jboss.metadata.ejb.spec.InterceptorBindingMetaData;
import org.jboss.metadata.ejb.spec.InterceptorBindingsMetaData;
import org.jboss.metadata.ejb.spec.InterceptorClassesMetaData;
-import org.jboss.metadata.ejb.spec.MethodParametersMetaData;
import org.jboss.metadata.ejb.spec.NamedMethodMetaData;
-import org.jboss.metadata.spi.signature.MethodSignature;
+import org.jboss.metadata.spi.signature.DeclaredMethodSignature;
import org.jboss.metadata.spi.signature.Signature;
/**
@@ -84,18 +83,18 @@
private ExcludeDefaultInterceptors excludeDefaultInterceptors;
//Method-level things
- private Map<Signature, Interceptors> methodInterceptors = new HashMap<Signature, Interceptors>();
- private Map<Signature, InterceptorOrder> methodInterceptorOrders = new HashMap<Signature, InterceptorOrder>();
- private Map<Signature, ExcludeDefaultInterceptors> methodExcludeDefaultInterceptors = new HashMap<Signature, ExcludeDefaultInterceptors>();
- private Map<Signature, ExcludeClassInterceptors> methodExcludeClassInterceptors = new HashMap<Signature, ExcludeClassInterceptors>();
+ private Map<DeclaredMethodSignature, Interceptors> methodInterceptors = new HashMap<DeclaredMethodSignature, Interceptors>();
+ private Map<DeclaredMethodSignature, InterceptorOrder> methodInterceptorOrders = new HashMap<DeclaredMethodSignature, InterceptorOrder>();
+ private Map<DeclaredMethodSignature, ExcludeDefaultInterceptors> methodExcludeDefaultInterceptors = new HashMap<DeclaredMethodSignature, ExcludeDefaultInterceptors>();
+ private Map<DeclaredMethodSignature, ExcludeClassInterceptors> methodExcludeClassInterceptors = new HashMap<DeclaredMethodSignature, ExcludeClassInterceptors>();
//Bean class methods
- private Map<String, AroundInvoke> aroundInvokes;
- private Map<String, PostConstruct> postConstructs;
- private Map<String, PostActivate> postActivates;
- private Map<String, PrePassivate> prePassivates;
- private Map<String, PreDestroy> preDestroys;
+ private Map<DeclaredMethodSignature, AroundInvoke> aroundInvokes;
+ private Map<DeclaredMethodSignature, PostConstruct> postConstructs;
+ private Map<DeclaredMethodSignature, PostActivate> postActivates;
+ private Map<DeclaredMethodSignature, PrePassivate> prePassivates;
+ private Map<DeclaredMethodSignature, PreDestroy> preDestroys;
private Class<?> beanClass;
private ClassLoader classLoader;
@@ -195,12 +194,17 @@
initialiseInterceptors(classInterceptorBindingMetaData);
initialiseInterceptorOrder(classInterceptorOrderMetaData);
- Map<String, List<Method>> methodMap = ClassHelper.getAllMethodsMap(beanClass);
- MethodSignatures methodSignatures = new MethodSignatures();
- initialiseMethodInterceptors(methodMap, methodSignatures, methodInterceptorBindingMetaData);
- initialiseMethodInterceptorOrders(methodMap, methodSignatures, methodInterceptorOrderMetaData);
+ Method realMethods[] = ClassHelper.getAllMethods(beanClass);
+ List<DeclaredMethodSignature> methods = new ArrayList<DeclaredMethodSignature>();
+ for(Method realMethod : realMethods)
+ {
+ methods.add(new DeclaredMethodSignature(realMethod));
+ }
+
+ initialiseMethodInterceptors(methods, methodInterceptorBindingMetaData);
+ initialiseMethodInterceptorOrders(methods, methodInterceptorOrderMetaData);
- initialiseAroundInvoke(methodMap);
+ initialiseAroundInvoke(methods);
}
private void setupMetaDataLists(JBossEnterpriseBeanMetaData beanMetaData,
@@ -341,7 +345,7 @@
return null;
}
- private void addMethodLevelExclusions(Signature sig, InterceptorBindingMetaData binding)
+ private void addMethodLevelExclusions(DeclaredMethodSignature sig, InterceptorBindingMetaData binding)
{
ExcludeDefaultInterceptors exDefaultInterceptors = checkExcludeDefaultInterceptors(binding);
if (exDefaultInterceptors != null)
@@ -359,11 +363,11 @@
}
}
- private void initialiseMethodInterceptors(Map<String, List<Method>> methodMap, MethodSignatures methodSignatures, List<InterceptorBindingMetaData> bindings)
+ private void initialiseMethodInterceptors(List<DeclaredMethodSignature> methods, List<InterceptorBindingMetaData> bindings)
{
if (bindings != null && bindings.size() > 0)
{
- this.methodInterceptors = new HashMap<Signature, Interceptors>();
+ this.methodInterceptors = new HashMap<DeclaredMethodSignature, Interceptors>();
for (InterceptorBindingMetaData binding : bindings)
{
NamedMethodMetaData method = binding.getMethod();
@@ -372,37 +376,28 @@
if(method.getMethodName() == null)
continue;
- List<Method> methods = methodMap.get(method.getMethodName());
-
- if (methods == null)
+ for (DeclaredMethodSignature refMethod : methods)
{
- throw new IllegalStateException("Bean class " + beanClass.getName() + " does not have a method called '" + method.getMethodName() + "'. This method name was used in an interceptor-binding entry.");
- }
-
- for (Method refMethod : methods)
- {
- Signature signature = methodSignatures.getSignature(refMethod);
- if (matchesMethod(signature, refMethod, method))
+ if(!matches(refMethod, method))
+ continue;
+ InterceptorsImpl interceptors = (InterceptorsImpl)methodInterceptors.get(refMethod);
+ if (interceptors == null)
{
- InterceptorsImpl interceptors = (InterceptorsImpl)methodInterceptors.get(signature);
- if (interceptors == null)
- {
- interceptors = new InterceptorsImpl();
- methodInterceptors.put(signature, interceptors);
- }
- add(interceptors, classLoader, binding);
- addMethodLevelExclusions(signature, binding);
+ interceptors = new InterceptorsImpl();
+ methodInterceptors.put(refMethod, interceptors);
}
+ add(interceptors, classLoader, binding);
+ addMethodLevelExclusions(refMethod, binding);
}
}
}
}
- private void initialiseMethodInterceptorOrders(Map<String, List<Method>> methodMap, MethodSignatures methodSignatures, List<InterceptorBindingMetaData> bindings)
+ private void initialiseMethodInterceptorOrders(List<DeclaredMethodSignature> methods, List<InterceptorBindingMetaData> bindings)
{
if (bindings != null && bindings.size() > 0)
{
- this.methodInterceptorOrders = new HashMap<Signature, InterceptorOrder>();
+ this.methodInterceptorOrders = new HashMap<DeclaredMethodSignature, InterceptorOrder>();
for (InterceptorBindingMetaData binding : bindings)
{
NamedMethodMetaData method = binding.getMethod();
@@ -411,46 +406,24 @@
if(method.getMethodName() == null)
continue;
- List<Method> methods = methodMap.get(method.getMethodName());
- for (Method refMethod : methods)
+ for (DeclaredMethodSignature refMethod : methods)
{
- Signature signature = methodSignatures.getSignature(refMethod);
- if (matchesMethod(signature, refMethod, method))
+ if(!matches(refMethod, method))
+ continue;
+ InterceptorOrderImpl interceptors = (InterceptorOrderImpl)methodInterceptors.get(refMethod);
+ if (interceptors == null)
{
- InterceptorOrderImpl interceptors = (InterceptorOrderImpl)methodInterceptors.get(signature);
- if (interceptors == null)
- {
- interceptors = new InterceptorOrderImpl();
- methodInterceptorOrders.put(signature, interceptors);
- }
- add(interceptors, classLoader, binding);
+ interceptors = new InterceptorOrderImpl();
+ methodInterceptorOrders.put(refMethod, interceptors);
}
+ add(interceptors, classLoader, binding);
}
}
}
}
- private boolean matchesMethod(Signature sig, Method refMethod, NamedMethodMetaData method)
+ private void initialiseAroundInvoke(List<DeclaredMethodSignature> methods)
{
- assert refMethod.getName().equals(method.getMethodName());
- MethodParametersMetaData methodParams = method.getMethodParams();
- if(methodParams == null)
- {
- return true;
- }
- else
- {
- if(Arrays.equals(methodParams.toArray(), sig.getParameters()))
- {
- return true;
- }
- }
-
- return false;
- }
-
- private void initialiseAroundInvoke(Map<String, List<Method>> methodMap)
- {
AroundInvokesMetaData aroundInvokes = null;
// if(beanMetaData instanceof JBossGenericBeanMetaData)
// aroundInvokes = ((JBossGenericBeanMetaData) beanMetaData).getAroundInvokes();
@@ -460,68 +433,83 @@
aroundInvokes = ((JBossSessionBeanMetaData) beanMetaData).getAroundInvokes();
if(aroundInvokes != null)
{
- for (String methodName : methodMap.keySet())
+ for (DeclaredMethodSignature method : methods)
{
- AroundInvoke aroundInvoke = getAroundInvokeAnnotation(aroundInvokes, methodName);
+ AroundInvoke aroundInvoke = getAroundInvokeAnnotation(aroundInvokes, method);
if(aroundInvoke != null)
{
if (this.aroundInvokes == null)
{
- this.aroundInvokes = new HashMap<String, AroundInvoke>();
+ this.aroundInvokes = new HashMap<DeclaredMethodSignature, AroundInvoke>();
}
- this.aroundInvokes.put(methodName, aroundInvoke);
+ this.aroundInvokes.put(method, aroundInvoke);
}
}
}
}
- private void initialiseLifecycleAnnotations(Map<String, List<Method>> methodMap)
+ private void initialiseLifecycleAnnotations(List<DeclaredMethodSignature> methods)
{
if(beanMetaData instanceof JBossSessionBeanMetaData)
{
- for (String methodName : methodMap.keySet())
+ for (DeclaredMethodSignature method : methods)
{
- PostConstruct postConstruct = getLifeCycleAnnotation(((JBossSessionBeanMetaData) beanMetaData).getPostConstructs(), PostConstructImpl.class, methodName);
+ PostConstruct postConstruct = getLifeCycleAnnotation(((JBossSessionBeanMetaData) beanMetaData).getPostConstructs(), PostConstructImpl.class, method);
if (postConstruct != null)
{
if (postConstructs == null)
{
- postConstructs = new HashMap<String, PostConstruct>();
+ postConstructs = new HashMap<DeclaredMethodSignature, PostConstruct>();
}
- postConstructs.put(methodName, postConstruct);
+ postConstructs.put(method, postConstruct);
}
- PostActivate postActivate = getLifeCycleAnnotation(((JBossSessionBeanMetaData) beanMetaData).getPostActivates(), PostActivateImpl.class, methodName);
+ PostActivate postActivate = getLifeCycleAnnotation(((JBossSessionBeanMetaData) beanMetaData).getPostActivates(), PostActivateImpl.class, method);
if(postActivate != null)
{
if (postActivates == null)
{
- postActivates = new HashMap<String, PostActivate>();
+ postActivates = new HashMap<DeclaredMethodSignature, PostActivate>();
}
- postActivates.put(methodName, postActivate);
+ postActivates.put(method, postActivate);
}
- PrePassivate prePassivate = getLifeCycleAnnotation(((JBossSessionBeanMetaData) beanMetaData).getPrePassivates(), PrePassivateImpl.class, methodName);
+ PrePassivate prePassivate = getLifeCycleAnnotation(((JBossSessionBeanMetaData) beanMetaData).getPrePassivates(), PrePassivateImpl.class, method);
if(prePassivate != null)
{
if (prePassivates == null)
{
- prePassivates = new HashMap<String, PrePassivate>();
+ prePassivates = new HashMap<DeclaredMethodSignature, PrePassivate>();
}
- prePassivates.put(methodName, prePassivate);
+ prePassivates.put(method, prePassivate);
}
- PreDestroy preDestroy = getLifeCycleAnnotation(((JBossSessionBeanMetaData) beanMetaData).getPreDestroys(), PreDestroyImpl.class, methodName);
+ PreDestroy preDestroy = getLifeCycleAnnotation(((JBossSessionBeanMetaData) beanMetaData).getPreDestroys(), PreDestroyImpl.class, method);
if(preDestroy != null)
{
if (preDestroys == null)
{
- preDestroys = new HashMap<String, PreDestroy>();
+ preDestroys = new HashMap<DeclaredMethodSignature, PreDestroy>();
}
- preDestroys.put(methodName, preDestroy);
+ preDestroys.put(method, preDestroy);
}
}
}
}
+ private static boolean matches(DeclaredMethodSignature signature, NamedMethodMetaData method)
+ {
+ if(!signature.getName().equals(method.getMethodName()))
+ return false;
+ if(method.getMethodParams() == null)
+ {
+ if(signature.getParameters() == null || signature.getParameters().length == 0)
+ return true;
+ else
+ return false;
+
+ }
+ return Arrays.equals(signature.getParameters(), method.getMethodParams().toArray());
+ }
+
@Override
public <A extends Annotation> A retrieveAnnotation(Class<A> annotationClass, JBossEnterpriseBeanMetaData beanMetaData, ClassLoader classLoader)
{
@@ -545,73 +533,70 @@
}
@Override
- public <A extends Annotation> A retrieveAnnotation(Class<A> annotationClass, JBossEnterpriseBeanMetaData beanMetaData, ClassLoader classLoader, String methodName, String... parameterNames)
+ public <A extends Annotation> A retrieveAnnotation(Class<A> annotationClass, JBossEnterpriseBeanMetaData beanMetaData, ClassLoader classLoader, DeclaredMethodSignature method)
{
if(annotationClass == AroundInvoke.class)
{
- if (parameterNames.length == 1 && parameterNames[0].equals(InvocationContext.class.getName()) && aroundInvokes != null)
+ String parameterTypes[] = method.getParameters();
+ if (parameterTypes.length == 1 && parameterTypes[0].equals(InvocationContext.class.getName()) && aroundInvokes != null)
{
- return annotationClass.cast(aroundInvokes.get(methodName));
+ return annotationClass.cast(aroundInvokes.get(method));
}
return null;
}
else if(annotationClass == InterceptorOrder.class)
{
- MethodSignature signature = new MethodSignature(methodName, parameterNames);
if (methodInterceptorOrders == null)
{
return null;
}
- return annotationClass.cast(methodInterceptorOrders.get(signature));
+ return annotationClass.cast(methodInterceptorOrders.get(method));
}
else if(annotationClass == Interceptors.class)
{
- MethodSignature signature = new MethodSignature(methodName, parameterNames);
if (methodInterceptors == null)
{
return null;
}
- return annotationClass.cast(methodInterceptors.get(signature));
+ return annotationClass.cast(methodInterceptors.get(method));
}
else if (annotationClass == ExcludeDefaultInterceptors.class)
{
- MethodSignature signature = new MethodSignature(methodName, parameterNames);
- return annotationClass.cast(methodExcludeDefaultInterceptors.get(signature));
+ return annotationClass.cast(methodExcludeDefaultInterceptors.get(method));
}
else if (annotationClass == ExcludeClassInterceptors.class)
{
- MethodSignature signature = new MethodSignature(methodName, parameterNames);
- return annotationClass.cast(methodExcludeClassInterceptors.get(signature));
+ return annotationClass.cast(methodExcludeClassInterceptors.get(method));
}
else if(annotationClass == PostActivate.class)
{
- if(beanMetaData instanceof JBossSessionBeanMetaData && parameterNames.length == 0 && postActivates != null)
+ if(beanMetaData instanceof JBossSessionBeanMetaData && method.getParameters().length == 0 && postActivates != null)
{
- return annotationClass.cast(postActivates.get(methodName));
+ return annotationClass.cast(postActivates.get(method));
}
}
else if(annotationClass == PostConstruct.class)
{
- if(beanMetaData instanceof JBossSessionBeanMetaData && parameterNames.length == 0 && postConstructs != null)
+ if(beanMetaData instanceof JBossSessionBeanMetaData && method.getParameters().length == 0 && postConstructs != null)
{
- return annotationClass.cast(postConstructs.get(methodName));
+ return annotationClass.cast(postConstructs.get(method));
}
}
else if(annotationClass == PreDestroy.class)
{
- if(beanMetaData instanceof JBossSessionBeanMetaData && parameterNames.length == 0 && preDestroys != null)
+ if(beanMetaData instanceof JBossSessionBeanMetaData && method.getParameters().length == 0 && preDestroys != null)
{
- return annotationClass.cast(preDestroys.get(methodName));
+ return annotationClass.cast(preDestroys.get(method));
}
}
else if(annotationClass == PrePassivate.class)
{
- if(beanMetaData instanceof JBossSessionBeanMetaData && parameterNames.length == 0 && prePassivates != null)
+ if(beanMetaData instanceof JBossSessionBeanMetaData && method.getParameters().length == 0 && prePassivates != null)
{
- return annotationClass.cast(prePassivates.get(methodName));
+ return annotationClass.cast(prePassivates.get(method));
}
}
- return super.retrieveAnnotation(annotationClass, beanMetaData, classLoader, methodName, parameterNames);
+ return super.retrieveAnnotation(annotationClass, beanMetaData, classLoader, method);
}
private void checkBeanExistsInDeployment(JBossEnterpriseBeanMetaData beanMetaData, String ejbName)
@@ -637,7 +622,7 @@
Signature s = methodSignatures.get(m);
if (s == null)
{
- s = new MethodSignature(m);
+ s = new DeclaredMethodSignature(m);
methodSignatures.put(m, s);
}
return s;
Modified: projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/EnvironmentInterceptorMetaDataBridge.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/EnvironmentInterceptorMetaDataBridge.java 2008-08-18 10:44:12 UTC (rev 77150)
+++ projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/EnvironmentInterceptorMetaDataBridge.java 2008-08-18 10:44:52 UTC (rev 77151)
@@ -22,7 +22,6 @@
package org.jboss.ejb3.interceptors.metadata;
import java.lang.annotation.Annotation;
-import java.util.Arrays;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@@ -38,12 +37,13 @@
import org.jboss.metadata.javaee.spec.Environment;
import org.jboss.metadata.javaee.spec.LifecycleCallbackMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
+import org.jboss.metadata.spi.signature.DeclaredMethodSignature;
/**
* Does only interceptor stuff.
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
+ * @version $Revision$
*/
public class EnvironmentInterceptorMetaDataBridge<M extends Environment> implements MetaDataBridge<M>
{
@@ -65,53 +65,64 @@
}
}
- protected AroundInvoke getAroundInvokeAnnotation(AroundInvokesMetaData callbacks, String methodName)
+ protected AroundInvoke getAroundInvokeAnnotation(AroundInvokesMetaData callbacks, DeclaredMethodSignature method)
{
if(callbacks == null || callbacks.isEmpty())
return null;
for(AroundInvokeMetaData callback : callbacks)
{
- // TODO: callback.classname
- String callbackMethodName = callback.getMethodName();
- if(methodName.equals(callbackMethodName))
- return new AroundInvokeImpl();
+ String callbackClassName = callback.getClassName();
+ if(isEmpty(callbackClassName) || callbackClassName.equals(method.getDeclaringClass()))
+ {
+ String callbackMethodName = callback.getMethodName();
+ if(method.getName().equals(callbackMethodName))
+ return new AroundInvokeImpl();
+ }
}
return null;
}
- protected <T extends Annotation> T getLifeCycleAnnotation(LifecycleCallbacksMetaData callbacks, Class<T> annotationImplType, String methodName)
+ protected <T extends Annotation> T getLifeCycleAnnotation(LifecycleCallbacksMetaData callbacks, Class<T> annotationImplType, DeclaredMethodSignature method)
{
if(callbacks == null || callbacks.isEmpty())
return null;
for(LifecycleCallbackMetaData callback : callbacks)
{
- // TODO: callback.className
- String callbackMethodName = callback.getMethodName();
- if(methodName.equals(callbackMethodName))
- return createAnnotationImpl(annotationImplType);
+ String callbackClassName = callback.getClassName();
+ if(isEmpty(callbackClassName) || callbackClassName.equals(method.getDeclaringClass()))
+ {
+ String callbackMethodName = callback.getMethodName();
+ if(method.getName().equals(callbackMethodName))
+ return createAnnotationImpl(annotationImplType);
+ }
}
return null;
}
+ private static boolean isEmpty(String s)
+ {
+ return s == null || s.length() == 0;
+ }
+
public <A extends Annotation> A retrieveAnnotation(Class<A> annotationClass, M metaData, ClassLoader classLoader)
{
return null;
}
- public <A extends Annotation> A retrieveAnnotation(Class<A> annotationClass, M metaData, ClassLoader classLoader, String methodName, String... parameterNames)
+ public <A extends Annotation> A retrieveAnnotation(Class<A> annotationClass, M metaData, ClassLoader classLoader, DeclaredMethodSignature method)
{
- if(log.isTraceEnabled()) log.trace("retrieve annotation " + annotationClass + " on " + metaData + " for " + methodName + " " + Arrays.toString(parameterNames));
+ if(log.isTraceEnabled()) log.trace("retrieve annotation " + annotationClass + " on " + metaData + " for " + method);
if(annotationClass == PostConstruct.class)
{
- PostConstruct lifeCycleAnnotation = getLifeCycleAnnotation(metaData.getPostConstructs(), PostConstructImpl.class, methodName);
+ PostConstruct lifeCycleAnnotation = getLifeCycleAnnotation(metaData.getPostConstructs(), PostConstructImpl.class, method);
if(lifeCycleAnnotation != null)
return annotationClass.cast(lifeCycleAnnotation);
}
else if(annotationClass == PreDestroy.class)
{
- PreDestroy lifeCycleAnnotation = getLifeCycleAnnotation(metaData.getPreDestroys(), PreDestroyImpl.class, methodName);
+ PreDestroy lifeCycleAnnotation = getLifeCycleAnnotation(metaData.getPreDestroys(), PreDestroyImpl.class, method);
if(lifeCycleAnnotation != null)
return annotationClass.cast(lifeCycleAnnotation);
}
Modified: projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/InterceptorMetaDataBridge.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/InterceptorMetaDataBridge.java 2008-08-18 10:44:12 UTC (rev 77150)
+++ projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/InterceptorMetaDataBridge.java 2008-08-18 10:44:52 UTC (rev 77151)
@@ -36,6 +36,7 @@
import org.jboss.ejb3.metadata.MetaDataBridge;
import org.jboss.logging.Logger;
import org.jboss.metadata.ejb.spec.InterceptorMetaData;
+import org.jboss.metadata.spi.signature.DeclaredMethodSignature;
/**
* Comment
@@ -61,38 +62,38 @@
}
@Override
- public <A extends Annotation> A retrieveAnnotation(Class<A> annotationClass, InterceptorMetaData interceptorMetaData, ClassLoader classLoader, String methodName, String... parameterNames)
+ public <A extends Annotation> A retrieveAnnotation(Class<A> annotationClass, InterceptorMetaData interceptorMetaData, ClassLoader classLoader, DeclaredMethodSignature method)
{
if(annotationClass == AroundInvoke.class)
{
- Annotation annotation = getAroundInvokeAnnotation(interceptorMetaData.getAroundInvokes(), methodName);
+ Annotation annotation = getAroundInvokeAnnotation(interceptorMetaData.getAroundInvokes(), method);
if(annotation != null)
return annotationClass.cast(annotation);
}
else if(annotationClass == PostActivate.class)
{
- PostActivate lifeCycleAnnotation = getLifeCycleAnnotation(interceptorMetaData.getPostActivates(), PostActivateImpl.class, methodName);
+ PostActivate lifeCycleAnnotation = getLifeCycleAnnotation(interceptorMetaData.getPostActivates(), PostActivateImpl.class, method);
if(lifeCycleAnnotation != null)
return annotationClass.cast(lifeCycleAnnotation);
}
else if(annotationClass == PostConstruct.class)
{
- PostConstruct lifeCycleAnnotation = getLifeCycleAnnotation(interceptorMetaData.getPostConstructs(), PostConstructImpl.class, methodName);
+ PostConstruct lifeCycleAnnotation = getLifeCycleAnnotation(interceptorMetaData.getPostConstructs(), PostConstructImpl.class, method);
if(lifeCycleAnnotation != null)
return annotationClass.cast(lifeCycleAnnotation);
}
else if(annotationClass == PreDestroy.class)
{
- PreDestroy lifeCycleAnnotation = getLifeCycleAnnotation(interceptorMetaData.getPreDestroys(), PreDestroyImpl.class, methodName);
+ PreDestroy lifeCycleAnnotation = getLifeCycleAnnotation(interceptorMetaData.getPreDestroys(), PreDestroyImpl.class, method);
if(lifeCycleAnnotation != null)
return annotationClass.cast(lifeCycleAnnotation);
}
else if(annotationClass == PrePassivate.class)
{
- PrePassivate lifeCycleAnnotation = getLifeCycleAnnotation(interceptorMetaData.getPrePassivates(), PrePassivateImpl.class, methodName);
+ PrePassivate lifeCycleAnnotation = getLifeCycleAnnotation(interceptorMetaData.getPrePassivates(), PrePassivateImpl.class, method);
if(lifeCycleAnnotation != null)
return annotationClass.cast(lifeCycleAnnotation);
}
- return super.retrieveAnnotation(annotationClass, interceptorMetaData, classLoader, methodName, parameterNames);
+ return super.retrieveAnnotation(annotationClass, interceptorMetaData, classLoader, method);
}
}
Added: projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/SameMethodNameBean.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/SameMethodNameBean.java (rev 0)
+++ projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/SameMethodNameBean.java 2008-08-18 10:44:52 UTC (rev 77151)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.interceptors.inheritance;
+
+import javax.annotation.PostConstruct;
+
+/**
+ * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class SameMethodNameBean extends SameMethodNameSuper
+{
+ @PostConstruct
+ public void postConstruct()
+ {
+ Interceptions.addPostConstruct(SameMethodNameBean.class);
+ }
+
+ protected void postConstructInSuper()
+ {
+ throw new IllegalStateException("Should not get here");
+ }
+}
Added: projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/SameMethodNameSuper.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/SameMethodNameSuper.java (rev 0)
+++ projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/SameMethodNameSuper.java 2008-08-18 10:44:52 UTC (rev 77151)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.interceptors.inheritance;
+
+import javax.annotation.PostConstruct;
+
+/**
+ * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class SameMethodNameSuper
+{
+ @SuppressWarnings("unused")
+ @PostConstruct
+ private void postConstructInSuper()
+ {
+ Interceptions.addPostConstruct(SameMethodNameSuper.class);
+ }
+}
Modified: projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/unit/InheritanceTestCase.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/unit/InheritanceTestCase.java 2008-08-18 10:44:12 UTC (rev 77150)
+++ projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/unit/InheritanceTestCase.java 2008-08-18 10:44:52 UTC (rev 77151)
@@ -23,8 +23,11 @@
import java.net.URL;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import junit.framework.TestCase;
+
import org.jboss.aop.AspectManager;
import org.jboss.aspects.common.AOPDeployer;
import org.jboss.ejb3.interceptors.container.BeanContext;
@@ -39,12 +42,14 @@
import org.jboss.ejb3.test.interceptors.inheritance.AnnotatedBean;
import org.jboss.ejb3.test.interceptors.inheritance.AnnotatedOverrideBean;
import org.jboss.ejb3.test.interceptors.inheritance.ClassBaseInterceptor;
+import org.jboss.ejb3.test.interceptors.inheritance.ClassInterceptor;
import org.jboss.ejb3.test.interceptors.inheritance.ClassOverrideInterceptor;
-import org.jboss.ejb3.test.interceptors.inheritance.ClassInterceptor;
import org.jboss.ejb3.test.interceptors.inheritance.Interceptions;
import org.jboss.ejb3.test.interceptors.inheritance.MethodBaseInterceptor;
import org.jboss.ejb3.test.interceptors.inheritance.MethodInterceptor;
import org.jboss.ejb3.test.interceptors.inheritance.MyInterface;
+import org.jboss.ejb3.test.interceptors.inheritance.SameMethodNameBean;
+import org.jboss.ejb3.test.interceptors.inheritance.SameMethodNameSuper;
import org.jboss.ejb3.test.interceptors.inheritance.XmlBase;
import org.jboss.ejb3.test.interceptors.inheritance.XmlBean;
import org.jboss.ejb3.test.interceptors.inheritance.XmlClassBaseInterceptor;
@@ -66,8 +71,6 @@
import org.jboss.xb.builder.JBossXBBuilder;
import org.w3c.dom.ls.LSInput;
-import junit.framework.TestCase;
-
/**
*
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
@@ -133,6 +136,8 @@
protected void setUp() throws Exception
{
log.info(deployer.deploy());
+
+ Interceptions.clear();
}
@Override
@@ -281,6 +286,18 @@
assertEquals(AnnotatedOverrideBean.class, postConstructs.get(1));
}
+ public void testSameMethodName() throws Throwable
+ {
+ JBossEnterpriseBeanMetaData beanMetaData = getJBossEnterpriseBeanMetaData("SameMethodNameBean");;
+
+ MyContainer<SameMethodNameBean> container = new MyContainer<SameMethodNameBean>("SameMethodNameBean", "Test", SameMethodNameBean.class, beanMetaData);
+
+ BeanContext<?> bean = container.construct();
+
+ List<Class<?>> expected = Arrays.asList((Class<?>) SameMethodNameSuper.class, SameMethodNameBean.class);
+ assertEquals(expected, Interceptions.getPostConstructs());
+ }
+
public void testXmlOverriddenMethods() throws Throwable
{
Thread.currentThread().setContextClassLoader(MyInterface.class.getClassLoader());
Modified: projects/ejb3/trunk/interceptors/src/test/resources/inheritance/META-INF/ejb-jar.xml
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/resources/inheritance/META-INF/ejb-jar.xml 2008-08-18 10:44:12 UTC (rev 77150)
+++ projects/ejb3/trunk/interceptors/src/test/resources/inheritance/META-INF/ejb-jar.xml 2008-08-18 10:44:52 UTC (rev 77151)
@@ -14,6 +14,13 @@
</session>
<session>
<ejb-name>AnnotatedOverrideBean</ejb-name>
+ </session>
+ <session>
+ <ejb-name>SameMethodNameBean</ejb-name>
+ <post-construct>
+ <lifecycle-callback-class>SameMethodNameSuper</lifecycle-callback-class>
+ <lifecycle-callback-method>postConstructInSuper</lifecycle-callback-method>
+ </post-construct>
</session>
<session>
<ejb-name>XmlBean</ejb-name>
Modified: projects/ejb3/trunk/security/pom.xml
===================================================================
--- projects/ejb3/trunk/security/pom.xml 2008-08-18 10:44:12 UTC (rev 77150)
+++ projects/ejb3/trunk/security/pom.xml 2008-08-18 10:44:52 UTC (rev 77151)
@@ -71,47 +71,41 @@
<artifactId>jboss-jacc-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-ext-api</artifactId>
- <version>0.3</version>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-ext-api</artifactId>
+ <version>0.3</version>
+ </dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-ext-api-impl</artifactId>
- <version>0.3</version>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-ext-api-impl</artifactId>
+ <version>0.3</version>
+ </dependency>
- <!-- JBoss AOP -->
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <!-- JBoss AOP -->
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <!-- JBoss MetaData -->
- <dependency>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
- </dependency>
+ <!-- EJB3 Metadata -->
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-metadata</artifactId>
+ <version>0.13.0-SNAPSHOT</version>
+ </dependency>
- <!-- EJB3 Metadata -->
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-metadata</artifactId>
- <version>0.12.1</version>
- </dependency>
-
<!-- JBoss Common Core -->
<dependency>
<groupId>org.jboss</groupId>
@@ -124,6 +118,12 @@
<artifactId>jboss-logging-spi</artifactId>
</dependency>
+ <!-- JBoss MetaData -->
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ </dependency>
+
<!-- JUnit -->
<dependency>
<groupId>junit</groupId>
Modified: projects/ejb3/trunk/security/src/main/java/org/jboss/ejb3/security/bridge/SecurityDomainMetaDataBridge.java
===================================================================
--- projects/ejb3/trunk/security/src/main/java/org/jboss/ejb3/security/bridge/SecurityDomainMetaDataBridge.java 2008-08-18 10:44:12 UTC (rev 77150)
+++ projects/ejb3/trunk/security/src/main/java/org/jboss/ejb3/security/bridge/SecurityDomainMetaDataBridge.java 2008-08-18 10:44:52 UTC (rev 77151)
@@ -27,6 +27,7 @@
import org.jboss.ejb3.annotation.impl.SecurityDomainImpl;
import org.jboss.ejb3.metadata.MetaDataBridge;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.spi.signature.DeclaredMethodSignature;
/**
* Meta data bridge to return the SecurityDomain Annotation
@@ -51,7 +52,7 @@
return null;
}
- public <A extends Annotation> A retrieveAnnotation(Class<A> annotationClass, JBossEnterpriseBeanMetaData beanMetaData, ClassLoader classLoader, String methodName, String... parameterNames)
+ public <A extends Annotation> A retrieveAnnotation(Class<A> annotationClass, JBossEnterpriseBeanMetaData beanMetaData, ClassLoader classLoader, DeclaredMethodSignature method)
{
return null;
}
Modified: projects/ejb3/trunk/transactions/pom.xml
===================================================================
--- projects/ejb3/trunk/transactions/pom.xml 2008-08-18 10:44:12 UTC (rev 77150)
+++ projects/ejb3/trunk/transactions/pom.xml 2008-08-18 10:44:52 UTC (rev 77151)
@@ -20,16 +20,18 @@
specification.
</description>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
- <!-- Internal -->
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-metadata</artifactId>
- <version>0.12.1</version>
- </dependency>
-
- <!-- External -->
- <dependency>
<groupId>jboss.aop</groupId>
<artifactId>jboss-aop-deployer-jdk50</artifactId>
<version>2.0.0.CR8</version>
@@ -101,7 +103,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-interceptors</artifactId>
- <version>0.13.2</version>
+ <version>0.13.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
Modified: projects/ejb3/trunk/transactions/src/main/java/org/jboss/ejb3/tx/metadata/ApplicationExceptionMetaDataBridge.java
===================================================================
--- projects/ejb3/trunk/transactions/src/main/java/org/jboss/ejb3/tx/metadata/ApplicationExceptionMetaDataBridge.java 2008-08-18 10:44:12 UTC (rev 77150)
+++ projects/ejb3/trunk/transactions/src/main/java/org/jboss/ejb3/tx/metadata/ApplicationExceptionMetaDataBridge.java 2008-08-18 10:44:52 UTC (rev 77151)
@@ -28,6 +28,7 @@
import org.jboss.ejb3.annotation.impl.ApplicationExceptionImpl;
import org.jboss.ejb3.metadata.MetaDataBridge;
import org.jboss.metadata.ejb.spec.ApplicationExceptionMetaData;
+import org.jboss.metadata.spi.signature.DeclaredMethodSignature;
/**
* @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
@@ -46,7 +47,7 @@
}
public <A extends Annotation> A retrieveAnnotation(Class<A> annotationClass, ApplicationExceptionMetaData metaData,
- ClassLoader classLoader, String methodName, String... parameterNames)
+ ClassLoader classLoader, DeclaredMethodSignature method)
{
if(annotationClass == ApplicationException.class)
{
More information about the jboss-cvs-commits
mailing list