Modified: openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateful/ThirdStatefulInterceptedBean.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateful/ThirdStatefulInterceptedBean.java?rev=607045&r1=607044&r2=607045&view=diff ============================================================================== --- openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateful/ThirdStatefulInterceptedBean.java (original) +++ openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateful/ThirdStatefulInterceptedBean.java Thu Dec 27 04:10:23 2007 @@ -36,8 +36,6 @@ import org.apache.openejb.test.interceptor.SecondClassInterceptor; /** - * - * * @version $Rev$ $Date$ */ @Stateful(name="ThirdStatefulIntercepted") @@ -49,7 +47,6 @@ /** * A simple dummy business method to concat 2 strings - * @see org.apache.openejb.test.Stateful.fulInterceptedLocal#concat(java.lang.String, java.lang.String) */ public String concat(String str1, String str2) { return str1.concat(str2); @@ -57,11 +54,9 @@ /** * A simple dummy busines method to reverse a string - * @see org.apache.openejb.test.Stateful.fulInterceptedLocal#reverse(java.lang.String) */ @Interceptors({MethodInterceptor.class}) public String reverse(String str) { - System.out.println("Reversing " + str); StringBuffer b = new StringBuffer(str); return b.reverse().toString(); } @@ -77,7 +72,7 @@ } /** - * @param contextData the contextData to set + * @param ctxData the contextData to set */ private void setContextData(Map<String, Object> ctxData) { ThirdStatefulInterceptedBean.contextData.putAll(ctxData); @@ -95,13 +90,12 @@ * the invocation of proceed in the last interceptor method in the chain is a no-op, and null is returned. * If there is more than one such interceptor method, the invocation of proceed causes the container to execute those methods in order. * - * @throws runtime exceptions or application exceptions that are allowed in the throws clause of the business method. + * @throws Exception runtime exceptions or application exceptions that are allowed in the throws clause of the business method. */ @AroundInvoke public Object inBeanInterceptor(InvocationContext ctx) throws Exception { Map<String, Object> ctxData = Interceptor.profile(ctx, "inBeanInterceptor"); setContextData(ctxData); - return ctx.proceed(); } @@ -109,13 +103,12 @@ * The interceptor method. * This should intercept postConstruct of the bean * - * @throws runtime exceptions. + * @throws Exception runtime exceptions. */ @PostConstruct public void inBeanInterceptorPostConstruct() throws Exception { Map<String, Object> ctxData = Interceptor.profile(this, "inBeanInterceptorPostConstruct"); setContextData(ctxData); - return; } @@ -123,39 +116,36 @@ * The interceptor method. * This should intercept postActivate of the bean * - * @throws runtime exceptions. + * @throws Exception runtime exceptions. */ @PostActivate public void inBeanInterceptorPostActivate() throws Exception { Map<String, Object> ctxData = Interceptor.profile(this, "inBeanInterceptorPostActivate"); setContextData(ctxData); - return; } /** * The interceptor method. * This should intercept prePassivate of the bean. * - * @throws runtime exceptions. + * @throws Exception runtime exceptions. */ @PrePassivate public void inBeanInterceptorPrePassivate() throws Exception { Map<String, Object> ctxData = Interceptor.profile(this, "inBeanInterceptorPrePassivate"); setContextData(ctxData); - return; } /** * The interceptor method. * This should intercept preDestroy of the bean. * - * @throws runtime exceptions. + * @throws Exception runtime exceptions. */ @PreDestroy public void inBeanInterceptorPreDestroy() throws Exception { Map<String, Object> ctxData = Interceptor.profile(this, "inBeanInterceptorPreDestroy"); setContextData(ctxData); - return; }
Modified: openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/SecondStatelessInterceptedBean.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/SecondStatelessInterceptedBean.java?rev=607045&r1=607044&r2=607045&view=diff ============================================================================== --- openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/SecondStatelessInterceptedBean.java (original) +++ openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/SecondStatelessInterceptedBean.java Thu Dec 27 04:10:23 2007 @@ -47,7 +47,6 @@ /** * A simple dummy business method to concat 2 strings - * @see org.apache.openejb.test.stateless.BasicStatelessInterceptedLocal#concat(java.lang.String, java.lang.String) */ public String concat(String str1, String str2) { return str1.concat(str2); @@ -55,11 +54,9 @@ /** * A simple dummy busines method to reverse a string - * @see org.apache.openejb.test.stateless.BasicStatelessInterceptedLocal#reverse(java.lang.String) */ @Interceptors({MethodInterceptor.class}) public String reverse(String str) { - System.out.println("Reversing " + str); StringBuffer b = new StringBuffer(str); return b.reverse().toString(); } Modified: openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/StatelessInterceptedBean.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/StatelessInterceptedBean.java?rev=607045&r1=607044&r2=607045&view=diff ============================================================================== --- openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/StatelessInterceptedBean.java (original) +++ openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/StatelessInterceptedBean.java Thu Dec 27 04:10:23 2007 @@ -60,7 +60,6 @@ if (str.length() > 0) { throw new NullPointerException(); } - System.out.println("Reversing " + str); StringBuffer b = new StringBuffer(str); return b.reverse().toString(); } Modified: openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/ThirdStatelessInterceptedBean.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/ThirdStatelessInterceptedBean.java?rev=607045&r1=607044&r2=607045&view=diff ============================================================================== --- openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/ThirdStatelessInterceptedBean.java (original) +++ openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/ThirdStatelessInterceptedBean.java Thu Dec 27 04:10:23 2007 @@ -34,8 +34,6 @@ import org.apache.openejb.test.interceptor.SecondClassInterceptor; /** - * - * * @version $Rev$ $Date$ */ @Stateless(name="ThirdStatelessIntercepted") @@ -59,13 +57,12 @@ */ @Interceptors({MethodInterceptor.class}) public String reverse(String str) { - System.out.println("Reversing " + str); StringBuffer b = new StringBuffer(str); return b.reverse().toString(); } /** - * @param contextData the contextData to set + * @param ctxData the contextData to set */ private void setContextData(Map<String, Object> ctxData) { ThirdStatelessInterceptedBean.contextData.putAll(ctxData); @@ -93,7 +90,7 @@ * the invocation of proceed in the last interceptor method in the chain is a no-op, and null is returned. * If there is more than one such interceptor method, the invocation of proceed causes the container to execute those methods in order. * - * @throws runtime exceptions or application exceptions that are allowed in the throws clause of the business method. + * @throws Exception runtime exceptions or application exceptions that are allowed in the throws clause of the business method. */ @AroundInvoke public Object inBeanInterceptor(InvocationContext ctx) throws Exception { @@ -107,7 +104,7 @@ * The interceptor method. * This should intercept postConstruct of the bean * - * @throws runtime exceptions. + * @throws Exception runtime exceptions. */ @PostConstruct public void inBeanInterceptorPostConstruct() throws Exception { @@ -120,7 +117,7 @@ * The interceptor method. * This should intercept preDestroy of the bean. * - * @throws runtime exceptions. + * @throws Exception runtime exceptions. */ @PreDestroy public void inBeanInterceptorPreDestroy() throws Exception { Modified: openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/resources/META-INF/ejb-jar.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/resources/META-INF/ejb-jar.xml?rev=607045&r1=607044&r2=607045&view=diff ============================================================================== --- openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/resources/META-INF/ejb-jar.xml (original) +++ openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/resources/META-INF/ejb-jar.xml Thu Dec 27 04:10:23 2007 @@ -22,15 +22,13 @@ <ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee - http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"; + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"; version="3.0" metadata-complete="true"> <description> This ejb-jar file contains assembled enterprise beans that are part of employee self-service application. </description> - <interceptors> <interceptor> <interceptor-class> @@ -38,9 +36,7 @@ </interceptor-class> </interceptor> </interceptors> - <assembly-descriptor> - <interceptor-binding> <ejb-name>*</ejb-name> <interceptor-class>
