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 05:23:21 UTC
svn commit: r528748 - in /incubator/tuscany/java/sca/modules:
host-embedded/src/main/java/org/apache/tuscany/host/embedded/
implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/
implementation-java-xml/src/test/java/o...
Author: jsdelfino
Date: Fri Apr 13 20:23:20 2007
New Revision: 528748
URL: http://svn.apache.org/viewvc?view=rev&rev=528748
Log:
Make sure that JDKCallback proxy handlers have given a WorkContext. Callbacks should now be working, synchronously.
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/module/JavaRuntimeModuleActivator.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceCallbackTestCase.java
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=528748&r1=528747&r2=528748
==============================================================================
--- 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 Fri Apr 13 20:23:20 2007
@@ -139,6 +139,10 @@
new JarContributionProcessor(pkgRegistry);
new FolderContributionProcessor(pkgRegistry);
+ WorkContext workContext = new SimpleWorkContext();
+ workContext.setIdentifier(Scope.COMPOSITE, DEFAULT_COMPOSITE);
+ PojoWorkContextTunnel.setThreadWorkContext(workContext);
+
DefaultArtifactResolver artifactResolver = new DefaultArtifactResolver();
ContributionService contributionService = new ContributionServiceImpl(repository, pkgRegistry,
@@ -165,9 +169,6 @@
}
container.startContext(DEFAULT_COMPOSITE, DEFAULT_COMPOSITE);
getWorkContext().setIdentifier(Scope.COMPOSITE, DEFAULT_COMPOSITE);
- WorkContext workContext = new SimpleWorkContext();
- workContext.setIdentifier(Scope.COMPOSITE, DEFAULT_COMPOSITE);
- PojoWorkContextTunnel.setThreadWorkContext(workContext);
tuscanySystem = getComponentManager().getComponent(URI.create("/" + composite.getName().getLocalPart()));
// Temporary here to help the bring up of samples and integration tests
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=528748&r1=528747&r2=528748
==============================================================================
--- 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 Fri Apr 13 20:23:20 2007
@@ -23,6 +23,7 @@
import java.util.Map;
import org.apache.tuscany.contribution.service.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;
@@ -60,7 +61,7 @@
public Map<Class, Object> getExtensionPoints() {
Map<Class, Object> map = new HashMap<Class, Object>();
- map.put(ProxyService.class, new JDKProxyService());
+ map.put(ProxyService.class, new JDKProxyService(PojoWorkContextTunnel.getThreadWorkContext()));
map.put(JavaClassIntrospectorExtensionPoint.class, new DefaultJavaClassIntrospector());
map.put(JavaInterfaceIntrospectorExtensionPoint.class, new DefaultJavaInterfaceIntrospector());
return map;
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceCallbackTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceCallbackTestCase.java?view=diff&rev=528748&r1=528747&r2=528748
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceCallbackTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceCallbackTestCase.java Fri Apr 13 20:23:20 2007
@@ -52,7 +52,7 @@
assertNotNull(service);
Method method = FooImpl.class.getMethod("setCallback", FooCallback.class);
processor.visitMethod(method, type);
- assertEquals(method, type.getCallbackMembers().get("callback").getAnchor());
+ assertEquals(method, type.getCallbackMembers().get(FooCallback.class.getName()).getAnchor());
}
public void testFieldCallbackInterface() throws Exception {
@@ -62,7 +62,7 @@
assertNotNull(service);
Field field = FooImpl.class.getDeclaredField("callback");
processor.visitField(field, type);
- assertEquals(field, type.getCallbackMembers().get(field.getName()).getAnchor());
+ assertEquals(field, type.getCallbackMembers().get(FooCallback.class.getName()).getAnchor());
}
public void testMethodDoesNotMatchCallback() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org