Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockConfigContext.java URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockConfigContext.java?rev=394379&r1=394378&r2=394379&view=diff ============================================================================== --- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockConfigContext.java (original) +++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockConfigContext.java Sat Apr 15 15:01:36 2006 @@ -19,7 +19,7 @@ import org.apache.tuscany.core.config.ConfigurationException; import org.apache.tuscany.core.context.ConfigurationContext; import org.apache.tuscany.core.context.ScopeContext; -import org.apache.tuscany.core.invocation.ProxyFactory; +import org.apache.tuscany.core.wire.ProxyFactory; import org.apache.tuscany.model.assembly.AssemblyObject; import org.apache.tuscany.model.assembly.Extensible; @@ -28,7 +28,7 @@ /** * A mock configuration context - * + * * @version $Rev$ $Date$ */ public class MockConfigContext implements ConfigurationContext {
Copied: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java (from r394377, 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/wire/InvocationConfigurationErrorTestCase.java?p2=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java&p1=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationConfigurationErrorTestCase.java&r1=394377&r2=394379&rev=394379&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/wire/InvocationConfigurationErrorTestCase.java Sat Apr 15 15:01:36 2006 @@ -11,17 +11,17 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.apache.tuscany.core.invocation; +package org.apache.tuscany.core.wire; import junit.framework.Assert; 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.SimpleTarget; -import org.apache.tuscany.core.invocation.mock.MockSyncInterceptor; -import org.apache.tuscany.core.invocation.mock.SimpleTargetImpl; -import org.apache.tuscany.core.invocation.mock.MockStaticInvoker; +import org.apache.tuscany.core.wire.impl.InvokerInterceptor; +import org.apache.tuscany.core.wire.impl.MessageChannelImpl; +import org.apache.tuscany.core.wire.mock.MockHandler; +import org.apache.tuscany.core.wire.mock.SimpleTarget; +import org.apache.tuscany.core.wire.mock.MockSyncInterceptor; +import org.apache.tuscany.core.wire.mock.SimpleTargetImpl; +import org.apache.tuscany.core.wire.mock.MockStaticInvoker; import org.apache.tuscany.core.message.Message; import org.apache.tuscany.core.message.MessageFactory; import org.apache.tuscany.core.message.impl.MessageFactoryImpl; Copied: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java (from r394377, 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/wire/InvocationConfigurationTestCase.java?p2=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java&p1=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationConfigurationTestCase.java&r1=394377&r2=394379&rev=394379&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/wire/InvocationConfigurationTestCase.java Sat Apr 15 15:01:36 2006 @@ -11,17 +11,17 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.apache.tuscany.core.invocation; +package org.apache.tuscany.core.wire; import junit.framework.Assert; 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.SimpleTarget; -import org.apache.tuscany.core.invocation.mock.MockHandler; -import org.apache.tuscany.core.invocation.mock.MockSyncInterceptor; -import org.apache.tuscany.core.invocation.mock.MockStaticInvoker; -import org.apache.tuscany.core.invocation.mock.SimpleTargetImpl; +import org.apache.tuscany.core.wire.impl.InvokerInterceptor; +import org.apache.tuscany.core.wire.impl.MessageChannelImpl; +import org.apache.tuscany.core.wire.mock.SimpleTarget; +import org.apache.tuscany.core.wire.mock.MockHandler; +import org.apache.tuscany.core.wire.mock.MockSyncInterceptor; +import org.apache.tuscany.core.wire.mock.MockStaticInvoker; +import org.apache.tuscany.core.wire.mock.SimpleTargetImpl; import org.apache.tuscany.core.message.Message; import org.apache.tuscany.core.message.MessageFactory; import org.apache.tuscany.core.message.impl.MessageFactoryImpl; Copied: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationErrorTestCase.java (from r394377, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationErrorTestCase.java) URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationErrorTestCase.java?p2=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationErrorTestCase.java&p1=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationErrorTestCase.java&r1=394377&r2=394379&rev=394379&view=diff ============================================================================== --- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationErrorTestCase.java (original) +++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/InvocationErrorTestCase.java Sat Apr 15 15:01:36 2006 @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.tuscany.core.invocation; +package org.apache.tuscany.core.wire; import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.tuscany.core.invocation.impl.InvokerInterceptor; -import org.apache.tuscany.core.invocation.jdk.JDKInvocationHandler; -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.wire.impl.InvokerInterceptor; +import org.apache.tuscany.core.wire.jdk.JDKInvocationHandler; +import org.apache.tuscany.core.wire.mock.MockHandler; +import org.apache.tuscany.core.wire.mock.MockStaticInvoker; +import org.apache.tuscany.core.wire.mock.MockSyncInterceptor; import org.apache.tuscany.core.message.impl.MessageFactoryImpl; import java.lang.reflect.InvocationHandler; @@ -31,7 +31,7 @@ import java.util.Map; /** - * Tests handling of exceptions thrown during an invocation + * Tests handling of exceptions thrown during an wire * * @version $Rev: 377006 $ $Date: 2006-02-11 09:41:59 -0800 (Sat, 11 Feb 2006) $ */ Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java?rev=394379&r1=394377&r2=394379&view=diff ============================================================================== --- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java (original) +++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java Sat Apr 15 15:01:36 2006 @@ -1,16 +1,16 @@ -package org.apache.tuscany.core.invocation.jdk; +package org.apache.tuscany.core.wire.jdk; import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.tuscany.core.invocation.InvocationConfiguration; -import org.apache.tuscany.core.invocation.MethodHashMap; -import org.apache.tuscany.core.invocation.mock.SimpleTarget; -import org.apache.tuscany.core.invocation.mock.SimpleTargetImpl; -import org.apache.tuscany.core.invocation.mock.MockStaticInvoker; -import org.apache.tuscany.core.invocation.mock.MockHandler; -import org.apache.tuscany.core.invocation.mock.MockSyncInterceptor; -import org.apache.tuscany.core.invocation.impl.InvokerInterceptor; -import org.apache.tuscany.core.invocation.impl.MessageChannelImpl; +import org.apache.tuscany.core.wire.InvocationConfiguration; +import org.apache.tuscany.core.wire.MethodHashMap; +import org.apache.tuscany.core.wire.mock.SimpleTarget; +import org.apache.tuscany.core.wire.mock.SimpleTargetImpl; +import org.apache.tuscany.core.wire.mock.MockStaticInvoker; +import org.apache.tuscany.core.wire.mock.MockHandler; +import org.apache.tuscany.core.wire.mock.MockSyncInterceptor; +import org.apache.tuscany.core.wire.impl.InvokerInterceptor; +import org.apache.tuscany.core.wire.impl.MessageChannelImpl; import org.apache.tuscany.core.message.impl.MessageFactoryImpl; import java.lang.reflect.Method; Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyFactoryTestCase.java URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyFactoryTestCase.java?rev=394379&r1=394377&r2=394379&view=diff ============================================================================== --- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyFactoryTestCase.java (original) +++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyFactoryTestCase.java Sat Apr 15 15:01:36 2006 @@ -11,19 +11,19 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.apache.tuscany.core.invocation.jdk; +package org.apache.tuscany.core.wire.jdk; import junit.framework.Assert; import junit.framework.TestCase; import org.apache.tuscany.core.context.QualifiedName; -import org.apache.tuscany.core.invocation.InvocationConfiguration; -import org.apache.tuscany.core.invocation.MethodHashMap; -import org.apache.tuscany.core.invocation.WireConfiguration; -import org.apache.tuscany.core.invocation.impl.InvokerInterceptor; -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.wire.InvocationConfiguration; +import org.apache.tuscany.core.wire.MethodHashMap; +import org.apache.tuscany.core.wire.WireConfiguration; +import org.apache.tuscany.core.wire.impl.InvokerInterceptor; +import org.apache.tuscany.core.wire.mock.MockStaticInvoker; +import org.apache.tuscany.core.wire.mock.MockSyncInterceptor; +import org.apache.tuscany.core.wire.mock.SimpleTarget; +import org.apache.tuscany.core.wire.mock.SimpleTargetImpl; import org.apache.tuscany.core.message.impl.MessageFactoryImpl; import java.lang.reflect.Method; Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockHandler.java URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockHandler.java?rev=394379&r1=394377&r2=394379&view=diff ============================================================================== --- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockHandler.java (original) +++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockHandler.java Sat Apr 15 15:01:36 2006 @@ -1,9 +1,9 @@ /** * */ -package org.apache.tuscany.core.invocation.mock; +package org.apache.tuscany.core.wire.mock; -import org.apache.tuscany.core.invocation.MessageHandler; +import org.apache.tuscany.core.wire.MessageHandler; import org.apache.tuscany.core.message.Message; /** Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockScopeContext.java URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockScopeContext.java?rev=394379&r1=394377&r2=394379&view=diff ============================================================================== --- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockScopeContext.java (original) +++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockScopeContext.java Sat Apr 15 15:01:36 2006 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.tuscany.core.invocation.mock; +package org.apache.tuscany.core.wire.mock; import org.apache.tuscany.core.builder.ContextFactory; import org.apache.tuscany.core.context.ScopeContext; Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockStaticInvoker.java URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockStaticInvoker.java?rev=394379&r1=394377&r2=394379&view=diff ============================================================================== --- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockStaticInvoker.java (original) +++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockStaticInvoker.java Sat Apr 15 15:01:36 2006 @@ -1,15 +1,15 @@ -package org.apache.tuscany.core.invocation.mock; +package org.apache.tuscany.core.wire.mock; -import org.apache.tuscany.core.invocation.Interceptor; -import org.apache.tuscany.core.invocation.InvocationRuntimeException; -import org.apache.tuscany.core.invocation.TargetInvoker; +import org.apache.tuscany.core.wire.Interceptor; +import org.apache.tuscany.core.wire.InvocationRuntimeException; +import org.apache.tuscany.core.wire.TargetInvoker; import org.apache.tuscany.core.message.Message; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; /** - * Caches component instances that do not need to be resolved for every invocation, e.g. an invocation originating from + * Caches component instances that do not need to be resolved for every wire, e.g. an wire originating from * a lesser scope intended for a target with a wider scope * * @version $Rev: 377006 $ $Date: 2006-02-11 09:41:59 -0800 (Sat, 11 Feb 2006) $ Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockSyncInterceptor.java URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockSyncInterceptor.java?rev=394379&r1=394377&r2=394379&view=diff ============================================================================== --- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockSyncInterceptor.java (original) +++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/MockSyncInterceptor.java Sat Apr 15 15:01:36 2006 @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.tuscany.core.invocation.mock; +package org.apache.tuscany.core.wire.mock; -import org.apache.tuscany.core.invocation.Interceptor; +import org.apache.tuscany.core.wire.Interceptor; import org.apache.tuscany.core.message.Message; public class MockSyncInterceptor implements Interceptor { Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleSource.java URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleSource.java?rev=394379&r1=394377&r2=394379&view=diff ============================================================================== --- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleSource.java (original) +++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleSource.java Sat Apr 15 15:01:36 2006 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.tuscany.core.invocation.mock; +package org.apache.tuscany.core.wire.mock; public interface SimpleSource { Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleSourceImpl.java URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleSourceImpl.java?rev=394379&r1=394377&r2=394379&view=diff ============================================================================== --- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleSourceImpl.java (original) +++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleSourceImpl.java Sat Apr 15 15:01:36 2006 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.tuscany.core.invocation.mock; +package org.apache.tuscany.core.wire.mock; public class SimpleSourceImpl implements SimpleSource { Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleTarget.java URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleTarget.java?rev=394379&r1=394377&r2=394379&view=diff ============================================================================== --- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleTarget.java (original) +++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleTarget.java Sat Apr 15 15:01:36 2006 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.tuscany.core.invocation.mock; +package org.apache.tuscany.core.wire.mock; public interface SimpleTarget { Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleTargetImpl.java URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleTargetImpl.java?rev=394379&r1=394377&r2=394379&view=diff ============================================================================== --- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleTargetImpl.java (original) +++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/wire/mock/SimpleTargetImpl.java Sat Apr 15 15:01:36 2006 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.tuscany.core.invocation.mock; +package org.apache.tuscany.core.wire.mock; public class SimpleTargetImpl implements SimpleTarget { Modified: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ServiceContract.java URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ServiceContract.java?rev=394379&r1=394378&r2=394379&view=diff ============================================================================== --- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ServiceContract.java (original) +++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ServiceContract.java Sat Apr 15 15:01:36 2006 @@ -34,14 +34,14 @@ void setInterface(Class value); /** - * Returns the callback interface for invocation from the provider back to its requestor. - * @return the callback interface for invocation from the provider back to its requestor + * Returns the callback interface for wire from the provider back to its requestor. + * @return the callback interface for wire from the provider back to its requestor */ Class getCallbackInterface(); /** - * Sets the callback interface for invocation from the provider back to its requestor. - * @param value the callback interface for invocation from the provider back to its requestor + * Sets the callback interface for wire from the provider back to its requestor. + * @param value the callback interface for wire from the provider back to its requestor */ void setCallbackInterface(Class value);
