[jboss-cvs] JBossAS SVN: r86179 - in projects/ejb3/trunk/remoting2: src/main/java/org/jboss/ejb3/remoting/endpoint/client and 4 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sun Mar 22 05:52:30 EDT 2009


Author: wolfc
Date: 2009-03-22 05:52:30 -0400 (Sun, 22 Mar 2009)
New Revision: 86179

Added:
   projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/RemoteContextDataInterceptor.java
Removed:
   projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/Interceptor.java
   projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/InterceptorInvocationHandler.java
   projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/NoopInterceptor.java
Modified:
   projects/ejb3/trunk/remoting2/pom.xml
   projects/ejb3/trunk/remoting2/src/main/java/org/jboss/ejb3/remoting/endpoint/client/RemoteContextData.java
   projects/ejb3/trunk/remoting2/src/main/java/org/jboss/ejb3/remoting/endpoint/client/RemoteInvocationHandlerInvocationHandler.java
   projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/InterceptedMockRemotable.java
   projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/SimpleInterceptorClientSide.java
   projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/SimpleInterceptorServerSide.java
   projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/unit/ClientInterceptorTestCase.java
   projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/common/AbstractRemotingTestCaseSetup.java
   projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/common/RemoteKernelControllerImpl.java
   projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/simple/unit/SimpleRemotingTestCase.java
Log:
EJBTHREE-1779: using jboss-ejb3-sis

Modified: projects/ejb3/trunk/remoting2/pom.xml
===================================================================
--- projects/ejb3/trunk/remoting2/pom.xml	2009-03-22 09:14:15 UTC (rev 86178)
+++ projects/ejb3/trunk/remoting2/pom.xml	2009-03-22 09:52:30 UTC (rev 86179)
@@ -56,8 +56,14 @@
       <artifactId>jboss-ejb3-endpoint</artifactId>
       <version>0.1.0-SNAPSHOT</version>
       <scope>test</scope>
-    </dependency>    
+    </dependency>
     <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-sis</artifactId>
+      <version>0.1.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging-log4j</artifactId>
       <scope>test</scope>

