geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r415218 - in /geronimo/branches/dain/openejb-2.2-merge/modules: core/src/java/org/apache/geronimo/core/service/ interceptor/ interceptor/src/ interceptor/src/main/ interceptor/src/main/java/ interceptor/src/main/java/org/ interceptor/src/ma...
Date Mon, 19 Jun 2006 00:20:16 GMT
Author: dain
Date: Sun Jun 18 17:20:12 2006
New Revision: 415218

URL: http://svn.apache.org/viewvc?rev=415218&view=rev
Log:
svn merge -r 378182:378183 https://svn.apache.org/repos/asf/geronimo/trunk@378183

Original Commit Message
-----------------------

Author: dblevins
Date: Wed Feb 15 22:29:45 2006
New Revision: 378183

URL: http://svn.apache.org/viewcvs?rev=378183&view=rev
Log:
Created a geronimo-interceptor package just for the interceptor API.
Nothing left in org.apache.geronimo.core anymore, though there is code
in that module still.  

Added:
    geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/
      - copied from r378183, geronimo/trunk/modules/interceptor/
    geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/LICENSE.txt
      - copied unchanged from r378183, geronimo/trunk/modules/interceptor/LICENSE.txt
    geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/NOTICE.txt
      - copied unchanged from r378183, geronimo/trunk/modules/interceptor/NOTICE.txt
    geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/maven.xml
      - copied unchanged from r378183, geronimo/trunk/modules/interceptor/maven.xml
    geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/pom.xml
      - copied unchanged from r378183, geronimo/trunk/modules/interceptor/pom.xml
    geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/project.xml
      - copied unchanged from r378183, geronimo/trunk/modules/interceptor/project.xml
    geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/
      - copied from r378183, geronimo/trunk/modules/interceptor/src/
    geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/
      - copied from r378183, geronimo/trunk/modules/interceptor/src/main/
    geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/java/
      - copied from r378183, geronimo/trunk/modules/interceptor/src/main/java/
    geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/java/org/
      - copied from r378183, geronimo/trunk/modules/interceptor/src/main/java/org/
    geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/java/org/apache/
      - copied from r378183, geronimo/trunk/modules/interceptor/src/main/java/org/apache/
    geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/java/org/apache/geronimo/
      - copied from r378183, geronimo/trunk/modules/interceptor/src/main/java/org/apache/geronimo/
    geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/
      - copied from r378183, geronimo/trunk/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/
    geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/Interceptor.java
      - copied unchanged from r378183, geronimo/trunk/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/Interceptor.java
    geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/Invocation.java
      - copied unchanged from r378183, geronimo/trunk/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/Invocation.java
    geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/InvocationKey.java
      - copied unchanged from r378183, geronimo/trunk/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/InvocationKey.java
    geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/InvocationResult.java
      - copied unchanged from r378183, geronimo/trunk/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/InvocationResult.java
    geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/SimpleInvocationResult.java
      - copied unchanged from r378183, geronimo/trunk/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/SimpleInvocationResult.java
    geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/test/
      - copied from r378183, geronimo/trunk/modules/interceptor/src/test/
    geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/test/java/
      - copied from r378183, geronimo/trunk/modules/interceptor/src/test/java/
Removed:
    geronimo/branches/dain/openejb-2.2-merge/modules/core/src/java/org/apache/geronimo/core/service/
Modified:
    geronimo/branches/dain/openejb-2.2-merge/modules/naming/project.xml
    geronimo/branches/dain/openejb-2.2-merge/modules/naming/src/java/org/apache/geronimo/naming/java/ComponentContextInterceptor.java
    geronimo/branches/dain/openejb-2.2-merge/modules/security/project.xml
    geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/InvocationSupport.java
    geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/ReflexiveInterceptor.java
    geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptor.java
    geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptorInvoker.java
    geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/SerializableInvocation.java
    geronimo/branches/dain/openejb-2.2-merge/modules/webservices/project.xml
    geronimo/branches/dain/openejb-2.2-merge/modules/webservices/src/java/org/apache/geronimo/webservices/MessageContextInvocationKey.java

