You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/02/24 04:34:20 UTC

svn commit: r380323 - in /incubator/tuscany/java/sca: binding.axis/src/main/java/org/apache/tuscany/binding/axis/handler/ container.java/src/test/java/org/apache/tuscany/container/java/builder/ container.java/src/test/java/org/apache/tuscany/container/...

Author: jmarino
Date: Thu Feb 23 19:34:17 2006
New Revision: 380323

URL: http://svn.apache.org/viewcvs?rev=380323&view=rev
Log:
core message and invocation package refactor

Added:
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/MessageChannel.java   (contents, props changed)
      - copied, changed from r380314, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/channel/MessageChannel.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/MessageHandler.java   (contents, props changed)
      - copied, changed from r380314, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/handler/MessageHandler.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/MessageChannelImpl.java   (contents, props changed)
      - copied, changed from r380314, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/channel/impl/MessageChannelImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/MessageDispatcher.java   (contents, props changed)
      - copied, changed from r380314, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/channel/impl/MessageDispatcher.java
Removed:
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/channel/MessageChannel.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/channel/impl/MessageChannelImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/channel/impl/MessageDispatcher.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/handler/MessageHandler.java
Modified:
    incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/handler/ExternalWebServiceConfigurationHandler.java
    incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/handler/ExternalWebServiceHandler.java
    incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/MockHandlerBuilder.java
    incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/invocation/mock/MockHandler.java
    incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/MockHandlerBuilder.java
    incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/invocation/mock/MockHandler.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/EndpointReference.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/impl/EndpointReferenceImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/InvocationConfiguration.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/OneWayInterceptor.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/RequestResponseInterceptor.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/Message.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageImpl.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationConfigurationErrorTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationConfigurationTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKInvocationHandlerTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/mock/MockHandler.java

Modified: incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/handler/ExternalWebServiceConfigurationHandler.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/handler/ExternalWebServiceConfigurationHandler.java?rev=380323&r1=380322&r2=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/handler/ExternalWebServiceConfigurationHandler.java (original)
+++ incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/handler/ExternalWebServiceConfigurationHandler.java Thu Feb 23 19:34:17 2006
@@ -21,9 +21,9 @@
 import org.apache.tuscany.core.addressing.EndpointReference;
 import org.apache.tuscany.core.context.TuscanyModuleComponentContext;
 import org.apache.tuscany.core.invocation.InvocationConfiguration;
+import org.apache.tuscany.core.invocation.MessageHandler;
 import org.apache.tuscany.core.invocation.ProxyConfiguration;
 import org.apache.tuscany.core.message.Message;
-import org.apache.tuscany.core.message.handler.MessageHandler;
 import org.apache.tuscany.model.assembly.Binding;
 import org.apache.tuscany.model.assembly.ConfiguredService;
 import org.apache.tuscany.model.assembly.ExternalService;
