[jboss-cvs] JBossAS SVN: r67501 - in trunk/ejb3/src/main/org/jboss: ejb3 and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 27 09:49:48 EST 2007
Author: adrian at jboss.org
Date: 2007-11-27 09:49:47 -0500 (Tue, 27 Nov 2007)
New Revision: 67501
Modified:
trunk/ejb3/src/main/org/jboss/ejb/InterceptorsImpl.java
trunk/ejb3/src/main/org/jboss/ejb3/AnnotationRepositoryToMetaData.java
trunk/ejb3/src/main/org/jboss/ejb3/EJBMetaDataLoader.java
trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
Log:
Log the real method/field name we bound annotations to and some other code tidyup
Modified: trunk/ejb3/src/main/org/jboss/ejb/InterceptorsImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb/InterceptorsImpl.java 2007-11-27 14:16:58 UTC (rev 67500)
+++ trunk/ejb3/src/main/org/jboss/ejb/InterceptorsImpl.java 2007-11-27 14:49:47 UTC (rev 67501)
@@ -73,7 +73,7 @@
return impl;
}
- public Class annotationType()
+ public Class<Interceptors> annotationType()
{
return Interceptors.class;
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/AnnotationRepositoryToMetaData.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/AnnotationRepositoryToMetaData.java 2007-11-27 14:16:58 UTC (rev 67500)
+++ trunk/ejb3/src/main/org/jboss/ejb3/AnnotationRepositoryToMetaData.java 2007-11-27 14:49:47 UTC (rev 67501)
@@ -88,8 +88,9 @@
throw new IllegalArgumentException("Null class");
MetaDataRetrieval classMetaData = ClassMetaDataRetrievalFactory.INSTANCE.getMetaDataRetrieval(new Scope(CommonLevels.CLASS, beanClass));
- mutableMetaData = new MemoryMetaDataLoader(new ScopeKey(CommonLevels.INSTANCE, name));
- MetaDataRetrieval dynamicXml = new EJBMetaDataLoader(container);
+ ScopeKey instanceScope = new ScopeKey(CommonLevels.INSTANCE, name);
+ mutableMetaData = new MemoryMetaDataLoader(instanceScope);
+ MetaDataRetrieval dynamicXml = new EJBMetaDataLoader(instanceScope, container);
MetaDataContext classContext = new AbstractMetaDataContext(classMetaData);
MetaDataRetrieval[] instance = { dynamicXml, mutableMetaData };
Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJBMetaDataLoader.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJBMetaDataLoader.java 2007-11-27 14:16:58 UTC (rev 67500)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJBMetaDataLoader.java 2007-11-27 14:49:47 UTC (rev 67501)
@@ -36,6 +36,7 @@
import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
import org.jboss.metadata.spi.retrieval.simple.SimpleAnnotationItem;
import org.jboss.metadata.spi.retrieval.simple.SimpleAnnotationsItem;
+import org.jboss.metadata.spi.scope.ScopeKey;
import org.jboss.metadata.spi.signature.MethodSignature;
import org.jboss.metadata.spi.signature.Signature;
@@ -56,10 +57,12 @@
/**
* Create a new EJBMetaDataLoader.
*
- * @param container
+ * @param key the scope
+ * @param container the container
*/
- public EJBMetaDataLoader(EJBContainer container)
+ public EJBMetaDataLoader(ScopeKey key, EJBContainer container)
{
+ super(key);
if (container == null)
throw new IllegalArgumentException("Null container");
this.container = container;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java 2007-11-27 14:16:58 UTC (rev 67500)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java 2007-11-27 14:49:47 UTC (rev 67501)
@@ -26,7 +26,6 @@
import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -45,16 +44,13 @@
import javax.ejb.ActivationConfigProperty;
import javax.ejb.Init;
import javax.ejb.Local;
-import javax.ejb.LocalHome;
import javax.ejb.MessageDriven;
import javax.ejb.PostActivate;
import javax.ejb.PrePassivate;
import javax.ejb.Remote;
-import javax.ejb.RemoteHome;
import javax.ejb.Remove;
import javax.ejb.Stateless;
import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
import javax.ejb.TransactionManagement;
import javax.ejb.TransactionManagementType;
import javax.interceptor.AroundInvoke;
@@ -135,9 +131,6 @@
import org.jboss.ejb.StatelessImpl;
import org.jboss.ejb.TransactionAttributeImpl;
import org.jboss.ejb.TransactionManagementImpl;
-import org.jboss.ejb3.cache.CacheFactoryRegistry;
-import org.jboss.ejb3.cache.Ejb3CacheFactory;
-import org.jboss.ejb3.cache.StatefulCache;
import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
import org.jboss.ejb3.mdb.ConsumerContainer;
import org.jboss.ejb3.mdb.MDB;
@@ -147,11 +140,8 @@
import org.jboss.ejb3.service.ServiceContainer;
import org.jboss.ejb3.stateful.StatefulContainer;
import org.jboss.logging.Logger;
-import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
-import org.jboss.metadata.common.ejb.IEnterpriseBeansMetaData;
import org.jboss.metadata.ejb.jboss.CacheConfigMetaData;
import org.jboss.metadata.ejb.jboss.ClusterConfigMetaData;
-import org.jboss.metadata.ejb.jboss.CurrentMessageMetaData;
import org.jboss.metadata.ejb.jboss.JBossAssemblyDescriptorMetaData;
import org.jboss.metadata.ejb.jboss.JBossConsumerBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
@@ -172,19 +162,15 @@
import org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData;
import org.jboss.metadata.ejb.spec.AroundInvokeMetaData;
import org.jboss.metadata.ejb.spec.AroundInvokesMetaData;
-import org.jboss.metadata.ejb.spec.AssemblyDescriptorMetaData;
import org.jboss.metadata.ejb.spec.BusinessLocalsMetaData;
import org.jboss.metadata.ejb.spec.BusinessRemotesMetaData;
import org.jboss.metadata.ejb.spec.ContainerTransactionMetaData;
-import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.spec.EnterpriseBeansMetaData;
import org.jboss.metadata.ejb.spec.ExcludeListMetaData;
import org.jboss.metadata.ejb.spec.InitMethodMetaData;
import org.jboss.metadata.ejb.spec.InitMethodsMetaData;
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.MessageDrivenBeanMetaData;
import org.jboss.metadata.ejb.spec.MethodMetaData;
import org.jboss.metadata.ejb.spec.MethodParametersMetaData;
import org.jboss.metadata.ejb.spec.MethodPermissionMetaData;
@@ -193,7 +179,6 @@
import org.jboss.metadata.ejb.spec.RemoveMethodMetaData;
import org.jboss.metadata.ejb.spec.RemoveMethodsMetaData;
import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
-import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
import org.jboss.metadata.ejb.spec.SubscriptionDurability;
import org.jboss.metadata.javaee.jboss.AnnotationMetaData;
import org.jboss.metadata.javaee.jboss.AnnotationPropertiesMetaData;
@@ -720,7 +705,7 @@
.getName(), property.getValue()));
}
- DefaultActivationSpecs existingAnnotation = (DefaultActivationSpecs)ejbClass.getAnnotation(DefaultActivationSpecs.class);
+ DefaultActivationSpecs existingAnnotation = ejbClass.getAnnotation(DefaultActivationSpecs.class);
if (existingAnnotation != null)
activationAnnotation.merge(existingAnnotation);
@@ -1020,8 +1005,7 @@
roleList.add(securityRole.getRoleName());
}
- DeclareRolesImpl annotation = new DeclareRolesImpl(
- (String[]) roleList.toArray(new String[roleList.size()]));
+ DeclareRolesImpl annotation = new DeclareRolesImpl(roleList.toArray(new String[roleList.size()]));
addClassAnnotation(container, DeclareRoles.class, annotation);
}
@@ -1078,8 +1062,7 @@
addClassAnnotation(container, annotation.annotationType(), annotation);
} else if (dd.getUnauthenticatedPrincipal() != null)
{
- SecurityDomain annotation = (SecurityDomain) ejbClass
- .getAnnotation(SecurityDomain.class);
+ SecurityDomain annotation = ejbClass.getAnnotation(SecurityDomain.class);
SecurityDomainImpl override;
if (annotation != null)
{
@@ -1283,8 +1266,7 @@
}
}
log.debug("adding " + Interceptors.class.getName()
- + " method annotation to " + ejbClass.getName() + "."
- + method.getName() + "(" + getParameters(method) + ")");
+ + " method annotation to " + method);
container.getAnnotations().addAnnotation(method,
Interceptors.class, impl);
@@ -1296,8 +1278,7 @@
ExcludeDefaultInterceptors.class) == null)
{
log.debug("adding " + ExcludeDefaultInterceptors.class.getName()
- + " method annotation to " + ejbClass.getName() + "."
- + method.getName() + "(" + getParameters(method) + ")");
+ + " method annotation to " + method);
container.getAnnotations().addAnnotation(method,
ExcludeDefaultInterceptors.class,
new ExcludeDefaultInterceptorsImpl());
@@ -1311,8 +1292,7 @@
ExcludeClassInterceptors.class) == null)
{
log.debug("adding " + ExcludeClassInterceptors.class.getName()
- + " method annotation to " + ejbClass.getName() + "."
- + method.getName() + "(" + getParameters(method) + ")");
+ + " method annotation to " + method);
container.getAnnotations().addAnnotation(method,
ExcludeClassInterceptors.class,
new ExcludeClassInterceptorsImpl());
@@ -1497,7 +1477,7 @@
if (config.getRemoveTimeoutSeconds() != null)
configAnnotation.setRemovalTimeoutSeconds(config.getRemoveTimeoutSeconds());
- org.jboss.annotation.ejb.cache.CacheConfig existingConfig = (org.jboss.annotation.ejb.cache.CacheConfig)ejbClass.getAnnotation(org.jboss.annotation.ejb.cache.CacheConfig.class);
+ org.jboss.annotation.ejb.cache.CacheConfig existingConfig = ejbClass.getAnnotation(org.jboss.annotation.ejb.cache.CacheConfig.class);
if (existingConfig != null)
configAnnotation.merge(existingConfig);
@@ -1516,7 +1496,7 @@
if (config.getRemoveTimeoutSeconds() != null)
configAnnotation.setRemovalTimeoutSeconds(config.getRemoveTimeoutSeconds());
- org.jboss.annotation.ejb.cache.CacheConfig existingConfig = (org.jboss.annotation.ejb.cache.CacheConfig)ejbClass.getAnnotation(org.jboss.annotation.ejb.cache.CacheConfig.class);
+ org.jboss.annotation.ejb.cache.CacheConfig existingConfig = ejbClass.getAnnotation(org.jboss.annotation.ejb.cache.CacheConfig.class);
if (existingConfig != null)
configAnnotation.merge(existingConfig);
@@ -1532,7 +1512,7 @@
if (!enterpriseBean.isClustered())
{
// ask directly, not the container (metadata setup in progress)
- Clustered existingAnnotation = (Clustered) ejbClass.getAnnotation(Clustered.class);
+ Clustered existingAnnotation = ejbClass.getAnnotation(Clustered.class);
if (existingAnnotation != null)
container.getAnnotations().disableAnnotation(Clustered.class.getName());
return;
@@ -1667,7 +1647,7 @@
String interfac = properties.getClassName();
if (interfac != null)
{
- Class clazz = di.getClassLoader().loadClass(interfac);
+ Class<?> clazz = di.getClassLoader().loadClass(interfac);
annotation.setInterface(clazz);
}
@@ -1764,7 +1744,7 @@
if (remoteBinding != null)
{
- RemoteBinding existingBinding = (RemoteBinding)ejbClass.getAnnotation(RemoteBinding.class);
+ RemoteBinding existingBinding = ejbClass.getAnnotation(RemoteBinding.class);
if (existingBinding != null)
remoteBinding.merge(existingBinding);
@@ -1888,7 +1868,7 @@
if (container.resolveAnnotation(found, ann) == null)
{
log.debug("adding " + ann.getName() + " method annotation to "
- + ejbClass.getName() + "." + found.getName());
+ + found);
container.getAnnotations().addAnnotation(found, ann,
getInterceptorImpl(ann));
@@ -2038,8 +2018,7 @@
if (methods[methodIndex].getName().equals(methodName))
{
log.debug("adding " + annotationClass.getName()
- + " method annotation to " + ejbClass.getName() + "."
- + methodName);
+ + " method annotation to " + methods[methodIndex]);
annotations.addAnnotation(methods[methodIndex],
annotationClass, annotation);
overrideAnnotations(container, methods[methodIndex],
@@ -2057,8 +2036,7 @@
if (methods[methodIndex].getName().equals(methodName))
{
log.debug("adding " + annotationClass.getName()
- + " method annotation to " + ejbClass.getName()
- + "." + methodName);
+ + " method annotation to " + methods[methodIndex]);
annotations.addAnnotation(methods[methodIndex],
annotationClass, annotation);
overrideAnnotations(container, methods[methodIndex],
@@ -2076,8 +2054,7 @@
if (member != null)
{
log.debug("adding " + annotationClass.getName()
- + " field annotation to " + ejbClass.getName() + "."
- + methodName);
+ + " field annotation to " + member);
annotations
.addAnnotation(member, annotationClass, annotation);
overrideAnnotations(container, member, annotationClass
@@ -2110,8 +2087,7 @@
java.lang.reflect.Member member = ejbClass.getMethod(methodName,
methodSignature);
log.debug("adding " + annotationClass.getName()
- + " method annotation to " + ejbClass.getName() + "."
- + methodName);
+ + " method annotation to " + member);
annotations.addAnnotation(member, annotationClass, annotation);
overrideAnnotations(container, member, annotationClass.getName(),
annotation);
@@ -2136,28 +2112,6 @@
addAnnotations(annotationClass, annotation, container, method.getMethodName(), method.getMethodParams());
}
- private static String getParameters(java.lang.reflect.Method m)
- {
- if (m.getParameterTypes().length == 0)
- {
- return "";
- }
- StringBuffer sb = new StringBuffer();
- boolean first = true;
- for (Class<?> param : m.getParameterTypes())
- {
- if (!first)
- {
- sb.append(", ");
- } else
- {
- first = false;
- }
- sb.append(InterceptorInfoRepository.simpleType(param));
- }
- return sb.toString();
- }
-
/**
* Verify whether the class has a method with a certain name.
*
More information about the jboss-cvs-commits
mailing list