dain 2003/09/07 21:33:54
Modified: modules/core/src/java/org/apache/geronimo/remoting/router
AbstractInterceptorRouter.java
AbstractRouterRouter.java
InterceptorRegistryRouter.java JMXRouter.java
JMXTarget.java SimpleInterceptorRegistryRouter.java
SubsystemRouter.java
modules/core/src/java/org/apache/geronimo/remoting
DeMarshalingInterceptor.java
InterceptorRegistry.java
InterVMRoutingInterceptor.java
IntraVMRoutingInterceptor.java
InvocationSupport.java MarshalingInterceptor.java
TransportInterceptor.java
modules/core/src/java/org/apache/geronimo/remoting/transport
NullTransportInterceptor.java
RemoteTransportInterceptor.java
TransportLoader.java TransportServer.java
Log:
Updated to reflect movement of base services code from o.a.g.common to
o.a.g.core.services.
Revision Changes Path
1.3 +8 -8
incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/AbstractInterceptorRouter.java
Index: AbstractInterceptorRouter.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/AbstractInterceptorRouter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractInterceptorRouter.java 1 Sep 2003 20:38:49 -0000 1.2
+++ AbstractInterceptorRouter.java 8 Sep 2003 04:33:53 -0000 1.3
@@ -57,10 +57,10 @@
import java.net.URI;
-import org.apache.geronimo.common.Interceptor;
-import org.apache.geronimo.common.InvocationResult;
-import org.apache.geronimo.common.SimpleInvocation;
-import org.apache.geronimo.management.AbstractManagedObject;
+import org.apache.geronimo.core.service.Interceptor;
+import org.apache.geronimo.core.service.InvocationResult;
+import org.apache.geronimo.core.service.SimpleInvocation;
+import org.apache.geronimo.kernel.service.AbstractManagedObject;
import org.apache.geronimo.remoting.InvocationSupport;
import org.apache.geronimo.remoting.MarshalledObject;
import org.apache.geronimo.remoting.transport.Msg;
@@ -73,7 +73,7 @@
/**
*
* @jmx:mbean
- *
extends="org.apache.geronimo.management.ManagedObject,org.apache.geronimo.management.StateManageable"
+ *
extends="org.apache.geronimo.kernel.management.ManagedObject,org.apache.geronimo.kernel.management.StateManageable"
*
* @version $Revision$ $Date$
*/
@@ -169,14 +169,14 @@
abstract protected Interceptor lookupInterceptorFrom(URI to) throws
Throwable;
/**
- * @see org.apache.geronimo.common.AbstractStateManageable#doStart()
+ * @see
org.apache.geronimo.core.service.AbstractStateManageable#doStart()
*/
protected void doStart() throws Exception {
routerLock.release();
}
/**
- * @see org.apache.geronimo.common.AbstractStateManageable#doStop()
+ * @see org.apache.geronimo.core.service.AbstractStateManageable#doStop()
*/
protected void doStop() throws Exception {
routerLock = createNewRouterLock();
1.3 +5 -5
incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/AbstractRouterRouter.java
Index: AbstractRouterRouter.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/AbstractRouterRouter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractRouterRouter.java 1 Sep 2003 20:38:49 -0000 1.2
+++ AbstractRouterRouter.java 8 Sep 2003 04:33:53 -0000 1.3
@@ -57,7 +57,7 @@
import java.net.URI;
-import org.apache.geronimo.management.AbstractManagedObject;
+import org.apache.geronimo.kernel.service.AbstractManagedObject;
import org.apache.geronimo.remoting.transport.Msg;
import org.apache.geronimo.remoting.transport.TransportException;
@@ -68,7 +68,7 @@
/**
*
* @jmx:mbean
- *
extends="org.apache.geronimo.management.ManagedObject,org.apache.geronimo.management.StateManageable"
+ *
extends="org.apache.geronimo.kernel.management.ManagedObject,org.apache.geronimo.kernel.management.StateManageable"
*
* @version $Revision$ $Date$
*/
@@ -154,14 +154,14 @@
abstract protected Router lookupRouterFrom(URI to);
/**
- * @see org.apache.geronimo.common.AbstractStateManageable#doStart()
+ * @see
org.apache.geronimo.core.service.AbstractStateManageable#doStart()
*/
protected void doStart() throws Exception {
routerLock.release();
}
/**
- * @see org.apache.geronimo.common.AbstractStateManageable#doStop()
+ * @see org.apache.geronimo.core.service.AbstractStateManageable#doStop()
*/
protected void doStop() throws Exception {
routerLock = createNewRouterLock();
1.3 +2 -2
incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/InterceptorRegistryRouter.java
Index: InterceptorRegistryRouter.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/InterceptorRegistryRouter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InterceptorRegistryRouter.java 1 Sep 2003 20:38:49 -0000 1.2
+++ InterceptorRegistryRouter.java 8 Sep 2003 04:33:53 -0000 1.3
@@ -57,7 +57,7 @@
import java.net.URI;
-import org.apache.geronimo.common.Interceptor;
+import org.apache.geronimo.core.service.Interceptor;
import org.apache.geronimo.remoting.InterceptorRegistry;
/**
1.3 +3 -3
incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/JMXRouter.java
Index: JMXRouter.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/JMXRouter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JMXRouter.java 1 Sep 2003 20:38:49 -0000 1.2
+++ JMXRouter.java 8 Sep 2003 04:33:53 -0000 1.3
@@ -60,8 +60,8 @@
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import org.apache.geronimo.common.Interceptor;
-import org.apache.geronimo.jmx.MBeanProxyFactory;
+import org.apache.geronimo.core.service.Interceptor;
+import org.apache.geronimo.kernel.jmx.MBeanProxyFactory;
/**
1.2 +2 -2
incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/JMXTarget.java
Index: JMXTarget.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/JMXTarget.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMXTarget.java 1 Sep 2003 20:40:14 -0000 1.1
+++ JMXTarget.java 8 Sep 2003 04:33:53 -0000 1.2
@@ -55,7 +55,7 @@
*/
package org.apache.geronimo.remoting.router;
-import org.apache.geronimo.common.Interceptor;
+import org.apache.geronimo.core.service.Interceptor;
/**
*
1.2 +4 -4
incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/SimpleInterceptorRegistryRouter.java
Index: SimpleInterceptorRegistryRouter.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/SimpleInterceptorRegistryRouter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleInterceptorRegistryRouter.java 29 Aug 2003 19:16:54 -0000
1.1
+++ SimpleInterceptorRegistryRouter.java 8 Sep 2003 04:33:53 -0000
1.2
@@ -57,9 +57,9 @@
import java.net.URI;
-import org.apache.geronimo.common.Interceptor;
-import org.apache.geronimo.common.InvocationResult;
-import org.apache.geronimo.common.SimpleInvocation;
+import org.apache.geronimo.core.service.Interceptor;
+import org.apache.geronimo.core.service.InvocationResult;
+import org.apache.geronimo.core.service.SimpleInvocation;
import org.apache.geronimo.remoting.InterceptorRegistry;
import org.apache.geronimo.remoting.InvocationSupport;
import org.apache.geronimo.remoting.MarshalledObject;
1.3 +4 -4
incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/SubsystemRouter.java
Index: SubsystemRouter.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/router/SubsystemRouter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SubsystemRouter.java 1 Sep 2003 20:38:49 -0000 1.2
+++ SubsystemRouter.java 8 Sep 2003 04:33:53 -0000 1.3
@@ -67,8 +67,8 @@
import javax.management.relation.RelationNotification;
import javax.management.relation.RelationServiceMBean;
-import org.apache.geronimo.jmx.JMXUtil;
-import org.apache.geronimo.jmx.MBeanProxyFactory;
+import org.apache.geronimo.kernel.jmx.JMXUtil;
+import org.apache.geronimo.kernel.jmx.MBeanProxyFactory;
/**
*
@@ -111,7 +111,7 @@
}
/**
- * @see
org.apache.geronimo.management.AbstractManagedObject#handleNotification(javax.management.Notification,
java.lang.Object)
+ * @see
org.apache.geronimo.kernel.service.AbstractManagedObject#handleNotification(javax.management.Notification,
java.lang.Object)
*/
public void handleNotification(Notification n, Object o) {
super.handleNotification(n, o);
1.4 +8 -8
incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/DeMarshalingInterceptor.java
Index: DeMarshalingInterceptor.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/DeMarshalingInterceptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DeMarshalingInterceptor.java 27 Aug 2003 04:50:39 -0000 1.3
+++ DeMarshalingInterceptor.java 8 Sep 2003 04:33:54 -0000 1.4
@@ -57,10 +57,10 @@
import java.io.Serializable;
-import org.apache.geronimo.common.Interceptor;
-import org.apache.geronimo.common.Invocation;
-import org.apache.geronimo.common.InvocationResult;
-import org.apache.geronimo.common.SimpleInvocationResult;
+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;
/**
* @version $Revision$ $Date$
@@ -92,7 +92,7 @@
}
/**
- * @see
org.apache.geronimo.common.AbstractInterceptor#invoke(org.apache.geronimo.common.Invocation)
+ * @see
org.apache.geronimo.core.service.AbstractInterceptor#invoke(org.apache.geronimo.core.service.Invocation)
*/
public InvocationResult invoke(Invocation invocation) throws Throwable {
Thread currentThread = Thread.currentThread();
@@ -119,14 +119,14 @@
}
/* (non-Javadoc)
- * @see org.apache.geronimo.common.Interceptor#getNext()
+ * @see org.apache.geronimo.core.service.Interceptor#getNext()
*/
public Interceptor getNext() {
return next;
}
/* (non-Javadoc)
- * @see
org.apache.geronimo.common.Interceptor#setNext(org.apache.geronimo.common.Interceptor)
+ * @see
org.apache.geronimo.core.service.Interceptor#setNext(org.apache.geronimo.core.service.Interceptor)
*/
public void setNext(Interceptor interceptor) throws
IllegalStateException {
next = interceptor;
1.2 +2 -2
incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/InterceptorRegistry.java
Index: InterceptorRegistry.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/InterceptorRegistry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InterceptorRegistry.java 22 Aug 2003 02:23:26 -0000 1.1
+++ InterceptorRegistry.java 8 Sep 2003 04:33:54 -0000 1.2
@@ -57,7 +57,7 @@
import java.util.HashMap;
-import org.apache.geronimo.common.Interceptor;
+import org.apache.geronimo.core.service.Interceptor;
/**
* @version $Revision$ $Date$
1.4 +7 -7
incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/InterVMRoutingInterceptor.java
Index: InterVMRoutingInterceptor.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/InterVMRoutingInterceptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InterVMRoutingInterceptor.java 27 Aug 2003 04:50:39 -0000 1.3
+++ InterVMRoutingInterceptor.java 8 Sep 2003 04:33:54 -0000 1.4
@@ -60,9 +60,9 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.apache.geronimo.common.Interceptor;
-import org.apache.geronimo.common.Invocation;
-import org.apache.geronimo.common.InvocationResult;
+import org.apache.geronimo.core.service.Interceptor;
+import org.apache.geronimo.core.service.Invocation;
+import org.apache.geronimo.core.service.InvocationResult;
/**
* @version $Revision$ $Date$
@@ -75,7 +75,7 @@
Interceptor localInterceptor;
/**
- * @see
org.apache.geronimo.common.AbstractInterceptor#invoke(org.apache.geronimo.common.Invocation)
+ * @see
org.apache.geronimo.core.service.AbstractInterceptor#invoke(org.apache.geronimo.core.service.Invocation)
*/
public InvocationResult invoke(Invocation invocation) throws Throwable {
return next.invoke(invocation);
@@ -155,14 +155,14 @@
}
/**
- * @see org.apache.geronimo.common.Interceptor#getNext()
+ * @see org.apache.geronimo.core.service.Interceptor#getNext()
*/
public Interceptor getNext() {
return next;
}
/**
- * @see
org.apache.geronimo.common.Interceptor#setNext(org.apache.geronimo.common.Interceptor)
+ * @see
org.apache.geronimo.core.service.Interceptor#setNext(org.apache.geronimo.core.service.Interceptor)
*/
public void setNext(Interceptor interceptor) throws
IllegalStateException {
this.next = interceptor;
1.4 +7 -7
incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/IntraVMRoutingInterceptor.java
Index: IntraVMRoutingInterceptor.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/IntraVMRoutingInterceptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IntraVMRoutingInterceptor.java 28 Aug 2003 05:12:10 -0000 1.3
+++ IntraVMRoutingInterceptor.java 8 Sep 2003 04:33:54 -0000 1.4
@@ -60,9 +60,9 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.apache.geronimo.common.Interceptor;
-import org.apache.geronimo.common.Invocation;
-import org.apache.geronimo.common.InvocationResult;
+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.remoting.transport.NullTransportInterceptor;
/**
@@ -74,7 +74,7 @@
transient Interceptor next;
/**
- * @see
org.apache.geronimo.common.AbstractInterceptor#invoke(org.apache.geronimo.common.Invocation)
+ * @see
org.apache.geronimo.core.service.AbstractInterceptor#invoke(org.apache.geronimo.core.service.Invocation)
*/
public InvocationResult invoke(Invocation invocation) throws Throwable {
return next.invoke(invocation);
@@ -126,14 +126,14 @@
}
/**
- * @see org.apache.geronimo.common.Interceptor#getNext()
+ * @see org.apache.geronimo.core.service.Interceptor#getNext()
*/
public Interceptor getNext() {
return next;
}
/**
- * @see
org.apache.geronimo.common.Interceptor#setNext(org.apache.geronimo.common.Interceptor)
+ * @see
org.apache.geronimo.core.service.Interceptor#setNext(org.apache.geronimo.core.service.Interceptor)
*/
public void setNext(Interceptor interceptor) throws
IllegalStateException {
this.next = interceptor;
1.5 +4 -4
incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/InvocationSupport.java
Index: InvocationSupport.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/InvocationSupport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InvocationSupport.java 28 Aug 2003 05:12:10 -0000 1.4
+++ InvocationSupport.java 8 Sep 2003 04:33:54 -0000 1.5
@@ -57,8 +57,8 @@
import java.io.ObjectStreamException;
import java.io.Serializable;
import java.net.URI;
-import org.apache.geronimo.common.Invocation;
-import org.apache.geronimo.common.InvocationKey;
+import org.apache.geronimo.core.service.Invocation;
+import org.apache.geronimo.core.service.InvocationKey;
/**
* @version $Revision$ $Date$
*/
@@ -126,7 +126,7 @@
}
/**
- * @see org.apache.geronimo.common.InvocationKey#isTransient()
+ * @see org.apache.geronimo.core.service.InvocationKey#isTransient()
*/
public boolean isTransient() {
return true;
1.5 +8 -8
incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/MarshalingInterceptor.java
Index: MarshalingInterceptor.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/MarshalingInterceptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MarshalingInterceptor.java 28 Aug 2003 05:12:10 -0000 1.4
+++ MarshalingInterceptor.java 8 Sep 2003 04:33:54 -0000 1.5
@@ -57,10 +57,10 @@
import java.io.Serializable;
-import org.apache.geronimo.common.Interceptor;
-import org.apache.geronimo.common.Invocation;
-import org.apache.geronimo.common.InvocationResult;
-import org.apache.geronimo.common.SimpleInvocationResult;
+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;
/**
* @version $Revision$ $Date$
@@ -69,7 +69,7 @@
TransportInterceptor next;
/**
- * @see
org.apache.geronimo.common.AbstractInterceptor#invoke(org.apache.geronimo.common.Invocation)
+ * @see
org.apache.geronimo.core.service.AbstractInterceptor#invoke(org.apache.geronimo.core.service.Invocation)
*/
public InvocationResult invoke(Invocation invocation) throws Throwable {
// Marshall the invocation and store it.
@@ -93,14 +93,14 @@
}
/**
- * @see org.apache.geronimo.common.Interceptor#getNext()
+ * @see org.apache.geronimo.core.service.Interceptor#getNext()
*/
public Interceptor getNext() {
return next;
}
/**
- * @see
org.apache.geronimo.common.Interceptor#setNext(org.apache.geronimo.common.Interceptor)
+ * @see
org.apache.geronimo.core.service.Interceptor#setNext(org.apache.geronimo.core.service.Interceptor)
*/
public void setNext(Interceptor interceptor) throws
IllegalStateException {
this.next = (TransportInterceptor) interceptor;
1.2 +2 -2
incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/TransportInterceptor.java
Index: TransportInterceptor.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/TransportInterceptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TransportInterceptor.java 22 Aug 2003 02:23:26 -0000 1.1
+++ TransportInterceptor.java 8 Sep 2003 04:33:54 -0000 1.2
@@ -55,7 +55,7 @@
*/
package org.apache.geronimo.remoting;
-import org.apache.geronimo.common.Interceptor;
+import org.apache.geronimo.core.service.Interceptor;
/**
* You can ask a TransportInterceptor what what type of
1.3 +7 -7
incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/transport/NullTransportInterceptor.java
Index: NullTransportInterceptor.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/transport/NullTransportInterceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NullTransportInterceptor.java 26 Aug 2003 22:11:24 -0000 1.2
+++ NullTransportInterceptor.java 8 Sep 2003 04:33:54 -0000 1.3
@@ -55,9 +55,9 @@
*/
package org.apache.geronimo.remoting.transport;
-import org.apache.geronimo.common.Interceptor;
-import org.apache.geronimo.common.Invocation;
-import org.apache.geronimo.common.InvocationResult;
+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.remoting.MarshalledObject;
import org.apache.geronimo.remoting.TransportInterceptor;
@@ -69,21 +69,21 @@
private Interceptor next;
/**
- * @see
org.apache.geronimo.common.AbstractInterceptor#invoke(org.apache.geronimo.common.Invocation)
+ * @see
org.apache.geronimo.core.service.AbstractInterceptor#invoke(org.apache.geronimo.core.service.Invocation)
*/
public InvocationResult invoke(Invocation invocation) throws Throwable {
return getNext().invoke(invocation);
}
/**
- * @see org.apache.geronimo.common.Interceptor#getNext()
+ * @see org.apache.geronimo.core.service.Interceptor#getNext()
*/
public Interceptor getNext() {
return next;
}
/**
- * @see
org.apache.geronimo.common.Interceptor#setNext(org.apache.geronimo.common.Interceptor)
+ * @see
org.apache.geronimo.core.service.Interceptor#setNext(org.apache.geronimo.core.service.Interceptor)
*/
public void setNext(Interceptor interceptor) throws
IllegalStateException {
next = interceptor;
1.3 +8 -8
incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/transport/RemoteTransportInterceptor.java
Index: RemoteTransportInterceptor.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/transport/RemoteTransportInterceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RemoteTransportInterceptor.java 26 Aug 2003 22:11:24 -0000 1.2
+++ RemoteTransportInterceptor.java 8 Sep 2003 04:33:54 -0000 1.3
@@ -63,10 +63,10 @@
import java.net.URI;
import java.net.URISyntaxException;
-import org.apache.geronimo.common.Interceptor;
-import org.apache.geronimo.common.Invocation;
-import org.apache.geronimo.common.InvocationResult;
-import org.apache.geronimo.common.SimpleInvocationResult;
+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.remoting.InvocationSupport;
import org.apache.geronimo.remoting.InvocationType;
import org.apache.geronimo.remoting.MarshalledObject;
@@ -81,7 +81,7 @@
transient TransportClient transportClient;
/**
- * @see
org.apache.geronimo.common.AbstractInterceptor#invoke(org.apache.geronimo.common.Invocation)
+ * @see
org.apache.geronimo.core.service.AbstractInterceptor#invoke(org.apache.geronimo.core.service.Invocation)
*/
public InvocationResult invoke(Invocation invocation) throws Throwable {
@@ -105,14 +105,14 @@
}
/**
- * @see org.apache.geronimo.common.Interceptor#getNext()
+ * @see org.apache.geronimo.core.service.Interceptor#getNext()
*/
public Interceptor getNext() {
return null;
}
/**
- * @see
org.apache.geronimo.common.Interceptor#setNext(org.apache.geronimo.common.Interceptor)
+ * @see
org.apache.geronimo.core.service.Interceptor#setNext(org.apache.geronimo.core.service.Interceptor)
*/
public void setNext(Interceptor interceptor) throws
IllegalStateException {
}
1.5 +6 -6
incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/transport/TransportLoader.java
Index: TransportLoader.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/transport/TransportLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TransportLoader.java 1 Sep 2003 20:38:49 -0000 1.4
+++ TransportLoader.java 8 Sep 2003 04:33:54 -0000 1.5
@@ -60,14 +60,14 @@
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import org.apache.geronimo.jmx.MBeanProxyFactory;
-import org.apache.geronimo.management.AbstractManagedObject;
+import org.apache.geronimo.kernel.service.AbstractManagedObject;
import org.apache.geronimo.remoting.router.*;
+import org.apache.geronimo.kernel.jmx.MBeanProxyFactory;
/**
*
* @jmx:mbean
- *
extends="org.apache.geronimo.management.ManagedObject,org.apache.geronimo.management.StateManageable"
+ *
extends="org.apache.geronimo.kernel.management.ManagedObject,org.apache.geronimo.kernel.management.StateManageable"
*
* @version $Revision$ $Date$
*/
@@ -81,7 +81,7 @@
private ObjectName routerTarget;
/**
- * @see org.apache.geronimo.common.AbstractComponent#doStart()
+ * @see org.apache.geronimo.core.service.AbstractComponent#doStart()
*/
protected void doStart() throws Exception {
@@ -100,7 +100,7 @@
}
/**
- * @see org.apache.geronimo.common.AbstractComponent#doStop()
+ * @see org.apache.geronimo.core.service.AbstractComponent#doStop()
*/
protected void doStop() throws Exception {
if (transportServer == null) {
1.3 +2 -2
incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/transport/TransportServer.java
Index: TransportServer.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/transport/TransportServer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TransportServer.java 29 Aug 2003 19:16:53 -0000 1.2
+++ TransportServer.java 8 Sep 2003 04:33:54 -0000 1.3
@@ -57,7 +57,7 @@
import java.net.URI;
-import org.apache.geronimo.common.Component;
+import org.apache.geronimo.core.service.Component;
import org.apache.geronimo.remoting.router.*;
/**
