You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2011/03/28 13:27:31 UTC
svn commit: r1086191 -
/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/
Author: dblevins
Date: Mon Mar 28 11:27:30 2011
New Revision: 1086191
URL: http://svn.apache.org/viewvc?rev=1086191&view=rev
Log:
Copy of the interceptors example recast as a unit tests. Seems this example picks up a lot of issues not covered in other tests
Added:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorOne.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorOne.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorSuperClassOne.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorSuperClassOne.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorSuperClassTwo.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorSuperClassTwo.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorTwo.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorTwo.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/DefaultInterceptorOne.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/DefaultInterceptorOne.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/DefaultInterceptorTwo.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/DefaultInterceptorTwo.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyIntercepted.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyIntercepted.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedBean.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyInterceptedBean.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedSuperClass.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyInterceptedSuperClass.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedTest.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/test/java/org/superbiz/interceptors/FullyInterceptedTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOne.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOne.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyIntf.java
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyIntf.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyParent.java
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyParent.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlySLSBean.java
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlySLSBean.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyTest.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/test/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorTwo.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorTwo.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedBean.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedBean.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedLocal.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedLocal.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedTest.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/test/java/org/superbiz/interceptors/SecondStatelessInterceptedTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SuperClassOfClassLevelInterceptor.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/SuperClassOfClassLevelInterceptor.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBean.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBean.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanLocal.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBeanLocal.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanTest.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/test/java/org/superbiz/interceptors/ThirdSLSBeanTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/Utils.java (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/Utils.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ejb-jar.xml (contents, props changed)
- copied, changed from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/resources/META-INF/ejb-jar.xml
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorOne.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorOne.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorOne.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorOne.java&p1=openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorOne.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorOne.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorOne.java Mon Mar 28 11:27:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorOne.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorOne.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorOne.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorOne.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorSuperClassOne.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorSuperClassOne.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorSuperClassOne.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorSuperClassOne.java&p1=openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorSuperClassOne.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorSuperClassOne.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorSuperClassOne.java Mon Mar 28 11:27:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorSuperClassOne.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorSuperClassOne.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorSuperClassOne.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorSuperClassOne.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorSuperClassTwo.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorSuperClassTwo.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorSuperClassTwo.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorSuperClassTwo.java&p1=openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorSuperClassTwo.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorSuperClassTwo.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorSuperClassTwo.java Mon Mar 28 11:27:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorSuperClassTwo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorSuperClassTwo.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorSuperClassTwo.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorSuperClassTwo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorTwo.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorTwo.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorTwo.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorTwo.java&p1=openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorTwo.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ClassLevelInterceptorTwo.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorTwo.java Mon Mar 28 11:27:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorTwo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorTwo.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorTwo.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ClassLevelInterceptorTwo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/DefaultInterceptorOne.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/DefaultInterceptorOne.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/DefaultInterceptorOne.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/DefaultInterceptorOne.java&p1=openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/DefaultInterceptorOne.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/DefaultInterceptorOne.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/DefaultInterceptorOne.java Mon Mar 28 11:27:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import javax.annotation.PostConstruct;
import javax.interceptor.AroundInvoke;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/DefaultInterceptorOne.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/DefaultInterceptorOne.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/DefaultInterceptorOne.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/DefaultInterceptorOne.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/DefaultInterceptorTwo.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/DefaultInterceptorTwo.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/DefaultInterceptorTwo.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/DefaultInterceptorTwo.java&p1=openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/DefaultInterceptorTwo.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/DefaultInterceptorTwo.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/DefaultInterceptorTwo.java Mon Mar 28 11:27:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/DefaultInterceptorTwo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/DefaultInterceptorTwo.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/DefaultInterceptorTwo.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/DefaultInterceptorTwo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyIntercepted.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyIntercepted.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyIntercepted.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyIntercepted.java&p1=openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyIntercepted.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyIntercepted.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyIntercepted.java Mon Mar 28 11:27:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import java.util.List;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyIntercepted.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyIntercepted.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyIntercepted.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedBean.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyInterceptedBean.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedBean.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedBean.java&p1=openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyInterceptedBean.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyInterceptedBean.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedBean.java Mon Mar 28 11:27:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import javax.ejb.Local;
import javax.ejb.Stateless;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedBean.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedBean.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedSuperClass.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyInterceptedSuperClass.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedSuperClass.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedSuperClass.java&p1=openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyInterceptedSuperClass.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/FullyInterceptedSuperClass.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedSuperClass.java Mon Mar 28 11:27:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import javax.interceptor.Interceptors;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedSuperClass.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedSuperClass.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedSuperClass.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedSuperClass.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedTest.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/test/java/org/superbiz/interceptors/FullyInterceptedTest.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedTest.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedTest.java&p1=openejb/trunk/openejb3/examples/interceptors/src/test/java/org/superbiz/interceptors/FullyInterceptedTest.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/test/java/org/superbiz/interceptors/FullyInterceptedTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedTest.java Mon Mar 28 11:27:30 2011
@@ -14,42 +14,54 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
-
-import java.util.Properties;
-import java.util.List;
-import java.util.ArrayList;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
+package org.apache.openejb.interceptors;
import junit.framework.TestCase;
-
-import org.junit.After;
-import org.junit.Before;
+import org.apache.openejb.jee.AssemblyDescriptor;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.Interceptor;
+import org.apache.openejb.jee.InterceptorBinding;
+import org.apache.openejb.jee.NamedMethod;
+import org.apache.openejb.jee.StatelessBean;
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.junit.Module;
import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.ejb.EJB;
+import java.util.ArrayList;
+import java.util.List;
/**
* @version $Rev$ $Date$
*/
+@RunWith(ApplicationComposer.class)
public class FullyInterceptedTest extends TestCase {
- private InitialContext initCtx;
+ @EJB
+ FullyIntercepted fullyIntercepted;
+
+
+ @Module
+ public EjbJar module() {
+ EjbJar ejbJar = new EjbJar();
- @Before
- public void setUp() throws Exception {
- Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory");
- properties.setProperty("openejb.deployments.classpath.include", ".*interceptors/target/classes.*");
+ StatelessBean bean = ejbJar.addEnterpriseBean(new StatelessBean(FullyInterceptedBean.class));
- initCtx = new InitialContext(properties);
+ AssemblyDescriptor assembly = ejbJar.getAssemblyDescriptor();
+
+ assembly.addInterceptorBinding(new InterceptorBinding("*", new Interceptor(DefaultInterceptorOne.class)));
+ assembly.addInterceptorBinding(new InterceptorBinding("*", new Interceptor(DefaultInterceptorTwo.class)));
+
+ InterceptorBinding b = assembly.addInterceptorBinding(new InterceptorBinding(bean));
+ b.setExcludeDefaultInterceptors(true);
+ b.setMethod(new NamedMethod("methodWithDefaultInterceptorsExcluded"));
+
+ return ejbJar;
}
@Test
public void testBusinessMethod() throws Exception {
-
- FullyIntercepted fullyIntercepted = (FullyIntercepted) initCtx.lookup("FullyInterceptedBeanLocal");
-
assert fullyIntercepted != null;
List<String> expected = new ArrayList<String>();
@@ -70,9 +82,6 @@ public class FullyInterceptedTest extend
@Test
public void testMethodWithDefaultInterceptorsExcluded() throws Exception {
-
- FullyIntercepted fullyIntercepted = (FullyIntercepted) initCtx.lookup("FullyInterceptedBeanLocal");
-
assert fullyIntercepted != null;
List<String> expected = new ArrayList<String>();
@@ -88,9 +97,4 @@ public class FullyInterceptedTest extend
List<String> actual = fullyIntercepted.methodWithDefaultInterceptorsExcluded();
assert expected.equals(actual) : "Expected " + expected + ", but got " + actual;
}
-
- @After
- public void tearDown() throws Exception {
- initCtx.close();
- }
}
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedTest.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedTest.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/FullyInterceptedTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOne.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOne.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOne.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOne.java&p1=openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOne.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOne.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOne.java Mon Mar 28 11:27:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOne.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOne.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOne.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOne.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyIntf.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyIntf.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyIntf.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyIntf.java&p1=openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyIntf.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyIntf.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyIntf.java Mon Mar 28 11:27:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import java.io.Serializable;
import java.util.List;
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyParent.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyParent.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyParent.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyParent.java&p1=openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyParent.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyParent.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyParent.java Mon Mar 28 11:27:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import java.util.List;
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlySLSBean.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlySLSBean.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlySLSBean.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlySLSBean.java&p1=openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlySLSBean.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlySLSBean.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlySLSBean.java Mon Mar 28 11:27:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import javax.ejb.Local;
import javax.ejb.Stateless;
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyTest.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/test/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyTest.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyTest.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyTest.java&p1=openejb/trunk/openejb3/examples/interceptors/src/test/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyTest.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/test/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyTest.java Mon Mar 28 11:27:30 2011
@@ -14,36 +14,48 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import junit.framework.TestCase;
-import org.junit.Before;
+import org.apache.openejb.jee.AssemblyDescriptor;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.Interceptor;
+import org.apache.openejb.jee.InterceptorBinding;
+import org.apache.openejb.jee.StatelessBean;
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.junit.Module;
import org.junit.Test;
+import org.junit.runner.RunWith;
-import javax.naming.Context;
-import javax.naming.InitialContext;
+import javax.ejb.EJB;
import java.util.ArrayList;
import java.util.List;
-import java.util.Properties;
/**
* @version $Rev$ $Date$
*/
+@RunWith(ApplicationComposer.class)
public class MethodLevelInterceptorOnlyTest extends TestCase {
- private InitialContext initCtx;
- @Before
- public void setUp() throws Exception {
- Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory");
- properties.setProperty("openejb.deployments.classpath.include", ".*interceptors/target/classes.*");
+ @EJB
+ private MethodLevelInterceptorOnlyParent bean;
- initCtx = new InitialContext(properties);
+ @Module
+ public EjbJar module() {
+ EjbJar ejbJar = new EjbJar();
+
+ StatelessBean bean = ejbJar.addEnterpriseBean(new StatelessBean(MethodLevelInterceptorOnlySLSBean.class));
+
+ AssemblyDescriptor assembly = ejbJar.getAssemblyDescriptor();
+
+ assembly.addInterceptorBinding(new InterceptorBinding("*", new Interceptor(DefaultInterceptorOne.class)));
+ assembly.addInterceptorBinding(new InterceptorBinding("*", new Interceptor(DefaultInterceptorTwo.class)));
+ assembly.addInterceptorBinding(new InterceptorBinding(bean)).setExcludeDefaultInterceptors(true);
+ return ejbJar;
}
@Test
public void testInterceptedGenerifiedBusinessIntfMethod() throws Exception {
- MethodLevelInterceptorOnlyParent bean = (MethodLevelInterceptorOnlyParent) initCtx.lookup("MethodLevelInterceptorOnlySLSBeanLocal");
assert bean != null;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyTest.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorOnlyTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorTwo.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorTwo.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorTwo.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorTwo.java&p1=openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorTwo.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorTwo.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorTwo.java Mon Mar 28 11:27:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorTwo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorTwo.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorTwo.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/MethodLevelInterceptorTwo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedBean.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedBean.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedBean.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedBean.java&p1=openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedBean.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedBean.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedBean.java Mon Mar 28 11:27:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import javax.ejb.Stateless;
import javax.interceptor.AroundInvoke;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedBean.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedLocal.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedLocal.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedLocal.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedLocal.java&p1=openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedLocal.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedLocal.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedLocal.java Mon Mar 28 11:27:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import java.util.List;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedLocal.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedTest.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/test/java/org/superbiz/interceptors/SecondStatelessInterceptedTest.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedTest.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedTest.java&p1=openejb/trunk/openejb3/examples/interceptors/src/test/java/org/superbiz/interceptors/SecondStatelessInterceptedTest.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/test/java/org/superbiz/interceptors/SecondStatelessInterceptedTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedTest.java Mon Mar 28 11:27:30 2011
@@ -14,39 +14,49 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
-import org.junit.Before;
+import junit.framework.TestCase;
+import org.apache.openejb.jee.AssemblyDescriptor;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.Interceptor;
+import org.apache.openejb.jee.InterceptorBinding;
+import org.apache.openejb.jee.StatelessBean;
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.junit.Module;
import org.junit.Test;
+import org.junit.runner.RunWith;
-import javax.naming.Context;
-import javax.naming.InitialContext;
+import javax.ejb.EJB;
import java.util.ArrayList;
import java.util.List;
-import java.util.Properties;
-
-import junit.framework.TestCase;
/**
* @version $Rev$ $Date$
*/
+@RunWith(ApplicationComposer.class)
public class SecondStatelessInterceptedTest extends TestCase {
- private InitialContext initCtx;
+ @EJB
+ private SecondStatelessInterceptedLocal bean;
+
+ @Module
+ public EjbJar module() {
+ EjbJar ejbJar = new EjbJar();
+
+ StatelessBean bean = ejbJar.addEnterpriseBean(new StatelessBean(SecondStatelessInterceptedBean.class));
+
+ AssemblyDescriptor assembly = ejbJar.getAssemblyDescriptor();
- @Before
- public void setUp() throws Exception {
- Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory");
- properties.setProperty("openejb.deployments.classpath.include", ".*interceptors/target/classes.*");
+ assembly.addInterceptorBinding(new InterceptorBinding("*", new Interceptor(DefaultInterceptorOne.class)));
+ assembly.addInterceptorBinding(new InterceptorBinding("*", new Interceptor(DefaultInterceptorTwo.class)));
+ assembly.addInterceptorBinding(new InterceptorBinding(bean)).setExcludeDefaultInterceptors(true);
- initCtx = new InitialContext(properties);
+ return ejbJar;
}
@Test
public void testMethodWithDefaultInterceptorsExcluded() throws Exception {
- SecondStatelessInterceptedLocal bean =
- (SecondStatelessInterceptedLocal) initCtx.lookup("SecondStatelessInterceptedBeanLocal");
assert bean != null;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SecondStatelessInterceptedTest.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SuperClassOfClassLevelInterceptor.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/SuperClassOfClassLevelInterceptor.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SuperClassOfClassLevelInterceptor.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SuperClassOfClassLevelInterceptor.java&p1=openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/SuperClassOfClassLevelInterceptor.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/SuperClassOfClassLevelInterceptor.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SuperClassOfClassLevelInterceptor.java Mon Mar 28 11:27:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import javax.annotation.PostConstruct;
import javax.interceptor.AroundInvoke;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SuperClassOfClassLevelInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SuperClassOfClassLevelInterceptor.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SuperClassOfClassLevelInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/SuperClassOfClassLevelInterceptor.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBean.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBean.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBean.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBean.java&p1=openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBean.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBean.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBean.java Mon Mar 28 11:27:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import javax.ejb.Stateless;
import javax.interceptor.*;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBean.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBean.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBean.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanLocal.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBeanLocal.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanLocal.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanLocal.java&p1=openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBeanLocal.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBeanLocal.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanLocal.java Mon Mar 28 11:27:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import java.util.List;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanLocal.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanLocal.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanLocal.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanLocal.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanTest.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/test/java/org/superbiz/interceptors/ThirdSLSBeanTest.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanTest.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanTest.java&p1=openejb/trunk/openejb3/examples/interceptors/src/test/java/org/superbiz/interceptors/ThirdSLSBeanTest.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/test/java/org/superbiz/interceptors/ThirdSLSBeanTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanTest.java Mon Mar 28 11:27:30 2011
@@ -14,38 +14,49 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
-import org.junit.Before;
+import junit.framework.TestCase;
+import org.apache.openejb.jee.AssemblyDescriptor;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.Interceptor;
+import org.apache.openejb.jee.InterceptorBinding;
+import org.apache.openejb.jee.StatelessBean;
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.junit.Module;
import org.junit.Test;
+import org.junit.runner.RunWith;
-import javax.naming.InitialContext;
-import javax.naming.Context;
-import java.util.Properties;
-import java.util.List;
+import javax.ejb.EJB;
import java.util.ArrayList;
-
-import junit.framework.TestCase;
+import java.util.List;
/**
* @version $Rev$ $Date$
*/
+@RunWith(ApplicationComposer.class)
public class ThirdSLSBeanTest extends TestCase {
- private InitialContext initCtx;
- @Before
- public void setUp() throws Exception {
- Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory");
- properties.setProperty("openejb.deployments.classpath.include", ".*interceptors/target/classes.*");
+ @EJB
+ private ThirdSLSBeanLocal bean;
+
+ @Module
+ public EjbJar module() {
+ EjbJar ejbJar = new EjbJar();
- initCtx = new InitialContext(properties);
+ StatelessBean bean = ejbJar.addEnterpriseBean(new StatelessBean(ThirdSLSBean.class));
+
+ AssemblyDescriptor assembly = ejbJar.getAssemblyDescriptor();
+
+ assembly.addInterceptorBinding(new InterceptorBinding("*", new Interceptor(DefaultInterceptorOne.class)));
+ assembly.addInterceptorBinding(new InterceptorBinding("*", new Interceptor(DefaultInterceptorTwo.class)));
+
+ return ejbJar;
}
+
@Test
public void testMethodWithDefaultInterceptorsExcluded() throws Exception {
- ThirdSLSBeanLocal bean = (ThirdSLSBeanLocal) initCtx.lookup("ThirdSLSBeanLocal");
-
assert bean != null;
List<String> expected = new ArrayList<String>();
@@ -62,8 +73,6 @@ public class ThirdSLSBeanTest extends Te
@Test
public void testMethodWithDefaultAndClassInterceptorsExcluded() throws Exception {
- ThirdSLSBeanLocal bean = (ThirdSLSBeanLocal) initCtx.lookup("ThirdSLSBeanLocal");
-
assert bean != null;
List<String> expected = new ArrayList<String>();
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanTest.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ThirdSLSBeanTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/Utils.java (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/Utils.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/Utils.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/Utils.java&p1=openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/Utils.java&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/java/org/superbiz/interceptors/Utils.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/Utils.java Mon Mar 28 11:27:30 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.interceptors;
+package org.apache.openejb.interceptors;
import javax.interceptor.InvocationContext;
import java.util.ArrayList;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/Utils.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ejb-jar.xml (from r1085868, openejb/trunk/openejb3/examples/interceptors/src/main/resources/META-INF/ejb-jar.xml)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ejb-jar.xml?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ejb-jar.xml&p1=openejb/trunk/openejb3/examples/interceptors/src/main/resources/META-INF/ejb-jar.xml&r1=1085868&r2=1086191&rev=1086191&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/src/main/resources/META-INF/ejb-jar.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ejb-jar.xml Mon Mar 28 11:27:30 2011
@@ -25,20 +25,20 @@
version="3.0">
<interceptors>
<interceptor>
- <interceptor-class>org.superbiz.interceptors.DefaultInterceptorOne</interceptor-class>
+ <interceptor-class>org.apache.openejb.interceptors.DefaultInterceptorOne</interceptor-class>
</interceptor>
<interceptor>
- <interceptor-class>org.superbiz.interceptors.DefaultInterceptorTwo</interceptor-class>
+ <interceptor-class>org.apache.openejb.interceptors.DefaultInterceptorTwo</interceptor-class>
</interceptor>
</interceptors>
<assembly-descriptor>
<interceptor-binding>
<ejb-name>*</ejb-name>
- <interceptor-class>org.superbiz.interceptors.DefaultInterceptorOne</interceptor-class>
+ <interceptor-class>org.apache.openejb.interceptors.DefaultInterceptorOne</interceptor-class>
</interceptor-binding>
<interceptor-binding>
<ejb-name>*</ejb-name>
- <interceptor-class>org.superbiz.interceptors.DefaultInterceptorTwo</interceptor-class>
+ <interceptor-class>org.apache.openejb.interceptors.DefaultInterceptorTwo</interceptor-class>
</interceptor-binding>
<interceptor-binding>
<ejb-name>FullyInterceptedBean</ejb-name>
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ejb-jar.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ejb-jar.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ejb-jar.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/interceptors/ejb-jar.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml