You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/04/14 21:17:36 UTC
svn commit: r528860 - in /incubator/tuscany/java/sca:
modules/assembly-xml/src/main/resources/
modules/assembly/src/main/resources/ modules/assembly/src/test/resources/
modules/binding-ws/src/main/resources/
modules/binding-ws/src/test/resources/ modul...
Author: jsdelfino
Date: Sat Apr 14 12:17:34 2007
New Revision: 528860
URL: http://svn.apache.org/viewvc?view=rev&rev=528860
Log:
Minor cleanup, removed some unused classes, removed empty directories.
Added:
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/WorkContextTunnel.java (with props)
incubator/tuscany/java/sca/samples/echo-binding/src/main/resources/EchoBinding.composite (with props)
Removed:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/resources/
incubator/tuscany/java/sca/modules/assembly/src/main/resources/
incubator/tuscany/java/sca/modules/assembly/src/test/resources/
incubator/tuscany/java/sca/modules/binding-ws/src/main/resources/
incubator/tuscany/java/sca/modules/binding-ws/src/test/resources/
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/resolver/
incubator/tuscany/java/sca/modules/contribution-impl/src/main/resources/
incubator/tuscany/java/sca/modules/contribution/src/main/resources/
incubator/tuscany/java/sca/modules/contribution/src/test/resources/
incubator/tuscany/java/sca/modules/core-databinding/src/test/resources/
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/CompositeClassLoader.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/VoidService.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/util/PojoWorkContextTunnel.java
incubator/tuscany/java/sca/modules/core/src/main/resources/
incubator/tuscany/java/sca/modules/core/src/test/resources/
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/sca/
incubator/tuscany/java/sca/modules/databinding/src/main/resources/
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/resources/
incubator/tuscany/java/sca/modules/implementation-java/src/main/resources/
incubator/tuscany/java/sca/modules/implementation-java/src/test/resources/
incubator/tuscany/java/sca/modules/interface-java/src/main/resources/
incubator/tuscany/java/sca/modules/interface-java/src/test/resources/
incubator/tuscany/java/sca/modules/interface-wsdl/src/main/resources/
incubator/tuscany/java/sca/modules/interface-wsdl/src/test/resources/
incubator/tuscany/java/sca/modules/interface/src/main/resources/
incubator/tuscany/java/sca/modules/interface/src/test/resources/
incubator/tuscany/java/sca/modules/policy/src/main/resources/
incubator/tuscany/java/sca/samples/echo-binding/src/test/resources/
incubator/tuscany/java/sca/samples/echo-databinding/src/main/resources/META-INF/sca/
incubator/tuscany/java/sca/samples/implementation-crud/src/test/resources/
Modified:
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/SimpleRuntimeImpl.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/ComponentObjectFactory.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandler.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerSerializationTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerTestCase.java
incubator/tuscany/java/sca/samples/echo-binding/src/main/java/echo/EchoService.java
incubator/tuscany/java/sca/samples/echo-databinding/src/main/java/echo/EchoService.java
Added: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/WorkContextTunnel.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/WorkContextTunnel.java?view=auto&rev=528860
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/WorkContextTunnel.java (added)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/WorkContextTunnel.java Sat Apr 14 12:17:34 2007
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on 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.spi.component;
+
+
+/**
+ * Class for tunneling a WorkContext through the invocation of a user class.
+ *
+ * @version $Rev$ $Date$
+ */
+public final class WorkContextTunnel {
+ private static final ThreadLocal<WorkContext> CONTEXT = new ThreadLocal<WorkContext>();
+
+ private WorkContextTunnel() {
+ }
+
+ /**
+ * Set the WorkContext for the current thread.
+ * The current work context is returned and must be restored after the invocation is complete.
+ * Typical usage would be:
+ * <pre>
+ * WorkContext old = PojoWorkContextTunnel.setThreadWorkContext(newContext);
+ * try {
+ * ... invoke user code ...
+ * } finally {
+ * PojoWorkContextTunnel.setThreadWorkContext(old);
+ * }
+ * </pre>
+ * @param context
+ * @return the current work context for the thread; this must be restored after the invocation is made
+ */
+ public static WorkContext setThreadWorkContext(WorkContext context) {
+ WorkContext old = CONTEXT.get();
+ CONTEXT.set(context);
+ return old;
+ }
+
+ /**
+ * Returns the WorkContext for the current thread.
+ *
+ * @return the WorkContext for the current thread
+ */
+ public static WorkContext getThreadWorkContext() {
+ return CONTEXT.get();
+ }
+}
Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/WorkContextTunnel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/WorkContextTunnel.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/SimpleRuntimeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/SimpleRuntimeImpl.java?view=diff&rev=528860&r1=528859&r2=528860
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/SimpleRuntimeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/SimpleRuntimeImpl.java Sat Apr 14 12:17:34 2007
@@ -52,7 +52,6 @@
import org.apache.tuscany.core.bootstrap.ExtensionPointRegistryImpl;
import org.apache.tuscany.core.component.SimpleWorkContext;
import org.apache.tuscany.core.runtime.AbstractRuntime;
-import org.apache.tuscany.core.util.PojoWorkContextTunnel;
import org.apache.tuscany.host.runtime.InitializationException;
import org.apache.tuscany.interfacedef.java.xml.JavaInterfaceProcessor;
import org.apache.tuscany.interfacedef.wsdl.xml.WSDLDocumentProcessor;
@@ -61,6 +60,7 @@
import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.Component;
+import org.apache.tuscany.spi.component.WorkContextTunnel;
import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeRegistry;
@@ -141,7 +141,7 @@
WorkContext workContext = new SimpleWorkContext();
workContext.setIdentifier(Scope.COMPOSITE, DEFAULT_COMPOSITE);
- PojoWorkContextTunnel.setThreadWorkContext(workContext);
+ WorkContextTunnel.setThreadWorkContext(workContext);
DefaultArtifactResolver artifactResolver = new DefaultArtifactResolver();
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/ComponentObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/ComponentObjectFactory.java?view=diff&rev=528860&r1=528859&r2=528860
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/ComponentObjectFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/ComponentObjectFactory.java Sat Apr 14 12:17:34 2007
@@ -18,10 +18,10 @@
*/
package org.apache.tuscany.implementation.java.context;
-import org.apache.tuscany.core.util.PojoWorkContextTunnel;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.WorkContextTunnel;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.component.WorkContext;
@@ -40,7 +40,7 @@
public T getInstance() throws ObjectCreationException {
try {
- WorkContext workContext = PojoWorkContextTunnel.getThreadWorkContext();
+ WorkContext workContext = WorkContextTunnel.getThreadWorkContext();
@SuppressWarnings("unchecked")
CONTEXT contextId = (CONTEXT) workContext.getIdentifier(scopeContainer.getScope());
return scopeContainer.getWrapper(component, contextId).getInstance();
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java?view=diff&rev=528860&r1=528859&r2=528860
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java Sat Apr 14 12:17:34 2007
@@ -23,7 +23,6 @@
import java.util.Map;
import org.apache.tuscany.contribution.processor.StAXArtifactProcessorRegistry;
-import org.apache.tuscany.core.util.PojoWorkContextTunnel;
import org.apache.tuscany.implementation.java.JavaImplementation;
import org.apache.tuscany.implementation.java.context.JavaComponentBuilder;
import org.apache.tuscany.implementation.java.introspect.BaseJavaClassIntrospectorExtension;
@@ -50,6 +49,7 @@
import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
import org.apache.tuscany.spi.bootstrap.ModuleActivator;
import org.apache.tuscany.spi.builder.BuilderRegistry;
+import org.apache.tuscany.spi.component.WorkContextTunnel;
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.wire.ProxyService;
@@ -61,7 +61,7 @@
public Map<Class, Object> getExtensionPoints() {
Map<Class, Object> map = new HashMap<Class, Object>();
- map.put(ProxyService.class, new JDKProxyService(PojoWorkContextTunnel.getThreadWorkContext()));
+ map.put(ProxyService.class, new JDKProxyService(WorkContextTunnel.getThreadWorkContext()));
map.put(JavaClassIntrospectorExtensionPoint.class, new DefaultJavaClassIntrospector());
map.put(JavaInterfaceIntrospectorExtensionPoint.class, new DefaultJavaInterfaceIntrospector());
return map;
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandler.java?view=diff&rev=528860&r1=528859&r2=528860
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandler.java Sat Apr 14 12:17:34 2007
@@ -31,12 +31,12 @@
import java.util.UUID;
import org.apache.tuscany.assembly.Contract;
-import org.apache.tuscany.core.util.PojoWorkContextTunnel;
import org.apache.tuscany.core.wire.NoMethodForOperationException;
import org.apache.tuscany.core.wire.WireUtils;
import org.apache.tuscany.interfacedef.InterfaceContract;
import org.apache.tuscany.spi.Scope;
import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.WorkContextTunnel;
import org.apache.tuscany.spi.component.ReactivationException;
import org.apache.tuscany.spi.component.SCAExternalizable;
import org.apache.tuscany.spi.component.TargetInvocationException;
@@ -121,7 +121,7 @@
}
TargetInvoker invoker = getInvoker(holder);
InvocationChain chain = holder.getChain();
- WorkContext workContext = PojoWorkContextTunnel.getThreadWorkContext();
+ WorkContext workContext = WorkContextTunnel.getThreadWorkContext();
// JFM commonting out temporarily
// if (wireContainerIsAtomicComponent && contractHasCallback && !callbackIsImplemented) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerSerializationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerSerializationTestCase.java?view=diff&rev=528860&r1=528859&r2=528860
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerSerializationTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerSerializationTestCase.java Sat Apr 14 12:17:34 2007
@@ -32,13 +32,13 @@
import org.apache.tuscany.assembly.Contract;
import org.apache.tuscany.core.component.WorkContextImpl;
-import org.apache.tuscany.core.util.PojoWorkContextTunnel;
import org.apache.tuscany.core.wire.InvocationChainImpl;
import org.apache.tuscany.core.wire.InvokerInterceptor;
import org.apache.tuscany.implementation.java.context.ModelHelper;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.interfacedef.impl.OperationImpl;
import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.WorkContextTunnel;
import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.wire.InvocationChain;
@@ -59,7 +59,7 @@
public void testSerializeDeserialize() throws Throwable {
JDKInvocationHandler handler =
new JDKInvocationHandler(Foo.class, wire, workContext);
- PojoWorkContextTunnel.setThreadWorkContext(workContext);
+ WorkContextTunnel.setThreadWorkContext(workContext);
try {
handler.invoke(null, Foo.class.getMethod("invoke"), null);
ByteArrayOutputStream stream = new ByteArrayOutputStream();
@@ -75,7 +75,7 @@
EasyMock.verify(invoker);
EasyMock.verify(wire);
} finally {
- PojoWorkContextTunnel.setThreadWorkContext(null);
+ WorkContextTunnel.setThreadWorkContext(null);
}
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerTestCase.java?view=diff&rev=528860&r1=528859&r2=528860
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandlerTestCase.java Sat Apr 14 12:17:34 2007
@@ -30,7 +30,6 @@
import org.apache.tuscany.assembly.Contract;
import org.apache.tuscany.core.component.SimpleWorkContext;
-import org.apache.tuscany.core.util.PojoWorkContextTunnel;
import org.apache.tuscany.core.wire.InvocationChainImpl;
import org.apache.tuscany.core.wire.WireImpl;
import org.apache.tuscany.implementation.java.context.ModelHelper;
@@ -39,6 +38,7 @@
import org.apache.tuscany.interfacedef.impl.DataTypeImpl;
import org.apache.tuscany.interfacedef.impl.OperationImpl;
import org.apache.tuscany.spi.Scope;
+import org.apache.tuscany.spi.component.WorkContextTunnel;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.InvocationRuntimeException;
@@ -85,7 +85,7 @@
op1.setInterface(contract.getInterfaceContract().getInterface());
WorkContext wc = new SimpleWorkContext();
- PojoWorkContextTunnel.setThreadWorkContext(wc);
+ WorkContextTunnel.setThreadWorkContext(wc);
try {
MockInvoker invoker = new MockInvoker();
@@ -110,7 +110,7 @@
currentConvID = (String) wc.getIdentifier(Scope.CONVERSATION);
assertSame(convID, currentConvID);
} finally {
- PojoWorkContextTunnel.setThreadWorkContext(null);
+ WorkContextTunnel.setThreadWorkContext(null);
}
}
Modified: incubator/tuscany/java/sca/samples/echo-binding/src/main/java/echo/EchoService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/echo-binding/src/main/java/echo/EchoService.java?view=diff&rev=528860&r1=528859&r2=528860
==============================================================================
--- incubator/tuscany/java/sca/samples/echo-binding/src/main/java/echo/EchoService.java (original)
+++ incubator/tuscany/java/sca/samples/echo-binding/src/main/java/echo/EchoService.java Sat Apr 14 12:17:34 2007
@@ -23,9 +23,9 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.core.util.PojoWorkContextTunnel;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.spi.CoreRuntimeException;
+import org.apache.tuscany.spi.component.WorkContextTunnel;
import org.apache.tuscany.spi.component.TargetInvokerCreationException;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.extension.ServiceBindingExtension;
@@ -61,7 +61,7 @@
// Get the invocation chain for the first operation in the service interface
InvocationChain chain = wire.getInvocationChains().get(0);
Interceptor headInterceptor = chain.getHeadInterceptor();
- WorkContext workContext = PojoWorkContextTunnel.getThreadWorkContext();
+ WorkContext workContext = WorkContextTunnel.getThreadWorkContext();
if (headInterceptor == null) {
// short-circuit the dispatch and invoke the target directly
TargetInvoker targetInvoker = chain.getTargetInvoker();
Added: incubator/tuscany/java/sca/samples/echo-binding/src/main/resources/EchoBinding.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/echo-binding/src/main/resources/EchoBinding.composite?view=auto&rev=528860
==============================================================================
--- incubator/tuscany/java/sca/samples/echo-binding/src/main/resources/EchoBinding.composite (added)
+++ incubator/tuscany/java/sca/samples/echo-binding/src/main/resources/EchoBinding.composite Sat Apr 14 12:17:34 2007
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ targetNamespace="http://echo"
+ xmlns:echo="http://echo"
+ name="EchoBinding">
+
+ <service name="EchoService" promote="EchoComponent">
+ <interface.java interface="echo.Echo"/>
+ <binding.echo uri="http://tempuri.org" />
+ </service>
+
+ <component name="EchoComponent">
+ <implementation.java class="echo.EchoComponentImpl"/>
+ </component>
+
+ <reference name="EchoReference" promote="EchoComponent/echoReference">
+ <interface.java interface="echo.Echo"/>
+ <binding.echo uri="http://tempuri.org" />
+ </reference>
+
+</composite>
Propchange: incubator/tuscany/java/sca/samples/echo-binding/src/main/resources/EchoBinding.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/samples/echo-binding/src/main/resources/EchoBinding.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/samples/echo-databinding/src/main/java/echo/EchoService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/echo-databinding/src/main/java/echo/EchoService.java?view=diff&rev=528860&r1=528859&r2=528860
==============================================================================
--- incubator/tuscany/java/sca/samples/echo-databinding/src/main/java/echo/EchoService.java (original)
+++ incubator/tuscany/java/sca/samples/echo-databinding/src/main/java/echo/EchoService.java Sat Apr 14 12:17:34 2007
@@ -23,9 +23,9 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.core.util.PojoWorkContextTunnel;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.spi.CoreRuntimeException;
+import org.apache.tuscany.spi.component.WorkContextTunnel;
import org.apache.tuscany.spi.component.TargetInvokerCreationException;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.extension.ServiceBindingExtension;
@@ -61,7 +61,7 @@
// Get the invocation chain for the first operation in the service interface
InvocationChain chain = wire.getInvocationChains().get(0);
Interceptor headInterceptor = chain.getHeadInterceptor();
- WorkContext workContext = PojoWorkContextTunnel.getThreadWorkContext();
+ WorkContext workContext = WorkContextTunnel.getThreadWorkContext();
if (headInterceptor == null) {
// short-circuit the dispatch and invoke the target directly
TargetInvoker targetInvoker = chain.getTargetInvoker();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org