[jboss-cvs] JBossAS SVN: r72634 - in projects/ejb3/dev/ejbthree1269: build and 29 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 23 16:07:12 EDT 2008
Author: ALRubinger
Date: 2008-04-23 16:07:12 -0400 (Wed, 23 Apr 2008)
New Revision: 72634
Added:
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/BaseLifecycleBean.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/BaseLifecycleInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/ChildLifecycleBean.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/ChildLifecycleInterceptor.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-bean-overridden-lifecycle/
projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-bean-overridden-lifecycle/META-INF/
projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-bean-overridden-lifecycle/META-INF/ejb-jar.xml
projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-interceptor-overridden-lifecycle/
projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-interceptor-overridden-lifecycle/META-INF/
projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-interceptor-overridden-lifecycle/META-INF/ejb-jar.xml
Removed:
projects/ejb3/dev/ejbthree1269/core/src/main/java/org/jboss/ejb3/embedded/
projects/ejb3/dev/ejbthree1269/core/src/main/resources/standalone/
projects/ejb3/dev/ejbthree1269/core/src/test/java/org/jboss/ejb3/test/standalone/
projects/ejb3/dev/ejbthree1269/core/src/test/java/org/jboss/ejb3/test/wls/
projects/ejb3/dev/ejbthree1269/core/src/test/resources/test/standalone/
projects/ejb3/dev/ejbthree1269/core/src/test/resources/test/standaloneWar/
projects/ejb3/dev/ejbthree1269/core/src/test/resources/test/wls/
projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-bean-overridden-lifecycle/META-INF/
projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-bean-overridden-lifecycle/META-INF/ejb-jar.xml
projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-interceptor-overridden-lifecycle/META-INF/
projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-interceptor-overridden-lifecycle/META-INF/ejb-jar.xml
Modified:
projects/ejb3/dev/ejbthree1269/async/pom.xml
projects/ejb3/dev/ejbthree1269/build/pom.xml
projects/ejb3/dev/ejbthree1269/cache/pom.xml
projects/ejb3/dev/ejbthree1269/core/build-test.xml
projects/ejb3/dev/ejbthree1269/core/jboss-ejb3-client.xml
projects/ejb3/dev/ejbthree1269/core/pom.xml
projects/ejb3/dev/ejbthree1269/core/src/main/java/org/jboss/ejb3/MCClientKernelAbstraction.java
projects/ejb3/dev/ejbthree1269/core/src/main/java/org/jboss/ejb3/MCKernelAbstraction.java
projects/ejb3/dev/ejbthree1269/core/src/main/resources/META-INF/ejb3-deployers-beans.xml
projects/ejb3/dev/ejbthree1269/core/src/test/resources/test-configs/statefulproxyfactoryoverride/deployers/ejb3.deployer/META-INF/ejb3-deployers-beans.xml
projects/ejb3/dev/ejbthree1269/injection/pom.xml
projects/ejb3/dev/ejbthree1269/installer/src/main/resources/conf/jbossas-ejb3-files-to-remove.txt
projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/LifecycleCallbacks.java
projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/unit/BadBindingTestCase.java
projects/ejb3/dev/ejbthree1269/locator/pom.xml
projects/ejb3/dev/ejbthree1269/plugin/pom.xml
projects/ejb3/dev/ejbthree1269/sandbox/pom.xml
projects/ejb3/dev/ejbthree1269/security/
projects/ejb3/dev/ejbthree1269/security/pom.xml
projects/ejb3/dev/ejbthree1269/socket-inflow/pom.xml
projects/ejb3/dev/ejbthree1269/transactions/pom.xml
projects/ejb3/dev/ejbthree1269/transactions/src/main/java/org/jboss/ejb3/tx/TxUtil.java
projects/ejb3/dev/ejbthree1269/transactions/src/test/java/org/jboss/ejb3/test/tx/bmt/StatefulBMTBean.java
projects/ejb3/dev/ejbthree1269/transactions/src/test/java/org/jboss/ejb3/test/tx/bmt/unit/BMTUnitTestCase.java
projects/ejb3/dev/ejbthree1269/transactions/src/test/java/org/jboss/ejb3/test/tx/common/MockEJBContext.java
projects/ejb3/dev/ejbthree1269/transactions/src/test/java/org/jboss/ejb3/test/tx/common/StatefulBeanContext.java
projects/ejb3/dev/ejbthree1269/transactions/src/test/java/org/jboss/ejb3/test/tx/common/StatefulContainer.java
projects/ejb3/dev/ejbthree1269/transactions/src/test/resources/instance/jboss-aop.xml
Log:
[EJBTHREE-1269] Backmerged with trunk at 72590:72633
Modified: projects/ejb3/dev/ejbthree1269/async/pom.xml
===================================================================
--- projects/ejb3/dev/ejbthree1269/async/pom.xml 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/async/pom.xml 2008-04-23 20:07:12 UTC (rev 72634)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.3-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-remoting-aspects</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>jboss.remoting</groupId>
Modified: projects/ejb3/dev/ejbthree1269/build/pom.xml
===================================================================
--- projects/ejb3/dev/ejbthree1269/build/pom.xml 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/build/pom.xml 2008-04-23 20:07:12 UTC (rev 72634)
@@ -221,11 +221,12 @@
<dependencyManagement>
<dependencies>
- <!--
-
- External
-
- -->
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+
<!-- Apache Commons Validator -->
<dependency>
<groupId>commons-validator</groupId>
@@ -267,9 +268,9 @@
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
+ <groupId>org.jboss.naming</groupId>
<artifactId>jnpserver</artifactId>
- <version>5.0.0.Beta4</version>
+ <version>5.0.0.CR1</version>
<scope>test</scope>
</dependency>
@@ -291,32 +292,39 @@
<dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-aspects-common</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
-
+
+ <!-- JavaEE APIs -->
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-ejb-api</artifactId>
- <version>3.0.0.Beta3Update1</version>
+ <version>3.0.0.CR1</version>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jacc-api</artifactId>
- <version>1.1.0.Beta3Update1</version>
+ <version>1.1.0.CR1</version>
</dependency>
-
+
<dependency>
<groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jaspi-api</artifactId>
+ <version>1.0.0.CR1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jca-api</artifactId>
- <version>1.5.0.Beta3Update1</version>
+ <version>1.5.0.CR1</version>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-persistence-api</artifactId>
- <version>3.0.0.Beta3Update1</version>
+ <version>3.0.0.CR1</version>
</dependency>
<!-- JBoss Microcontainer -->
Modified: projects/ejb3/dev/ejbthree1269/cache/pom.xml
===================================================================
--- projects/ejb3/dev/ejbthree1269/cache/pom.xml 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/cache/pom.xml 2008-04-23 20:07:12 UTC (rev 72634)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.3-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
Modified: projects/ejb3/dev/ejbthree1269/core/build-test.xml
===================================================================
--- projects/ejb3/dev/ejbthree1269/core/build-test.xml 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/core/build-test.xml 2008-04-23 20:07:12 UTC (rev 72634)
@@ -677,14 +677,6 @@
</fileset>
</copy>
- <copy todir="${build.lib}/embeddable/standalone">
- <fileset dir="${build.lib}">
- <include name="jmsinflowmdb.jar"/>
- <include name="jcainflowmdb.jar"/>
- <include name="quartzmdb.jar"/>
- </fileset>
- </copy>
-
<copy todir="${build.ejb3.lib}/embeddable/lib">
<fileset dir="${build.lib}">
<include name="jcainflow.jar"/>
@@ -3136,11 +3128,6 @@
</fileset>
</copy>
- <copy todir="${build.lib}/embeddable/standalone">
- <fileset dir="${build.lib}">
- <include name="mdb-test.jar"/>
- </fileset>
- </copy>
</target>
<target name="mdbtopic"
@@ -3164,14 +3151,6 @@
</fileset>
-->
</jar>
-
- <!--
- <copy todir="${build.lib}/embeddable/standalone">
- <fileset dir="${build.lib}">
- <include name="mdbtopic-test.jar"/>
- </fileset>
- </copy>
- -->
</target>
<target name="concurrent"
@@ -4183,7 +4162,7 @@
aspectdomain, ejbcontext, schema, mail, scopedclassloader, dependency,
securitydomain, enventry, security5,
jms/managed, naming, bmt, jca/inflowmdb, pool, jms, security, reference21_30, factory, dd/web, txexceptions,
- exception, dd/override, stateless, standalone-jar, dd/mdb, bank, dd, longlived, xmlcfg, hbm, pkg, regressionHHH275,
+ exception, dd/override, stateless, dd/mdb, bank, dd, longlived, xmlcfg, hbm, pkg, regressionHHH275,
entityexception, asynchronous, consumer, clusteredentity, secondary, stateful, service, lob, cache, initial,
timer, benchmark, entity, joininheritance, singletable, tableperclass, dependent, mdb, manytomany, regression,
composite, composite2, entitycallback, relationships, ssl, ssladvanced, clusteredsession, strictpool, jacc,
@@ -4462,116 +4441,6 @@
</junit>
</target>
- <target name="standalone-jar"
- description="Builds all jar files.">
-
- <mkdir dir="${build.lib}/embeddable/standalone"/>
-
- <jar jarfile="${build.lib}/embeddable/standalone/standalone.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/standalone/*.class"/>
- <include name="org/jboss/ejb3/test/standalone/unit/*.class"/>
- </fileset>
- <fileset dir="${build.resources}/test/standaloneWar">
- <include name="marker.txt"/>
- </fileset>
- <fileset dir="${build.resources}/test/standalone">
- <include name="deployer.xml"/>
- <include name="kernel-test.xml"/>
- </fileset>
- <fileset dir="${resources}/test/standalone">
- <include name="META-INF/persistence.xml"/>
- <include name="META-INF/ejb-jar.xml"/>
- </fileset>
- </jar>
-
- <war warfile="${build.lib}/standalone.war"
- webxml="${build.resources}/test/standaloneWar/WEB-INF/web.xml">
- <lib dir="${module.output}/lib/embeddable/lib">
- <include name="*.jar"/>
- </lib>
- <!--lib dir="${module.output}/lib/embeddable/conf/">
- <include name="standalone.jar"/>
- </lib-->
- <lib dir="${build.lib}/embeddable/standalone">
- <include name="*.jar"/>
- </lib>
- <!--classes dir="${module.output}/lib/embeddable/conf">
- <include name="*.xml"/>
- <include name="default.persistence.properties"/>
- </classes-->
- <fileset dir="${source.java}">
- <include name="EmbeddedEJB3.jsp"/>
- </fileset>
- </war>
-
- <jar jarfile="${build.lib}/embeddable/standalone/jms.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/standalone/jms/*.class"/>
- <include name="org/jboss/ejb3/test/standalone/jms/unit/*.class"/>
- </fileset>
- </jar>
-
- <mkdir dir="${build.lib}/embeddable/standalone/standard"/>
- <copy todir="${build.lib}/embeddable/standalone/standard" file="${build.resources}/test/standalone/standard/testjms.xml"/>
- <copy todir="${build.lib}/embeddable/standalone/standard" file="${build.resources}/test/standalone/standard/jca-inflowmdb-beans.xml"/>
-
- <mkdir dir="${build.lib}/embeddable/standalone/embeddedjms"/>
- <copy todir="${build.lib}/embeddable/standalone/embeddedjms" file="${build.resources}/test/standalone/embeddedjms/testjms.xml"/>
- <jar jarfile="${build.lib}/embeddable/standalone/mdb.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/standalone/embeddedjms/*.class"/>
- <include name="org/jboss/ejb3/test/standalone/embeddedjms/unit/*.class"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/embeddable/standalone/flushmodenever-session1.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/standalone/flushmodenever/*1*.class"/>
- <include name="org/jboss/ejb3/test/standalone/flushmodenever/unit/*.class"/>
- </fileset>
- <fileset dir="${resources}/test/standalone/flushmodenever/session1">
- <include name="META-INF/persistence.xml"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/embeddable/standalone/flushmodenever-session2.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/standalone/flushmodenever/*2*.class"/>
- </fileset>
- <fileset dir="${resources}/test/standalone/flushmodenever/session2">
- <include name="META-INF/persistence.xml"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/embeddable/standalone/flushmodenever-util.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/standalone/flushmodenever/Util.class"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/embeddable/standalone/embedded-security.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/standalone/security/**/*.class"/>
- </fileset>
- <fileset dir="${resources}/test/standalone/security/">
- <include name="*.properties"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/embeddable/standalone/embedded-servicepojo.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/standalone/servicepojo/**/*.class"/>
- </fileset>
- <!--
- <fileset dir="${resources}/test/standalone/servicepojo/">
- <include name="*.properties"/>
- </fileset>
- -->
- </jar>
-
- </target>
-
<target name="client14-tests" depends="init"
description="Execute all tests for Java1.4 client compatibility.">
<mkdir dir="${build.reports}"/>
@@ -4658,116 +4527,6 @@
</target>
- <target name="standalone-test" depends="init" if="test"
- description="Execute all tests in the given test directory.">
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
- <!-- Remove the test.log so each run has a fresh log -->
- <delete file="${build.testlog}/test.log"/>
- <path id="standalone.classpath">
- <fileset dir="${module.output}/lib/embeddable/lib">
- <include name="*.jar"/>
- </fileset>
- <pathelement location="${module.output}/lib/embeddable/conf"/>
- <pathelement location="${module.output}/lib/embeddable/lib"/>
- <pathelement location="${build.lib}/embeddable/standalone"/>
- <pathelement location="${build.lib}/embeddable/standalone/standard"/>
- <!-- TODO: deployment should take care of adding jars to classpath -->
- <fileset dir="${build.lib}/embeddable/standalone">
- <include name="*.jar"/>
- </fileset>
- </path>
- <junit dir="${module.output}"
- printsummary="yes"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
-
- <jvmarg value="-Dorg.jboss.jms.asf.useold=true"/>
-
- <sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/>
- <sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="log4j.configuration" value="file:${location.resources.test}/test/log4j.xml"/>
- <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
- <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
- <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
-
- <classpath>
- <path refid="standalone.classpath"/>
- <path refid="jboss.test.classpath"/>
- <path refid="jboss.jmx.classpath"/>
- </classpath>
-
- <formatter type="plain" usefile="true"/>
- <formatter type="xml" usefile="true"/>
-
- <batchtest todir="${build.reports}"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
-
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/${test}/unit/*TestCase.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="test-standalone-with-jboss" if="test">
- <!-- For use when we're doing a standalone test with jboss -->
-
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
- <!-- Remove the test.log so each run has a fresh log -->
- <delete file="${build.testlog}/test.log"/>
- <path id="standalone.classpath">
- <fileset dir="${module.output}/lib/embeddable/lib">
- <include name="*.jar"/>
- </fileset>
- <pathelement location="${module.output}/lib/embeddable/conf"/>
- <fileset dir="${build.lib}/embeddable/${test}">
- <include name="*.jar"/>
- </fileset>
- </path>
- <junit dir="${module.output}"
- printsummary="yes"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
-
- <sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/>
- <sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="log4j.configuration" value="file:${location.resources.test}/test/log4j.xml"/>
- <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
- <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
- <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
- <sysproperty key="java.security.auth.login.config" value="${resources}/test/security/auth.conf"/>
-
- <classpath>
- <path refid="standalone.classpath"/>
- <path refid="jboss.test.classpath"/>
- <path refid="hsqldb.hsqldb.classpath"/>
- <!-- this must come last -->
- <pathelement location="${build.classes}"/>
- <pathelement location="${resources}/test"/>
- <path refid="javac.classpath"/>
- </classpath>
-
- <formatter type="plain" usefile="true"/>
- <formatter type="xml" usefile="true"/>
-
- <batchtest todir="${build.reports}"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
-
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/${test}/unit/*TestCase.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
<target name="run-clusteredentity" depends="init"
description="Runs the clusteredentity stuff in a cluster">
@@ -4803,7 +4562,6 @@
</target>
<target name="tests" depends="init" description="Execute all tests">
- <!--antcall target="standalone-tests" inheritRefs="true"/-->
<antcall target="simple-tests" inheritRefs="true"/>
<antcall target="ejb-tests" inheritRefs="true"/>
<antcall target="entity-tests" inheritRefs="true"/>
@@ -4822,30 +4580,11 @@
</target>
<target name="no-start-jboss-tests" depends="init" description="Execute all tests">
- <!--antcall target="standalone-tests" inheritRefs="true"/-->
<antcall target="no-start-jboss-ejb-tests" inheritRefs="true"/>
<antcall target="no-start-jboss-entity-tests" inheritRefs="true"/>
<antcall target="no-start-jboss-iiop-tests" inheritRefs="true"/>
</target>
- <target name="standalone-tests" depends="init">
- <antcall target="standalone-test" inheritRefs="true">
- <param name="test" value="standalone"/>
- </antcall>
- <antcall target="standalone-test" inheritRefs="true">
- <param name="test" value="standalone/flushmodenever"/>
- </antcall>
- <antcall target="standalone-test" inheritRefs="true">
- <param name="test" value="standalone/embeddedjms"/>
- </antcall>
- <antcall target="standalone-test" inheritRefs="true">
- <param name="test" value="standalone/security"/>
- </antcall>
- <antcall target="standalone-test" inheritRefs="true">
- <param name="test" value="standalone/servicepojo"/>
- </antcall>
- </target>
-
<target name="simple-tests" depends="init">
<antcall target="test" inheritRefs="true">
<param name="test" value="cachepassivation"/>
Modified: projects/ejb3/dev/ejbthree1269/core/jboss-ejb3-client.xml
===================================================================
--- projects/ejb3/dev/ejbthree1269/core/jboss-ejb3-client.xml 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/core/jboss-ejb3-client.xml 2008-04-23 20:07:12 UTC (rev 72634)
@@ -63,7 +63,6 @@
<outputDirectory></outputDirectory>
<includes>
<include>org/jboss/ejb3/security/client/**/*.class</include>
- <include>org/jboss/ejb3/security/helpers/**/*.class</include>
<include>org/jboss/ejb3/security/embedded/**/*.class</include>
<include>org/jboss/ejb3/security/bridge/**/*.class</include>
<include>org/jboss/ejb3/security/SecurityDomainManager.class</include>
Modified: projects/ejb3/dev/ejbthree1269/core/pom.xml
===================================================================
--- projects/ejb3/dev/ejbthree1269/core/pom.xml 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/core/pom.xml 2008-04-23 20:07:12 UTC (rev 72634)
@@ -265,186 +265,272 @@
<version>1.3</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
<scope>test</scope>
- </dependency>
+ </dependency>
+
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.7</version> <!-- Only used here, for Unit Tests -->
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
<version>3.2.6.ga</version>
</dependency>
+
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
<version>3.3.1.GA</version>
</dependency>
+
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>3.3.2.GA</version>
</dependency>
+
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata</artifactId>
</dependency>
+
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
<version>1.0.6-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-transaction-spi</artifactId>
</dependency>
+
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
<version>2.0.0.Beta8</version>
</dependency>
+
<dependency>
- <groupId>org.jboss</groupId>
+ <groupId>org.jboss.naming</groupId>
<artifactId>jnpserver</artifactId>
</dependency>
+
<dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
</dependency>
+
<dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-aspects</artifactId>
</dependency>
+
<dependency>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
<!-- not used anywhere else -->
<version>2.1.0.CR4</version>
</dependency>
+
<dependency>
+ <groupId>org.jboss.aspects</groupId>
+ <artifactId>jboss-remoting-aspects</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.cluster</groupId>
<artifactId>jboss-ha-client</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.jboss.cluster</groupId>
<artifactId>jboss-ha-server-api</artifactId>
- <version>1.0.0.GA</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-async</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-cache</artifactId>
<version>0.13.0-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-security</artifactId>
<version>0.13.0-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-ext-api</artifactId>
<version>0.3</version>
</dependency>
+
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-ext-api-impl</artifactId>
<version>0.3-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-interceptors</artifactId>
<version>0.13.0-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-metadata</artifactId>
<version>0.12.1</version>
</dependency>
+
<dependency>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded</artifactId>
<version>beta3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-ejb-api</artifactId>
</dependency>
+
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jacc-api</artifactId>
</dependency>
+
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jca-api</artifactId>
</dependency>
+
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-persistence-api</artifactId>
</dependency>
+
+ <!-- this needs to be removed -->
<dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
+ <artifactId>jboss-as-connector</artifactId>
+ <version>${version.org.jboss.jboss-as}</version>
<exclusions>
<exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi-bare</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-cluster</artifactId>
+ <artifactId>jboss-as-server</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-profileservice</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ </exclusion>
+
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-j2se</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-j2se</artifactId>
+ </exclusion>
</exclusions>
- <version>${version.org.jboss.jboss-as}</version>
- </dependency>
+ </dependency>
+
+ <!-- this needs to be removed -->
<dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-connector</artifactId>
+ <artifactId>jboss-as-server</artifactId>
<version>${version.org.jboss.jboss-as}</version>
</dependency>
+
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-container</artifactId>
</dependency>
+
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-core-spi</artifactId>
</dependency>
+
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
+
<dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jboss-security-spi</artifactId>
<version>2.0.2.Beta6</version>
</dependency>
+
<dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jbosssx</artifactId>
<version>2.0.2.Beta6</version>
</dependency>
+
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
</dependency>
+
<dependency>
<groupId>quartz</groupId>
<artifactId>quartz</artifactId>
<version>1.6.0</version>
</dependency>
+
<dependency>
<groupId>trove</groupId>
<artifactId>trove</artifactId>
</dependency>
+
</dependencies>
</project>
Modified: projects/ejb3/dev/ejbthree1269/core/src/main/java/org/jboss/ejb3/MCClientKernelAbstraction.java
===================================================================
--- projects/ejb3/dev/ejbthree1269/core/src/main/java/org/jboss/ejb3/MCClientKernelAbstraction.java 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/core/src/main/java/org/jboss/ejb3/MCClientKernelAbstraction.java 2008-04-23 20:07:12 UTC (rev 72634)
@@ -21,7 +21,6 @@
*/
package org.jboss.ejb3;
-import org.jboss.ejb3.embedded.resource.RARDeployment;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
import org.jboss.logging.Logger;
@@ -53,21 +52,13 @@
if (entry != null)
{
Object target = entry.getTarget();
- if (target instanceof RARDeployment)
+ Class[] types = new Class[signature.length];
+ for (int i = 0; i < signature.length; ++i)
{
- RARDeployment deployment = (RARDeployment) target;
- return deployment.invoke(operationName, params, signature);
+ types[i] = Thread.currentThread().getContextClassLoader().loadClass(signature[i]);
}
- else
- {
- Class[] types = new Class[signature.length];
- for (int i = 0; i < signature.length; ++i)
- {
- types[i] = Thread.currentThread().getContextClassLoader().loadClass(signature[i]);
- }
- Method method = target.getClass().getMethod(operationName, types);
- return method.invoke(target, params);
- }
+ Method method = target.getClass().getMethod(operationName, types);
+ return method.invoke(target, params);
}
return null;
}
Modified: projects/ejb3/dev/ejbthree1269/core/src/main/java/org/jboss/ejb3/MCKernelAbstraction.java
===================================================================
--- projects/ejb3/dev/ejbthree1269/core/src/main/java/org/jboss/ejb3/MCKernelAbstraction.java 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/core/src/main/java/org/jboss/ejb3/MCKernelAbstraction.java 2008-04-23 20:07:12 UTC (rev 72634)
@@ -37,7 +37,6 @@
import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
import org.jboss.beans.metadata.spi.DemandMetaData;
import org.jboss.beans.metadata.spi.SupplyMetaData;
-import org.jboss.ejb3.embedded.resource.RARDeployment;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
import org.jboss.logging.Logger;
@@ -240,21 +239,13 @@
if (entry != null)
{
Object target = entry.getTarget();
- if (target instanceof RARDeployment)
+ Class[] types = new Class[signature.length];
+ for (int i = 0; i < signature.length; ++i)
{
- RARDeployment deployment = (RARDeployment)target;
- return deployment.invoke(operationName, params, signature);
- }
- else
- {
- Class[] types = new Class[signature.length];
- for (int i = 0; i < signature.length; ++i)
- {
- types[i] = Thread.currentThread().getContextClassLoader().loadClass(signature[i]);
- }
- Method method = target.getClass().getMethod(operationName, types);
- return method.invoke(target, params);
+ types[i] = Thread.currentThread().getContextClassLoader().loadClass(signature[i]);
}
+ Method method = target.getClass().getMethod(operationName, types);
+ return method.invoke(target, params);
}
return null;
}
Modified: projects/ejb3/dev/ejbthree1269/core/src/main/resources/META-INF/ejb3-deployers-beans.xml
===================================================================
--- projects/ejb3/dev/ejbthree1269/core/src/main/resources/META-INF/ejb3-deployers-beans.xml 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/core/src/main/resources/META-INF/ejb3-deployers-beans.xml 2008-04-23 20:07:12 UTC (rev 72634)
@@ -5,8 +5,6 @@
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <!-- TODO this should be removed later on when ENC gets changed -->
- <bean name="java:comp/Initializer" class="org.jboss.ejb3.embedded.JavaCompInitializer"/>
<bean name="DefaultPersistenceProperties" class="org.jboss.ejb3.DefaultPersistenceProperties"/>
<bean name="Ejb3Deployer" class="org.jboss.ejb3.deployers.Ejb3Deployer">
Modified: projects/ejb3/dev/ejbthree1269/core/src/test/resources/test-configs/statefulproxyfactoryoverride/deployers/ejb3.deployer/META-INF/ejb3-deployers-beans.xml
===================================================================
--- projects/ejb3/dev/ejbthree1269/core/src/test/resources/test-configs/statefulproxyfactoryoverride/deployers/ejb3.deployer/META-INF/ejb3-deployers-beans.xml 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/core/src/test/resources/test-configs/statefulproxyfactoryoverride/deployers/ejb3.deployer/META-INF/ejb3-deployers-beans.xml 2008-04-23 20:07:12 UTC (rev 72634)
@@ -5,8 +5,6 @@
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <!-- TODO this should be removed later on when ENC gets changed -->
- <bean name="java:comp/Initializer" class="org.jboss.ejb3.embedded.JavaCompInitializer"/>
<bean name="DefaultPersistenceProperties" class="org.jboss.ejb3.DefaultPersistenceProperties"/>
<bean name="Ejb3Deployer" class="org.jboss.ejb3.deployers.Ejb3Deployer">
Modified: projects/ejb3/dev/ejbthree1269/injection/pom.xml
===================================================================
--- projects/ejb3/dev/ejbthree1269/injection/pom.xml 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/injection/pom.xml 2008-04-23 20:07:12 UTC (rev 72634)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.3-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
Modified: projects/ejb3/dev/ejbthree1269/installer/src/main/resources/conf/jbossas-ejb3-files-to-remove.txt
===================================================================
--- projects/ejb3/dev/ejbthree1269/installer/src/main/resources/conf/jbossas-ejb3-files-to-remove.txt 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/installer/src/main/resources/conf/jbossas-ejb3-files-to-remove.txt 2008-04-23 20:07:12 UTC (rev 72634)
@@ -5,6 +5,7 @@
client/jboss-ejb3-impl-javadoc.jar
client/jboss-ejb3-ext-api.jar
client/jboss-ha-client.jar
+client/jboss-ejb3-core-client.jar
server/default/lib/jboss-ejb3-impl.jar
server/default/lib/jboss-ejb3-cache.jar
server/default/lib/jboss-ejb3-ext-api.jar
@@ -32,4 +33,4 @@
server/all/deploy/ejb3-connectors-service.xml
server/all/deploy/ejb3-timer-service.xml
server/all/deploy/cluster/ejb3-clustered-sfsbcache-beans.xml
-server/all/deploy/cluster/ejb3-entity-cache-beans.xml
\ No newline at end of file
+server/all/deploy/cluster/ejb3-entity-cache-beans.xml
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-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/LifecycleCallbacks.java 2008-04-23 20:07:12 UTC (rev 72634)
@@ -48,7 +48,6 @@
{
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
@@ -56,6 +55,7 @@
{
Object interceptor = component.getInterceptor(interceptorClass);
ExtendedAdvisor interceptorAdvisor = ExtendedAdvisorHelper.getExtendedAdvisor(advisor, interceptor);
+ HashSet<Class<?>> classes = null;
for(Method interceptorMethod : ClassHelper.getAllMethods(interceptorClass))
{
if (!ClassHelper.isOverridden(interceptorClass, interceptorMethod))
@@ -63,7 +63,7 @@
//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);
+ classes = checkClass(classes, interceptorMethod, advisor, lifecycleAnnotationType);
interceptors.add(new LifecycleCallbackInterceptorMethodInterceptor(interceptor, interceptorMethod));
}
}
@@ -72,13 +72,14 @@
// Bean lifecycle callbacks
Class<?> beanClass = advisor.getClazz();
+ HashSet<Class<?>> classes = null;
for(Method beanMethod : ClassHelper.getAllMethods(beanClass))
{
if (!ClassHelper.isOverridden(beanClass, beanMethod))
{
if(advisor.hasAnnotation(beanMethod, lifecycleAnnotationType))
{
- checkClass(classes, beanMethod, advisor, lifecycleAnnotationType);
+ classes = checkClass(classes, beanMethod, advisor, lifecycleAnnotationType);
interceptors.add(new LifecycleCallbackBeanMethodInterceptor(beanMethod));
}
}
@@ -89,29 +90,37 @@
return interceptors.toArray(new Interceptor[0]);
}
- private static void checkClass(HashSet<Class<?>> classes, Method m, Advisor advisor, Class<? extends Annotation> lifecycleAnnotationType)
+ private static HashSet<Class<?>> checkClass(HashSet<Class<?>> classes, Method m, Advisor advisor, Class<? extends Annotation> lifecycleAnnotationType)
{
- if (classes.contains(m.getDeclaringClass()))
+ if (classes != null)
{
- String type = null;
- if (lifecycleAnnotationType == PostConstruct.class)
+ if (classes.contains(m.getDeclaringClass()))
{
- type = "post-construct";
+ 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());
}
- 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());
}
+ else
+ {
+ classes = new HashSet<Class<?>>();
+ }
classes.add(m.getDeclaringClass());
+ return classes;
}
}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/BaseLifecycleBean.java (from rev 72633, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/BaseLifecycleBean.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/BaseLifecycleBean.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/BaseLifecycleBean.java 2008-04-23 20:07:12 UTC (rev 72634)
@@ -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.badbinding;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class BaseLifecycleBean
+{
+ public void lifecycle()
+ {
+
+ }
+
+ public void lifecycle2()
+ {
+
+ }
+}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/BaseLifecycleInterceptor.java (from rev 72633, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/BaseLifecycleInterceptor.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/BaseLifecycleInterceptor.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/BaseLifecycleInterceptor.java 2008-04-23 20:07:12 UTC (rev 72634)
@@ -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.badbinding;
+
+import javax.interceptor.InvocationContext;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class BaseLifecycleInterceptor
+{
+ public void lifecycle(InvocationContext ctx)
+ {
+
+ }
+
+ public void lifecycle2(InvocationContext ctx)
+ {
+
+ }
+}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/ChildLifecycleBean.java (from rev 72633, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/ChildLifecycleBean.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/ChildLifecycleBean.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/ChildLifecycleBean.java 2008-04-23 20:07:12 UTC (rev 72634)
@@ -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.badbinding;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class ChildLifecycleBean extends BaseLifecycleBean
+{
+ public void lifecycle()
+ {
+
+ }
+
+ public void lifecycle2()
+ {
+
+ }
+}
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/ChildLifecycleInterceptor.java (from rev 72633, projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/ChildLifecycleInterceptor.java)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/ChildLifecycleInterceptor.java (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/ChildLifecycleInterceptor.java 2008-04-23 20:07:12 UTC (rev 72634)
@@ -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.badbinding;
+
+import javax.interceptor.InvocationContext;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class ChildLifecycleInterceptor extends BaseLifecycleInterceptor
+{
+ public void lifecycle(InvocationContext ctx)
+ {
+
+ }
+
+ public void lifecycle2(InvocationContext ctx)
+ {
+
+ }
+}
Modified: projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/unit/BadBindingTestCase.java
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/unit/BadBindingTestCase.java 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/badbinding/unit/BadBindingTestCase.java 2008-04-23 20:07:12 UTC (rev 72634)
@@ -34,6 +34,7 @@
import org.jboss.ejb3.interceptors.metadata.InterceptorMetaDataBridge;
import org.jboss.ejb3.metadata.MetaDataBridge;
import org.jboss.ejb3.metadata.annotation.AnnotationRepositoryToMetaData;
+import org.jboss.ejb3.test.interceptors.badbinding.ChildLifecycleBean;
import org.jboss.ejb3.test.interceptors.common.CommonInterceptor;
import org.jboss.ejb3.test.interceptors.metadata.MetadataBean;
import org.jboss.logging.Logger;
@@ -207,8 +208,40 @@
testBinding("badbinding/goodbean-interceptor-order-binding-with-method/META-INF/ejb-jar.xml");
}
- private MyContainer<MetadataBean> testBinding(String ejbJarXml) throws Throwable
+
+ public void testBadBeanBeanOverriddenLifecycle() throws Throwable
{
+ try
+ {
+ MyContainer container = testBinding("badbinding/badbean-bean-overridden-lifecycle/META-INF/ejb-jar.xml", ChildLifecycleBean.class, "ChildLifecycleBean");
+ container.construct();
+ fail("Only the child lifecycle method should have been chosen");
+ }
+ catch(Exception expected)
+ {
+ }
+ }
+
+ public void testBadBeanInterceptorOverriddenLifecycle() throws Throwable
+ {
+ try
+ {
+ MyContainer container = testBinding("badbinding/badbean-interceptor-overridden-lifecycle/META-INF/ejb-jar.xml", ChildLifecycleBean.class, "ChildLifecycleBean");
+ container.construct();
+ fail("Only the child lifecycle method should have been chosen");
+ }
+ catch(Exception expected)
+ {
+ }
+ }
+
+ private MyContainer testBinding(String ejbJarXml) throws Throwable
+ {
+ return testBinding(ejbJarXml, MetadataBean.class, "MetadataBean");
+ }
+
+ private MyContainer testBinding(String ejbJarXml, Class<?> clazz, String name) throws Throwable
+ {
// To make surefire happy
Thread.currentThread().setContextClassLoader(MetadataBean.class.getClassLoader());
@@ -220,12 +253,12 @@
JBoss50MetaData jbossMetaData = new JBoss50MetaData();
jbossMetaData.merge(null, metaData);
- JBossEnterpriseBeanMetaData beanMetaData = jbossMetaData.getEnterpriseBean("MetadataBean");
+ JBossEnterpriseBeanMetaData beanMetaData = jbossMetaData.getEnterpriseBean(name);
assertNotNull(beanMetaData);
assertEquals(0, CommonInterceptor.postConstructs);
- MyContainer<MetadataBean> container = new MyContainer<MetadataBean>("MetadataBean", "Test", MetadataBean.class, beanMetaData);
+ MyContainer container = new MyContainer(name, "Test", clazz, beanMetaData);
container.testAdvisor();
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-bean-overridden-lifecycle (from rev 72633, projects/ejb3/trunk/interceptors/src/test/resources/badbinding/badbean-bean-overridden-lifecycle)
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-bean-overridden-lifecycle/META-INF (from rev 72633, projects/ejb3/trunk/interceptors/src/test/resources/badbinding/badbean-bean-overridden-lifecycle/META-INF)
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-bean-overridden-lifecycle/META-INF/ejb-jar.xml
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/resources/badbinding/badbean-bean-overridden-lifecycle/META-INF/ejb-jar.xml 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-bean-overridden-lifecycle/META-INF/ejb-jar.xml 2008-04-23 20:07:12 UTC (rev 72634)
@@ -1,25 +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>ChildLifecycleBean</ejb-name>
- <around-invoke>
- <method-name>aroundInvoke</method-name>
- </around-invoke>
- <post-construct>
- <lifecycle-callback-method>lifecycle</lifecycle-callback-method>
- </post-construct>
- <post-construct>
- <lifecycle-callback-method>lifecycle2</lifecycle-callback-method>
- </post-construct>
- </session>
- </enterprise-beans>
-</ejb-jar>
\ No newline at end of file
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-bean-overridden-lifecycle/META-INF/ejb-jar.xml (from rev 72633, projects/ejb3/trunk/interceptors/src/test/resources/badbinding/badbean-bean-overridden-lifecycle/META-INF/ejb-jar.xml)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-bean-overridden-lifecycle/META-INF/ejb-jar.xml (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-bean-overridden-lifecycle/META-INF/ejb-jar.xml 2008-04-23 20:07:12 UTC (rev 72634)
@@ -0,0 +1,25 @@
+<?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>ChildLifecycleBean</ejb-name>
+ <around-invoke>
+ <method-name>aroundInvoke</method-name>
+ </around-invoke>
+ <post-construct>
+ <lifecycle-callback-method>lifecycle</lifecycle-callback-method>
+ </post-construct>
+ <post-construct>
+ <lifecycle-callback-method>lifecycle2</lifecycle-callback-method>
+ </post-construct>
+ </session>
+ </enterprise-beans>
+</ejb-jar>
\ No newline at end of file
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-interceptor-overridden-lifecycle (from rev 72633, projects/ejb3/trunk/interceptors/src/test/resources/badbinding/badbean-interceptor-overridden-lifecycle)
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-interceptor-overridden-lifecycle/META-INF (from rev 72633, projects/ejb3/trunk/interceptors/src/test/resources/badbinding/badbean-interceptor-overridden-lifecycle/META-INF)
Deleted: projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-interceptor-overridden-lifecycle/META-INF/ejb-jar.xml
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/resources/badbinding/badbean-interceptor-overridden-lifecycle/META-INF/ejb-jar.xml 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-interceptor-overridden-lifecycle/META-INF/ejb-jar.xml 2008-04-23 20:07:12 UTC (rev 72634)
@@ -1,38 +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>ChildLifecycleBean</ejb-name>
- <around-invoke>
- <method-name>aroundInvoke</method-name>
- </around-invoke>
- </session>
- </enterprise-beans>
- <interceptors>
- <interceptor>
- <interceptor-class>org.jboss.ejb3.test.interceptors.badbinding.ChildLifecycleInterceptor</interceptor-class>
- <post-construct>
- <lifecycle-callback-method>lifecycle</lifecycle-callback-method>
- </post-construct>
- <post-construct>
- <lifecycle-callback-method>lifecycle2</lifecycle-callback-method>
- </post-construct>
- </interceptor>
- </interceptors>
- <assembly-descriptor>
- <interceptor-binding>
- <ejb-name>*</ejb-name>
- <interceptor-order>
- <interceptor-class>org.jboss.ejb3.test.interceptors.badbinding.ChildLifecycleInterceptor</interceptor-class>
- </interceptor-order>
- </interceptor-binding>
- </assembly-descriptor>
-</ejb-jar>
\ No newline at end of file
Copied: projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-interceptor-overridden-lifecycle/META-INF/ejb-jar.xml (from rev 72633, projects/ejb3/trunk/interceptors/src/test/resources/badbinding/badbean-interceptor-overridden-lifecycle/META-INF/ejb-jar.xml)
===================================================================
--- projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-interceptor-overridden-lifecycle/META-INF/ejb-jar.xml (rev 0)
+++ projects/ejb3/dev/ejbthree1269/interceptors/src/test/resources/badbinding/badbean-interceptor-overridden-lifecycle/META-INF/ejb-jar.xml 2008-04-23 20:07:12 UTC (rev 72634)
@@ -0,0 +1,38 @@
+<?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>ChildLifecycleBean</ejb-name>
+ <around-invoke>
+ <method-name>aroundInvoke</method-name>
+ </around-invoke>
+ </session>
+ </enterprise-beans>
+ <interceptors>
+ <interceptor>
+ <interceptor-class>org.jboss.ejb3.test.interceptors.badbinding.ChildLifecycleInterceptor</interceptor-class>
+ <post-construct>
+ <lifecycle-callback-method>lifecycle</lifecycle-callback-method>
+ </post-construct>
+ <post-construct>
+ <lifecycle-callback-method>lifecycle2</lifecycle-callback-method>
+ </post-construct>
+ </interceptor>
+ </interceptors>
+ <assembly-descriptor>
+ <interceptor-binding>
+ <ejb-name>*</ejb-name>
+ <interceptor-order>
+ <interceptor-class>org.jboss.ejb3.test.interceptors.badbinding.ChildLifecycleInterceptor</interceptor-class>
+ </interceptor-order>
+ </interceptor-binding>
+ </assembly-descriptor>
+</ejb-jar>
\ No newline at end of file
Modified: projects/ejb3/dev/ejbthree1269/locator/pom.xml
===================================================================
--- projects/ejb3/dev/ejbthree1269/locator/pom.xml 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/locator/pom.xml 2008-04-23 20:07:12 UTC (rev 72634)
@@ -10,7 +10,7 @@
<parent>
<artifactId>jboss-ejb3-build</artifactId>
<groupId>org.jboss.ejb3</groupId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.3-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
Modified: projects/ejb3/dev/ejbthree1269/plugin/pom.xml
===================================================================
--- projects/ejb3/dev/ejbthree1269/plugin/pom.xml 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/plugin/pom.xml 2008-04-23 20:07:12 UTC (rev 72634)
@@ -77,14 +77,12 @@
<version>0.1.0-SNAPSHOT</version>
</dependency>
-<dependency>
+ <dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
- <version>0.1.0-SNAPSHOT</version>
<classifier>client</classifier>
+ <version>0.1.0-SNAPSHOT</version>
</dependency>
-
-
</dependencies>
<!-- Distribution Management -->
Modified: projects/ejb3/dev/ejbthree1269/sandbox/pom.xml
===================================================================
--- projects/ejb3/dev/ejbthree1269/sandbox/pom.xml 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/sandbox/pom.xml 2008-04-23 20:07:12 UTC (rev 72634)
@@ -53,7 +53,7 @@
<version>2.2.1.GA</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
+ <groupId>org.jboss.naming</groupId>
<artifactId>jnpserver</artifactId>
<scope>test</scope>
</dependency>
Property changes on: projects/ejb3/dev/ejbthree1269/security
___________________________________________________________________
Name: svn:ignore
- target
+ target
eclipse-target
Modified: projects/ejb3/dev/ejbthree1269/security/pom.xml
===================================================================
--- projects/ejb3/dev/ejbthree1269/security/pom.xml 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/security/pom.xml 2008-04-23 20:07:12 UTC (rev 72634)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.3-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
@@ -39,30 +39,18 @@
<version>2.0.2.Beta6</version>
</dependency>
- <!-- EJB3 API -->
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- </dependency>
-
<!-- JACC API -->
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jacc-api</artifactId>
</dependency>
- <!-- JASPI API -->
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaspi-api</artifactId>
- <version>1.0.0.Beta3Update1</version>
- </dependency>
-
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-ext-api</artifactId>
<version>0.3</version>
</dependency>
+
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-ext-api-impl</artifactId>
@@ -73,6 +61,16 @@
<dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- JBoss MetaData -->
@@ -94,19 +92,18 @@
<artifactId>jboss-common-core</artifactId>
</dependency>
- <!-- JBoss Common Logging -->
+ <!-- JBoss Logging SPI -->
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>runtime</scope>
+ <artifactId>jboss-logging-spi</artifactId>
</dependency>
- <!-- JUnit -->
+ <!-- JUnit
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency> -->
</dependencies>
</project>
Modified: projects/ejb3/dev/ejbthree1269/socket-inflow/pom.xml
===================================================================
--- projects/ejb3/dev/ejbthree1269/socket-inflow/pom.xml 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/socket-inflow/pom.xml 2008-04-23 20:07:12 UTC (rev 72634)
@@ -10,7 +10,7 @@
<parent>
<artifactId>jboss-ejb3-build</artifactId>
<groupId>org.jboss.ejb3</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.3-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
@@ -41,18 +41,17 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
- <!-- These Versions must be moved to the parent POM -->
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
- <version>1.0.2</version>
</dependency>
+
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jca-api</artifactId>
- <version>1.5.0.Beta3Update1</version>
</dependency>
</dependencies>
Modified: projects/ejb3/dev/ejbthree1269/transactions/pom.xml
===================================================================
--- projects/ejb3/dev/ejbthree1269/transactions/pom.xml 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/transactions/pom.xml 2008-04-23 20:07:12 UTC (rev 72634)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.3-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-current-invocation-aspects</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
@@ -60,15 +60,9 @@
<version>5.0.0.Beta4</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
+ <groupId>org.jboss.naming</groupId>
<artifactId>jnpserver</artifactId>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.metadata</groupId>
Modified: projects/ejb3/dev/ejbthree1269/transactions/src/main/java/org/jboss/ejb3/tx/TxUtil.java
===================================================================
--- projects/ejb3/dev/ejbthree1269/transactions/src/main/java/org/jboss/ejb3/tx/TxUtil.java 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/transactions/src/main/java/org/jboss/ejb3/tx/TxUtil.java 2008-04-23 20:07:12 UTC (rev 72634)
@@ -31,10 +31,13 @@
import javax.transaction.Status;
import javax.transaction.SystemException;
import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
import org.jboss.aop.Advisor;
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.MethodInvocation;
+import org.jboss.aspects.currentinvocation.CurrentInvocation;
+import org.jboss.ejb3.interceptors.container.BeanContext;
import org.jboss.logging.Logger;
import org.jboss.tm.TransactionManagerLocator;
@@ -48,12 +51,14 @@
{
private static final Logger log = Logger.getLogger(TxUtil.class);
- protected static TransactionManager getTransactionManager()
+ // TODO: should really be protected
+ public static TransactionManager getTransactionManager()
{
return TransactionManagerLocator.getInstance().locate();
}
- protected static TransactionManagementType getTransactionManagementType(Advisor advisor)
+ // TODO: should really be protected
+ public static TransactionManagementType getTransactionManagementType(Advisor advisor)
{
TransactionManagement transactionManagement = (TransactionManagement) advisor.resolveAnnotation(TransactionManagement.class);
if (transactionManagement == null) return TransactionManagementType.CONTAINER;
@@ -92,12 +97,9 @@
}
- /**
- * @param currentInvocation
- * @return
- */
- public static boolean getRollbackOnly(Invocation currentInvocation)
+ public static boolean getRollbackOnly()
{
+ Invocation currentInvocation = CurrentInvocation.getCurrentInvocation();
Advisor advisor = currentInvocation.getAdvisor();
// EJB1.1 11.6.1: Must throw IllegalStateException if BMT
TransactionManagementType type = TxUtil.getTransactionManagementType(advisor);
@@ -151,4 +153,47 @@
return getTxType(invocation.getAdvisor(), ((MethodInvocation) invocation).getActualMethod());
}
+ public static UserTransaction getUserTransaction(BeanContext<?> ctx)
+ {
+ Invocation invocation = CurrentInvocation.getCurrentInvocation();
+
+ // TODO: these checks are real ugly
+ // getUserTransaction is not allowed during construction and injection EJB 3 4.4.1 and EJB 3 4.5.2
+ // We're constructing the bean
+ if(invocation == null)
+ throw new IllegalStateException("It's not allowed to get the UserTransaction during construction and injection " + ctx);
+ // Is construction happening from within another bean?
+ if(ctx.getInstance() != invocation.getTargetObject())
+ throw new IllegalStateException("It's not allowed to get the UserTransaction during construction and injection " + ctx);
+
+ Advisor advisor = invocation.getAdvisor();
+ TransactionManagementType type = TxUtil.getTransactionManagementType(advisor);
+ if (type != TransactionManagementType.BEAN) throw new IllegalStateException("Container " + advisor.getName() + ": it is illegal to inject UserTransaction into a CMT bean");
+
+ return new UserTransactionImpl();
+ }
+
+ public static void setRollbackOnly()
+ {
+ Advisor advisor = CurrentInvocation.getCurrentInvocation().getAdvisor();
+ // EJB1.1 11.6.1: Must throw IllegalStateException if BMT
+ TransactionManagementType type = TxUtil.getTransactionManagementType(advisor);
+ if (type != TransactionManagementType.CONTAINER) throw new IllegalStateException("Container " + advisor.getName() + ": it is illegal to call setRollbackOnly from BMT: " + type);
+
+ try
+ {
+ TransactionManager tm = TxUtil.getTransactionManager();
+
+ // The getRollbackOnly and setRollBackOnly method of the SessionContext interface should be used
+ // only in the session bean methods that execute in the context of a transaction.
+ if (tm.getTransaction() == null)
+ throw new IllegalStateException("setRollbackOnly() not allowed without a transaction.");
+
+ tm.setRollbackOnly();
+ }
+ catch (SystemException e)
+ {
+ log.warn("failed to set rollback only; ignoring", e);
+ }
+ }
}
Modified: projects/ejb3/dev/ejbthree1269/transactions/src/test/java/org/jboss/ejb3/test/tx/bmt/StatefulBMTBean.java
===================================================================
--- projects/ejb3/dev/ejbthree1269/transactions/src/test/java/org/jboss/ejb3/test/tx/bmt/StatefulBMTBean.java 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/transactions/src/test/java/org/jboss/ejb3/test/tx/bmt/StatefulBMTBean.java 2008-04-23 20:07:12 UTC (rev 72634)
@@ -21,13 +21,13 @@
*/
package org.jboss.ejb3.test.tx.bmt;
+import javax.annotation.Resource;
+import javax.ejb.SessionContext;
import javax.ejb.Stateful;
import javax.ejb.TransactionManagement;
import javax.ejb.TransactionManagementType;
import javax.transaction.UserTransaction;
-import org.jboss.ejb3.tx.UserTransactionImpl;
-
/**
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
* @version $Revision: $
@@ -36,12 +36,19 @@
@TransactionManagement(TransactionManagementType.BEAN)
public class StatefulBMTBean
{
+ private SessionContext ctx;
+ private Boolean isGetUserTransactionAllowed;
+
private UserTransaction getUserTransaction()
{
- // TODO: use the API
- return new UserTransactionImpl();
+ return ctx.getUserTransaction();
}
+ public boolean isGetUserTransactionAllowed()
+ {
+ return isGetUserTransactionAllowed;
+ }
+
public void normal() throws Exception
{
UserTransaction tx = getUserTransaction();
@@ -56,4 +63,24 @@
tx.rollback();
}
}
+
+ /**
+ * Note that the call to this method is hard-coded!
+ * @param ctx
+ */
+ @Resource
+ public void setSessionContext(SessionContext ctx)
+ {
+ this.ctx = ctx;
+
+ try
+ {
+ ctx.getUserTransaction();
+ isGetUserTransactionAllowed = true;
+ }
+ catch(IllegalStateException e)
+ {
+ isGetUserTransactionAllowed = false;
+ }
+ }
}
Modified: projects/ejb3/dev/ejbthree1269/transactions/src/test/java/org/jboss/ejb3/test/tx/bmt/unit/BMTUnitTestCase.java
===================================================================
--- projects/ejb3/dev/ejbthree1269/transactions/src/test/java/org/jboss/ejb3/test/tx/bmt/unit/BMTUnitTestCase.java 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/transactions/src/test/java/org/jboss/ejb3/test/tx/bmt/unit/BMTUnitTestCase.java 2008-04-23 20:07:12 UTC (rev 72634)
@@ -29,6 +29,7 @@
import org.jboss.ejb3.test.tx.mc.UnitTestBootstrap;
import org.junit.After;
import org.junit.AfterClass;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -71,6 +72,17 @@
}
@Test
+ public void testIsGetUserTransactionAllowed() throws Throwable
+ {
+ StatefulContainer<StatefulBMTBean> container = new StatefulContainer<StatefulBMTBean>("StatefulBMTBean", "Stateful Container", StatefulBMTBean.class);
+
+ Object id = container.construct();
+
+ Boolean isAllowed = container.invoke(id, "isGetUserTransactionAllowed");
+ Assert.assertFalse(isAllowed);
+ }
+
+ @Test
public void testNormal() throws Throwable
{
StatefulContainer<StatefulBMTBean> container = new StatefulContainer<StatefulBMTBean>("StatefulBMTBean", "Stateful Container", StatefulBMTBean.class);
Modified: projects/ejb3/dev/ejbthree1269/transactions/src/test/java/org/jboss/ejb3/test/tx/common/MockEJBContext.java
===================================================================
--- projects/ejb3/dev/ejbthree1269/transactions/src/test/java/org/jboss/ejb3/test/tx/common/MockEJBContext.java 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/transactions/src/test/java/org/jboss/ejb3/test/tx/common/MockEJBContext.java 2008-04-23 20:07:12 UTC (rev 72634)
@@ -74,7 +74,7 @@
public boolean getRollbackOnly() throws IllegalStateException
{
- return TxUtil.getRollbackOnly(getCurrentInvocation());
+ return TxUtil.getRollbackOnly();
}
public TimerService getTimerService() throws IllegalStateException
@@ -104,6 +104,6 @@
public void setRollbackOnly() throws IllegalStateException
{
- throw new IllegalStateException("N/A");
+ TxUtil.setRollbackOnly();
}
}
Modified: projects/ejb3/dev/ejbthree1269/transactions/src/test/java/org/jboss/ejb3/test/tx/common/StatefulBeanContext.java
===================================================================
--- projects/ejb3/dev/ejbthree1269/transactions/src/test/java/org/jboss/ejb3/test/tx/common/StatefulBeanContext.java 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/transactions/src/test/java/org/jboss/ejb3/test/tx/common/StatefulBeanContext.java 2008-04-23 20:07:12 UTC (rev 72634)
@@ -21,12 +21,25 @@
*/
package org.jboss.ejb3.test.tx.common;
+import java.security.Identity;
+import java.security.Principal;
import java.util.List;
+import java.util.Properties;
import java.util.UUID;
+import javax.ejb.EJBHome;
+import javax.ejb.EJBLocalHome;
+import javax.ejb.EJBLocalObject;
+import javax.ejb.EJBObject;
+import javax.ejb.SessionContext;
+import javax.ejb.TimerService;
+import javax.transaction.UserTransaction;
+import javax.xml.rpc.handler.MessageContext;
+
import org.jboss.aop.metadata.SimpleMetaData;
import org.jboss.ejb3.cache.Identifiable;
import org.jboss.ejb3.interceptors.container.DummyBeanContext;
+import org.jboss.ejb3.tx.TxUtil;
/**
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
@@ -38,6 +51,95 @@
private Object id = UUID.randomUUID();
private SimpleMetaData metaData = new SimpleMetaData();
+ private SessionContext sessionContext = new SessionContext()
+ {
+ public <T> T getBusinessObject(Class<T> businessInterface) throws IllegalStateException
+ {
+ throw new RuntimeException("N/A");
+ }
+
+ public EJBLocalObject getEJBLocalObject() throws IllegalStateException
+ {
+ throw new RuntimeException("N/A");
+ }
+
+ public EJBObject getEJBObject() throws IllegalStateException
+ {
+ throw new RuntimeException("N/A");
+ }
+
+ public Class getInvokedBusinessInterface() throws IllegalStateException
+ {
+ throw new RuntimeException("N/A");
+ }
+
+ public MessageContext getMessageContext() throws IllegalStateException
+ {
+ throw new RuntimeException("N/A");
+ }
+
+ public Identity getCallerIdentity()
+ {
+ throw new RuntimeException("N/A");
+ }
+
+ public Principal getCallerPrincipal()
+ {
+ throw new RuntimeException("N/A");
+ }
+
+ public EJBHome getEJBHome()
+ {
+ throw new RuntimeException("N/A");
+ }
+
+ public EJBLocalHome getEJBLocalHome()
+ {
+ throw new RuntimeException("N/A");
+ }
+
+ public Properties getEnvironment()
+ {
+ throw new RuntimeException("N/A");
+ }
+
+ public boolean getRollbackOnly() throws IllegalStateException
+ {
+ throw new RuntimeException("N/A");
+ }
+
+ public TimerService getTimerService() throws IllegalStateException
+ {
+ throw new RuntimeException("N/A");
+ }
+
+ public UserTransaction getUserTransaction() throws IllegalStateException
+ {
+ return TxUtil.getUserTransaction(StatefulBeanContext.this);
+ }
+
+ public boolean isCallerInRole(Identity role)
+ {
+ throw new RuntimeException("N/A");
+ }
+
+ public boolean isCallerInRole(String roleName)
+ {
+ throw new RuntimeException("N/A");
+ }
+
+ public Object lookup(String name)
+ {
+ throw new RuntimeException("N/A");
+ }
+
+ public void setRollbackOnly() throws IllegalStateException
+ {
+ throw new RuntimeException("N/A");
+ }
+
+ };
+
/**
* @param instance
* @param interceptors
@@ -56,4 +158,9 @@
{
return metaData;
}
+
+ protected SessionContext getSessionContext()
+ {
+ return sessionContext;
+ }
}
Modified: projects/ejb3/dev/ejbthree1269/transactions/src/test/java/org/jboss/ejb3/test/tx/common/StatefulContainer.java
===================================================================
--- projects/ejb3/dev/ejbthree1269/transactions/src/test/java/org/jboss/ejb3/test/tx/common/StatefulContainer.java 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/transactions/src/test/java/org/jboss/ejb3/test/tx/common/StatefulContainer.java 2008-04-23 20:07:12 UTC (rev 72634)
@@ -32,6 +32,7 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
+import javax.ejb.SessionContext;
import org.jboss.aop.Advisor;
import org.jboss.aop.ClassAdvisor;
@@ -51,6 +52,7 @@
import org.jboss.ejb3.interceptors.container.ContainerMethodInvocation;
import org.jboss.ejb3.interceptors.container.DestructionInvocation;
import org.jboss.ejb3.interceptors.lang.ClassHelper;
+import org.jboss.logging.Logger;
/**
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
@@ -58,6 +60,8 @@
*/
public class StatefulContainer<T> extends AbstractContainer<T, StatefulContainer<T>>
{
+ private static final Logger log = Logger.getLogger(StatefulContainer.class);
+
private BeanContextFactory<T, StatefulContainer<T>> beanContextFactory = new BeanContextFactory<T, StatefulContainer<T>>()
{
@@ -84,8 +88,20 @@
Object initargs[] = null;
T targetObject = getBeanClass().cast(advisor.invokeNew(initargs, idx));
- BeanContext<T> component = new StatefulBeanContext<T>(targetObject, ejb3Interceptors);
+ StatefulBeanContext<T> component = new StatefulBeanContext<T>(targetObject, ejb3Interceptors);
+ // Do injection (sort of)
+ try
+ {
+ Method method = getBeanClass().getMethod("setSessionContext", SessionContext.class);
+ SessionContext sessionContext = component.getSessionContext();
+ method.invoke(targetObject, sessionContext);
+ }
+ catch(NoSuchMethodException e)
+ {
+ log.debug("no method found setSessionContext");
+ }
+
// Do lifecycle callbacks
Interceptor interceptors[] = createLifecycleInterceptors(component, PostConstruct.class);
Modified: projects/ejb3/dev/ejbthree1269/transactions/src/test/resources/instance/jboss-aop.xml
===================================================================
--- projects/ejb3/dev/ejbthree1269/transactions/src/test/resources/instance/jboss-aop.xml 2008-04-23 19:43:43 UTC (rev 72633)
+++ projects/ejb3/dev/ejbthree1269/transactions/src/test/resources/instance/jboss-aop.xml 2008-04-23 20:07:12 UTC (rev 72634)
@@ -16,6 +16,7 @@
<domain name="Stateful Container">
<bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.aspects.currentinvocation.CurrentInvocationInterceptor"/>
<!--interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/-->
<interceptor-ref name="org.jboss.ejb3.tx.CMTTxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.test.tx.common.StatefulInstanceInterceptor"/>
More information about the jboss-cvs-commits
mailing list