Author: jlaskowski
Date: Mon Nov 19 15:16:34 2007
New Revision: 596479
URL: http://svn.apache.org/viewvc?rev=596479&view=rev
Log:
One more interceptor and some changes to existing ones
Added:
openejb/trunk/openejb3/examples/interceptors/src/main/java/org/apache/openejb/examples/interceptors/SuperClassOfClassLevelInterceptor.java
(with props)
Modified:
openejb/trunk/openejb3/examples/interceptors/src/main/java/org/apache/openejb/examples/interceptors/ClassLevelInterceptorSuperClassTwo.java
openejb/trunk/openejb3/examples/interceptors/src/test/java/org/apache/openejb/examples/interceptors/FullyInterceptedTest.java
Modified:
openejb/trunk/openejb3/examples/interceptors/src/main/java/org/apache/openejb/examples/interceptors/ClassLevelInterceptorSuperClassTwo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/interceptors/src/main/java/org/apache/openejb/examples/interceptors/ClassLevelInterceptorSuperClassTwo.java?rev=596479&r1=596478&r2=596479&view=diff
==============================================================================
---
openejb/trunk/openejb3/examples/interceptors/src/main/java/org/apache/openejb/examples/interceptors/ClassLevelInterceptorSuperClassTwo.java
(original)
+++
openejb/trunk/openejb3/examples/interceptors/src/main/java/org/apache/openejb/examples/interceptors/ClassLevelInterceptorSuperClassTwo.java
Mon Nov 19 15:16:34 2007
@@ -22,10 +22,10 @@
/**
* @version $Rev$ $Date$
*/
-public class ClassLevelInterceptorSuperClassTwo {
+public class ClassLevelInterceptorSuperClassTwo extends
SuperClassOfClassLevelInterceptor {
@AroundInvoke
private Object businessMethodInterceptor(InvocationContext ic) throws
Exception {
- return ic.proceed() + "-superclassone";
+ return ic.proceed() + "-superclasstwo";
}
}
Added:
openejb/trunk/openejb3/examples/interceptors/src/main/java/org/apache/openejb/examples/interceptors/SuperClassOfClassLevelInterceptor.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/interceptors/src/main/java/org/apache/openejb/examples/interceptors/SuperClassOfClassLevelInterceptor.java?rev=596479&view=auto
==============================================================================
---
openejb/trunk/openejb3/examples/interceptors/src/main/java/org/apache/openejb/examples/interceptors/SuperClassOfClassLevelInterceptor.java
(added)
+++
openejb/trunk/openejb3/examples/interceptors/src/main/java/org/apache/openejb/examples/interceptors/SuperClassOfClassLevelInterceptor.java
Mon Nov 19 15:16:34 2007
@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.examples.interceptors;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class SuperClassOfClassLevelInterceptor {
+ @AroundInvoke
+ private Object businessMethodInterceptor(InvocationContext ic) throws
Exception {
+ return ic.proceed() + "-superclassclasslevel";
+ }
+
+}
Propchange:
openejb/trunk/openejb3/examples/interceptors/src/main/java/org/apache/openejb/examples/interceptors/SuperClassOfClassLevelInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
openejb/trunk/openejb3/examples/interceptors/src/main/java/org/apache/openejb/examples/interceptors/SuperClassOfClassLevelInterceptor.java
------------------------------------------------------------------------------
svn:executable = *
Propchange:
openejb/trunk/openejb3/examples/interceptors/src/main/java/org/apache/openejb/examples/interceptors/SuperClassOfClassLevelInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange:
openejb/trunk/openejb3/examples/interceptors/src/main/java/org/apache/openejb/examples/interceptors/SuperClassOfClassLevelInterceptor.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
openejb/trunk/openejb3/examples/interceptors/src/test/java/org/apache/openejb/examples/interceptors/FullyInterceptedTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/interceptors/src/test/java/org/apache/openejb/examples/interceptors/FullyInterceptedTest.java?rev=596479&r1=596478&r2=596479&view=diff
==============================================================================
---
openejb/trunk/openejb3/examples/interceptors/src/test/java/org/apache/openejb/examples/interceptors/FullyInterceptedTest.java
(original)
+++
openejb/trunk/openejb3/examples/interceptors/src/test/java/org/apache/openejb/examples/interceptors/FullyInterceptedTest.java
Mon Nov 19 15:16:34 2007
@@ -49,7 +49,9 @@
assertNotNull(fullyIntercepted);
- String expected =
"businessMethod-bean-methodone-methodtwo-classone-classtwo";
+ // messages in reverse invocation order
+ // TODO: Almost 6 interceptors are not executed;
+ String expected =
"businessMethod-bean-methodtwo-methodone-classtwo-classone";
String actual = fullyIntercepted.businessMethod();
assert expected.equals(actual) : "Expected \"" + expected + "\", but
got \"" + actual + "\"";