Modified: geronimo/branches/dain/openejb-2.2-merge/modules/naming/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/modules/naming/project.xml?rev=415218&r1=415217&r2=415218&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/modules/naming/project.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/modules/naming/project.xml Sun Jun 18 17:20:12
2006
@@ -46,7 +46,7 @@
         <!-- only for ComponentContextInterceptor -->
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-core</artifactId>
+            <artifactId>geronimo-interceptor</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
 

Modified: geronimo/branches/dain/openejb-2.2-merge/modules/naming/src/java/org/apache/geronimo/naming/java/ComponentContextInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/modules/naming/src/java/org/apache/geronimo/naming/java/ComponentContextInterceptor.java?rev=415218&r1=415217&r2=415218&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/modules/naming/src/java/org/apache/geronimo/naming/java/ComponentContextInterceptor.java
(original)
+++ geronimo/branches/dain/openejb-2.2-merge/modules/naming/src/java/org/apache/geronimo/naming/java/ComponentContextInterceptor.java
Sun Jun 18 17:20:12 2006
@@ -17,16 +17,11 @@
 
 package org.apache.geronimo.naming.java;
 
-import java.util.Properties;
-import java.util.Iterator;
-import java.util.Map;
 import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 
-import org.apache.geronimo.core.service.Interceptor;
-import org.apache.geronimo.core.service.Invocation;
-import org.apache.geronimo.core.service.InvocationResult;
+import org.apache.geronimo.interceptor.Interceptor;
+import org.apache.geronimo.interceptor.Invocation;
+import org.apache.geronimo.interceptor.InvocationResult;
 
 /**
  * An interceptor that pushes the current component's java:comp context into

Modified: geronimo/branches/dain/openejb-2.2-merge/modules/security/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/modules/security/project.xml?rev=415218&r1=415217&r2=415218&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/modules/security/project.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/modules/security/project.xml Sun Jun 18 17:20:12
2006
@@ -60,6 +60,7 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-core</artifactId>
+            <artifactId>geronimo-interceptor</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
 

Modified: geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/InvocationSupport.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/InvocationSupport.java?rev=415218&r1=415217&r2=415218&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/InvocationSupport.java
(original)
+++ geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/InvocationSupport.java
Sun Jun 18 17:20:12 2006
@@ -20,8 +20,9 @@
 import java.io.Serializable;
 import java.net.URI;
 
-import org.apache.geronimo.core.service.Invocation;
-import org.apache.geronimo.core.service.InvocationKey;
+import org.apache.geronimo.interceptor.Invocation;
+import org.apache.geronimo.interceptor.InvocationKey;
+
 /**
  * @version $Rev$ $Date$
  */
@@ -47,7 +48,7 @@
     public static void putInvocationType(Invocation invocation, InvocationType type) {
         invocation.put(INVOCATION_TYPE, type);
     }
-    
+
     private final transient String name;
     private final int ordinal;
 
@@ -82,9 +83,9 @@
         }
         return false;
     }