@@ -46,7 +46,7 @@
     }
 
     /**
-     * @see org.apache.tuscany.core.message.handler.MessageHandler#processMessage(org.apache.tuscany.core.message.Message)
+     * @see org.apache.tuscany.core.invocation.MessageHandler#processMessage(org.apache.tuscany.core.message.Message)
      */
     public boolean processMessage(Message message) {
         // Get the endpoint reference of the target service and the service model element

Modified: incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/handler/ExternalWebServiceHandler.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/handler/ExternalWebServiceHandler.java?rev=380323&r1=380322&r2=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/handler/ExternalWebServiceHandler.java (original)
+++ incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/handler/ExternalWebServiceHandler.java Thu Feb 23 19:34:17 2006
@@ -39,8 +39,8 @@
 import org.apache.tuscany.binding.axis.mediator.impl.SOAPRPCLiteralMediatorImpl;
 import org.apache.tuscany.core.addressing.EndpointReference;
 import org.apache.tuscany.core.context.TuscanyModuleComponentContext;
+import org.apache.tuscany.core.invocation.MessageHandler;
 import org.apache.tuscany.core.message.Message;
-import org.apache.tuscany.core.message.handler.MessageHandler;
 import org.apache.tuscany.core.message.impl.MessageFactoryImpl;
 import org.apache.tuscany.model.assembly.AssemblyFactory;
 import org.apache.tuscany.model.assembly.ExternalService;
@@ -144,7 +144,7 @@
     }
 
     /**
-     * @see org.apache.tuscany.core.message.handler.MessageHandler#processMessage(org.apache.tuscany.core.message.Message)
+     * @see org.apache.tuscany.core.invocation.MessageHandler#processMessage(org.apache.tuscany.core.message.Message)
      */
     public boolean processMessage(Message message) {
         try {

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/MockHandlerBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/MockHandlerBuilder.java?rev=380323&r1=380322&r2=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/MockHandlerBuilder.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/MockHandlerBuilder.java Thu Feb 23 19:34:17 2006
@@ -17,8 +17,8 @@
 import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
 import org.apache.tuscany.core.context.Context;
 import org.apache.tuscany.core.invocation.InvocationConfiguration;
+import org.apache.tuscany.core.invocation.MessageHandler;
 import org.apache.tuscany.core.invocation.spi.ProxyFactory;
-import org.apache.tuscany.core.message.handler.MessageHandler;
 import org.apache.tuscany.model.assembly.AssemblyModelObject;
 import org.apache.tuscany.model.assembly.ConfiguredReference;
 import org.apache.tuscany.model.assembly.ConfiguredService;

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/invocation/mock/MockHandler.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/invocation/mock/MockHandler.java?rev=380323&r1=380322&r2=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/invocation/mock/MockHandler.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/invocation/mock/MockHandler.java Thu Feb 23 19:34:17 2006
@@ -3,8 +3,8 @@
  */
 package org.apache.tuscany.container.java.invocation.mock;
 
+import org.apache.tuscany.core.invocation.MessageHandler;
 import org.apache.tuscany.core.message.Message;
-import org.apache.tuscany.core.message.handler.MessageHandler;
 
 /**
  *

Modified: incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/MockHandlerBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/MockHandlerBuilder.java?rev=380323&r1=380322&r2=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/MockHandlerBuilder.java (original)
+++ incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/MockHandlerBuilder.java Thu Feb 23 19:34:17 2006
@@ -17,8 +17,8 @@
 import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
 import org.apache.tuscany.core.context.Context;
 import org.apache.tuscany.core.invocation.InvocationConfiguration;
+import org.apache.tuscany.core.invocation.MessageHandler;
 import org.apache.tuscany.core.invocation.spi.ProxyFactory;
-import org.apache.tuscany.core.message.handler.MessageHandler;
 import org.apache.tuscany.model.assembly.AssemblyModelObject;
 import org.apache.tuscany.model.assembly.ConfiguredReference;
 import org.apache.tuscany.model.assembly.ConfiguredService;

Modified: incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/invocation/mock/MockHandler.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/invocation/mock/MockHandler.java?rev=380323&r1=380322&r2=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/invocation/mock/MockHandler.java (original)
+++ incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/invocation/mock/MockHandler.java Thu Feb 23 19:34:17 2006
@@ -3,8 +3,8 @@
  */
 package org.apache.tuscany.container.js.invocation.mock;
 
+import org.apache.tuscany.core.invocation.MessageHandler;
 import org.apache.tuscany.core.message.Message;
-import org.apache.tuscany.core.message.handler.MessageHandler;
 
 /**
  * A test handler

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/EndpointReference.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/EndpointReference.java?rev=380323&r1=380322&r2=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/EndpointReference.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/EndpointReference.java Thu Feb 23 19:34:17 2006
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import org.apache.tuscany.core.message.handler.MessageHandler;
+import org.apache.tuscany.core.invocation.MessageHandler;
 import org.apache.tuscany.model.assembly.ConfiguredPort;
 
 /**

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/impl/EndpointReferenceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/impl/EndpointReferenceImpl.java?rev=380323&r1=380322&r2=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/impl/EndpointReferenceImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/addressing/impl/EndpointReferenceImpl.java Thu Feb 23 19:34:17 2006
@@ -20,8 +20,8 @@
 import java.util.Map;
 
 import org.apache.tuscany.core.addressing.EndpointReference;
+import org.apache.tuscany.core.invocation.MessageHandler;
 import org.apache.tuscany.core.message.Message;
-import org.apache.tuscany.core.message.handler.MessageHandler;
 import org.apache.tuscany.model.assembly.ConfiguredPort;
 
 /**
@@ -124,7 +124,7 @@
     }
 
     /**
-     * @see org.apache.tuscany.core.addressing.EndpointReference#setMessageHandler(org.apache.tuscany.core.message.handler.MessageHandler)
+     * @see org.apache.tuscany.core.addressing.EndpointReference#setMessageHandler(org.apache.tuscany.core.invocation.MessageHandler)
      */
     public void setMessageHandler(MessageHandler messageHandler) {
         this.messageHandler = messageHandler;
@@ -173,7 +173,7 @@
     }
 
     /**
-     * @see org.apache.tuscany.core.message.handler.MessageHandler#processMessage(org.apache.tuscany.core.message.Message)
+     * @see org.apache.tuscany.core.invocation.MessageHandler#processMessage(org.apache.tuscany.core.message.Message)
      */
     public boolean processMessage(Message message) {
         return messageHandler.processMessage(message);

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java?rev=380323&r1=380322&r2=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java Thu Feb 23 19:34:17 2006
@@ -23,8 +23,8 @@
 import org.apache.tuscany.core.context.QualifiedName;
 import org.apache.tuscany.core.context.ScopeContext;
 import org.apache.tuscany.core.invocation.InvocationConfiguration;
+import org.apache.tuscany.core.invocation.impl.MessageChannelImpl;
 import org.apache.tuscany.core.invocation.spi.ProxyFactory;
-import org.apache.tuscany.core.message.channel.impl.MessageChannelImpl;
 import org.osoa.sca.annotations.Scope;
 
 /**

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/InvocationConfiguration.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/InvocationConfiguration.java?rev=380323&r1=380322&r2=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/InvocationConfiguration.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/InvocationConfiguration.java Thu Feb 23 19:34:17 2006
@@ -20,11 +20,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.tuscany.core.invocation.impl.MessageChannelImpl;
+import org.apache.tuscany.core.invocation.impl.MessageDispatcher;
 import org.apache.tuscany.core.invocation.impl.RequestResponseInterceptor;
-import org.apache.tuscany.core.message.channel.MessageChannel;
-import org.apache.tuscany.core.message.channel.impl.MessageChannelImpl;
-import org.apache.tuscany.core.message.channel.impl.MessageDispatcher;
-import org.apache.tuscany.core.message.handler.MessageHandler;
 
 /**
  * Contains a source- or target-side invocation pipeline for a service operation. Source and target invocation pipelines
@@ -42,10 +40,10 @@
  * <li>The last source interceptor, which must be of type
  * {@link org.apache.tuscany.core.invocation.impl.RequestResponseInterceptor} if there are handlers present, will be
  * invoked. The RR interceptor will in turn pass the message to a
- * {@link org.apache.tuscany.core.message.channel.MessageChannel} which will invoke all source-side request handlers.
+ * {@link org.apache.tuscany.core.invocation.MessageChannel} which will invoke all source-side request handlers.
  * <li> The RR interceptor will then invoke the target-side request <tt>MessageChannel</tt>.
  * <li> The last source-side handler, an instance of
- * {@link org.apache.tuscany.core.message.channel.impl.MessageDispatcher}, will invoke the first source-side
+ * {@link org.apache.tuscany.core.invocation.impl.MessageDispatcher}, will invoke the first source-side
  * interceptor, which in turn will pass the message down the target-side interceptor chain.
  * <li> If the target is a component instance the last target-side interceptor, an instance of
  * {@link org.apache.tuscany.core.invocation.impl.InvokerInterceptor} will retrieve the
@@ -72,7 +70,7 @@
  * @see org.apache.tuscany.core.builder.WireBuilder
  * @see org.apache.tuscany.core.invocation.spi.ProxyFactory
  * @see org.apache.tuscany.core.invocation.TargetInvoker
- * @see org.apache.tuscany.core.message.channel.impl.MessageDispatcher
+ * @see org.apache.tuscany.core.invocation.impl.MessageDispatcher
  * 
  * @version $Rev$ $Date$
  */

Copied: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/MessageChannel.java (from r380314, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/channel/MessageChannel.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/MessageChannel.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/MessageChannel.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/channel/MessageChannel.java&r1=380314&r2=380323&rev=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/channel/MessageChannel.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/MessageChannel.java Thu Feb 23 19:34:17 2006
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.tuscany.core.message.channel;
+package org.apache.tuscany.core.invocation;
 
 import org.apache.tuscany.core.message.Message;
 

Propchange: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/MessageChannel.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/MessageChannel.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/MessageHandler.java (from r380314, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/handler/MessageHandler.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/MessageHandler.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/MessageHandler.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/handler/MessageHandler.java&r1=380314&r2=380323&rev=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/handler/MessageHandler.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/MessageHandler.java Thu Feb 23 19:34:17 2006
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.tuscany.core.message.handler;
+package org.apache.tuscany.core.invocation;
 
 import org.apache.tuscany.core.message.Message;
 

Propchange: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/MessageHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/MessageHandler.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/MessageChannelImpl.java (from r380314, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/channel/impl/MessageChannelImpl.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/MessageChannelImpl.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/MessageChannelImpl.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/channel/impl/MessageChannelImpl.java&r1=380314&r2=380323&rev=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/channel/impl/MessageChannelImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/MessageChannelImpl.java Thu Feb 23 19:34:17 2006
@@ -14,13 +14,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.tuscany.core.message.channel.impl;
+package org.apache.tuscany.core.invocation.impl;
 
 import java.util.List;
 
+import org.apache.tuscany.core.invocation.MessageChannel;
+import org.apache.tuscany.core.invocation.MessageHandler;
 import org.apache.tuscany.core.message.Message;
-import org.apache.tuscany.core.message.channel.MessageChannel;
-import org.apache.tuscany.core.message.handler.MessageHandler;
 
 /**
  * A channel comprising an ordered collection of message handlers.

Propchange: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/MessageChannelImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/MessageChannelImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/MessageDispatcher.java (from r380314, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/channel/impl/MessageDispatcher.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/MessageDispatcher.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/MessageDispatcher.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/channel/impl/MessageDispatcher.java&r1=380314&r2=380323&rev=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/channel/impl/MessageDispatcher.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/MessageDispatcher.java Thu Feb 23 19:34:17 2006
@@ -14,11 +14,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.tuscany.core.message.channel.impl;
+package org.apache.tuscany.core.invocation.impl;
 
 import org.apache.tuscany.core.invocation.Interceptor;
+import org.apache.tuscany.core.invocation.MessageHandler;
 import org.apache.tuscany.core.message.Message;
-import org.apache.tuscany.core.message.handler.MessageHandler;
 
 /**
  * A message handler that dispatches the message through an interceptor stack and the uses the response channel to

Propchange: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/MessageDispatcher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/MessageDispatcher.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/OneWayInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/OneWayInterceptor.java?rev=380323&r1=380322&r2=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/OneWayInterceptor.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/OneWayInterceptor.java Thu Feb 23 19:34:17 2006
@@ -17,8 +17,8 @@
 package org.apache.tuscany.core.invocation.impl;
 
 import org.apache.tuscany.core.invocation.Interceptor;
+import org.apache.tuscany.core.invocation.MessageChannel;
 import org.apache.tuscany.core.message.Message;
-import org.apache.tuscany.core.message.channel.MessageChannel;
 
 /**
  * An interceptor that sends the invocation Message down its request channel and does not expect a response.

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/RequestResponseInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/RequestResponseInterceptor.java?rev=380323&r1=380322&r2=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/RequestResponseInterceptor.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/impl/RequestResponseInterceptor.java Thu Feb 23 19:34:17 2006
@@ -17,8 +17,8 @@
 package org.apache.tuscany.core.invocation.impl;
 
 import org.apache.tuscany.core.invocation.Interceptor;
+import org.apache.tuscany.core.invocation.MessageChannel;
 import org.apache.tuscany.core.message.Message;
-import org.apache.tuscany.core.message.channel.MessageChannel;
 
 /**
  * An interceptor that first sends the invocation Message down its request channel then extracts the response from the

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/Message.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/Message.java?rev=380323&r1=380322&r2=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/Message.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/Message.java Thu Feb 23 19:34:17 2006
@@ -19,8 +19,8 @@
 import java.util.Map;
 
 import org.apache.tuscany.core.addressing.EndpointReference;
+import org.apache.tuscany.core.invocation.MessageChannel;
 import org.apache.tuscany.core.invocation.TargetInvoker;
-import org.apache.tuscany.core.message.channel.MessageChannel;
 
 /**
  * Represents a request, response, or exception for an invocation

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageImpl.java?rev=380323&r1=380322&r2=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/message/impl/MessageImpl.java Thu Feb 23 19:34:17 2006
@@ -20,9 +20,9 @@
 import java.util.Map;
 
 import org.apache.tuscany.core.addressing.EndpointReference;
+import org.apache.tuscany.core.invocation.MessageChannel;
 import org.apache.tuscany.core.invocation.TargetInvoker;
 import org.apache.tuscany.core.message.Message;
-import org.apache.tuscany.core.message.channel.MessageChannel;
 
 /**
  */
@@ -220,7 +220,7 @@
     }
 
     /**
-     * @see org.apache.tuscany.core.message.channel.MessageChannel#send(org.apache.tuscany.core.message.Message)
+     * @see org.apache.tuscany.core.invocation.MessageChannel#send(org.apache.tuscany.core.message.Message)
      */
     public void send(Message message) {
         relatedCallbackMessage = message;

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationConfigurationErrorTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationConfigurationErrorTestCase.java?rev=380323&r1=380322&r2=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationConfigurationErrorTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationConfigurationErrorTestCase.java Thu Feb 23 19:34:17 2006
@@ -19,6 +19,7 @@
 import junit.framework.TestCase;
 
 import org.apache.tuscany.core.invocation.impl.InvokerInterceptor;
+import org.apache.tuscany.core.invocation.impl.MessageChannelImpl;
 import org.apache.tuscany.core.invocation.mock.MockHandler;
 import org.apache.tuscany.core.invocation.mock.MockStaticInvoker;
 import org.apache.tuscany.core.invocation.mock.MockSyncInterceptor;
@@ -26,7 +27,6 @@
 import org.apache.tuscany.core.invocation.mock.SimpleTargetImpl;
 import org.apache.tuscany.core.message.Message;
 import org.apache.tuscany.core.message.MessageFactory;
-import org.apache.tuscany.core.message.channel.impl.MessageChannelImpl;
 import org.apache.tuscany.core.message.impl.MessageFactoryImpl;
 
 /**

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationConfigurationTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationConfigurationTestCase.java?rev=380323&r1=380322&r2=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationConfigurationTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationConfigurationTestCase.java Thu Feb 23 19:34:17 2006
@@ -19,6 +19,7 @@
 import junit.framework.TestCase;
 
 import org.apache.tuscany.core.invocation.impl.InvokerInterceptor;
+import org.apache.tuscany.core.invocation.impl.MessageChannelImpl;
 import org.apache.tuscany.core.invocation.mock.MockHandler;
 import org.apache.tuscany.core.invocation.mock.MockStaticInvoker;
 import org.apache.tuscany.core.invocation.mock.MockSyncInterceptor;
@@ -26,7 +27,6 @@
 import org.apache.tuscany.core.invocation.mock.SimpleTargetImpl;
 import org.apache.tuscany.core.message.Message;
 import org.apache.tuscany.core.message.MessageFactory;
-import org.apache.tuscany.core.message.channel.impl.MessageChannelImpl;
 import org.apache.tuscany.core.message.impl.MessageFactoryImpl;
 
 public class InvocationConfigurationTestCase extends TestCase {

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKInvocationHandlerTestCase.java?rev=380323&r1=380322&r2=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKInvocationHandlerTestCase.java Thu Feb 23 19:34:17 2006
@@ -9,12 +9,12 @@
 
 import org.apache.tuscany.core.invocation.InvocationConfiguration;
 import org.apache.tuscany.core.invocation.impl.InvokerInterceptor;
+import org.apache.tuscany.core.invocation.impl.MessageChannelImpl;
 import org.apache.tuscany.core.invocation.mock.MockHandler;
 import org.apache.tuscany.core.invocation.mock.MockStaticInvoker;
 import org.apache.tuscany.core.invocation.mock.MockSyncInterceptor;
 import org.apache.tuscany.core.invocation.mock.SimpleTarget;
 import org.apache.tuscany.core.invocation.mock.SimpleTargetImpl;
-import org.apache.tuscany.core.message.channel.impl.MessageChannelImpl;
 import org.apache.tuscany.core.message.impl.MessageFactoryImpl;
 
 public class JDKInvocationHandlerTestCase extends TestCase {

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/mock/MockHandler.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/mock/MockHandler.java?rev=380323&r1=380322&r2=380323&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/mock/MockHandler.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/mock/MockHandler.java Thu Feb 23 19:34:17 2006
@@ -3,8 +3,8 @@
  */
 package org.apache.tuscany.core.invocation.mock;
 
+import org.apache.tuscany.core.invocation.MessageHandler;
 import org.apache.tuscany.core.message.Message;
-import org.apache.tuscany.core.message.handler.MessageHandler;
 
 /**
  *