Modified: projects/ejb3/trunk/remoting2/src/main/java/org/jboss/ejb3/remoting/endpoint/client/RemoteContextData.java
===================================================================
--- projects/ejb3/trunk/remoting2/src/main/java/org/jboss/ejb3/remoting/endpoint/client/RemoteContextData.java	2009-03-22 09:14:15 UTC (rev 86178)
+++ projects/ejb3/trunk/remoting2/src/main/java/org/jboss/ejb3/remoting/endpoint/client/RemoteContextData.java	2009-03-22 09:52:30 UTC (rev 86179)
@@ -24,7 +24,7 @@
 import java.util.Map;
 
 /**
- * TODO: This doesn't belong here, because it's a contract with InterceptorInvocationHandler.
+ * Allows for setting and resetting of the remote context data.
  * 
  * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
  * @version $Revision: $

Modified: projects/ejb3/trunk/remoting2/src/main/java/org/jboss/ejb3/remoting/endpoint/client/RemoteInvocationHandlerInvocationHandler.java
===================================================================
--- projects/ejb3/trunk/remoting2/src/main/java/org/jboss/ejb3/remoting/endpoint/client/RemoteInvocationHandlerInvocationHandler.java	2009-03-22 09:14:15 UTC (rev 86178)
+++ projects/ejb3/trunk/remoting2/src/main/java/org/jboss/ejb3/remoting/endpoint/client/RemoteInvocationHandlerInvocationHandler.java	2009-03-22 09:52:30 UTC (rev 86179)
@@ -31,7 +31,7 @@
 
 /**
  * An invocation handler which delegates to an invocation handler that handles invocations
- * on a RemotableEndpoint.
+ * on a RemotableEndpoint. Before calling upon this handler a RemoteContextData must be set.
  * 
  * In theory you the delegate should be an RemotableEndpoint. In practice this is usually an
  * InvocationHandler, so this class skips through immediately to that handler.

Modified: projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/InterceptedMockRemotable.java
===================================================================
--- projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/InterceptedMockRemotable.java	2009-03-22 09:14:15 UTC (rev 86178)
+++ projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/InterceptedMockRemotable.java	2009-03-22 09:52:30 UTC (rev 86179)
@@ -29,6 +29,7 @@
 
 import org.jboss.ejb3.common.lang.SerializableMethod;
 import org.jboss.ejb3.remoting2.test.common.MockRemotable;
+import org.jboss.ejb3.sis.Interceptor;
 
 /**
  * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>

Deleted: projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/Interceptor.java
===================================================================
--- projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/Interceptor.java	2009-03-22 09:14:15 UTC (rev 86178)
+++ projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/Interceptor.java	2009-03-22 09:52:30 UTC (rev 86179)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, 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.remoting2.test.clientinterceptor;
-
-import javax.interceptor.InvocationContext;
-
-/**
- * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public interface Interceptor
-{
-   Object invoke(InvocationContext context) throws Exception;
-}

Deleted: projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/InterceptorInvocationHandler.java
===================================================================
--- projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/InterceptorInvocationHandler.java	2009-03-22 09:14:15 UTC (rev 86178)
+++ projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/InterceptorInvocationHandler.java	2009-03-22 09:52:30 UTC (rev 86179)
@@ -1,117 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, 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.remoting2.test.clientinterceptor;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.interceptor.InvocationContext;
-
-import org.jboss.ejb3.remoting.endpoint.client.RemoteContextData;
-
-/**
- * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class InterceptorInvocationHandler implements InvocationHandler
-{
-   private InvocationHandler handler;
-   private Interceptor interceptor;
-   
-   public InterceptorInvocationHandler(InvocationHandler handler, Interceptor interceptor)
-   {
-      this.handler = handler;
-      this.interceptor = interceptor;
-   }
-   
-   /* (non-Javadoc)
-    * @see java.lang.reflect.InvocationHandler#invoke(java.lang.Object, java.lang.reflect.Method, java.lang.Object[])
-    */
-   public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable
-   {
-      final Map<String, Object> contextData = new HashMap<String, Object>();
-      InvocationContext context = new InvocationContext() {
-         private Object[] parameters = args;
-         
-         public Map<String, Object> getContextData()
-         {
-            return contextData;
-         }
-
-         public Method getMethod()
-         {
-            return method;
-         }
-
-         public Object[] getParameters()
-         {
-            return args;
-         }
-
-         public Object getTarget()
-         {
-            return proxy;
-         }
-
-         public Object proceed() throws Exception
-         {
-            try
-            {
-               return handler.invoke(proxy, method, parameters);
-            }
-            catch(Error e)
-            {
-               throw e;
-            }
-            catch(RuntimeException e)
-            {
-               throw e;
-            }
-            catch(Exception e)
-            {
-               throw e;
-            }
-            catch(Throwable t)
-            {
-               // should not happen
-               throw new RuntimeException(t);
-            }
-         }
-
-         public void setParameters(Object[] params)
-         {
-            this.parameters = params;
-         }
-      };
-      RemoteContextData.setContextData(contextData);
-      try
-      {
-         return interceptor.invoke(context);
-      }
-      finally
-      {
-         RemoteContextData.cleanContextData();
-      }
-   }
-}