-    
+
     /**
-     * @see org.apache.geronimo.core.service.InvocationKey#isTransient()
+     * @see org.apache.geronimo.interceptor.InvocationKey#isTransient()
      */
     public boolean isTransient() {
         return true;

Modified: geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/ReflexiveInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/ReflexiveInterceptor.java?rev=415218&r1=415217&r2=415218&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/ReflexiveInterceptor.java
(original)
+++ geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/ReflexiveInterceptor.java
Sun Jun 18 17:20:12 2006
@@ -20,10 +20,10 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import org.apache.geronimo.core.service.Interceptor;
-import org.apache.geronimo.core.service.Invocation;
-import org.apache.geronimo.core.service.InvocationResult;
-import org.apache.geronimo.core.service.SimpleInvocationResult;
+import org.apache.geronimo.interceptor.Interceptor;
+import org.apache.geronimo.interceptor.Invocation;
+import org.apache.geronimo.interceptor.InvocationResult;
+import org.apache.geronimo.interceptor.SimpleInvocationResult;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptor.java?rev=415218&r1=415217&r2=415218&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptor.java
(original)
+++ geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptor.java
Sun Jun 18 17:20:12 2006
@@ -36,9 +36,9 @@
 import org.activeio.net.SocketSyncChannelFactory;
 import org.activeio.packet.ByteArrayPacket;
 
-import org.apache.geronimo.core.service.Interceptor;
-import org.apache.geronimo.core.service.Invocation;
-import org.apache.geronimo.core.service.InvocationResult;
+import org.apache.geronimo.interceptor.Interceptor;
+import org.apache.geronimo.interceptor.Invocation;
+import org.apache.geronimo.interceptor.InvocationResult;
 import org.apache.geronimo.kernel.ObjectInputStreamExt;
 
 /**

Modified: geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptorInvoker.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptorInvoker.java?rev=415218&r1=415217&r2=415218&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptorInvoker.java
(original)
+++ geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptorInvoker.java
Sun Jun 18 17:20:12 2006
@@ -24,9 +24,9 @@
 import org.activeio.RequestListener;
 import org.activeio.packet.EmptyPacket;
 
-import org.apache.geronimo.core.service.Interceptor;
-import org.apache.geronimo.core.service.Invocation;
-import org.apache.geronimo.core.service.InvocationResult;
+import org.apache.geronimo.interceptor.Interceptor;
+import org.apache.geronimo.interceptor.Invocation;
+import org.apache.geronimo.interceptor.InvocationResult;
 
 /**
  * @version $Rev$ $Date$
@@ -61,29 +61,29 @@
         Thread currentThread = Thread.currentThread();
         ClassLoader orig = currentThread.getContextClassLoader();
         try {
-            
+
             Invocation marshalledInvocation;
-            
+
             try {
                 currentThread.setContextClassLoader(classloader);
                 marshalledInvocation = (Invocation) RequestChannelInterceptor.deserialize(request,classloader);
             } catch (Throwable e) {
                 // Could not deserialize the invocation...
                 e.printStackTrace();
-                return RequestChannelInterceptor.serialize(new ThrowableWrapper(e));    
           
+                return RequestChannelInterceptor.serialize(new ThrowableWrapper(e));
             }
 
             try {
                 InvocationResult rc = next.invoke(marshalledInvocation);
-                return RequestChannelInterceptor.serialize(rc);                
+                return RequestChannelInterceptor.serialize(rc);
             } catch (Throwable e) {
-                return RequestChannelInterceptor.serialize(new ThrowableWrapper(e));    
           
+                return RequestChannelInterceptor.serialize(new ThrowableWrapper(e));
             }
 
-            
+
         } catch (IOException e) {
             // TODO: handle this.
-            return EmptyPacket.EMPTY_PACKET;            
+            return EmptyPacket.EMPTY_PACKET;
         } finally {
             currentThread.setContextClassLoader(orig);
         }

Modified: geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/SerializableInvocation.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/SerializableInvocation.java?rev=415218&r1=415217&r2=415218&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/SerializableInvocation.java
(original)
+++ geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/SerializableInvocation.java
Sun Jun 18 17:20:12 2006
@@ -26,8 +26,8 @@
 import java.util.HashMap;
 import java.util.Iterator;
 
-import org.apache.geronimo.core.service.Invocation;
-import org.apache.geronimo.core.service.InvocationKey;
+import org.apache.geronimo.interceptor.Invocation;
+import org.apache.geronimo.interceptor.InvocationKey;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/branches/dain/openejb-2.2-merge/modules/webservices/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/modules/webservices/project.xml?rev=415218&r1=415217&r2=415218&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/modules/webservices/project.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/modules/webservices/project.xml Sun Jun 18 17:20:12
2006
@@ -65,6 +65,12 @@
 
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>geronimo-interceptor</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>

Modified: geronimo/branches/dain/openejb-2.2-merge/modules/webservices/src/java/org/apache/geronimo/webservices/MessageContextInvocationKey.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/modules/webservices/src/java/org/apache/geronimo/webservices/MessageContextInvocationKey.java?rev=415218&r1=415217&r2=415218&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/modules/webservices/src/java/org/apache/geronimo/webservices/MessageContextInvocationKey.java
(original)
+++ geronimo/branches/dain/openejb-2.2-merge/modules/webservices/src/java/org/apache/geronimo/webservices/MessageContextInvocationKey.java
Sun Jun 18 17:20:12 2006
@@ -16,7 +16,7 @@
  */
 package org.apache.geronimo.webservices;
 
-import org.apache.geronimo.core.service.InvocationKey;
+import org.apache.geronimo.interceptor.InvocationKey;
 
 /**
  * @version $Rev$ $Date$



Mime
View raw message