[jboss-cvs] JBossAS SVN: r72591 - in projects/ejb3/dev/ejbthree1269: installer/src/main/resources/conf and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 22 19:25:59 EDT 2008
Author: ALRubinger
Date: 2008-04-22 19:25:58 -0400 (Tue, 22 Apr 2008)
New Revision: 72591
Added:
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedBase.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedBean.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedOverrideBean.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassBaseInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassOverrideInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/Interceptions.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodBaseInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodOverrideInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MyInterface.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlBase.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlBean.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassBaseInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassOverrideInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodBaseInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodOverrideInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlOverrideBean.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/unit/
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/unit/InheritanceTestCase.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/inheritance/
projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/inheritance/META-INF/
projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/inheritance/META-INF/ejb-jar.xml
Removed:
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedBase.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedBean.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedOverrideBean.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassBaseInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassOverrideInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/Interceptions.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodBaseInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodOverrideInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MyInterface.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlBase.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlBean.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassBaseInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassOverrideInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodBaseInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodOverrideInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlOverrideBean.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/unit/
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/unit/InheritanceTestCase.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/inheritance/META-INF/
projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/inheritance/META-INF/ejb-jar.xml
Modified:
projects/ejb3/dev/ejbthree1269/core/.classpath
projects/ejb3/dev/ejbthree1269/core/jboss-ejb3-client.xml
projects/ejb3/dev/ejbthree1269/core/pom.xml
projects/ejb3/dev/ejbthree1269/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-client.txt
projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/InjectInterceptorsFactory.java
projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/LifecycleCallbackBeanMethodInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/LifecycleCallbacks.java
projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/lang/ClassHelper.java
projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/BeanInterceptorMetaDataBridge.java
projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/InterceptorMetaDataBridge.java
projects/ejb3/dev/ejbthree1269/plugin/pom.xml
projects/ejb3/dev/ejbthree1269/plugin/src/main/resources/installer.xml
Log:
[EJBTHREE-1269] Backmerged with trunk from 72523:72590
Modified: projects/ejb3/dev/ejbthree1269/core/.classpath
===================================================================
--- projects/ejb3/dev/ejbthree1269/core/.classpath 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/core/.classpath 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,3 +1,4 @@
+<<<<<<< .working
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
@@ -266,4 +267,155 @@
<classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
-</classpath>
\ No newline at end of file
+</classpath>=======
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/tests-classes" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/tests-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-avalon/avalon-framework/4.1.5/avalon-framework-4.1.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/bcel/bcel/5.1/bcel-5.1.jar" sourcepath="M2_REPO/bcel/bcel/5.1/bcel-5.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/bsh/bsh/1.3.0/bsh-1.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar" sourcepath="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar" sourcepath="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar" sourcepath="M2_REPO/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/security/jaas/1.0.01/jaas-1.0.01.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/security/jacc/1.0/jacc-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jacorb/jacorb/2.3.0jboss.patch5-brew/jacorb-2.3.0jboss.patch5-brew.jar"/>
+ <classpathentry kind="var" path="M2_REPO/urbanophile/java-getopt/1.0.9/java-getopt-1.0.9.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR7/jboss-aop-2.0.0.CR7.jar" sourcepath="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR7/jboss-aop-2.0.0.CR7-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop-aspects/2.0.0.CR7/jboss-aop-aspects-2.0.0.CR7.jar" sourcepath="M2_REPO/org/jboss/aop/jboss-aop-aspects/2.0.0.CR7/jboss-aop-aspects-2.0.0.CR7-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/aop/jboss-aop-deployer-jdk50/2.0.0.CR8/jboss-aop-deployer-jdk50-2.0.0.CR8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/aop/jboss-aop-jboss4-jdk50/2.0.0.CR8/jboss-aop-jboss4-jdk50-2.0.0.CR8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/aop/jboss-aop-jdk50/2.0.0.CR8/jboss-aop-jdk50-2.0.0.CR8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.0.Beta13/jboss-aop-mc-int-2.0.0.Beta13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-aspects/5.0.0-SNAPSHOT/jboss-as-aspects-5.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-bootstrap/5.0.0-SNAPSHOT/jboss-as-bootstrap-5.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-connector/5.0.0-SNAPSHOT/jboss-as-connector-5.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.0.0-SNAPSHOT/jboss-as-j2se-5.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.0.0-SNAPSHOT/jboss-as-j2se-5.0.0-SNAPSHOT-tests.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.0.0-SNAPSHOT/jboss-as-jmx-5.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-main/5.0.0-SNAPSHOT/jboss-as-main-5.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.0.0-SNAPSHOT/jboss-as-mbeans-5.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-naming/5.0.0-SNAPSHOT/jboss-as-naming-5.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-naming/5.0.0-SNAPSHOT/jboss-as-naming-5.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-profileservice/5.0.0-SNAPSHOT/jboss-as-profileservice-5.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-server/5.0.0-SNAPSHOT/jboss-as-server-5.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-server/5.0.0-SNAPSHOT/jboss-as-server-5.0.0-SNAPSHOT-client.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-server-manager/0.1.0-SNAPSHOT/jboss-as-server-manager-0.1.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system/5.0.0-SNAPSHOT/jboss-as-system-5.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.0.0-SNAPSHOT/jboss-as-system-jmx-5.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloader/2.0.0.Beta11/jboss-classloader-2.0.0.Beta11.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloader/2.0.0.Beta11/jboss-classloader-2.0.0.Beta11-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading/2.0.0.Beta11/jboss-classloading-2.0.0.Beta11.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading/2.0.0.Beta11/jboss-classloading-2.0.0.Beta11-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-classloading-spi/5.0.0.Beta4/jboss-classloading-spi-5.0.0.Beta4.jar" sourcepath="M2_REPO/org/jboss/jboss-classloading-spi/5.0.0.Beta4/jboss-classloading-spi-5.0.0.Beta4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.0.Beta11/jboss-classloading-vfs-2.0.0.Beta11.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.0.Beta11/jboss-classloading-vfs-2.0.0.Beta11-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.2.GA/jboss-common-core-2.0.2.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-core/2.0.2.GA/jboss-common-core-2.0.2.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.5.GA/jboss-common-core-2.2.5.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.5.GA/jboss-common-core-2.2.5.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-container/2.0.0.Beta9/jboss-container-2.0.0.Beta9.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-container/2.0.0.Beta9/jboss-container-2.0.0.Beta9-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-corba-ots-spi/5.0.0.Beta4/jboss-corba-ots-spi-5.0.0.Beta4.jar" sourcepath="M2_REPO/org/jboss/jboss-corba-ots-spi/5.0.0.Beta4/jboss-corba-ots-spi-5.0.0.Beta4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.Beta9/jboss-dependency-2.0.0.Beta9.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.Beta9/jboss-dependency-2.0.0.Beta9-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.0.Beta14/jboss-deployers-client-2.0.0.Beta14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.0.Beta14/jboss-deployers-client-spi-2.0.0.Beta14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-deployers-client-spi/2.0.0.Beta6/jboss-deployers-client-spi-2.0.0.Beta6.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-deployers-client-spi/2.0.0.Beta6/jboss-deployers-client-spi-2.0.0.Beta6-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.0.Beta14/jboss-deployers-core-2.0.0.Beta14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.0.Beta14/jboss-deployers-core-spi-2.0.0.Beta14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-deployers-core-spi/2.0.0.Beta9/jboss-deployers-core-spi-2.0.0.Beta9.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-deployers-core-spi/2.0.0.Beta9/jboss-deployers-core-spi-2.0.0.Beta9-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.0.Beta14/jboss-deployers-impl-2.0.0.Beta14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.0.Beta14/jboss-deployers-spi-2.0.0.Beta14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.0.Beta14/jboss-deployers-structure-spi-2.0.0.Beta14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.0.Beta14/jboss-deployers-vfs-2.0.0.Beta14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.0.Beta14/jboss-deployers-vfs-spi-2.0.0.Beta14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.Beta3Update1/jboss-ejb-api-3.0.0.Beta3Update1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.Beta3Update1/jboss-ejb-api-3.0.0.Beta3Update1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api/0.3/jboss-ejb3-ext-api-0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api-impl/0.3-SNAPSHOT/jboss-ejb3-ext-api-impl-0.3-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-metadata/0.12.1/jboss-ejb3-metadata-0.12.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/embedded/jboss-embedded/beta3-SNAPSHOT/jboss-embedded-beta3-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/cluster/jboss-ha-client/1.0.0.GA/jboss-ha-client-1.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/cluster/jboss-ha-client/1.0.0.GA/jboss-ha-client-1.0.0.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/cluster/jboss-ha-server-api/1.0.0.GA/jboss-ha-server-api-1.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/cluster/jboss-ha-server-api/1.0.0.GA/jboss-ha-server-api-1.0.0.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jacc-api/1.1.0.Beta3Update1/jboss-jacc-api-1.1.0.Beta3Update1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jacc-api/1.1.0.Beta3Update1/jboss-jacc-api-1.1.0.Beta3Update1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jaspi-api/1.0-BETA1/jboss-jaspi-api-1.0-BETA1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jaspi-api/1.0-BETA1/jboss-jaspi-api-1.0-BETA1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-javaee/5.0.0.Beta3/jboss-javaee-5.0.0.Beta3.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-javaee/5.0.0.Beta3/jboss-javaee-5.0.0.Beta3-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxrpc/1.0.4.GA/jboss-jaxrpc-1.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-jaxws/2.0.1.GA/jboss-jaxws-2.0.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jca-api/1.5.0.Beta3Update1/jboss-jca-api-1.5.0.Beta3Update1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jca-api/1.5.0.Beta3Update1/jboss-jca-api-1.5.0.Beta3Update1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jms-api/1.1.0-SNAPSHOT/jboss-jms-api-1.1.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jms-api/1.1.0-SNAPSHOT/jboss-jms-api-1.1.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.Beta9/jboss-kernel-2.0.0.Beta9.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.Beta9/jboss-kernel-2.0.0.Beta9-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.0.0.Beta12/jboss-managed-2.0.0.Beta12.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.0.0.Beta12/jboss-managed-2.0.0.Beta12-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-managed/2.0.0.Beta9/jboss-managed-2.0.0.Beta9.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-managed/2.0.0.Beta9/jboss-managed-2.0.0.Beta9-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/metadata/jboss-metadata/1.0.0-SNAPSHOT/jboss-metadata-1.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/metadata/jboss-metadata/1.0.0.Beta7/jboss-metadata-1.0.0.Beta7-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.Beta12/jboss-metatype-2.0.0.Beta12.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.Beta12/jboss-metatype-2.0.0.Beta12-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-metatype/2.0.0.Beta9/jboss-metatype-2.0.0.Beta9.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-metatype/2.0.0.Beta9/jboss-metatype-2.0.0.Beta9-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-persistence-api/3.0.0.Beta3Update1/jboss-persistence-api-3.0.0.Beta3Update1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-persistence-api/3.0.0.Beta3Update1/jboss-persistence-api-3.0.0.Beta3Update1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.0.Beta12/jboss-reflect-2.0.0.Beta12.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.0.Beta12/jboss-reflect-2.0.0.Beta12-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/remoting/jboss-remoting/2.4.0.CR1/jboss-remoting-2.4.0.CR1.jar" sourcepath="M2_REPO/jboss/remoting/jboss-remoting/2.4.0.CR1/jboss-remoting-2.4.0.CR1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-remoting-aspects/1.0.0-SNAPSHOT/jboss-remoting-aspects-1.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-saaj/3.0.1-native-2.0.4.GA/jboss-saaj-3.0.1-native-2.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-security-aspects/1.0.0-SNAPSHOT/jboss-security-aspects-1.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.Beta6/jboss-security-spi-2.0.2.Beta6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-serialization/1.0.3.GA/jboss-serialization-1.0.3.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-servlet-api/2.5.0-SNAPSHOT/jboss-servlet-api-2.5.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/aop/jboss-standalone-aspect-library-jdk50/2.0.0.CR8/jboss-standalone-aspect-library-jdk50-2.0.0.CR8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.6-SNAPSHOT/jboss-test-1.0.6-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.6-SNAPSHOT/jboss-test-1.0.6-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.20070913080910/jboss-transaction-api-1.0.1.20070913080910.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.20070913080910/jboss-transaction-api-1.0.1.20070913080910-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-transaction-aspects/1.0.0-SNAPSHOT/jboss-transaction-aspects-1.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-transaction-spi/5.0.0.Beta4/jboss-transaction-spi-5.0.0.Beta4.jar" sourcepath="M2_REPO/org/jboss/jboss-transaction-spi/5.0.0.Beta4/jboss-transaction-spi-5.0.0.Beta4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.0.0.Beta8/jboss-vfs-2.0.0.Beta8.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.0.0.Beta8/jboss-vfs-2.0.0.Beta8-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/cache/jbosscache-core/2.1.0.CR4/jbosscache-core-2.1.0.CR4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx/2.0.2.Beta6/jbosssx-2.0.2.Beta6.jar" sourcepath="M2_REPO/org/jboss/security/jbosssx/2.0.2.Beta5/jbosssx-2.0.2.Beta5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/1.0.2.GA/jbossws-spi-1.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR8/jbossxb-2.0.0.CR8.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.CR8/jbossxb-2.0.0.CR8-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jgroups/jgroups/2.6.1/jgroups-2.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jnpserver/5.0.0.Beta4/jnpserver-5.0.0.Beta4.jar" sourcepath="M2_REPO/org/jboss/jnpserver/5.0.0.Beta4/jnpserver-5.0.0.Beta4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jpl-pattern/jpl-pattern/1.0/jpl-pattern-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jpl-util/jpl-util/1.0/jpl-util-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4/mail-1.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar" sourcepath="M2_REPO/qdox/qdox/1.6/qdox-1.6-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/quartz/quartz/1.6.0/quartz-1.6.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/trove/trove/1.0.2/trove-1.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/cache"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/security"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/interceptors"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
+>>>>>>> .merge-right.r72590
Modified: projects/ejb3/dev/ejbthree1269/core/jboss-ejb3-client.xml
===================================================================
--- projects/ejb3/dev/ejbthree1269/core/jboss-ejb3-client.xml 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/core/jboss-ejb3-client.xml 2008-04-22 23:25:58 UTC (rev 72591)
@@ -6,7 +6,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.0.0.xsd"
>
- <id>jboss-ejb3-client</id>
+ <id>client</id>
<formats>
<format>jar</format>
</formats>
Modified: projects/ejb3/dev/ejbthree1269/core/pom.xml
===================================================================
--- projects/ejb3/dev/ejbthree1269/core/pom.xml 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/core/pom.xml 2008-04-22 23:25:58 UTC (rev 72591)
@@ -100,9 +100,7 @@
<descriptors>
<descriptor>jboss-ejb3-client.xml</descriptor>
</descriptors>
- <finalName>jboss-ejb3-client</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <attach>false</attach>
+ <attach>true</attach>
</configuration>
<inherited>false</inherited>
</plugin>
Modified: projects/ejb3/dev/ejbthree1269/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-client.txt
===================================================================
--- projects/ejb3/dev/ejbthree1269/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-client.txt 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-client.txt 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,2 +1,3 @@
jboss-ejb3-ext-api.jar
-jboss-ha-client.jar
\ No newline at end of file
+jboss-ha-client.jar
+jboss-ejb3-core-client.jar
Modified: projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/InjectInterceptorsFactory.java
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/InjectInterceptorsFactory.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/InjectInterceptorsFactory.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -93,10 +93,13 @@
ExtendedAdvisor interceptorAdvisor = ExtendedAdvisorHelper.getExtendedAdvisor(advisor);
for (Method interceptorMethod : ClassHelper.getAllMethods(interceptorClass))
{
- if (interceptorAdvisor
- .isAnnotationPresent(interceptorClass, interceptorMethod, AroundInvoke.class))
+ if (!ClassHelper.isOverridden(interceptorClass, interceptorMethod))
{
- interceptors.add(new EJB3InterceptorInterceptor(interceptorClass, interceptorMethod));
+ if (interceptorAdvisor
+ .isAnnotationPresent(interceptorClass, interceptorMethod, AroundInvoke.class))
+ {
+ interceptors.add(new EJB3InterceptorInterceptor(interceptorClass, interceptorMethod));
+ }
}
}
}
@@ -104,9 +107,12 @@
Class<?> beanClass = advisor.getClazz();
for(Method beanMethod : ClassHelper.getAllMethods(beanClass))
{
- if(advisor.hasAnnotation(beanMethod, AroundInvoke.class))
+ if (!ClassHelper.isOverridden(beanClass, beanMethod))
{
- interceptors.add(new BusinessMethodBeanMethodInterceptor(beanMethod));
+ if(advisor.hasAnnotation(beanMethod, AroundInvoke.class))
+ {
+ interceptors.add(new BusinessMethodBeanMethodInterceptor(beanMethod));
+ }
}
}
return new InterceptorSequencer(interceptors);
Modified: projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/LifecycleCallbackBeanMethodInterceptor.java
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/LifecycleCallbackBeanMethodInterceptor.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/LifecycleCallbackBeanMethodInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -72,6 +72,9 @@
{
method.setAccessible(accessible);
}
+ //Call invocation.invokeNext() since bean class callback methods don't call
+ //InvocationContext.proceed(), and there may be sub-class methods
+ invocation.invokeNext();
return null;
}
catch(InvocationTargetException e)
Modified: projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/LifecycleCallbacks.java
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/LifecycleCallbacks.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/LifecycleCallbacks.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -24,8 +24,14 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.ejb.PostActivate;
+import javax.ejb.PrePassivate;
+
import org.jboss.aop.Advisor;
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.advice.PerVmAdvice;
@@ -42,6 +48,7 @@
{
public static Interceptor[] createLifecycleCallbackInterceptors(Advisor advisor, List<Class<?>> lifecycleInterceptorClasses, BeanContext<?> component, Class<? extends Annotation> lifecycleAnnotationType) throws Exception
{
+ HashSet<Class<?>> classes = new HashSet<Class<?>>();
List<Interceptor> interceptors = new ArrayList<Interceptor>();
// 12.7 footnote 57: ignore method level interceptors
// The lifecycle callbacks on the interceptors must be invoked in order
@@ -51,9 +58,14 @@
ExtendedAdvisor interceptorAdvisor = ExtendedAdvisorHelper.getExtendedAdvisor(advisor, interceptor);
for(Method interceptorMethod : ClassHelper.getAllMethods(interceptorClass))
{
- if(interceptorAdvisor.isAnnotationPresent(interceptorClass, interceptorMethod, lifecycleAnnotationType))
+ if (!ClassHelper.isOverridden(interceptorClass, interceptorMethod))
{
- interceptors.add(new LifecycleCallbackInterceptorMethodInterceptor(interceptor, interceptorMethod));
+ //Only a candidate for a lifecycle method if not overridden
+ if(interceptorAdvisor.isAnnotationPresent(interceptorClass, interceptorMethod, lifecycleAnnotationType)) //For Xml this returns true sometimes
+ {
+ checkClass(classes, interceptorMethod, advisor, lifecycleAnnotationType);
+ interceptors.add(new LifecycleCallbackInterceptorMethodInterceptor(interceptor, interceptorMethod));
+ }
}
}
}
@@ -62,9 +74,13 @@
Class<?> beanClass = advisor.getClazz();
for(Method beanMethod : ClassHelper.getAllMethods(beanClass))
{
- if(advisor.hasAnnotation(beanMethod, lifecycleAnnotationType))
+ if (!ClassHelper.isOverridden(beanClass, beanMethod))
{
- interceptors.add(new LifecycleCallbackBeanMethodInterceptor(beanMethod));
+ if(advisor.hasAnnotation(beanMethod, lifecycleAnnotationType))
+ {
+ checkClass(classes, beanMethod, advisor, lifecycleAnnotationType);
+ interceptors.add(new LifecycleCallbackBeanMethodInterceptor(beanMethod));
+ }
}
}
@@ -72,4 +88,30 @@
return interceptors.toArray(new Interceptor[0]);
}
+
+ private static void checkClass(HashSet<Class<?>> classes, Method m, Advisor advisor, Class<? extends Annotation> lifecycleAnnotationType)
+ {
+ if (classes.contains(m.getDeclaringClass()))
+ {
+ String type = null;
+ if (lifecycleAnnotationType == PostConstruct.class)
+ {
+ type = "post-construct";
+ }
+ else if (lifecycleAnnotationType == PreDestroy.class)
+ {
+ type = "pre-destroy";
+ }
+ else if (lifecycleAnnotationType == PostActivate.class)
+ {
+ type = "post-activate";
+ }
+ else if (lifecycleAnnotationType == PrePassivate.class)
+ {
+ type = "pre-passivate";
+ }
+ throw new RuntimeException("More than one '" + type + "' method in " + advisor.getName());
+ }
+ classes.add(m.getDeclaringClass());
+ }
}
Modified: projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/lang/ClassHelper.java
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/lang/ClassHelper.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/lang/ClassHelper.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -82,6 +82,47 @@
}
/**
+ * Returns the method with the specified method name and parameters.
+ *
+ * @param cls
+ * @param methodName
+ * @param params
+ * @return
+ * @throws NoSuchMethodException
+ */
+ public static Method getMethod(Class<?> cls, String methodName, Class<?> ... params) throws NoSuchMethodException
+ {
+ if(cls == null)
+ {
+ throw new NoSuchMethodException("Class is null " + methodName);
+ }
+
+ Method m = getDeclaredMethod(cls, methodName, params);
+ if (m == null)
+ {
+ throw new NoSuchMethodException("No method named " + methodName + " in " + cls + " (or super classes)");
+ }
+ return m;
+ }
+
+ private static Method getDeclaredMethod(Class<?> cls, String methodName, Class<?> ... params)
+ {
+ try
+ {
+ return cls.getDeclaredMethod(methodName, params);
+ }
+ catch (NoSuchMethodException e1)
+ {
+ }
+
+ if (cls == Object.class)
+ {
+ return null;
+ }
+
+ return getDeclaredMethod(cls.getSuperclass(), methodName, params);
+ }
+ /**
* Returns all public, private and package protected methods including
* inherited ones in a map indexed by name.
*
@@ -125,4 +166,21 @@
for(Method method : cls.getDeclaredMethods())
methods.add(method);
}
+
+ public static boolean isOverridden(Class<?> icptr, Method method)
+ {
+ try
+ {
+ Method bottomMethod = getMethod(icptr, method.getName(), method.getParameterTypes());
+ if (bottomMethod.getDeclaringClass() == method.getDeclaringClass())
+ {
+ return false;
+ }
+ return true;
+ }
+ catch (NoSuchMethodException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
}
Modified: projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/BeanInterceptorMetaDataBridge.java
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/BeanInterceptorMetaDataBridge.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/BeanInterceptorMetaDataBridge.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -50,7 +50,6 @@
import org.jboss.ejb3.interceptors.util.InterceptorCollection;
import org.jboss.ejb3.metadata.MetaDataBridge;
import org.jboss.logging.Logger;
-import org.jboss.metadata.ejb.jboss.JBossAssemblyDescriptorMetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
import org.jboss.metadata.ejb.jboss.JBossMessageDrivenBeanMetaData;
@@ -326,6 +325,12 @@
continue;
List<Method> methods = methodMap.get(method.getMethodName());
+
+ if (methods == null)
+ {
+ 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);
Modified: projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/InterceptorMetaDataBridge.java
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/InterceptorMetaDataBridge.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/InterceptorMetaDataBridge.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -47,6 +47,13 @@
{
private static final Logger log = Logger.getLogger(InterceptorMetaDataBridge.class);
+ public InterceptorMetaDataBridge()
+ {
+ // FIXME InterceptorMetaDataBridge constructor
+ System.out.println("======> Creating interceptor metadata bridge");
+
+ }
+
@Override
public <A extends Annotation> A retrieveAnnotation(Class<A> annotationClass, InterceptorMetaData metaData, ClassLoader classLoader)
{
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance)
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedBase.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedBase.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedBase.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,55 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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;
-import javax.annotation.PreDestroy;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class AnnotatedBase
-{
- @PostConstruct
- public void basePostConstruct()
- {
- Interceptions.addPostConstruct(AnnotatedBase.class);
- }
-
- @PreDestroy
- public void basePreDestroy()
- {
- Interceptions.addPreDestroy(AnnotatedBase.class);
- }
-
- @AroundInvoke
- public Object baseAround(InvocationContext ctx) throws Exception
- {
- Interceptions.addAroundInvoke(AnnotatedBase.class);
- return ctx.proceed();
- }
-}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedBase.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedBase.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedBase.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedBase.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,55 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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;
+import javax.annotation.PreDestroy;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class AnnotatedBase
+{
+ @PostConstruct
+ public void basePostConstruct()
+ {
+ Interceptions.addPostConstruct(AnnotatedBase.class);
+ }
+
+ @PreDestroy
+ public void basePreDestroy()
+ {
+ Interceptions.addPreDestroy(AnnotatedBase.class);
+ }
+
+ @AroundInvoke
+ public Object baseAround(InvocationContext ctx) throws Exception
+ {
+ Interceptions.addAroundInvoke(AnnotatedBase.class);
+ return ctx.proceed();
+ }
+}
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedBean.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedBean.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedBean.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,63 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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;
-import javax.annotation.PreDestroy;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptors;
-import javax.interceptor.InvocationContext;
-
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
- at Interceptors(ClassInterceptor.class)
-public class AnnotatedBean extends AnnotatedBase implements MyInterface
-{
- @Interceptors(MethodInterceptor.class)
- public void method()
- {
-
- }
-
- @AroundInvoke
- public Object around(InvocationContext ctx) throws Exception
- {
- Interceptions.addAroundInvoke(AnnotatedBean.class);
- return ctx.proceed();
- }
-
- @PostConstruct
- public void postConstruct()
- {
- Interceptions.addPostConstruct(AnnotatedBean.class);
- }
-
- @PreDestroy
- public void preDestroy()
- {
- Interceptions.addPreDestroy(AnnotatedBean.class);
- }
-}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedBean.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedBean.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedBean.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedBean.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,63 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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;
+import javax.annotation.PreDestroy;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptors;
+import javax.interceptor.InvocationContext;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Interceptors(ClassInterceptor.class)
+public class AnnotatedBean extends AnnotatedBase implements MyInterface
+{
+ @Interceptors(MethodInterceptor.class)
+ public void method()
+ {
+
+ }
+
+ @AroundInvoke
+ public Object around(InvocationContext ctx) throws Exception
+ {
+ Interceptions.addAroundInvoke(AnnotatedBean.class);
+ return ctx.proceed();
+ }
+
+ @PostConstruct
+ public void postConstruct()
+ {
+ Interceptions.addPostConstruct(AnnotatedBean.class);
+ }
+
+ @PreDestroy
+ public void preDestroy()
+ {
+ Interceptions.addPreDestroy(AnnotatedBean.class);
+ }
+}
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedOverrideBean.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedOverrideBean.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedOverrideBean.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,85 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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;
-import javax.annotation.PreDestroy;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptors;
-import javax.interceptor.InvocationContext;
-
-/**
- * Overrides the interceptor and callback methods from the superclass
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
- at Interceptors(ClassOverrideInterceptor.class)
-public class AnnotatedOverrideBean extends AnnotatedBean
-{
- @Interceptors(MethodOverrideInterceptor.class)
- public void method()
- {
-
- }
-
- @AroundInvoke
- @Override
- public Object around(InvocationContext ctx) throws Exception
- {
- Interceptions.addAroundInvoke(AnnotatedOverrideBean.class);
- return ctx.proceed();
- }
-
- @PostConstruct
- @Override
- public void postConstruct()
- {
- Interceptions.addPostConstruct(AnnotatedOverrideBean.class);
- }
-
- @PreDestroy
- @Override
- public void preDestroy()
- {
- Interceptions.addPreDestroy(AnnotatedOverrideBean.class);
- }
-
- @Override
- public void basePostConstruct()
- {
- throw new RuntimeException("Should never get called");
- }
-
- @Override
- public void basePreDestroy()
- {
- throw new RuntimeException("Should never get called");
- }
-
- @Override
- public Object baseAround(InvocationContext ctx) throws Exception
- {
- throw new RuntimeException("Should never get called");
- }
-
-}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedOverrideBean.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedOverrideBean.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedOverrideBean.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/AnnotatedOverrideBean.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,85 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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;
+import javax.annotation.PreDestroy;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptors;
+import javax.interceptor.InvocationContext;
+
+/**
+ * Overrides the interceptor and callback methods from the superclass
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Interceptors(ClassOverrideInterceptor.class)
+public class AnnotatedOverrideBean extends AnnotatedBean
+{
+ @Interceptors(MethodOverrideInterceptor.class)
+ public void method()
+ {
+
+ }
+
+ @AroundInvoke
+ @Override
+ public Object around(InvocationContext ctx) throws Exception
+ {
+ Interceptions.addAroundInvoke(AnnotatedOverrideBean.class);
+ return ctx.proceed();
+ }
+
+ @PostConstruct
+ @Override
+ public void postConstruct()
+ {
+ Interceptions.addPostConstruct(AnnotatedOverrideBean.class);
+ }
+
+ @PreDestroy
+ @Override
+ public void preDestroy()
+ {
+ Interceptions.addPreDestroy(AnnotatedOverrideBean.class);
+ }
+
+ @Override
+ public void basePostConstruct()
+ {
+ throw new RuntimeException("Should never get called");
+ }
+
+ @Override
+ public void basePreDestroy()
+ {
+ throw new RuntimeException("Should never get called");
+ }
+
+ @Override
+ public Object baseAround(InvocationContext ctx) throws Exception
+ {
+ throw new RuntimeException("Should never get called");
+ }
+
+}
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassBaseInterceptor.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassBaseInterceptor.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassBaseInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,72 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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;
-import javax.annotation.PreDestroy;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class ClassBaseInterceptor
-{
- @PostConstruct
- public void basePostConstruct(InvocationContext ctx)
- {
- try
- {
- Interceptions.addPostConstruct(ClassBaseInterceptor.class);
- ctx.proceed();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
-
- @PreDestroy
- public void basePreDestroy(InvocationContext ctx)
- {
- try
- {
- Interceptions.addPreDestroy(ClassBaseInterceptor.class);
- ctx.proceed();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
-
- @AroundInvoke
- public Object baseAround(InvocationContext ctx) throws Exception
- {
- Interceptions.addAroundInvoke(ClassBaseInterceptor.class);
- return ctx.proceed();
- }
-
-}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassBaseInterceptor.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassBaseInterceptor.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassBaseInterceptor.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassBaseInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,72 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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;
+import javax.annotation.PreDestroy;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class ClassBaseInterceptor
+{
+ @PostConstruct
+ public void basePostConstruct(InvocationContext ctx)
+ {
+ try
+ {
+ Interceptions.addPostConstruct(ClassBaseInterceptor.class);
+ ctx.proceed();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @PreDestroy
+ public void basePreDestroy(InvocationContext ctx)
+ {
+ try
+ {
+ Interceptions.addPreDestroy(ClassBaseInterceptor.class);
+ ctx.proceed();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @AroundInvoke
+ public Object baseAround(InvocationContext ctx) throws Exception
+ {
+ Interceptions.addAroundInvoke(ClassBaseInterceptor.class);
+ return ctx.proceed();
+ }
+
+}
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassInterceptor.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassInterceptor.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,71 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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;
-import javax.annotation.PreDestroy;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class ClassInterceptor extends ClassBaseInterceptor
-{
- @AroundInvoke
- public Object around(InvocationContext ctx) throws Exception
- {
- Interceptions.addAroundInvoke(ClassInterceptor.class);
- return ctx.proceed();
- }
-
- @PostConstruct
- public void postConstruct(InvocationContext ctx)
- {
- try
- {
- Interceptions.addPostConstruct(ClassInterceptor.class);
- ctx.proceed();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
-
- @PreDestroy
- public void preDestroy(InvocationContext ctx)
- {
- try
- {
- Interceptions.addPreDestroy(ClassInterceptor.class);
- ctx.proceed();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
-}
\ No newline at end of file
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassInterceptor.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassInterceptor.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassInterceptor.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,71 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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;
+import javax.annotation.PreDestroy;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class ClassInterceptor extends ClassBaseInterceptor
+{
+ @AroundInvoke
+ public Object around(InvocationContext ctx) throws Exception
+ {
+ Interceptions.addAroundInvoke(ClassInterceptor.class);
+ return ctx.proceed();
+ }
+
+ @PostConstruct
+ public void postConstruct(InvocationContext ctx)
+ {
+ try
+ {
+ Interceptions.addPostConstruct(ClassInterceptor.class);
+ ctx.proceed();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @PreDestroy
+ public void preDestroy(InvocationContext ctx)
+ {
+ try
+ {
+ Interceptions.addPreDestroy(ClassInterceptor.class);
+ ctx.proceed();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+}
\ No newline at end of file
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassOverrideInterceptor.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassOverrideInterceptor.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassOverrideInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,92 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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;
-import javax.annotation.PreDestroy;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * Overrides the interceptor and callback methods from the superclass
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class ClassOverrideInterceptor extends ClassInterceptor
-{
- @AroundInvoke
- @Override
- public Object around(InvocationContext ctx) throws Exception
- {
- Interceptions.addAroundInvoke(ClassOverrideInterceptor.class);
- return ctx.proceed();
- }
-
- @PostConstruct
- @Override
- public void postConstruct(InvocationContext ctx)
- {
- try
- {
- Interceptions.addPostConstruct(ClassOverrideInterceptor.class);
- ctx.proceed();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
-
- @PreDestroy
- @Override
- public void preDestroy(InvocationContext ctx)
- {
- try
- {
- Interceptions.addPreDestroy(ClassOverrideInterceptor.class);
- ctx.proceed();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public void basePostConstruct(InvocationContext ctx)
- {
- throw new RuntimeException("Should never get called");
- }
-
- @Override
- public void basePreDestroy(InvocationContext ctx)
- {
- throw new RuntimeException("Should never get called");
- }
-
- @Override
- public Object baseAround(InvocationContext ctx) throws Exception
- {
- throw new RuntimeException("Should never get called");
- }
-}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassOverrideInterceptor.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassOverrideInterceptor.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassOverrideInterceptor.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/ClassOverrideInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,92 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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;
+import javax.annotation.PreDestroy;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * Overrides the interceptor and callback methods from the superclass
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class ClassOverrideInterceptor extends ClassInterceptor
+{
+ @AroundInvoke
+ @Override
+ public Object around(InvocationContext ctx) throws Exception
+ {
+ Interceptions.addAroundInvoke(ClassOverrideInterceptor.class);
+ return ctx.proceed();
+ }
+
+ @PostConstruct
+ @Override
+ public void postConstruct(InvocationContext ctx)
+ {
+ try
+ {
+ Interceptions.addPostConstruct(ClassOverrideInterceptor.class);
+ ctx.proceed();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @PreDestroy
+ @Override
+ public void preDestroy(InvocationContext ctx)
+ {
+ try
+ {
+ Interceptions.addPreDestroy(ClassOverrideInterceptor.class);
+ ctx.proceed();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public void basePostConstruct(InvocationContext ctx)
+ {
+ throw new RuntimeException("Should never get called");
+ }
+
+ @Override
+ public void basePreDestroy(InvocationContext ctx)
+ {
+ throw new RuntimeException("Should never get called");
+ }
+
+ @Override
+ public Object baseAround(InvocationContext ctx) throws Exception
+ {
+ throw new RuntimeException("Should never get called");
+ }
+}
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/Interceptions.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/Interceptions.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/Interceptions.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,73 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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 java.util.ArrayList;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class Interceptions
-{
- private static ArrayList<Class<?>> aroundInvokes = new ArrayList<Class<?>>();
- private static ArrayList<Class<?>> postConstructs = new ArrayList<Class<?>>();
- private static ArrayList<Class<?>> preDestroys = new ArrayList<Class<?>>();
-
- public static void addAroundInvoke(Class<?> clazz)
- {
- aroundInvokes.add(clazz);
- }
-
- public static void addPostConstruct(Class<?> clazz)
- {
- postConstructs.add(clazz);
- }
-
- public static void addPreDestroy(Class<?> clazz)
- {
- preDestroys.add(clazz);
- }
-
- public static void clear()
- {
- aroundInvokes.clear();
- postConstructs.clear();
- preDestroys.clear();
- }
-
- public static ArrayList<Class<?>> getAroundInvokes()
- {
- return aroundInvokes;
- }
-
- public static ArrayList<Class<?>> getPostConstructs()
- {
- return postConstructs;
- }
-
- public static ArrayList<Class<?>> getPreDestroys()
- {
- return preDestroys;
- }
-}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/Interceptions.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/Interceptions.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/Interceptions.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/Interceptions.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,73 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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 java.util.ArrayList;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class Interceptions
+{
+ private static ArrayList<Class<?>> aroundInvokes = new ArrayList<Class<?>>();
+ private static ArrayList<Class<?>> postConstructs = new ArrayList<Class<?>>();
+ private static ArrayList<Class<?>> preDestroys = new ArrayList<Class<?>>();
+
+ public static void addAroundInvoke(Class<?> clazz)
+ {
+ aroundInvokes.add(clazz);
+ }
+
+ public static void addPostConstruct(Class<?> clazz)
+ {
+ postConstructs.add(clazz);
+ }
+
+ public static void addPreDestroy(Class<?> clazz)
+ {
+ preDestroys.add(clazz);
+ }
+
+ public static void clear()
+ {
+ aroundInvokes.clear();
+ postConstructs.clear();
+ preDestroys.clear();
+ }
+
+ public static ArrayList<Class<?>> getAroundInvokes()
+ {
+ return aroundInvokes;
+ }
+
+ public static ArrayList<Class<?>> getPostConstructs()
+ {
+ return postConstructs;
+ }
+
+ public static ArrayList<Class<?>> getPreDestroys()
+ {
+ return preDestroys;
+ }
+}
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodBaseInterceptor.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodBaseInterceptor.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodBaseInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,41 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class MethodBaseInterceptor
-{
- @AroundInvoke
- public Object baseAround(InvocationContext ctx) throws Exception
- {
- Interceptions.addAroundInvoke(MethodBaseInterceptor.class);
- return ctx.proceed();
- }
-}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodBaseInterceptor.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodBaseInterceptor.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodBaseInterceptor.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodBaseInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,41 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class MethodBaseInterceptor
+{
+ @AroundInvoke
+ public Object baseAround(InvocationContext ctx) throws Exception
+ {
+ Interceptions.addAroundInvoke(MethodBaseInterceptor.class);
+ return ctx.proceed();
+ }
+}
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodInterceptor.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodInterceptor.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,42 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class MethodInterceptor extends MethodBaseInterceptor
-{
- @AroundInvoke
- public Object around(InvocationContext ctx) throws Exception
- {
- Interceptions.addAroundInvoke(MethodInterceptor.class);
- return ctx.proceed();
- }
-
-}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodInterceptor.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodInterceptor.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodInterceptor.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,42 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class MethodInterceptor extends MethodBaseInterceptor
+{
+ @AroundInvoke
+ public Object around(InvocationContext ctx) throws Exception
+ {
+ Interceptions.addAroundInvoke(MethodInterceptor.class);
+ return ctx.proceed();
+ }
+
+}
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodOverrideInterceptor.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodOverrideInterceptor.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodOverrideInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,47 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class MethodOverrideInterceptor extends MethodInterceptor
-{
- @AroundInvoke
- @Override
- public Object around(InvocationContext ctx) throws Exception
- {
- Interceptions.addAroundInvoke(MethodOverrideInterceptor.class);
- return ctx.proceed();
- }
-
- @Override
- public Object baseAround(InvocationContext ctx) throws Exception
- {
- throw new RuntimeException("Should never get called");
- }
-}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodOverrideInterceptor.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodOverrideInterceptor.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodOverrideInterceptor.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MethodOverrideInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,47 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class MethodOverrideInterceptor extends MethodInterceptor
+{
+ @AroundInvoke
+ @Override
+ public Object around(InvocationContext ctx) throws Exception
+ {
+ Interceptions.addAroundInvoke(MethodOverrideInterceptor.class);
+ return ctx.proceed();
+ }
+
+ @Override
+ public Object baseAround(InvocationContext ctx) throws Exception
+ {
+ throw new RuntimeException("Should never get called");
+ }
+}
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MyInterface.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MyInterface.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MyInterface.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,32 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public interface MyInterface
-{
- void method();
-}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MyInterface.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MyInterface.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MyInterface.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/MyInterface.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,32 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface MyInterface
+{
+ void method();
+}
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlBase.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlBase.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlBase.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,49 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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.interceptor.InvocationContext;
-
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class XmlBase
-{
- public Object baseAround(InvocationContext ctx) throws Exception
- {
- Interceptions.addAroundInvoke(XmlBase.class);
- return ctx.proceed();
- }
-
- public void basePreDestroy()
- {
- Interceptions.addPreDestroy(XmlBase.class);
- }
-
- public void basePostConstruct()
- {
- Interceptions.addPostConstruct(XmlBase.class);
- }
- }
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlBase.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlBase.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlBase.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlBase.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,49 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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.interceptor.InvocationContext;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class XmlBase
+{
+ public Object baseAround(InvocationContext ctx) throws Exception
+ {
+ Interceptions.addAroundInvoke(XmlBase.class);
+ return ctx.proceed();
+ }
+
+ public void basePreDestroy()
+ {
+ Interceptions.addPreDestroy(XmlBase.class);
+ }
+
+ public void basePostConstruct()
+ {
+ Interceptions.addPostConstruct(XmlBase.class);
+ }
+ }
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlBean.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlBean.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlBean.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,54 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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.interceptor.InvocationContext;
-
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class XmlBean extends XmlBase
-{
- public void method()
- {
-
- }
-
- public Object around(InvocationContext ctx) throws Exception
- {
- Interceptions.addAroundInvoke(XmlBean.class);
- return ctx.proceed();
- }
-
- public void postConstruct()
- {
- Interceptions.addPostConstruct(XmlBean.class);
- }
-
- public void preDestroy()
- {
- Interceptions.addPreDestroy(XmlBean.class);
- }
-}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlBean.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlBean.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlBean.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlBean.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,54 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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.interceptor.InvocationContext;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class XmlBean extends XmlBase
+{
+ public void method()
+ {
+
+ }
+
+ public Object around(InvocationContext ctx) throws Exception
+ {
+ Interceptions.addAroundInvoke(XmlBean.class);
+ return ctx.proceed();
+ }
+
+ public void postConstruct()
+ {
+ Interceptions.addPostConstruct(XmlBean.class);
+ }
+
+ public void preDestroy()
+ {
+ Interceptions.addPreDestroy(XmlBean.class);
+ }
+}
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassBaseInterceptor.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassBaseInterceptor.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassBaseInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,65 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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.interceptor.InvocationContext;
-
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class XmlClassBaseInterceptor
-{
- public Object baseAround(InvocationContext ctx) throws Exception
- {
- Interceptions.addAroundInvoke(XmlClassBaseInterceptor.class);
- return ctx.proceed();
- }
-
- public void basePostConstruct(InvocationContext ctx)
- {
- try
- {
- Interceptions.addPostConstruct(XmlClassBaseInterceptor.class);
- ctx.proceed();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
-
- public void basePreDestroy(InvocationContext ctx)
- {
- try
- {
- Interceptions.addPreDestroy(XmlClassBaseInterceptor.class);
- ctx.proceed();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
-}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassBaseInterceptor.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassBaseInterceptor.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassBaseInterceptor.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassBaseInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,65 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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.interceptor.InvocationContext;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class XmlClassBaseInterceptor
+{
+ public Object baseAround(InvocationContext ctx) throws Exception
+ {
+ Interceptions.addAroundInvoke(XmlClassBaseInterceptor.class);
+ return ctx.proceed();
+ }
+
+ public void basePostConstruct(InvocationContext ctx)
+ {
+ try
+ {
+ Interceptions.addPostConstruct(XmlClassBaseInterceptor.class);
+ ctx.proceed();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public void basePreDestroy(InvocationContext ctx)
+ {
+ try
+ {
+ Interceptions.addPreDestroy(XmlClassBaseInterceptor.class);
+ ctx.proceed();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+}
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassInterceptor.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassInterceptor.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,65 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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.interceptor.InvocationContext;
-
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class XmlClassInterceptor extends XmlClassBaseInterceptor
-{
- public Object around(InvocationContext ctx) throws Exception
- {
- Interceptions.addAroundInvoke(XmlClassInterceptor.class);
- return ctx.proceed();
- }
-
- public void postConstruct(InvocationContext ctx)
- {
- try
- {
- Interceptions.addPostConstruct(XmlClassInterceptor.class);
- ctx.proceed();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
-
- public void preDestroy(InvocationContext ctx)
- {
- try
- {
- Interceptions.addPreDestroy(XmlClassInterceptor.class);
- ctx.proceed();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
-}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassInterceptor.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassInterceptor.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassInterceptor.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,65 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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.interceptor.InvocationContext;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class XmlClassInterceptor extends XmlClassBaseInterceptor
+{
+ public Object around(InvocationContext ctx) throws Exception
+ {
+ Interceptions.addAroundInvoke(XmlClassInterceptor.class);
+ return ctx.proceed();
+ }
+
+ public void postConstruct(InvocationContext ctx)
+ {
+ try
+ {
+ Interceptions.addPostConstruct(XmlClassInterceptor.class);
+ ctx.proceed();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public void preDestroy(InvocationContext ctx)
+ {
+ try
+ {
+ Interceptions.addPreDestroy(XmlClassInterceptor.class);
+ ctx.proceed();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+}
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassOverrideInterceptor.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassOverrideInterceptor.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassOverrideInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,68 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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.interceptor.InvocationContext;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class XmlClassOverrideInterceptor extends XmlClassInterceptor
-{
- @Override
- public Object around(InvocationContext ctx) throws Exception
- {
- Interceptions.addAroundInvoke(XmlClassOverrideInterceptor.class);
- return ctx.proceed();
- }
-
- @Override
- public void postConstruct(InvocationContext ctx)
- {
- try
- {
- Interceptions.addPostConstruct(XmlClassOverrideInterceptor.class);
- ctx.proceed();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public void preDestroy(InvocationContext ctx)
- {
- try
- {
- Interceptions.addPreDestroy(XmlClassOverrideInterceptor.class);
- ctx.proceed();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
-
-}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassOverrideInterceptor.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassOverrideInterceptor.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassOverrideInterceptor.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlClassOverrideInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,68 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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.interceptor.InvocationContext;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class XmlClassOverrideInterceptor extends XmlClassInterceptor
+{
+ @Override
+ public Object around(InvocationContext ctx) throws Exception
+ {
+ Interceptions.addAroundInvoke(XmlClassOverrideInterceptor.class);
+ return ctx.proceed();
+ }
+
+ @Override
+ public void postConstruct(InvocationContext ctx)
+ {
+ try
+ {
+ Interceptions.addPostConstruct(XmlClassOverrideInterceptor.class);
+ ctx.proceed();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public void preDestroy(InvocationContext ctx)
+ {
+ try
+ {
+ Interceptions.addPreDestroy(XmlClassOverrideInterceptor.class);
+ ctx.proceed();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+}
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodBaseInterceptor.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodBaseInterceptor.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodBaseInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,40 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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.interceptor.InvocationContext;
-
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class XmlMethodBaseInterceptor
-{
- public Object baseAround(InvocationContext ctx) throws Exception
- {
- Interceptions.addAroundInvoke(XmlMethodBaseInterceptor.class);
- return ctx.proceed();
- }
-
-}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodBaseInterceptor.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodBaseInterceptor.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodBaseInterceptor.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodBaseInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,40 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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.interceptor.InvocationContext;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class XmlMethodBaseInterceptor
+{
+ public Object baseAround(InvocationContext ctx) throws Exception
+ {
+ Interceptions.addAroundInvoke(XmlMethodBaseInterceptor.class);
+ return ctx.proceed();
+ }
+
+}
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodInterceptor.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodInterceptor.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,39 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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.interceptor.InvocationContext;
-
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class XmlMethodInterceptor extends XmlMethodBaseInterceptor
-{
- public Object around(InvocationContext ctx) throws Exception
- {
- Interceptions.addAroundInvoke(XmlMethodInterceptor.class);
- return ctx.proceed();
- }
-}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodInterceptor.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodInterceptor.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodInterceptor.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,39 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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.interceptor.InvocationContext;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class XmlMethodInterceptor extends XmlMethodBaseInterceptor
+{
+ public Object around(InvocationContext ctx) throws Exception
+ {
+ Interceptions.addAroundInvoke(XmlMethodInterceptor.class);
+ return ctx.proceed();
+ }
+}
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodOverrideInterceptor.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodOverrideInterceptor.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodOverrideInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,42 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class XmlMethodOverrideInterceptor extends XmlMethodInterceptor
-{
- @AroundInvoke
- @Override
- public Object around(InvocationContext ctx) throws Exception
- {
- Interceptions.addAroundInvoke(XmlMethodOverrideInterceptor.class);
- return ctx.proceed();
- }
-
-}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodOverrideInterceptor.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodOverrideInterceptor.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodOverrideInterceptor.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlMethodOverrideInterceptor.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,42 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class XmlMethodOverrideInterceptor extends XmlMethodInterceptor
+{
+ @AroundInvoke
+ @Override
+ public Object around(InvocationContext ctx) throws Exception
+ {
+ Interceptions.addAroundInvoke(XmlMethodOverrideInterceptor.class);
+ return ctx.proceed();
+ }
+
+}
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlOverrideBean.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlOverrideBean.java 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlOverrideBean.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,58 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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.interceptor.Interceptors;
-import javax.interceptor.InvocationContext;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class XmlOverrideBean extends XmlBean
-{
- @Interceptors(MethodOverrideInterceptor.class)
- public void method()
- {
-
- }
-
- @Override
- public Object around(InvocationContext ctx) throws Exception
- {
- Interceptions.addAroundInvoke(XmlOverrideBean.class);
- return ctx.proceed();
- }
-
- @Override
- public void postConstruct()
- {
- Interceptions.addPostConstruct(XmlOverrideBean.class);
- }
-
- @Override
- public void preDestroy()
- {
- Interceptions.addPreDestroy(XmlOverrideBean.class);
- }
-}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlOverrideBean.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlOverrideBean.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlOverrideBean.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/XmlOverrideBean.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,58 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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.interceptor.Interceptors;
+import javax.interceptor.InvocationContext;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class XmlOverrideBean extends XmlBean
+{
+ @Interceptors(MethodOverrideInterceptor.class)
+ public void method()
+ {
+
+ }
+
+ @Override
+ public Object around(InvocationContext ctx) throws Exception
+ {
+ Interceptions.addAroundInvoke(XmlOverrideBean.class);
+ return ctx.proceed();
+ }
+
+ @Override
+ public void postConstruct()
+ {
+ Interceptions.addPostConstruct(XmlOverrideBean.class);
+ }
+
+ @Override
+ public void preDestroy()
+ {
+ Interceptions.addPreDestroy(XmlOverrideBean.class);
+ }
+}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/unit (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/unit)
Deleted: projects/ejb3/dev/ejbthree1269/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-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/unit/InheritanceTestCase.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,325 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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.unit;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.aop.AspectManager;
-import org.jboss.aspects.common.AOPDeployer;
-import org.jboss.ejb3.interceptors.container.BeanContext;
-import org.jboss.ejb3.interceptors.direct.AbstractDirectContainer;
-import org.jboss.ejb3.interceptors.metadata.AdditiveBeanInterceptorMetaDataBridge;
-import org.jboss.ejb3.interceptors.metadata.InterceptorComponentMetaDataLoaderFactory;
-import org.jboss.ejb3.interceptors.metadata.InterceptorMetaDataBridge;
-import org.jboss.ejb3.interceptors.proxy.ProxyContainer;
-import org.jboss.ejb3.metadata.MetaDataBridge;
-import org.jboss.ejb3.metadata.annotation.AnnotationRepositoryToMetaData;
-import org.jboss.ejb3.test.interceptors.inheritance.AnnotatedBase;
-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.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.XmlBase;
-import org.jboss.ejb3.test.interceptors.inheritance.XmlBean;
-import org.jboss.ejb3.test.interceptors.inheritance.XmlClassBaseInterceptor;
-import org.jboss.ejb3.test.interceptors.inheritance.XmlClassInterceptor;
-import org.jboss.ejb3.test.interceptors.inheritance.XmlClassOverrideInterceptor;
-import org.jboss.ejb3.test.interceptors.inheritance.XmlMethodBaseInterceptor;
-import org.jboss.ejb3.test.interceptors.inheritance.XmlMethodInterceptor;
-import org.jboss.ejb3.test.interceptors.inheritance.XmlOverrideBean;
-import org.jboss.logging.Logger;
-import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
-import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
-import org.jboss.metadata.ejb.spec.InterceptorMetaData;
-import org.jboss.xb.binding.JBossXBException;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
-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>
- * @version $Revision: 1.1 $
- */
-public class InheritanceTestCase extends TestCase
-{
- private static final Logger log = Logger.getLogger(InheritanceTestCase.class);
-
- private class MyContainer<T> extends AbstractDirectContainer<T, MyContainer<T>>
- {
- public MyContainer(String name, String domainName, Class<? extends T> beanClass, JBossEnterpriseBeanMetaData beanMetaData)
- {
- super();
-
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- AnnotationRepositoryToMetaData annotations = new AnnotationRepositoryToMetaData(beanClass, beanMetaData, name, classLoader);
- List<MetaDataBridge<InterceptorMetaData>> interceptorBridges = new ArrayList<MetaDataBridge<InterceptorMetaData>>();
- interceptorBridges.add(new InterceptorMetaDataBridge());
- annotations.addComponentMetaDataLoaderFactory(new InterceptorComponentMetaDataLoaderFactory(interceptorBridges));
- annotations.addMetaDataBridge(new AdditiveBeanInterceptorMetaDataBridge(beanClass, classLoader, beanMetaData));
-
- initializeAdvisor(name, getDomain(domainName), beanClass, annotations);
- }
-
- public void testAdvisor()
- {
- MyContainer<?> container = getAdvisor().getContainer();
- assertNotNull("container not set in managed object advisor", container);
- assertTrue(container == this);
- }
- }
-
- protected static SchemaBindingResolver schemaResolverForClass(final Class<?> root)
- {
- return new SchemaBindingResolver()
- {
- public String getBaseURI()
- {
- return null;
- }
-
- public SchemaBinding resolve(String nsUri, String baseURI, String schemaLocation)
- {
- return JBossXBBuilder.build(root);
- }
-
- public LSInput resolveAsLSInput(String nsUri, String baseUri, String schemaLocation)
- {
- return null;
- }
-
- public void setBaseURI(String baseURI)
- {
- }
- };
- }
-
- // FIXME: use the right jboss-aop.xml
- AOPDeployer deployer = new AOPDeployer("proxy/jboss-aop.xml");
-
- @Override
- protected void setUp() throws Exception
- {
- log.info(deployer.deploy());
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- log.info(deployer.undeploy());
- }
-
- public void testAnnotatedInheritanceAroundInvoke() throws Throwable
- {
- Thread.currentThread().setContextClassLoader(MyInterface.class.getClassLoader());
-
- ProxyContainer<AnnotatedBean> container = new ProxyContainer<AnnotatedBean>("AnnotatedContainer", "InterceptorContainer", AnnotatedBean.class);
- Interceptions.clear();
-
- Class<?> interfaces[] = { MyInterface.class };
- MyInterface proxy = container.constructProxy(interfaces);
-
- ArrayList<Class<?>> interceptions = Interceptions.getAroundInvokes();
- assertEquals(0, interceptions.size());
-
- proxy.method();
-
- assertEquals(6, interceptions.size());
- assertEquals(ClassBaseInterceptor.class, interceptions.get(0));
- assertEquals(ClassInterceptor.class, interceptions.get(1));
- assertEquals(MethodBaseInterceptor.class, interceptions.get(2));
- assertEquals(MethodInterceptor.class, interceptions.get(3));
- assertEquals(AnnotatedBase.class, interceptions.get(4));
- assertEquals(AnnotatedBean.class, interceptions.get(5));
- }
-
- public void testXmlInheritanceAroundInvoke() throws Throwable
- {
- AspectManager.verbose = true;
-
- // To make surefire happy
- Thread.currentThread().setContextClassLoader(MyInterface.class.getClassLoader());
-
- JBossEnterpriseBeanMetaData beanMetaData = getJBossEnterpriseBeanMetaData("XmlBean");
-
- MyContainer<XmlBean> container = new MyContainer<XmlBean>("XmlBean", "Test", XmlBean.class, beanMetaData);
- container.testAdvisor();
-
- BeanContext<XmlBean> bean = container.construct();
-
- Interceptions.clear();
- container.invoke(bean, "method");
-
- ArrayList<Class<?>> interceptions = Interceptions.getAroundInvokes();
- assertEquals("Wrong number of interceptions " + interceptions, 6, interceptions.size());
- assertEquals(XmlClassBaseInterceptor.class, interceptions.get(0));
- assertEquals(XmlClassInterceptor.class, interceptions.get(1));
- assertEquals(XmlMethodBaseInterceptor.class, interceptions.get(2));
- assertEquals(XmlMethodInterceptor.class, interceptions.get(3));
- assertEquals(XmlBase.class, interceptions.get(4));
- assertEquals(XmlBean.class, interceptions.get(5));
- }
-
- public void testAnnotatedInheritanceLifecycle() throws Throwable
- {
- Thread.currentThread().setContextClassLoader(MyInterface.class.getClassLoader());
-
- JBossEnterpriseBeanMetaData beanMetaData = getJBossEnterpriseBeanMetaData("AnnotatedBean");
-
- MyContainer<AnnotatedBean> container = new MyContainer<AnnotatedBean>("AnnotatedBean", "Test", AnnotatedBean.class, beanMetaData);
- container.testAdvisor();
-
- Interceptions.clear();
-
- BeanContext<AnnotatedBean> bean = container.construct();
- ArrayList<Class<?>> postConstructs = Interceptions.getPostConstructs();
- assertEquals("Wrong number of interceptions " + postConstructs, 4, postConstructs.size());
- assertEquals(ClassBaseInterceptor.class, postConstructs.get(0));
- assertEquals(ClassInterceptor.class, postConstructs.get(1));
- assertEquals(AnnotatedBase.class, postConstructs.get(2));
- assertEquals(AnnotatedBean.class, postConstructs.get(3));
-
- container.invoke(bean, "method");
-
- container.destroy(bean);
- ArrayList<Class<?>> preDestroy = Interceptions.getPreDestroys();
- assertEquals("Wrong number of interceptions " + preDestroy, 4, preDestroy.size());
- assertEquals(ClassBaseInterceptor.class, preDestroy.get(0));
- assertEquals(ClassInterceptor.class, preDestroy.get(1));
- assertEquals(AnnotatedBase.class, preDestroy.get(2));
- assertEquals(AnnotatedBean.class, preDestroy.get(3));
- }
-
- public void testXmlInheritanceLifecycle() throws Throwable
- {
- AspectManager.verbose = true;
-
- // To make surefire happy
- Thread.currentThread().setContextClassLoader(MyInterface.class.getClassLoader());
-
- JBossEnterpriseBeanMetaData beanMetaData = getJBossEnterpriseBeanMetaData("XmlBean");
-
- MyContainer<XmlBean> container = new MyContainer<XmlBean>("XmlBean", "Test", XmlBean.class, beanMetaData);
- container.testAdvisor();
-
- Interceptions.clear();
-
- BeanContext<XmlBean> bean = container.construct();
- ArrayList<Class<?>> postConstructs = Interceptions.getPostConstructs();
- assertEquals("Wrong number of interceptions " + postConstructs, 4, postConstructs.size());
- assertEquals(XmlClassBaseInterceptor.class, postConstructs.get(0));
- assertEquals(XmlClassInterceptor.class, postConstructs.get(1));
- assertEquals(XmlBase.class, postConstructs.get(2));
- assertEquals(XmlBean.class, postConstructs.get(3));
-
- container.invoke(bean, "method");
-
- container.destroy(bean);
- ArrayList<Class<?>> preDestroy = Interceptions.getPreDestroys();
- assertEquals("Wrong number of interceptions " + preDestroy, 4, preDestroy.size());
- assertEquals(XmlClassBaseInterceptor.class, preDestroy.get(0));
- assertEquals(XmlClassInterceptor.class, preDestroy.get(1));
- assertEquals(XmlBase.class, preDestroy.get(2));
- assertEquals(XmlBean.class, preDestroy.get(3));
- }
-
- public void testAnnotatedOverriddenMethods() throws Throwable
- {
- Thread.currentThread().setContextClassLoader(MyInterface.class.getClassLoader());
-
- JBossEnterpriseBeanMetaData beanMetaData = getJBossEnterpriseBeanMetaData("AnnotatedOverrideBean");
-
- MyContainer<AnnotatedOverrideBean> container = new MyContainer<AnnotatedOverrideBean>("AnnotatedOverrideBean", "Test", AnnotatedOverrideBean.class, beanMetaData);
- container.testAdvisor();
-
- Interceptions.clear();
-
- BeanContext<AnnotatedOverrideBean> bean = container.construct();
- ArrayList<Class<?>> postConstructs = Interceptions.getPostConstructs();
- assertEquals("Wrong number of interceptions " + postConstructs, 2, postConstructs.size());
- assertEquals(ClassOverrideInterceptor.class, postConstructs.get(0));
- assertEquals(AnnotatedOverrideBean.class, postConstructs.get(1));
-
- container.invoke(bean, "method");
-
- container.destroy(bean);
- ArrayList<Class<?>> preDestroy = Interceptions.getPreDestroys();
- assertEquals("Wrong number of interceptions " + preDestroy, 2, preDestroy.size());
- assertEquals(ClassOverrideInterceptor.class, postConstructs.get(0));
- assertEquals(AnnotatedOverrideBean.class, postConstructs.get(1));
- }
-
- public void testXmlOverriddenMethods() throws Throwable
- {
- Thread.currentThread().setContextClassLoader(MyInterface.class.getClassLoader());
-
- JBossEnterpriseBeanMetaData beanMetaData = getJBossEnterpriseBeanMetaData("XmlOverrideBean");
-
- MyContainer<XmlOverrideBean> container = new MyContainer<XmlOverrideBean>("XmlOverrideBean", "Test", XmlOverrideBean.class, beanMetaData);
- container.testAdvisor();
-
- Interceptions.clear();
-
- BeanContext<XmlOverrideBean> bean = container.construct();
- ArrayList<Class<?>> postConstructs = Interceptions.getPostConstructs();
- assertEquals("Wrong number of interceptions " + postConstructs, 2, postConstructs.size());
- assertEquals(XmlClassOverrideInterceptor.class, postConstructs.get(0));
- assertEquals(XmlOverrideBean.class, postConstructs.get(1));
-
- container.invoke(bean, "method");
-
- container.destroy(bean);
- ArrayList<Class<?>> preDestroy = Interceptions.getPreDestroys();
- assertEquals("Wrong number of interceptions " + preDestroy, 2, preDestroy.size());
- assertEquals(XmlClassOverrideInterceptor.class, postConstructs.get(0));
- assertEquals(XmlOverrideBean.class, postConstructs.get(1));
- }
-
- private JBossEnterpriseBeanMetaData getJBossEnterpriseBeanMetaData(String name) throws JBossXBException
- {
- // Bootstrap metadata
- UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
- Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
- URL url = Thread.currentThread().getContextClassLoader().getResource("inheritance/META-INF/ejb-jar.xml");
- EjbJar30MetaData metaData = (EjbJar30MetaData) unmarshaller.unmarshal(url.toString(), schemaResolverForClass(EjbJar30MetaData.class));
- JBoss50MetaData jbossMetaData = new JBoss50MetaData();
- jbossMetaData.merge(null, metaData);
-
- JBossEnterpriseBeanMetaData beanMetaData = jbossMetaData.getEnterpriseBean(name);
- assertNotNull(beanMetaData);
-
- return beanMetaData;
- }
-}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/unit/InheritanceTestCase.java (from rev 72590, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/unit/InheritanceTestCase.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/unit/InheritanceTestCase.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/inheritance/unit/InheritanceTestCase.java 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,325 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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.unit;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.aop.AspectManager;
+import org.jboss.aspects.common.AOPDeployer;
+import org.jboss.ejb3.interceptors.container.BeanContext;
+import org.jboss.ejb3.interceptors.direct.AbstractDirectContainer;
+import org.jboss.ejb3.interceptors.metadata.AdditiveBeanInterceptorMetaDataBridge;
+import org.jboss.ejb3.interceptors.metadata.InterceptorComponentMetaDataLoaderFactory;
+import org.jboss.ejb3.interceptors.metadata.InterceptorMetaDataBridge;
+import org.jboss.ejb3.interceptors.proxy.ProxyContainer;
+import org.jboss.ejb3.metadata.MetaDataBridge;
+import org.jboss.ejb3.metadata.annotation.AnnotationRepositoryToMetaData;
+import org.jboss.ejb3.test.interceptors.inheritance.AnnotatedBase;
+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.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.XmlBase;
+import org.jboss.ejb3.test.interceptors.inheritance.XmlBean;
+import org.jboss.ejb3.test.interceptors.inheritance.XmlClassBaseInterceptor;
+import org.jboss.ejb3.test.interceptors.inheritance.XmlClassInterceptor;
+import org.jboss.ejb3.test.interceptors.inheritance.XmlClassOverrideInterceptor;
+import org.jboss.ejb3.test.interceptors.inheritance.XmlMethodBaseInterceptor;
+import org.jboss.ejb3.test.interceptors.inheritance.XmlMethodInterceptor;
+import org.jboss.ejb3.test.interceptors.inheritance.XmlOverrideBean;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
+import org.jboss.metadata.ejb.spec.InterceptorMetaData;
+import org.jboss.xb.binding.JBossXBException;
+import org.jboss.xb.binding.Unmarshaller;
+import org.jboss.xb.binding.UnmarshallerFactory;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+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>
+ * @version $Revision: 1.1 $
+ */
+public class InheritanceTestCase extends TestCase
+{
+ private static final Logger log = Logger.getLogger(InheritanceTestCase.class);
+
+ private class MyContainer<T> extends AbstractDirectContainer<T, MyContainer<T>>
+ {
+ public MyContainer(String name, String domainName, Class<? extends T> beanClass, JBossEnterpriseBeanMetaData beanMetaData)
+ {
+ super();
+
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ AnnotationRepositoryToMetaData annotations = new AnnotationRepositoryToMetaData(beanClass, beanMetaData, name, classLoader);
+ List<MetaDataBridge<InterceptorMetaData>> interceptorBridges = new ArrayList<MetaDataBridge<InterceptorMetaData>>();
+ interceptorBridges.add(new InterceptorMetaDataBridge());
+ annotations.addComponentMetaDataLoaderFactory(new InterceptorComponentMetaDataLoaderFactory(interceptorBridges));
+ annotations.addMetaDataBridge(new AdditiveBeanInterceptorMetaDataBridge(beanClass, classLoader, beanMetaData));
+
+ initializeAdvisor(name, getDomain(domainName), beanClass, annotations);
+ }
+
+ public void testAdvisor()
+ {
+ MyContainer<?> container = getAdvisor().getContainer();
+ assertNotNull("container not set in managed object advisor", container);
+ assertTrue(container == this);
+ }
+ }
+
+ protected static SchemaBindingResolver schemaResolverForClass(final Class<?> root)
+ {
+ return new SchemaBindingResolver()
+ {
+ public String getBaseURI()
+ {
+ return null;
+ }
+
+ public SchemaBinding resolve(String nsUri, String baseURI, String schemaLocation)
+ {
+ return JBossXBBuilder.build(root);
+ }
+
+ public LSInput resolveAsLSInput(String nsUri, String baseUri, String schemaLocation)
+ {
+ return null;
+ }
+
+ public void setBaseURI(String baseURI)
+ {
+ }
+ };
+ }
+
+ // FIXME: use the right jboss-aop.xml
+ AOPDeployer deployer = new AOPDeployer("proxy/jboss-aop.xml");
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ log.info(deployer.deploy());
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ log.info(deployer.undeploy());
+ }
+
+ public void testAnnotatedInheritanceAroundInvoke() throws Throwable
+ {
+ Thread.currentThread().setContextClassLoader(MyInterface.class.getClassLoader());
+
+ ProxyContainer<AnnotatedBean> container = new ProxyContainer<AnnotatedBean>("AnnotatedContainer", "InterceptorContainer", AnnotatedBean.class);
+ Interceptions.clear();
+
+ Class<?> interfaces[] = { MyInterface.class };
+ MyInterface proxy = container.constructProxy(interfaces);
+
+ ArrayList<Class<?>> interceptions = Interceptions.getAroundInvokes();
+ assertEquals(0, interceptions.size());
+
+ proxy.method();
+
+ assertEquals(6, interceptions.size());
+ assertEquals(ClassBaseInterceptor.class, interceptions.get(0));
+ assertEquals(ClassInterceptor.class, interceptions.get(1));
+ assertEquals(MethodBaseInterceptor.class, interceptions.get(2));
+ assertEquals(MethodInterceptor.class, interceptions.get(3));
+ assertEquals(AnnotatedBase.class, interceptions.get(4));
+ assertEquals(AnnotatedBean.class, interceptions.get(5));
+ }
+
+ public void testXmlInheritanceAroundInvoke() throws Throwable
+ {
+ AspectManager.verbose = true;
+
+ // To make surefire happy
+ Thread.currentThread().setContextClassLoader(MyInterface.class.getClassLoader());
+
+ JBossEnterpriseBeanMetaData beanMetaData = getJBossEnterpriseBeanMetaData("XmlBean");
+
+ MyContainer<XmlBean> container = new MyContainer<XmlBean>("XmlBean", "Test", XmlBean.class, beanMetaData);
+ container.testAdvisor();
+
+ BeanContext<XmlBean> bean = container.construct();
+
+ Interceptions.clear();
+ container.invoke(bean, "method");
+
+ ArrayList<Class<?>> interceptions = Interceptions.getAroundInvokes();
+ assertEquals("Wrong number of interceptions " + interceptions, 6, interceptions.size());
+ assertEquals(XmlClassBaseInterceptor.class, interceptions.get(0));
+ assertEquals(XmlClassInterceptor.class, interceptions.get(1));
+ assertEquals(XmlMethodBaseInterceptor.class, interceptions.get(2));
+ assertEquals(XmlMethodInterceptor.class, interceptions.get(3));
+ assertEquals(XmlBase.class, interceptions.get(4));
+ assertEquals(XmlBean.class, interceptions.get(5));
+ }
+
+ public void testAnnotatedInheritanceLifecycle() throws Throwable
+ {
+ Thread.currentThread().setContextClassLoader(MyInterface.class.getClassLoader());
+
+ JBossEnterpriseBeanMetaData beanMetaData = getJBossEnterpriseBeanMetaData("AnnotatedBean");
+
+ MyContainer<AnnotatedBean> container = new MyContainer<AnnotatedBean>("AnnotatedBean", "Test", AnnotatedBean.class, beanMetaData);
+ container.testAdvisor();
+
+ Interceptions.clear();
+
+ BeanContext<AnnotatedBean> bean = container.construct();
+ ArrayList<Class<?>> postConstructs = Interceptions.getPostConstructs();
+ assertEquals("Wrong number of interceptions " + postConstructs, 4, postConstructs.size());
+ assertEquals(ClassBaseInterceptor.class, postConstructs.get(0));
+ assertEquals(ClassInterceptor.class, postConstructs.get(1));
+ assertEquals(AnnotatedBase.class, postConstructs.get(2));
+ assertEquals(AnnotatedBean.class, postConstructs.get(3));
+
+ container.invoke(bean, "method");
+
+ container.destroy(bean);
+ ArrayList<Class<?>> preDestroy = Interceptions.getPreDestroys();
+ assertEquals("Wrong number of interceptions " + preDestroy, 4, preDestroy.size());
+ assertEquals(ClassBaseInterceptor.class, preDestroy.get(0));
+ assertEquals(ClassInterceptor.class, preDestroy.get(1));
+ assertEquals(AnnotatedBase.class, preDestroy.get(2));
+ assertEquals(AnnotatedBean.class, preDestroy.get(3));
+ }
+
+ public void testXmlInheritanceLifecycle() throws Throwable
+ {
+ AspectManager.verbose = true;
+
+ // To make surefire happy
+ Thread.currentThread().setContextClassLoader(MyInterface.class.getClassLoader());
+
+ JBossEnterpriseBeanMetaData beanMetaData = getJBossEnterpriseBeanMetaData("XmlBean");
+
+ MyContainer<XmlBean> container = new MyContainer<XmlBean>("XmlBean", "Test", XmlBean.class, beanMetaData);
+ container.testAdvisor();
+
+ Interceptions.clear();
+
+ BeanContext<XmlBean> bean = container.construct();
+ ArrayList<Class<?>> postConstructs = Interceptions.getPostConstructs();
+ assertEquals("Wrong number of interceptions " + postConstructs, 4, postConstructs.size());
+ assertEquals(XmlClassBaseInterceptor.class, postConstructs.get(0));
+ assertEquals(XmlClassInterceptor.class, postConstructs.get(1));
+ assertEquals(XmlBase.class, postConstructs.get(2));
+ assertEquals(XmlBean.class, postConstructs.get(3));
+
+ container.invoke(bean, "method");
+
+ container.destroy(bean);
+ ArrayList<Class<?>> preDestroy = Interceptions.getPreDestroys();
+ assertEquals("Wrong number of interceptions " + preDestroy, 4, preDestroy.size());
+ assertEquals(XmlClassBaseInterceptor.class, preDestroy.get(0));
+ assertEquals(XmlClassInterceptor.class, preDestroy.get(1));
+ assertEquals(XmlBase.class, preDestroy.get(2));
+ assertEquals(XmlBean.class, preDestroy.get(3));
+ }
+
+ public void testAnnotatedOverriddenMethods() throws Throwable
+ {
+ Thread.currentThread().setContextClassLoader(MyInterface.class.getClassLoader());
+
+ JBossEnterpriseBeanMetaData beanMetaData = getJBossEnterpriseBeanMetaData("AnnotatedOverrideBean");
+
+ MyContainer<AnnotatedOverrideBean> container = new MyContainer<AnnotatedOverrideBean>("AnnotatedOverrideBean", "Test", AnnotatedOverrideBean.class, beanMetaData);
+ container.testAdvisor();
+
+ Interceptions.clear();
+
+ BeanContext<AnnotatedOverrideBean> bean = container.construct();
+ ArrayList<Class<?>> postConstructs = Interceptions.getPostConstructs();
+ assertEquals("Wrong number of interceptions " + postConstructs, 2, postConstructs.size());
+ assertEquals(ClassOverrideInterceptor.class, postConstructs.get(0));
+ assertEquals(AnnotatedOverrideBean.class, postConstructs.get(1));
+
+ container.invoke(bean, "method");
+
+ container.destroy(bean);
+ ArrayList<Class<?>> preDestroy = Interceptions.getPreDestroys();
+ assertEquals("Wrong number of interceptions " + preDestroy, 2, preDestroy.size());
+ assertEquals(ClassOverrideInterceptor.class, postConstructs.get(0));
+ assertEquals(AnnotatedOverrideBean.class, postConstructs.get(1));
+ }
+
+ public void testXmlOverriddenMethods() throws Throwable
+ {
+ Thread.currentThread().setContextClassLoader(MyInterface.class.getClassLoader());
+
+ JBossEnterpriseBeanMetaData beanMetaData = getJBossEnterpriseBeanMetaData("XmlOverrideBean");
+
+ MyContainer<XmlOverrideBean> container = new MyContainer<XmlOverrideBean>("XmlOverrideBean", "Test", XmlOverrideBean.class, beanMetaData);
+ container.testAdvisor();
+
+ Interceptions.clear();
+
+ BeanContext<XmlOverrideBean> bean = container.construct();
+ ArrayList<Class<?>> postConstructs = Interceptions.getPostConstructs();
+ assertEquals("Wrong number of interceptions " + postConstructs, 2, postConstructs.size());
+ assertEquals(XmlClassOverrideInterceptor.class, postConstructs.get(0));
+ assertEquals(XmlOverrideBean.class, postConstructs.get(1));
+
+ container.invoke(bean, "method");
+
+ container.destroy(bean);
+ ArrayList<Class<?>> preDestroy = Interceptions.getPreDestroys();
+ assertEquals("Wrong number of interceptions " + preDestroy, 2, preDestroy.size());
+ assertEquals(XmlClassOverrideInterceptor.class, postConstructs.get(0));
+ assertEquals(XmlOverrideBean.class, postConstructs.get(1));
+ }
+
+ private JBossEnterpriseBeanMetaData getJBossEnterpriseBeanMetaData(String name) throws JBossXBException
+ {
+ // Bootstrap metadata
+ UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
+ Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
+ URL url = Thread.currentThread().getContextClassLoader().getResource("inheritance/META-INF/ejb-jar.xml");
+ EjbJar30MetaData metaData = (EjbJar30MetaData) unmarshaller.unmarshal(url.toString(), schemaResolverForClass(EjbJar30MetaData.class));
+ JBoss50MetaData jbossMetaData = new JBoss50MetaData();
+ jbossMetaData.merge(null, metaData);
+
+ JBossEnterpriseBeanMetaData beanMetaData = jbossMetaData.getEnterpriseBean(name);
+ assertNotNull(beanMetaData);
+
+ return beanMetaData;
+ }
+}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/inheritance (from rev 72590, projects/ejb3/trunk/interceptors/src/test/resources/inheritance)
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/inheritance/META-INF (from rev 72590, projects/ejb3/trunk/interceptors/src/test/resources/inheritance/META-INF)
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/inheritance/META-INF/ejb-jar.xml
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/resources/inheritance/META-INF/ejb-jar.xml 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/inheritance/META-INF/ejb-jar.xml 2008-04-22 23:25:58 UTC (rev 72591)
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ejb-jar
- xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
- version="3.0">
- <display-name>InterceptorsTest</display-name>
- <!-- Must define a bean here, because we have no annotation on it -->
- <!-- (Can't use @Stateless within ejb3-interceptors) -->
- <enterprise-beans>
- <session>
- <ejb-name>AnnotatedBean</ejb-name>
- </session>
- <session>
- <ejb-name>AnnotatedOverrideBean</ejb-name>
- </session>
- <session>
- <ejb-name>XmlBean</ejb-name>
- <around-invoke>
- <method-name>baseAround</method-name>
- </around-invoke>
- <around-invoke>
- <method-name>around</method-name>
- </around-invoke>
- <post-construct>
- <lifecycle-callback-method>postConstruct</lifecycle-callback-method>
- </post-construct>
- <post-construct>
- <lifecycle-callback-method>basePostConstruct</lifecycle-callback-method>
- </post-construct>
- <pre-destroy>
- <lifecycle-callback-method>basePreDestroy</lifecycle-callback-method>
- </pre-destroy>
- <pre-destroy>
- <lifecycle-callback-method>preDestroy</lifecycle-callback-method>
- </pre-destroy>
- </session>
- <session>
- <ejb-name>XmlOverrideBean</ejb-name>
- <around-invoke>
- <method-name>baseAround</method-name>
- </around-invoke>
- <around-invoke>
- <method-name>around</method-name>
- </around-invoke>
- <post-construct>
- <lifecycle-callback-method>postConstruct</lifecycle-callback-method>
- </post-construct>
- <pre-destroy>
- <lifecycle-callback-method>preDestroy</lifecycle-callback-method>
- </pre-destroy>
- </session>
- </enterprise-beans>
- <interceptors>
- <interceptor>
- <interceptor-class>org.jboss.ejb3.test.interceptors.inheritance.XmlClassInterceptor</interceptor-class>
- <around-invoke>
- <method-name>baseAround</method-name>
- </around-invoke>
- <around-invoke>
- <method-name>around</method-name>
- </around-invoke>
- <post-construct>
- <lifecycle-callback-method>postConstruct</lifecycle-callback-method>
- </post-construct>
- <post-construct>
- <lifecycle-callback-method>basePostConstruct</lifecycle-callback-method>
- </post-construct>
- <pre-destroy>
- <lifecycle-callback-method>basePreDestroy</lifecycle-callback-method>
- </pre-destroy>
- <pre-destroy>
- <lifecycle-callback-method>preDestroy</lifecycle-callback-method>
- </pre-destroy>
- </interceptor>
- <interceptor>
- <interceptor-class>org.jboss.ejb3.test.interceptors.inheritance.XmlMethodInterceptor</interceptor-class>
- <around-invoke>
- <method-name>baseAround</method-name>
- </around-invoke>
- <around-invoke>
- <method-name>around</method-name>
- </around-invoke>
- </interceptor>
- <interceptor>
- <interceptor-class>org.jboss.ejb3.test.interceptors.inheritance.XmlClassOverrideInterceptor</interceptor-class>
- <around-invoke>
- <method-name>baseAround</method-name>
- </around-invoke>
- <around-invoke>
- <method-name>around</method-name>
- </around-invoke>
- <post-construct>
- <lifecycle-callback-method>postConstruct</lifecycle-callback-method>
- </post-construct>
- <pre-destroy>
- <lifecycle-callback-method>preDestroy</lifecycle-callback-method>
- </pre-destroy>
- </interceptor>
- <interceptor>
- <interceptor-class>org.jboss.ejb3.test.interceptors.inheritance.XmlMethodOverrideInterceptor</interceptor-class>
- <around-invoke>
- <method-name>around</method-name>
- </around-invoke>
- </interceptor>
- </interceptors>
- <assembly-descriptor>
- <interceptor-binding>
- <ejb-name>XmlBean</ejb-name>
- <interceptor-class>org.jboss.ejb3.test.interceptors.inheritance.XmlClassInterceptor</interceptor-class>
- </interceptor-binding>
- <interceptor-binding>
- <ejb-name>XmlBean</ejb-name>
- <interceptor-class>org.jboss.ejb3.test.interceptors.inheritance.XmlMethodInterceptor</interceptor-class>
- <method>
- <method-name>method</method-name>
- </method>
- </interceptor-binding>
- <interceptor-binding>
- <ejb-name>XmlOverrideBean</ejb-name>
- <interceptor-class>org.jboss.ejb3.test.interceptors.inheritance.XmlClassOverrideInterceptor</interceptor-class>
- </interceptor-binding>
- <interceptor-binding>
- <ejb-name>XmlOverrideBean</ejb-name>
- <interceptor-class>org.jboss.ejb3.test.interceptors.inheritance.XmlMethodOverrideInterceptor</interceptor-class>
- <method>
- <method-name>method</method-name>
- </method>
- </interceptor-binding>
- </assembly-descriptor>
-</ejb-jar>
\ No newline at end of file
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/inheritance/META-INF/ejb-jar.xml (from rev 72590, projects/ejb3/trunk/interceptors/src/test/resources/inheritance/META-INF/ejb-jar.xml)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/inheritance/META-INF/ejb-jar.xml (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/inheritance/META-INF/ejb-jar.xml 2008-04-22 23:25:58 UTC (rev 72591)
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
+ version="3.0">
+ <display-name>InterceptorsTest</display-name>
+ <!-- Must define a bean here, because we have no annotation on it -->
+ <!-- (Can't use @Stateless within ejb3-interceptors) -->
+ <enterprise-beans>
+ <session>
+ <ejb-name>AnnotatedBean</ejb-name>
+ </session>
+ <session>
+ <ejb-name>AnnotatedOverrideBean</ejb-name>
+ </session>
+ <session>
+ <ejb-name>XmlBean</ejb-name>
+ <around-invoke>
+ <method-name>baseAround</method-name>
+ </around-invoke>
+ <around-invoke>
+ <method-name>around</method-name>
+ </around-invoke>
+ <post-construct>
+ <lifecycle-callback-method>postConstruct</lifecycle-callback-method>
+ </post-construct>
+ <post-construct>
+ <lifecycle-callback-method>basePostConstruct</lifecycle-callback-method>
+ </post-construct>
+ <pre-destroy>
+ <lifecycle-callback-method>basePreDestroy</lifecycle-callback-method>
+ </pre-destroy>
+ <pre-destroy>
+ <lifecycle-callback-method>preDestroy</lifecycle-callback-method>
+ </pre-destroy>
+ </session>
+ <session>
+ <ejb-name>XmlOverrideBean</ejb-name>
+ <around-invoke>
+ <method-name>baseAround</method-name>
+ </around-invoke>
+ <around-invoke>
+ <method-name>around</method-name>
+ </around-invoke>
+ <post-construct>
+ <lifecycle-callback-method>postConstruct</lifecycle-callback-method>
+ </post-construct>
+ <pre-destroy>
+ <lifecycle-callback-method>preDestroy</lifecycle-callback-method>
+ </pre-destroy>
+ </session>
+ </enterprise-beans>
+ <interceptors>
+ <interceptor>
+ <interceptor-class>org.jboss.ejb3.test.interceptors.inheritance.XmlClassInterceptor</interceptor-class>
+ <around-invoke>
+ <method-name>baseAround</method-name>
+ </around-invoke>
+ <around-invoke>
+ <method-name>around</method-name>
+ </around-invoke>
+ <post-construct>
+ <lifecycle-callback-method>postConstruct</lifecycle-callback-method>
+ </post-construct>
+ <post-construct>
+ <lifecycle-callback-method>basePostConstruct</lifecycle-callback-method>
+ </post-construct>
+ <pre-destroy>
+ <lifecycle-callback-method>basePreDestroy</lifecycle-callback-method>
+ </pre-destroy>
+ <pre-destroy>
+ <lifecycle-callback-method>preDestroy</lifecycle-callback-method>
+ </pre-destroy>
+ </interceptor>
+ <interceptor>
+ <interceptor-class>org.jboss.ejb3.test.interceptors.inheritance.XmlMethodInterceptor</interceptor-class>
+ <around-invoke>
+ <method-name>baseAround</method-name>
+ </around-invoke>
+ <around-invoke>
+ <method-name>around</method-name>
+ </around-invoke>
+ </interceptor>
+ <interceptor>
+ <interceptor-class>org.jboss.ejb3.test.interceptors.inheritance.XmlClassOverrideInterceptor</interceptor-class>
+ <around-invoke>
+ <method-name>baseAround</method-name>
+ </around-invoke>
+ <around-invoke>
+ <method-name>around</method-name>
+ </around-invoke>
+ <post-construct>
+ <lifecycle-callback-method>postConstruct</lifecycle-callback-method>
+ </post-construct>
+ <pre-destroy>
+ <lifecycle-callback-method>preDestroy</lifecycle-callback-method>
+ </pre-destroy>
+ </interceptor>
+ <interceptor>
+ <interceptor-class>org.jboss.ejb3.test.interceptors.inheritance.XmlMethodOverrideInterceptor</interceptor-class>
+ <around-invoke>
+ <method-name>around</method-name>
+ </around-invoke>
+ </interceptor>
+ </interceptors>
+ <assembly-descriptor>
+ <interceptor-binding>
+ <ejb-name>XmlBean</ejb-name>
+ <interceptor-class>org.jboss.ejb3.test.interceptors.inheritance.XmlClassInterceptor</interceptor-class>
+ </interceptor-binding>
+ <interceptor-binding>
+ <ejb-name>XmlBean</ejb-name>
+ <interceptor-class>org.jboss.ejb3.test.interceptors.inheritance.XmlMethodInterceptor</interceptor-class>
+ <method>
+ <method-name>method</method-name>
+ </method>
+ </interceptor-binding>
+ <interceptor-binding>
+ <ejb-name>XmlOverrideBean</ejb-name>
+ <interceptor-class>org.jboss.ejb3.test.interceptors.inheritance.XmlClassOverrideInterceptor</interceptor-class>
+ </interceptor-binding>
+ <interceptor-binding>
+ <ejb-name>XmlOverrideBean</ejb-name>
+ <interceptor-class>org.jboss.ejb3.test.interceptors.inheritance.XmlMethodOverrideInterceptor</interceptor-class>
+ <method>
+ <method-name>method</method-name>
+ </method>
+ </interceptor-binding>
+ </assembly-descriptor>
+</ejb-jar>
\ No newline at end of file
Modified: projects/ejb3/dev/ejbthree1269/plugin/pom.xml
===================================================================
--- projects/ejb3/dev/ejbthree1269/plugin/pom.xml 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/plugin/pom.xml 2008-04-22 23:25:58 UTC (rev 72591)
@@ -77,6 +77,14 @@
<version>0.1.0-SNAPSHOT</version>
</dependency>
+<dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-core</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ <classifier>client</classifier>
+ </dependency>
+
+
</dependencies>
<!-- Distribution Management -->
Modified: projects/ejb3/dev/ejbthree1269/plugin/src/main/resources/installer.xml
===================================================================
--- projects/ejb3/dev/ejbthree1269/plugin/src/main/resources/installer.xml 2008-04-22 23:12:27 UTC (rev 72590)
+++ projects/ejb3/dev/ejbthree1269/plugin/src/main/resources/installer.xml 2008-04-22 23:25:58 UTC (rev 72591)
@@ -36,9 +36,9 @@
<outputDirectory>lib</outputDirectory>
</dependencySet>
<dependencySet>
- <outputFileNameMapping>${classifier}.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifactId}-${classifier}.${extension}</outputFileNameMapping>
<includes>
- <include>org.jboss.ejb3:jboss-ejb3-core:jar:jboss-ejb3-client</include>
+ <include>org.jboss.ejb3:jboss-ejb3-core:jar:client</include>
</includes>
<outputDirectory>lib</outputDirectory>
</dependencySet>
More information about the jboss-cvs-commits
mailing list