[jboss-cvs] JBossAS SVN: r110171 - trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 23 02:05:24 EST 2010
Author: marius.bogoevici
Date: 2010-12-23 02:05:23 -0500 (Thu, 23 Dec 2010)
New Revision: 110171
Modified:
trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldEjbInterceptorMetadataDeployer.java
Log:
JBAS-8769 - remove some useless code
Modified: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldEjbInterceptorMetadataDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldEjbInterceptorMetadataDeployer.java 2010-12-23 05:41:59 UTC (rev 110170)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldEjbInterceptorMetadataDeployer.java 2010-12-23 07:05:23 UTC (rev 110171)
@@ -41,7 +41,6 @@
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.annotation.creator.EjbProcessorUtils;
import org.jboss.metadata.annotation.creator.ejb.InterceptorMetaDataCreator;
-import org.jboss.metadata.annotation.finder.AnnotationFinder;
import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
import org.jboss.metadata.ejb.jboss.JBossAssemblyDescriptorMetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
@@ -70,6 +69,7 @@
* Adds wb custom interceptor to ejb deployments.
*
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ * @author Marius Bogoevici
*/
@SuppressWarnings("deprecation")
public class WeldEjbInterceptorMetadataDeployer extends WeldAwareMetadataDeployer<JBossMetaData>
@@ -318,33 +318,9 @@
}
}
-
- for (Element<ExcludeDefaultInterceptors, Method> element : getMethodsWithExcludedDefaults(deploymentUnit))
- {
- //re-add CDI support defaults if they would be otherwise excluded
- for (JBossEnterpriseBeanMetaData enterpriseBeanMetaData : jBossEnterpriseBeansMetaData)
- {
-
- if (enterpriseBeanMetaData.getEjbClass().equals(element.getOwnerClassName()))
- {
- String ejbName = enterpriseBeanMetaData.getEjbName();
- NamedMethodMetaData namedMethod = new NamedMethodMetaData();
- namedMethod.setMethodName(element.getAnnotatedElement().getName());
- MethodParametersMetaData methodParams = EjbProcessorUtils.getMethodParameters(element.getAnnotatedElement());
- namedMethod.setMethodParams(methodParams);
- if (!processedMethodMetadatas.contains(namedMethod))
- {
- interceptorBindings.add(0, createBinding(INJECTION_INTERCEPTOR_CLASS_NAME, ejbName, namedMethod, false));
- interceptorBindings.add(0, createBinding(CONTEXT_INTERCEPTOR_CLASS_NAME, ejbName, namedMethod, false));
- processedMethodMetadatas.add(namedMethod);
- }
- }
- }
- }
-
for (Element<ExcludeClassInterceptors, Method> element : getMethodsWithExcludedClasses(deploymentUnit))
{
- //re-add CDI support defaults if they would be otherwise excluded
+ //re-add CDI interceptors if they would be otherwise excluded
for (JBossEnterpriseBeanMetaData enterpriseBeanMetaData : jBossEnterpriseBeansMetaData)
{
@@ -355,8 +331,6 @@
namedMethod.setMethodName(element.getAnnotatedElement().getName());
MethodParametersMetaData methodParams = EjbProcessorUtils.getMethodParameters(element.getAnnotatedElement());
namedMethod.setMethodParams(methodParams);
- interceptorBindings.add(0, createBinding(INJECTION_INTERCEPTOR_CLASS_NAME, ejbName, namedMethod, false));
- interceptorBindings.add(0, createBinding(CONTEXT_INTERCEPTOR_CLASS_NAME, ejbName, namedMethod, false));
if (!processedMethodMetadatas.contains(namedMethod))
{
interceptorBindings.add(0, createBinding(INJECTION_INTERCEPTOR_CLASS_NAME, ejbName, namedMethod, false));
More information about the jboss-cvs-commits
mailing list