[jboss-cvs] JBossAS SVN: r64426 - in trunk/ejb3: src/main/org/jboss/ejb3 and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 2 08:35:48 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-08-02 08:35:48 -0400 (Thu, 02 Aug 2007)
New Revision: 64426
Added:
trunk/ejb3/src/resources/test/ejbthree1023/
trunk/ejb3/src/resources/test/ejbthree1023/ejbthree1023-aop.xml
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/AnnotatedLocal.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/AnnotatedLocalBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/DefaultLocal.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/DefaultLocalBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/FacadeBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/FacadeRemote.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/TestInterceptor.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/unit/
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/unit/DefaultLocalInterfaceWovenBeanTestCase.java
Modified:
trunk/ejb3/build-test.xml
trunk/ejb3/src/main/org/jboss/ejb3/ProxyFactoryHelper.java
Log:
[EJBTHREE-1023] Fix and test for default local interface not picked up if class is woven with JBoss AOP
Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml 2007-08-02 12:31:12 UTC (rev 64425)
+++ trunk/ejb3/build-test.xml 2007-08-02 12:35:48 UTC (rev 64426)
@@ -123,7 +123,7 @@
<!-- ========= -->
<!-- Libraries -->
<!-- ========= -->
-
+
<!-- The combined library classpath -->
<path id="library.classpath">
<path refid="sun.jaf.classpath"/>
@@ -278,7 +278,7 @@
<!-- This test accesses some ejb3 classes directly -->
<path refid="jboss.ejb3.classpath"/>
</path>
-
+
<path id="dd.web.client.classpath">
<path refid="client.classpath"/>
<path refid="apache.httpclient.classpath"/>
@@ -288,7 +288,7 @@
<pathelement path="${resources}/test/iiop"/>
<path refid="client.classpath"/>
</path>
-
+
<!-- The classpath required to build javadocs. -->
<path id="javadoc.classpath">
<path refid="javac.classpath"/>
@@ -304,7 +304,7 @@
<property name="jbosstest.nodeploy" value="false"/>
<import file="imports/build-simple.xml"/>
-
+
<target name="init">
<record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/>
<!-- Setup the version 1 classes so the tests compile -->
@@ -471,7 +471,7 @@
<include name="org/jboss/ejb3/test/jca/inflow/*.class"/>
</fileset>
</jar>
-
+
<jar jarfile="${build.lib}/jcainflow.rar">
<fileset dir="${build.lib}">
<include name="jcainflow.jar"/>
@@ -486,7 +486,7 @@
<include name="*.xml"/>
</fileset>
</copy>
-
+
<copy todir="${build.lib}/embeddable/standalone">
<fileset dir="${build.lib}">
<include name="jmsinflowmdb.jar"/>
@@ -794,9 +794,9 @@
<target name="appclient"
description="Builds appclient-test.ear."
depends="compile-classes">
-
+
<mkdir dir="${build.lib}"/>
-
+
<jar jarfile="${build.lib}/appclient-test-client.jar" manifest="${resources}/test/appclient/Manifest">
<zipfileset prefix="META-INF" dir="${resources}/test/appclient">
<include name="application-client.xml"/>
@@ -807,20 +807,20 @@
<include name="org/jboss/ejb3/test/appclient/client/HelloWorldClient.class"/>
</fileset>
</jar>
-
+
<jar jarfile="${build.lib}/appclient-test.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/appclient/*.class"/>
</fileset>
</jar>
-
+
<ear appxml="${resources}/test/appclient/application.xml" earfile="${build.lib}/appclient-test.ear">
<fileset dir="${build.lib}">
<include name="appclient-test-client.jar"/>
<include name="appclient-test.jar"/>
</fileset>
</ear>
-
+
<jar jarfile="${build.lib}/appclient-simpleresource-client.jar">
<manifest>
<attribute name="Main-Class" value="org.jboss.ejb3.test.appclient.client.SimpleResourceClient"/>
@@ -832,7 +832,7 @@
<include name="org/jboss/ejb3/test/appclient/client/SimpleResourceClient.class"/>
</fileset>
</jar>
-
+
<jar jarfile="${build.lib}/appclient-simpleresource.ear">
<fileset dir="${build.lib}">
<include name="appclient-simpleresource-client.jar"/>
@@ -1197,13 +1197,13 @@
</fileset>
</jar>
</target>
-
+
<!--target name="transaction"
description="Builds all jar files."
depends="compile-classes">
-
+
<mkdir dir="${build.lib}"/>
-
+
<jar jarfile="${build.lib}/transaction-test.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/transaction/*.class"/>
@@ -1252,9 +1252,9 @@
<target name="unauthenticatedprincipal"
description="Builds all jar files."
depends="compile-classes">
-
+
<mkdir dir="${build.lib}"/>
-
+
<jar jarfile="${build.lib}/unauthenticatedprincipal.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/unauthenticatedprincipal/*.class"/>
@@ -1601,20 +1601,20 @@
</fileset>
</jar>
</target>
-
+
<target name="clusteredservice"
description="Builds all jar files."
depends="compile-classes">
-
+
<mkdir dir="${build.lib}"/>
-
+
<jar jarfile="${build.lib}/clusteredservice.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/clusteredservice/*.class"/>
<exclude name="org/jboss/ejb3/test/clusteredservice/ServiceWeb.class"/>
</fileset>
</jar>
-
+
<war warfile="${build.lib}/clusteredservice.war"
webxml="${build.resources}/test/clusteredservice/WEB-INF/web.xml">
<classes dir="${build.classes}">
@@ -1624,13 +1624,13 @@
</classes>
</war>
</target>
-
+
<target name="clusteredjms"
description="Builds all jar files."
depends="compile-classes">
-
+
<mkdir dir="${build.lib}"/>
-
+
<jar jarfile="${build.lib}/clusteredjms-test.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/clusteredjms/*.class"/>
@@ -1687,7 +1687,7 @@
<include name="servlet-security-service.xml"/>
</fileset>
</ear>
-
+
<copy todir="${build.lib}">
<fileset dir="${resources}/test/servlet">
<include name="servlet-security-service.xml"/>
@@ -1856,7 +1856,7 @@
</fileset>
<zipfileset dir="${build.resources}/test/ejbthree724" includes="META-INF/persistence.xml"/>
</jar>
-
+
<ear earfile="${build.lib}/ejbthree724.ear" appxml="${build.resources}/test/ejbthree724/META-INF/application.xml">
<fileset dir="${build.lib}" includes="ejbthree724-*.jar"/>
</ear>
@@ -1896,7 +1896,7 @@
</fileset>
</jar>
</target>
-
+
<target name="ejbthree921"
description="Builds all jar files."
depends="compile-classes">
@@ -1924,7 +1924,7 @@
<fileset dir="${resources}/test/ejbthree936"/>
</jar>
</target>
-
+
<target name="ejbthree939"
description="Builds all jar files."
depends="compile-classes">
@@ -1937,14 +1937,14 @@
</fileset>
<fileset dir="${resources}/test/ejbthree939" includes="META-INF/*"/>
</jar>
-
+
<copy todir="${build.lib}">
<fileset dir="${resources}/test/ejbthree939">
<include name="*.xml"/>
</fileset>
</copy>
</target>
-
+
<target name="ejbthree953"
description="Builds all jar files."
depends="compile-classes">
@@ -1958,7 +1958,7 @@
<!--fileset dir="${resources}/test/ejbthree953" includes="META-INF/*"/-->
</jar>
</target>
-
+
<target name="ejbthree957"
description="Builds all jar files."
depends="compile-classes">
@@ -1971,14 +1971,14 @@
</fileset>
<fileset dir="${resources}/test/ejbthree957/one" includes="META-INF/*"/>
</jar>
-
+
<jar jarfile="${build.lib}/ejbthree957-two.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/ejbthree957/MyStateless*.class"/>
</fileset>
<fileset dir="${resources}/test/ejbthree957/two" includes="META-INF/*"/>
</jar>
-
+
<jar jarfile="${build.lib}/ejbthree957.ear">
<fileset dir="${build.lib}" includes="ejbthree957-*.jar">
</fileset>
@@ -1986,83 +1986,99 @@
<fileset dir="${resources}/test/ejbthree957/ear" includes="META-INF/*"/>
-->
</jar>
-
+
<copy todir="${build.lib}">
<fileset dir="${resources}/test/ejbthree957">
<include name="*.xml"/>
</fileset>
</copy>
</target>
-
+
<target name="ejbthree959"
description="Builds a simple jar files."
depends="compile-classes">
-
+
<build-simple-jar name="ejbthree959"/>
</target>
-
+
<target name="ejbthree963"
description="Builds a simple jar files."
depends="compile-classes">
-
+
<build-simple-jar name="ejbthree963"/>
</target>
-
+
<target name="ejbthree967"
description="Builds a simple jar files."
depends="compile-classes">
-
+
<build-simple-jar name="ejbthree967"/>
</target>
-
+
<target name="ejbthree971"
description="Builds a simple jar files."
depends="compile-classes">
-
+
<build-simple-jar name="ejbthree971"/>
</target>
-
+
<target name="ejbthree973"
description="Builds a simple jar files."
depends="compile-classes">
-
+
<build-simple-jar name="ejbthree973"/>
-
+
<copy todir="${build.lib}">
<fileset dir="${resources}/test/ejbthree973">
<include name="*.xml"/>
</fileset>
</copy>
</target>
-
+
<target name="ejbthree985"
description="Builds a simple jar file."
depends="compile-classes">
-
+
<build-simple-jar name="ejbthree985"/>
</target>
-
+
<target name="ejbthree986"
description="Builds a simple jar file."
depends="compile-classes">
-
+
<build-simple-jar name="ejbthree986"/>
</target>
-
+
<target name="ejbthree989"
description="Builds a simple jar file."
depends="compile-classes">
-
+
<build-simple-jar name="ejbthree989"/>
</target>
-
+
<target name="ejbthree1020"
description="Builds a simple jar file."
depends="compile-classes">
-
+
<build-simple-jar name="ejbthree1020"/>
</target>
-
+
+ <target name="ejbthree1023"
+ description="Builds a simple jar files."
+ depends="compile-classes">
+
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/ejbthree1023.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/ejbthree1023/*.class"/>
+ </fileset>
+ <fileset dir="${resources}/test/ejbthree1023">
+ <include name="*.xml"/>
+ </fileset>
+ </jar>
+ </target>
+
<target name="jaxws"
description="Builds a simple jar."
depends="compile-classes">
@@ -2090,7 +2106,7 @@
<include name="org/jboss/ejb3/test/wolfc/*.class"/>
</fileset>
</jar>
-
+
<ear destfile="${build.lib}/wolfc.ear" appxml="${build.resources}/test/wolfc/application.xml">
<zipfileset prefix="META-INF" dir="${build.resources}/test/wolfc">
<include name="jboss-app.xml"/>
@@ -2356,7 +2372,7 @@
</fileset>
</jar>
</target>
-
+
<target name="arjuna"
description="Builds all jar files."
depends="compile-classes">
@@ -2404,7 +2420,7 @@
</fileset>
</jar>
</target>
-
+
<target name="entityoptimisticlocking"
description="Builds all jar files."
depends="compile-classes">
@@ -2420,7 +2436,7 @@
</fileset>
</jar>
</target>
-
+
<target name="persistenceunits"
description="Builds all jar files."
depends="compile-classes">
@@ -2455,13 +2471,13 @@
</fileset>
</jar>
</target>
-
+
<target name="mdbtransactions"
description="Builds all jar files."
depends="compile-classes">
-
+
<mkdir dir="${build.lib}"/>
-
+
<jar jarfile="${build.lib}/mdbtransactions-test.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/mdbtransactions/*.class"/>
@@ -2471,7 +2487,7 @@
<include name="META-INF/persistence.xml"/>
</fileset>
</jar>
-
+
<jar jarfile="${build.lib}/mdbtransactions21-test.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/mdbtransactions/*21.class"/>
@@ -2481,7 +2497,7 @@
<include name="META-INF/jboss.xml"/>
</fileset>
</jar>
-
+
<copy todir="${build.lib}">
<fileset dir="${resources}/test/mdbtransactions">
<include name="*.xml"/>
@@ -2616,7 +2632,7 @@
</fileset>
</jar>
</target>
-
+
<target name="invalidtxmdb"
description="Builds all jar files."
depends="compile-classes">
@@ -2652,13 +2668,13 @@
<include name="META-INF/*.xml"/>
</fileset>
</jar>
-
+
<copy todir="${build.lib}">
<fileset dir="${resources}/test/mdb">
<include name="*.xml"/>
</fileset>
</copy>
-
+
<copy todir="${build.lib}/embeddable/standalone">
<fileset dir="${build.lib}">
<include name="mdb-test.jar"/>
@@ -2687,7 +2703,7 @@
</fileset>
-->
</jar>
-
+
<!--
<copy todir="${build.lib}/embeddable/standalone">
<fileset dir="${build.lib}">
@@ -2762,13 +2778,13 @@
</fileset>
</jar>
</target>
-
+
<!--target name="concurrent"
description="Builds all jar files."
depends="compile-classes">
-
+
<mkdir dir="${build.lib}"/>
-
+
<jar jarfile="${build.lib}/concurrent-test.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/concurrent/**/*.class"/>
@@ -2776,7 +2792,7 @@
</fileset>
</jar>
</target-->
-
+
<target name="descriptortypo"
description="Builds all jar files."
depends="compile-classes">
@@ -2880,7 +2896,7 @@
</fileset>
</jar>
</target>
-
+
<target name="tck5sec"
description="Builds all jar files."
depends="compile-classes">
@@ -2897,7 +2913,7 @@
<include name="roles.properties"/>
</fileset>
</jar>
-
+
<ear appxml="${resources}/test/tck5sec/META-INF/application.xml" earfile="${build.lib}/tck5sec-test.ear">
<!--metainf dir="${build.resources}/test/tck5sec/META-INF">
<include name="jboss-app.xml"/>
@@ -2969,7 +2985,7 @@
</classes>
</war>
</target>
-
+
<target name="homeinterface"
description="Builds all jar files."
depends="compile-classes">
@@ -3013,8 +3029,8 @@
</fileset>
</copy>
</target>
-
+
<target name="stateless"
description="Builds all jar files."
depends="compile-classes">
@@ -3030,10 +3046,10 @@
<include name="roles.properties"/>
</fileset>
</jar>
-
+
<copy file="${build.lib}/stateless-test.jar" tofile="${build.lib}/stateless-test.ejb3"/>
</target>
-
+
<target name="localfromremote"
description="Builds all jar files."
depends="compile-classes">
@@ -3045,20 +3061,20 @@
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/localfromremote/*.class"/>
</fileset>
-
+
<fileset dir="${resources}/test/localfromremote">
<include name="jndi.properties"/>
</fileset>
</jar>
<delete file="${resources}/test/localfromremote/jndi.properties"/>
<copy file="${build.lib}/localfromremote-test1.jar" tofile="${resources}/test-configs/localfromremote1/deploy/localfromremote-test.jar"/>
-
+
<copy file="${resources}/test/localfromremote/jndi2.properties" tofile="${resources}/test/localfromremote/jndi.properties"/>
<jar jarfile="${build.lib}/localfromremote-test2.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/localfromremote/*.class"/>
</fileset>
-
+
<fileset dir="${resources}/test/localfromremote">
<include name="jndi.properties"/>
</fileset>
@@ -3066,7 +3082,7 @@
<delete file="${resources}/test/localfromremote/jndi.properties"/>
<copy file="${build.lib}/localfromremote-test2.jar" tofile="${resources}/test-configs/localfromremote2/deploy/localfromremote-test.jar"/>
</target>
-
+
<target name="concurrentnaming"
description="Builds all jar files."
depends="compile-classes">
@@ -3094,20 +3110,20 @@
<include name="META-INF/*.xml"/>
</fileset>
</jar>
-
+
<copy todir="${build.lib}">
<fileset dir="${resources}/test/propertyreplacement">
<include name="*.xml"/>
</fileset>
</copy>
</target>
-
+
<target name="invoker"
description="Builds all jar files."
depends="compile-classes">
-
+
<mkdir dir="${build.lib}"/>
-
+
<jar jarfile="${build.lib}/invoker-test.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/invoker/*.class"/>
@@ -3448,14 +3464,14 @@
<include name="META-INF/application.xml"/>
</fileset>
</jar>
-
+
<!-- Copy the optimistic locking JBC config to ${build.lib} so we can deploy it -->
<copy todir="${build.lib}">
<fileset dir="${resources}/test/clusteredentity/optimistic">
<include name="optimistic-entity-cache-*.xml"/>
</fileset>
</copy>
-
+
</target>
<target name="clusteredsession"
@@ -3500,28 +3516,28 @@
<include name="META-INF/*.xml"/>
</fileset>
</jar>
-
+
<copy todir="${build.lib}">
<fileset dir="${resources}/test/clusteredsession/islocal/foreign">
<include name="testlocal-beans.xml"/>
</fileset>
</copy>
</target>
-
- <target name="jars" depends="localfromremote, clusteredjms, entityoptimisticlocking, concurrentnaming, propertyreplacement, persistenceunits, appclient, tck5sec, invalidtxmdb, descriptortypo, libdeployment, homeinterface, timestampentity, arjuna, mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader,
- circulardependency, jsp, timerdependency, servicedependency, servlet, stateless14, webservices, ear, ejbthree440,
- ejbthree454, ejbthree653, ejbthree670, ejbthree712, ejbthree724, ejbthree751, ejbthree832, ejbthree921, ejbthree936,
+
+ <target name="jars" depends="localfromremote, clusteredjms, entityoptimisticlocking, concurrentnaming, propertyreplacement, persistenceunits, appclient, tck5sec, invalidtxmdb, descriptortypo, libdeployment, homeinterface, timestampentity, arjuna, mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader,
+ circulardependency, jsp, timerdependency, servicedependency, servlet, stateless14, webservices, ear, ejbthree440,
+ ejbthree454, ejbthree653, ejbthree670, ejbthree712, ejbthree724, ejbthree751, ejbthree832, ejbthree921, ejbthree936,
ejbthree939,
ejbthree953, ejbthree957, ejbthree959, ejbthree963, ejbthree967, ejbthree971, ejbthree973, ejbthree985, ejbthree986,
- ejbthree989, ejbthree1020,
+ ejbthree989, ejbthree1020, ejbthree1023,
jaxws,
- aspectdomain, ejbcontext, schema, mail, scopedclassloader, dependency,
- securitydomain, enventry,
- 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,
- 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,
+ aspectdomain, ejbcontext, schema, mail, scopedclassloader, dependency,
+ securitydomain, enventry,
+ 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,
+ 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,
localcall, interceptors, interceptors2, interceptors3, iiop, clientinterceptor"/>
<target name="test" depends="init" if="test"
@@ -3568,7 +3584,7 @@
<isset property="test.jndi.url"/>
</not>
</condition>
-
+
<junit dir="${module.output}"
printsummary="yes"
haltonerror="false"
@@ -3629,7 +3645,7 @@
<!-- EJBTHREE-485 needs javassist -->
<path refid="javassist.classpath"/>
-
+
<!-- For clustered entities -->
<path refid="hsqldb.hsqldb.classpath"/>
@@ -3730,7 +3746,7 @@
<!-- EJBTHREE-485 needs javassist -->
<path refid="javassist.classpath"/>
-
+
<!-- For clustered entities -->
<path refid="hsqldb.hsqldb.classpath"/>
</classpath>
@@ -3791,11 +3807,11 @@
<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">
@@ -3962,7 +3978,7 @@
haltonerror="false"
haltonfailure="false"
fork="true">
-
+
<jvmarg value="-Dorg.jboss.jms.asf.useold=true"/>
<sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/>
@@ -4068,8 +4084,8 @@
</java>
</target>
-
+
<target name="run" depends="init" if="class"
description="Execute all tests in the given test directory.">
<java fork="true" classname="${class}">
@@ -4399,6 +4415,9 @@
<antcall target="test" inheritRefs="true">
<param name="test" value="ejbthree1020"/>
</antcall>
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="ejbthree1023"/>
+ </antcall>
</target>
<target name="entity-tests" depends="init" description="Execute all tests">
@@ -4542,7 +4561,7 @@
<antcall target="tests-clustering-shutdown"/>
</target>
-
+
<target name="libdeployment-test" depends="init">
<create-config baseconf="all" newconf="libdeployment">
<patternset>
@@ -4551,14 +4570,14 @@
<include name="lib/**"/>
</patternset>
</create-config>
-
+
<start-jboss conf="libdeployment" host="${node0}" jvmargs="-Xmx256M"/>
<wait-on-host/>
-
+
<antcall target="test" inheritRefs="true">
<param name="test" value="libdeployment"/>
</antcall>
-
+
<stop-jboss/>
<wait-on-shutdown conf="libdeployment"/>
</target>
@@ -4618,7 +4637,7 @@
<stop-jboss/>
<wait-on-shutdown conf="ejb3-ssl-advanced"/>
</target>
-
+
<target name="invoker-test" depends="init">
<create-config baseconf="all" newconf="invoker">
<patternset>
@@ -4627,21 +4646,21 @@
<include name="lib/**"/>
</patternset>
</create-config>
-
+
<start-jboss conf="invoker" host="${node0}" jvmargs="-Xmx128M"/>
<wait-on-host/>
-
- <property name="jvmargs" value=""/>
-
+
+ <property name="jvmargs" value=""/>
+
<!--antcall target="test-with-jvmargs" inheritRefs="true">
<param name="test" value="invoker"/>
<param name="jvmargs" value="${jvmargs}"/>
</antcall-->
-
+
<antcall target="test" inheritRefs="true">
<param name="test" value="invoker"/>
</antcall>
-
+
<stop-jboss/>
<wait-on-shutdown conf="invoker"/>
</target>
@@ -4692,7 +4711,7 @@
</antcall>
</target>
-
+
<target name="multi-instance-localfromremote-test">
<create-config baseconf="default" newconf="localfromremote1">
<patternset>
@@ -4708,22 +4727,22 @@
<include name="lib/**"/>
</patternset>
</create-config>
-
+
<start-jboss conf="localfromremote1" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
<start-jboss conf="localfromremote2" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
-
- <antcall target="tests-multi-instance-wait"/>
-
+
+ <antcall target="tests-multi-instance-wait"/>
+
<antcall target="test-with-jvmargs" inheritRefs="true">
<param name="test" value="localfromremote"/>
<param name="jvmargs" value=""/>
</antcall>
-
+
<stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
<stop-jboss url="${node0.jndi.port1.url}" jboss.dist="${ejb3.dist}"/>
</target>
-
+
<target name="clustered-jms-test">
<create-config baseconf="all" newconf="clusteredjms">
<patternset>
@@ -4742,15 +4761,15 @@
</create-config>
<start-jboss conf="clusteredjms" host="${node0}" jvmargs="-Xmx512M"/>
- <start-jboss conf="clusteredjms2" host="${node1}" jvmargs="-Xmx512M"/>
-
- <antcall target="tests-clustering-wait"/>
-
+ <start-jboss conf="clusteredjms2" host="${node1}" jvmargs="-Xmx512M"/>
+
+ <antcall target="tests-clustering-wait"/>
+
<antcall target="test-with-jvmargs" inheritRefs="true">
<param name="test" value="clusteredjms"/>
<param name="jvmargs" value=""/>
</antcall>
-
+
<stop-jboss url="${node0.jndi.url}"/>
<stop-jboss url="${node1.jndi.url}"/>
@@ -4760,7 +4779,7 @@
<echo message="Waiting for nodes to start..."/>
<waitfor maxwait="240" maxwaitunit="second"
checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout">
- <and>
+ <and>
<http url="${node0.http.url}"/>
<http url="${node1.http.url}"/>
</and>
@@ -4768,7 +4787,7 @@
<fail message="Timeout waiting for nodes to start" if="cluster.timeout"/>
<echo message="Nodes have started, waiting for cluster to stablize..."/>
</target>
-
+
<target name="tests-multi-instance-wait" unless="${tests.clustering.skip.startup}">
<echo message="Waiting for nodes to start..."/>
<waitfor maxwait="120" maxwaitunit="second"
@@ -4868,15 +4887,15 @@
<param name="test.extension" value="jacorb"/>
<param name="test.jndi.url" value="corbaloc::localhost:3528/JBoss/Naming/root"/>
<!-- using jacorb -->
- <param name="jvmargs" value="${debugFlags}
- -Djava.security.manager
- -Djava.security.policy=${resources}/security/tst.policy
- -Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
- -Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
- -Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer
- -Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.iiop.csiv2.SASClientInitializer
- -DORBInitRef.NameService=corbaloc::localhost:3528/JBoss/Naming/root
- -Djacorb.log.default.verbosity=10
+ <param name="jvmargs" value="${debugFlags}
+ -Djava.security.manager
+ -Djava.security.policy=${resources}/security/tst.policy
+ -Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
+ -Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
+ -Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer
+ -Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.iiop.csiv2.SASClientInitializer
+ -DORBInitRef.NameService=corbaloc::localhost:3528/JBoss/Naming/root
+ -Djacorb.log.default.verbosity=10
-Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory" />
</antcall>
</target>
@@ -4911,7 +4930,7 @@
</antcall>
<!-- TODO: call sunorb-test, but the report gets overwritten -->
</target>
-
+
<target name="stop-jboss">
<server:stop name="all"/>
</target>
Modified: trunk/ejb3/src/main/org/jboss/ejb3/ProxyFactoryHelper.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/ProxyFactoryHelper.java 2007-08-02 12:31:12 UTC (rev 64425)
+++ trunk/ejb3/src/main/org/jboss/ejb3/ProxyFactoryHelper.java 2007-08-02 12:35:48 UTC (rev 64426)
@@ -67,7 +67,7 @@
}
/**
- *
+ *
* @param container
* @return the local interfaces of the container or an empty array
*/
@@ -119,7 +119,7 @@
//return li.value(); ALR Removed (EJBTHREE-751)
}
}
-
+
// no @Local interfaces implemented
if (li == null)
{
@@ -138,8 +138,8 @@
}
}
}
-
- if (intf.getName().equals(endpoint))
+
+ if (intf.getName().equals(endpoint))
return new Class[]{};
Class[] rtn = {intf};
@@ -147,8 +147,8 @@
((EJBContainer) container).getAnnotations().addClassAnnotation(javax.ejb.Local.class, li);
return rtn;
}
-
+
// Check to ensure @Local and @Remote are not defined on the same interface
// JIRA EJBTHREE-751
for (Class remoteInterface : ri)
@@ -162,15 +162,15 @@
}
}
}
-
+
return li.value();
}
/**
* Resolve the business interfaces on an enterprise bean.
- *
+ *
* Note: for normal operation call container.getBusinessInterfaces().
- *
+ *
* @param beanClass
* @return
* @see org.jboss.ejb3.EJBContainer#getBusinessInterfaces()
@@ -187,6 +187,10 @@
{
Class nextIntf = it.next();
if (nextIntf.getName().startsWith("javax.ejb") || nextIntf.getName().startsWith("javax.xml.ws")) it.remove();
+
+ //FIXME Other aop frameworks might add other interfaces, this should really be configurable
+ if (nextIntf.getName().startsWith("org.jboss.aop.")) it.remove();
+
}
return interfaces;
}
@@ -243,24 +247,24 @@
return false;
}
-
+
public static String getHomeJndiName(Container container)
{
Advisor advisor = (Advisor) container;
RemoteHomeBinding binding = (RemoteHomeBinding)advisor.resolveAnnotation(RemoteHomeBinding.class);
if (binding != null)
return binding.jndiBinding();
-
+
return container.getEjbName() + "/home";
}
-
+
public static String getLocalHomeJndiName(Container container)
{
Advisor advisor = (Advisor) container;
LocalHomeBinding binding = (LocalHomeBinding)advisor.resolveAnnotation(LocalHomeBinding.class);
if (binding != null)
return binding.jndiBinding();
-
+
return container.getEjbName() + "/localHome";
}
@@ -268,7 +272,7 @@
{
assert container != null : "container is null";
assert businessInterface != null : "businessInterface is null";
-
+
if (!(container instanceof SessionContainer)) return null;
Advisor advisor = (Advisor) container;
Class[] remotes = getRemoteInterfaces(container);
@@ -355,7 +359,7 @@
}
/**
- *
+ *
* @param container
* @return the remote interfaces of the container or an empty array
*/
@@ -456,7 +460,7 @@
if (deploymentScope != null) return deploymentScope.getBaseName() + "/" + name;
return name;
}
-
+
public static String getClientBindUrl(RemoteBinding binding) throws Exception
{
String clientBindUrl = binding.clientBindUrl();
@@ -473,7 +477,7 @@
clientBindUrl = RemoteProxyFactory.DEFAULT_CLIENT_BINDING;
}
}
-
+
return clientBindUrl;
}
}
Added: trunk/ejb3/src/resources/test/ejbthree1023/ejbthree1023-aop.xml
===================================================================
--- trunk/ejb3/src/resources/test/ejbthree1023/ejbthree1023-aop.xml (rev 0)
+++ trunk/ejb3/src/resources/test/ejbthree1023/ejbthree1023-aop.xml 2007-08-02 12:35:48 UTC (rev 64426)
@@ -0,0 +1,8 @@
+<aop>
+ <bind pointcut="execution(* org.jboss.ejb3.test.ejbthree1023.AnnotatedLocalBean->woven())">
+ <interceptor class="org.jboss.ejb3.test.ejbthree1023.TestInterceptor"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.ejb3.test.ejbthree1023.DefaultLocalBean->woven())">
+ <interceptor class="org.jboss.ejb3.test.ejbthree1023.TestInterceptor"/>
+ </bind>
+</aop>
\ No newline at end of file
Added: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/AnnotatedLocal.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/AnnotatedLocal.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/AnnotatedLocal.java 2007-08-02 12:35:48 UTC (rev 64426)
@@ -0,0 +1,36 @@
+/*
+* 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.ejbthree1023;
+
+import javax.ejb.Local;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Local
+public interface AnnotatedLocal
+{
+ void woven();
+ void notWoven();
+}
Added: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/AnnotatedLocalBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/AnnotatedLocalBean.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/AnnotatedLocalBean.java 2007-08-02 12:35:48 UTC (rev 64426)
@@ -0,0 +1,46 @@
+/*
+* 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.ejbthree1023;
+
+import javax.ejb.Stateless;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Stateless
+public class AnnotatedLocalBean implements AnnotatedLocal
+{
+ public static boolean woven;
+ public static boolean notWoven;
+
+ public void notWoven()
+ {
+ notWoven = true;
+ }
+
+ public void woven()
+ {
+ woven = true;
+ }
+}
Added: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/DefaultLocal.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/DefaultLocal.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/DefaultLocal.java 2007-08-02 12:35:48 UTC (rev 64426)
@@ -0,0 +1,33 @@
+/*
+* 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.ejbthree1023;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface DefaultLocal
+{
+ void woven();
+ void notWoven();
+}
Added: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/DefaultLocalBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/DefaultLocalBean.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/DefaultLocalBean.java 2007-08-02 12:35:48 UTC (rev 64426)
@@ -0,0 +1,46 @@
+/*
+* 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.ejbthree1023;
+
+import javax.ejb.Stateless;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Stateless
+public class DefaultLocalBean implements DefaultLocal
+{
+ public static boolean woven;
+ public static boolean notWoven;
+
+ public void notWoven()
+ {
+ notWoven = true;
+ }
+
+ public void woven()
+ {
+ woven = true;
+ }
+}
Added: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/FacadeBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/FacadeBean.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/FacadeBean.java 2007-08-02 12:35:48 UTC (rev 64426)
@@ -0,0 +1,137 @@
+/*
+* 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.ejbthree1023;
+
+import javax.ejb.Stateless;
+import javax.naming.InitialContext;
+
+import org.jboss.aop.Advised;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Stateless
+public class FacadeBean implements FacadeRemote
+{
+ public void callWovenBeanWithAnnotatedLocal() throws Exception
+ {
+ InitialContext ctx = new InitialContext();
+ AnnotatedLocal local = (AnnotatedLocal)ctx.lookup("AnnotatedLocalBean/local");
+
+ if (!Advised.class.isAssignableFrom(AnnotatedLocalBean.class))
+ {
+ throw new RuntimeException("AnnotatedLocalBean was not woven");
+ }
+
+ AnnotatedLocalBean.woven = false;
+ AnnotatedLocalBean.notWoven = false;
+ TestInterceptor.invoked = false;
+
+ local.woven();
+
+ if (!AnnotatedLocalBean.woven)
+ {
+ throw new RuntimeException("woven was not called");
+ }
+ if (AnnotatedLocalBean.notWoven)
+ {
+ throw new RuntimeException("notWoven was called");
+ }
+ if (!TestInterceptor.invoked)
+ {
+ throw new RuntimeException("TestInterceptor was not invoked");
+ }
+
+ AnnotatedLocalBean.woven = false;
+ AnnotatedLocalBean.notWoven = false;
+ TestInterceptor.invoked = false;
+
+ local.notWoven();
+
+ if (AnnotatedLocalBean.woven)
+ {
+ throw new RuntimeException("woven was called");
+ }
+ if (!AnnotatedLocalBean.notWoven)
+ {
+ throw new RuntimeException("notWoven was not called");
+ }
+ if (TestInterceptor.invoked)
+ {
+ throw new RuntimeException("TestInterceptor was invoked");
+ }
+
+ }
+
+ public void callWovenBeanWithDefaultLocal() throws Exception
+ {
+ InitialContext ctx = new InitialContext();
+ DefaultLocal local = (DefaultLocal)ctx.lookup("DefaultLocalBean/local");
+
+ if (!Advised.class.isAssignableFrom(DefaultLocalBean.class))
+ {
+ throw new RuntimeException("DefaultLocalBean was not woven");
+ }
+
+ DefaultLocalBean.woven = false;
+ DefaultLocalBean.notWoven = false;
+ TestInterceptor.invoked = false;
+
+ local.woven();
+
+ if (!DefaultLocalBean.woven)
+ {
+ throw new RuntimeException("woven was not called");
+ }
+ if (DefaultLocalBean.notWoven)
+ {
+ throw new RuntimeException("notWoven was called");
+ }
+ if (!TestInterceptor.invoked)
+ {
+ throw new RuntimeException("TestInterceptor was not invoked");
+ }
+
+ DefaultLocalBean.woven = false;
+ DefaultLocalBean.notWoven = false;
+ TestInterceptor.invoked = false;
+
+ local.notWoven();
+
+ if (DefaultLocalBean.woven)
+ {
+ throw new RuntimeException("woven was called");
+ }
+ if (!DefaultLocalBean.notWoven)
+ {
+ throw new RuntimeException("notWoven was not called");
+ }
+ if (TestInterceptor.invoked)
+ {
+ throw new RuntimeException("TestInterceptor was invoked");
+ }
+
+ }
+
+}
Added: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/FacadeRemote.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/FacadeRemote.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/FacadeRemote.java 2007-08-02 12:35:48 UTC (rev 64426)
@@ -0,0 +1,36 @@
+/*
+* 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.ejbthree1023;
+
+import javax.ejb.Remote;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Remote
+public interface FacadeRemote
+{
+ void callWovenBeanWithAnnotatedLocal() throws Exception;
+ void callWovenBeanWithDefaultLocal() throws Exception;
+}
Added: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/TestInterceptor.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/TestInterceptor.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/TestInterceptor.java 2007-08-02 12:35:48 UTC (rev 64426)
@@ -0,0 +1,46 @@
+/*
+* 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.ejbthree1023;
+
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.aop.joinpoint.Invocation;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class TestInterceptor implements Interceptor
+{
+ public static boolean invoked;
+ public String getName()
+ {
+ return null;
+ }
+
+ public Object invoke(Invocation invocation) throws Throwable
+ {
+ invoked = true;
+ return invocation.invokeNext();
+ }
+
+}
Added: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/unit/DefaultLocalInterfaceWovenBeanTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/unit/DefaultLocalInterfaceWovenBeanTestCase.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1023/unit/DefaultLocalInterfaceWovenBeanTestCase.java 2007-08-02 12:35:48 UTC (rev 64426)
@@ -0,0 +1,141 @@
+/*
+* 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.ejbthree1023.unit;
+
+import javax.management.Attribute;
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.ejb3.test.ejbthree1023.FacadeRemote;
+import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossTestSetup;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class DefaultLocalInterfaceWovenBeanTestCase extends JBossTestCase
+{
+
+ public DefaultLocalInterfaceWovenBeanTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testAnnotatedLocalInterfaceWovenBean() throws Exception
+ {
+ //Just a sanity test
+ InitialContext ctx = getInitialContext();
+ FacadeRemote facade = (FacadeRemote)ctx.lookup("FacadeBean/remote");
+ facade.callWovenBeanWithAnnotatedLocal();
+ }
+
+ public void testDefaultLocalInterfaceWovenBean() throws Exception
+ {
+ //The real test for this issue
+ InitialContext ctx = getInitialContext();
+ FacadeRemote facade = (FacadeRemote)ctx.lookup("FacadeBean/remote");
+ facade.callWovenBeanWithDefaultLocal();
+ }
+
+ public static Test suite() throws Exception
+ {
+ TestSuite suite = new TestSuite();
+ suite.addTest(new TestSuite(DefaultLocalInterfaceWovenBeanTestCase.class));
+
+ AOPTestSetup setup = new AOPTestSetup(suite, "ejbthree1023.jar");
+ return setup;
+ }
+
+ static class AOPTestSetup extends JBossTestSetup
+ {
+ public static String ASPECT_MANAGER_NAME = "jboss.aop:service=AspectManager";
+
+ private String jar;
+ private String originalInclude;
+
+ // Create an initializer for the test suite
+ AOPTestSetup(TestSuite suite, String jar) throws Exception
+ {
+ super(suite);
+ this.jar = jar;
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ ObjectName aspectManager = new ObjectName(ASPECT_MANAGER_NAME);
+
+ originalInclude = (String)getServer().getAttribute(aspectManager, "Include");
+ Attribute include = new Attribute("Include", originalInclude + ", org.jboss.ejb3.test.");
+ getServer().setAttribute(aspectManager, include);
+
+ Attribute enableTransformer = new Attribute("EnableTransformer", Boolean.TRUE);
+ getServer().setAttribute(aspectManager, enableTransformer);
+ try
+ {
+ redeploy(jar);
+ }
+ catch(Exception e)
+ {
+ // Reset the EnableTransformer to false
+ try
+ {
+ enableTransformer = new Attribute("EnableTransformer", Boolean.FALSE);
+ getServer().setAttribute(aspectManager, enableTransformer);
+ }
+ catch(Exception ex)
+ {
+ getLog().error("Failed to set EnableTransformer to false", ex);
+ }
+ throw e;
+ }
+ }
+ protected void tearDown() throws Exception
+ {
+ Exception undeployException = null;
+ try
+ {
+ undeploy(jar);
+ }
+ catch(Exception e)
+ {
+ undeployException = e;
+ }
+ ObjectName aspectManager = new ObjectName(ASPECT_MANAGER_NAME);
+
+ Attribute include = new Attribute("Include", originalInclude);
+ getServer().setAttribute(aspectManager, include);
+
+
+ Attribute enableTransformer = new Attribute("EnableTransformer", Boolean.FALSE);
+ getServer().setAttribute(aspectManager, enableTransformer);
+ if( undeployException != null )
+ throw undeployException;
+ super.tearDown();
+ }
+ }
+}
More information about the jboss-cvs-commits
mailing list