Deleted: projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/NoopInterceptor.java
===================================================================
--- projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/NoopInterceptor.java	2009-03-22 09:14:15 UTC (rev 86178)
+++ projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/NoopInterceptor.java	2009-03-22 09:52:30 UTC (rev 86179)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, 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.remoting2.test.clientinterceptor;
-
-import javax.interceptor.InvocationContext;
-
-/**
- * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class NoopInterceptor implements Interceptor
-{
-   public Object invoke(InvocationContext context) throws Exception
-   {
-      return context.proceed();
-   }
-}

Added: projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/RemoteContextDataInterceptor.java
===================================================================
--- projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/RemoteContextDataInterceptor.java	                        (rev 0)
+++ projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/RemoteContextDataInterceptor.java	2009-03-22 09:52:30 UTC (rev 86179)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.remoting2.test.clientinterceptor;
+
+import javax.interceptor.InvocationContext;
+
+import org.jboss.ejb3.remoting.endpoint.client.RemoteContextData;
+import org.jboss.ejb3.sis.Interceptor;
+
+/**
+ * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class RemoteContextDataInterceptor implements Interceptor
+{
+   public Object invoke(InvocationContext context) throws Exception
+   {
+      RemoteContextData.setContextData(context.getContextData());
+      try
+      {
+         return context.proceed();
+      }
+      finally
+      {
+         RemoteContextData.cleanContextData();
+      }
+   }
+}

Modified: projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/SimpleInterceptorClientSide.java
===================================================================
--- projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/SimpleInterceptorClientSide.java	2009-03-22 09:14:15 UTC (rev 86178)
+++ projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/SimpleInterceptorClientSide.java	2009-03-22 09:52:30 UTC (rev 86179)
@@ -25,6 +25,7 @@
 
 import javax.interceptor.InvocationContext;
 
+import org.jboss.ejb3.sis.Interceptor;
 import org.jboss.logging.Logger;
 
 /**

Modified: projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/SimpleInterceptorServerSide.java
===================================================================
--- projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/SimpleInterceptorServerSide.java	2009-03-22 09:14:15 UTC (rev 86178)
+++ projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/SimpleInterceptorServerSide.java	2009-03-22 09:52:30 UTC (rev 86179)
@@ -25,6 +25,8 @@
 
 import javax.interceptor.InvocationContext;
 
+import org.jboss.ejb3.sis.Interceptor;
+
 /**
  * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
  * @version $Revision: $

Modified: projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/unit/ClientInterceptorTestCase.java
===================================================================
--- projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/unit/ClientInterceptorTestCase.java	2009-03-22 09:14:15 UTC (rev 86178)
+++ projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/clientinterceptor/unit/ClientInterceptorTestCase.java	2009-03-22 09:52:30 UTC (rev 86179)
@@ -31,11 +31,13 @@
 import org.jboss.ejb3.remoting2.client.RemoteInvocationHandler;
 import org.jboss.ejb3.remoting2.test.clientinterceptor.Current;
 import org.jboss.ejb3.remoting2.test.clientinterceptor.InterceptedMockRemotable;
-import org.jboss.ejb3.remoting2.test.clientinterceptor.Interceptor;
-import org.jboss.ejb3.remoting2.test.clientinterceptor.InterceptorInvocationHandler;
+import org.jboss.ejb3.remoting2.test.clientinterceptor.RemoteContextDataInterceptor;
 import org.jboss.ejb3.remoting2.test.clientinterceptor.SimpleInterceptorClientSide;
 import org.jboss.ejb3.remoting2.test.common.AbstractRemotingTestCaseSetup;
 import org.jboss.ejb3.remoting2.test.common.MockInterface;
+import org.jboss.ejb3.sis.Interceptor;
+import org.jboss.ejb3.sis.InterceptorAssembly;
+import org.jboss.ejb3.sis.reflect.InterceptorInvocationHandler;
 import org.jboss.remoting.Client;
 import org.jboss.remoting.InvokerLocator;
 import org.junit.BeforeClass;
@@ -55,7 +57,7 @@
       install(InterceptedMockRemotable.class);
    }
    
-   private <T> T createRemoteProxy(Client client, Serializable oid, Class<T> businessInterface, Interceptor interceptor)
+   private <T> T createRemoteProxy(Client client, Serializable oid, Class<T> businessInterface, org.jboss.ejb3.sis.Interceptor interceptor)
    {
       RemoteInvocationHandler delegate = new RemoteInvocationHandler(client, oid);
       
@@ -63,6 +65,9 @@
       Serializable session = null;
       InvocationHandler handler = new RemoteInvocationHandlerInvocationHandler(delegate, session, businessInterface);
 
+      Interceptor interceptors[] = new Interceptor[] { new RemoteContextDataInterceptor(), interceptor };
+      interceptor = new InterceptorAssembly(interceptors);
+      
       handler = new InterceptorInvocationHandler(handler, interceptor);
       
       ClassLoader loader = Thread.currentThread().getContextClassLoader();

Modified: projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/common/AbstractRemotingTestCaseSetup.java
===================================================================
--- projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/common/AbstractRemotingTestCaseSetup.java	2009-03-22 09:14:15 UTC (rev 86178)
+++ projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/common/AbstractRemotingTestCaseSetup.java	2009-03-22 09:52:30 UTC (rev 86179)
@@ -36,8 +36,8 @@
 import org.jboss.ejb3.remoting.endpoint.client.RemoteInvocationHandlerInvocationHandler;
 import org.jboss.ejb3.remoting2.client.RemoteInvocationHandler;
 import org.jboss.ejb3.remoting2.test.clientinterceptor.InterceptedMockRemotable;
-import org.jboss.ejb3.remoting2.test.clientinterceptor.InterceptorInvocationHandler;
-import org.jboss.ejb3.remoting2.test.clientinterceptor.NoopInterceptor;
+import org.jboss.ejb3.remoting2.test.clientinterceptor.RemoteContextDataInterceptor;
+import org.jboss.ejb3.sis.reflect.InterceptorInvocationHandler;
 import org.jboss.logging.Logger;
 import org.jboss.remoting.Client;
 import org.jboss.remoting.InvokerLocator;
@@ -174,7 +174,7 @@
       Serializable session = null;
       InvocationHandler handler = new RemoteInvocationHandlerInvocationHandler(delegate, session, businessInterface);
 
-      handler = new InterceptorInvocationHandler(handler, new NoopInterceptor());
+      handler = new InterceptorInvocationHandler(handler, new RemoteContextDataInterceptor());
       
       ClassLoader loader = Thread.currentThread().getContextClassLoader();
       Class<?> interfaces[] = { businessInterface };

Modified: projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/common/RemoteKernelControllerImpl.java
===================================================================
--- projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/common/RemoteKernelControllerImpl.java	2009-03-22 09:14:15 UTC (rev 86178)
+++ projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/common/RemoteKernelControllerImpl.java	2009-03-22 09:52:30 UTC (rev 86179)
@@ -69,6 +69,10 @@
          java.lang.reflect.Method saveMethod = saveClass.getDeclaredMethod(methodName, new Class[0]);
          saveMethod.invoke(null, new Object[0]);
       }
+      catch(ClassNotFoundException e)
+      {
+         log.warn("Cobertura was not found");
+      }
       catch (Throwable t)
       {
          t.printStackTrace();

Modified: projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/simple/unit/SimpleRemotingTestCase.java
===================================================================
--- projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/simple/unit/SimpleRemotingTestCase.java	2009-03-22 09:14:15 UTC (rev 86178)
+++ projects/ejb3/trunk/remoting2/src/test/java/org/jboss/ejb3/remoting2/test/simple/unit/SimpleRemotingTestCase.java	2009-03-22 09:52:30 UTC (rev 86179)
@@ -35,10 +35,10 @@
 import org.jboss.ejb3.remoting.endpoint.client.RemoteInvocationHandlerInvocationHandler;
 import org.jboss.ejb3.remoting2.EJB3ServerInvocationHandler;
 import org.jboss.ejb3.remoting2.client.RemoteInvocationHandler;
-import org.jboss.ejb3.remoting2.test.clientinterceptor.InterceptorInvocationHandler;
-import org.jboss.ejb3.remoting2.test.clientinterceptor.NoopInterceptor;
+import org.jboss.ejb3.remoting2.test.clientinterceptor.RemoteContextDataInterceptor;
 import org.jboss.ejb3.remoting2.test.common.AbstractRemotingTestCaseSetup;
 import org.jboss.ejb3.remoting2.test.common.MockInterface;
+import org.jboss.ejb3.sis.reflect.InterceptorInvocationHandler;
 import org.jboss.logging.Logger;
 import org.jboss.remoting.Client;
 import org.jboss.remoting.InvokerLocator;
@@ -97,7 +97,7 @@
       Class<?> businessInterface = MockInterface.class;
       InvocationHandler handler = new RemoteInvocationHandlerInvocationHandler(delegate, session, businessInterface);
       
-      handler = new InterceptorInvocationHandler(handler, new NoopInterceptor());
+      handler = new InterceptorInvocationHandler(handler, new RemoteContextDataInterceptor());
       
       ClassLoader loader = Thread.currentThread().getContextClassLoader();
       Class<?> interfaces[] = { businessInterface };




More information about the jboss-cvs-commits mailing list