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/05/03 10:53:17 UTC
svn commit: r534755 - in /incubator/tuscany/java/sca/modules:
binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/
binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/
core/src/main/java/org/apache/tuscany/core/runtime/ implementation-...
Author: jsdelfino
Date: Thu May 3 01:53:16 2007
New Revision: 534755
URL: http://svn.apache.org/viewvc?view=rev&rev=534755
Log:
Minor cleanup of some of the module activators
Modified:
incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIModuleActivator.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ModuleActivator.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeActivatorImpl.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-script/src/main/java/org/apache/tuscany/implementation/script/ScriptModuleActivator.java
incubator/tuscany/java/sca/modules/interface-java-runtime/src/main/java/org/apache/tuscany/interfacedef/java/module/JavaInterfaceRuntimeModuleActivator.java
incubator/tuscany/java/sca/modules/interface-wsdl-runtime/src/main/java/org/apache/tuscany/interfacedef/wsdl/module/WSDLInterfaceRuntimeModuleActivator.java
Modified: incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIModuleActivator.java?view=diff&rev=534755&r1=534754&r2=534755
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIModuleActivator.java Thu May 3 01:53:16 2007
@@ -30,7 +30,6 @@
import org.apache.tuscany.core.ModuleActivator;
import org.apache.tuscany.policy.PolicyFactory;
import org.apache.tuscany.policy.impl.DefaultPolicyFactory;
-import org.apache.tuscany.rmi.DefaultRMIHostExtensionPoint;
import org.apache.tuscany.rmi.RMIHostExtensionPoint;
import org.apache.tuscany.spi.builder.BuilderRegistry;
@@ -38,23 +37,18 @@
private RMIBindingBuilder builder;
- public void start(ExtensionPointRegistry extensionPointRegistry) {
+ public void start(ExtensionPointRegistry registry) {
- StAXArtifactProcessorExtensionPoint artifactProcessorRegistry =
- extensionPointRegistry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
+ StAXArtifactProcessorExtensionPoint processors =
+ registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
RMIBindingFactory rmiFactory = new DefaultRMIBindingFactory();
AssemblyFactory assemblyFactory = new DefaultAssemblyFactory();
PolicyFactory policyFactory = new DefaultPolicyFactory();
- artifactProcessorRegistry.addExtension(
- new RMIBindingProcessor(assemblyFactory, policyFactory, rmiFactory));
+ processors.addExtension(new RMIBindingProcessor(assemblyFactory, policyFactory, rmiFactory));
- RMIHostExtensionPoint rmiHost =
- extensionPointRegistry.getExtensionPoint(RMIHostExtensionPoint.class);
- if (rmiHost == null) {
- rmiHost = new DefaultRMIHostExtensionPoint();
- }
+ RMIHostExtensionPoint rmiHost = registry.getExtensionPoint(RMIHostExtensionPoint.class);
- BuilderRegistry builderRegistry = extensionPointRegistry.getExtensionPoint(BuilderRegistry.class);
+ BuilderRegistry builderRegistry = registry.getExtensionPoint(BuilderRegistry.class);
builder = new RMIBindingBuilder();
builder.setBuilderRegistry(builderRegistry);
builder.setRmiHost(rmiHost);
@@ -62,6 +56,7 @@
}
public void stop(ExtensionPointRegistry registry) {
+ //FIXME
// release resources held by bindings
// needed because the stop methods in ReferenceImpl and ServiceImpl aren't being called
// TODO: revisit this as part of the lifecycle work
Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ModuleActivator.java?view=diff&rev=534755&r1=534754&r2=534755
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ModuleActivator.java Thu May 3 01:53:16 2007
@@ -42,21 +42,21 @@
private Axis2BindingBuilder builder;
- public void start(ExtensionPointRegistry extensionPointRegistry) {
+ public void start(ExtensionPointRegistry registry) {
- StAXArtifactProcessorExtensionPoint artifactProcessorRegistry = extensionPointRegistry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
+ StAXArtifactProcessorExtensionPoint processors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
AssemblyFactory assemblyFactory = new DefaultAssemblyFactory();
PolicyFactory policyFactory = new DefaultPolicyFactory();
WebServiceBindingFactory wsFactory = new DefaultWebServiceBindingFactory();
WSDLFactory wsdlFactory = new DefaultWSDLFactory();
WSDLInterfaceIntrospector introspector = new DefaultWSDLInterfaceIntrospector(wsdlFactory);
- artifactProcessorRegistry.addExtension(new WebServiceBindingProcessor(
+ processors.addExtension(new WebServiceBindingProcessor(
assemblyFactory, policyFactory, wsFactory,
wsdlFactory, introspector));
- ServletHostExtensionPoint servletHost = extensionPointRegistry.getExtensionPoint(ServletHostExtensionPoint.class);
+ ServletHostExtensionPoint servletHost = registry.getExtensionPoint(ServletHostExtensionPoint.class);
- BuilderRegistry builderRegistry = extensionPointRegistry.getExtensionPoint(BuilderRegistry.class);
+ BuilderRegistry builderRegistry = registry.getExtensionPoint(BuilderRegistry.class);
builder = new Axis2BindingBuilder();
builder.setBuilderRegistry(builderRegistry);
builder.setServletHost(servletHost);
@@ -65,6 +65,7 @@
}
public void stop(ExtensionPointRegistry registry) {
+ //FIXME
// release resources held by bindings
// needed because the stop methods in ReferenceImpl and ServiceImpl aren't being called
// TODO: revisit this as part of the lifecycle work
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeActivatorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeActivatorImpl.java?view=diff&rev=534755&r1=534754&r2=534755
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeActivatorImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeActivatorImpl.java Thu May 3 01:53:16 2007
@@ -111,7 +111,6 @@
extensionPointRegistry.addExtensionPoint(AssemblyFactory.class, assemblyFactory);
extensionPointRegistry.addExtensionPoint(PolicyFactory.class, policyFactory);
- extensionPointRegistry.addExtensionPoint(InterfaceContractMapper.class, interfaceContractMapper);
extensionPointRegistry.addExtensionPoint(ScopeRegistry.class, scopeRegistry);
// Create a work context
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=534755&r1=534754&r2=534755
==============================================================================
--- 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 Thu May 3 01:53:16 2007
@@ -56,6 +56,7 @@
import org.apache.tuscany.implementation.java.invocation.RuntimeJavaImplementationFactory;
import org.apache.tuscany.implementation.java.xml.JavaImplementationProcessor;
import org.apache.tuscany.interfacedef.InterfaceContractMapper;
+import org.apache.tuscany.interfacedef.impl.DefaultInterfaceContractMapper;
import org.apache.tuscany.interfacedef.java.JavaFactory;
import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospector;
@@ -92,14 +93,12 @@
return map;
}
- public void start(ExtensionPointRegistry extensionPointRegistry) {
- JDKProxyService proxyFactory = (JDKProxyService) extensionPointRegistry.getExtensionPoint(ProxyFactory.class);
+ public void start(ExtensionPointRegistry registry) {
+ JDKProxyService proxyFactory = (JDKProxyService) registry.getExtensionPoint(ProxyFactory.class);
- JavaInterfaceIntrospectorExtensionPoint interfaceIntrospector = extensionPointRegistry
- .getExtensionPoint(JavaInterfaceIntrospectorExtensionPoint.class);
+ JavaInterfaceIntrospectorExtensionPoint interfaceIntrospector = registry.getExtensionPoint(JavaInterfaceIntrospectorExtensionPoint.class);
- JavaClassIntrospectorExtensionPoint classIntrospector = extensionPointRegistry
- .getExtensionPoint(JavaClassIntrospectorExtensionPoint.class);
+ JavaClassIntrospectorExtensionPoint classIntrospector = registry.getExtensionPoint(JavaClassIntrospectorExtensionPoint.class);
BaseJavaClassIntrospectorExtension[] extensions = new BaseJavaClassIntrospectorExtension[] {
new ConstructorProcessor(assemblyFactory),
new AllowsPassByReferenceProcessor(assemblyFactory),
@@ -116,49 +115,43 @@
new HeuristicPojoProcessor(assemblyFactory, javaFactory, interfaceIntrospector),
new PolicyProcessor(assemblyFactory, policyFactory)
};
- for (JavaClassIntrospectorExtension e : extensions) {
- classIntrospector.addExtension(e);
+ for (JavaClassIntrospectorExtension extension : extensions) {
+ classIntrospector.addExtension(extension);
}
- DefaultMediator mediator =
- new DefaultMediator(extensionPointRegistry.getExtensionPoint(DataBindingExtensionPoint.class),
- extensionPointRegistry.getExtensionPoint(TransformerExtensionPoint.class));
+ DataBindingExtensionPoint dataBindings = registry.getExtensionPoint(DataBindingExtensionPoint.class);
+ TransformerExtensionPoint transformers = registry.getExtensionPoint(TransformerExtensionPoint.class);
+ DefaultMediator mediator =new DefaultMediator(dataBindings, transformers);
JavaPropertyValueObjectFactory factory = new JavaPropertyValueObjectFactory(mediator);
- DataBindingExtensionPoint dataBindingRegistry = extensionPointRegistry.getExtensionPoint(DataBindingExtensionPoint.class);
+ StAXArtifactProcessorExtensionPoint processors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
- StAXArtifactProcessorExtensionPoint artifactProcessorRegistry = extensionPointRegistry
- .getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-
- ScopeRegistry scopeRegistry = extensionPointRegistry.getExtensionPoint(ScopeRegistry.class);
+ ScopeRegistry scopeRegistry = registry.getExtensionPoint(ScopeRegistry.class);
- WorkContext workContext = extensionPointRegistry.getExtensionPoint(WorkContext.class);
- JavaImplementationFactory javaImplementationFactory = new RuntimeJavaImplementationFactory(assemblyFactory,
- scopeRegistry,
- proxyFactory,
- workContext,
- dataBindingRegistry,
- factory);
+ WorkContext workContext = registry.getExtensionPoint(WorkContext.class);
+ JavaImplementationFactory javaImplementationFactory =
+ new RuntimeJavaImplementationFactory(assemblyFactory, scopeRegistry, proxyFactory,
+ workContext, dataBindings, factory);
JavaImplementationProcessor javaImplementationProcessor =
new JavaImplementationProcessor(assemblyFactory, policyFactory, javaImplementationFactory, classIntrospector);
- artifactProcessorRegistry.addExtension(javaImplementationProcessor);
+ processors.addExtension(javaImplementationProcessor);
// FIXME: To be removed
- org.apache.tuscany.implementation.java.proxy.JDKProxyService proxyService = (org.apache.tuscany.implementation.java.proxy.JDKProxyService)extensionPointRegistry
- .getExtensionPoint(ProxyService.class);
- InterfaceContractMapper mapper = extensionPointRegistry.getExtensionPoint(InterfaceContractMapper.class);
+ org.apache.tuscany.implementation.java.proxy.JDKProxyService proxyService =
+ (org.apache.tuscany.implementation.java.proxy.JDKProxyService)registry.getExtensionPoint(ProxyService.class);
+ InterfaceContractMapper mapper = new DefaultInterfaceContractMapper();
proxyService.setInterfaceContractMapper(mapper);
proxyService.setWorkContext(workContext);
- BuilderRegistry builderRegistry = extensionPointRegistry.getExtensionPoint(BuilderRegistry.class);
+ BuilderRegistry builderRegistry = registry.getExtensionPoint(BuilderRegistry.class);
if (builderRegistry != null) {
JavaComponentBuilder builder = new JavaComponentBuilder();
- builder.setProxyService(extensionPointRegistry.getExtensionPoint(ProxyService.class));
- builder.setWorkContext(extensionPointRegistry.getExtensionPoint(WorkContext.class));
+ builder.setProxyService(registry.getExtensionPoint(ProxyService.class));
+ builder.setWorkContext(registry.getExtensionPoint(WorkContext.class));
builderRegistry.register(JavaImplementation.class, builder);
builder.setPropertyValueObjectFactory(factory);
- builder.setDataBindingRegistry(dataBindingRegistry);
+ builder.setDataBindingRegistry(dataBindings);
}
}
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptModuleActivator.java?view=diff&rev=534755&r1=534754&r2=534755
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptModuleActivator.java Thu May 3 01:53:16 2007
@@ -50,9 +50,7 @@
DefaultMediator mediator = new DefaultMediator(dataBindings, transformers);
ScriptPropertyValueObjectFactory factory = new ScriptPropertyValueObjectFactory(mediator);
builder.setPropertyValueObjectFactory(factory);
-
- DataBindingExtensionPoint dataBindingRegistry = registry.getExtensionPoint(DataBindingExtensionPoint.class);
- builder.setDataBindingRegistry(dataBindingRegistry);
+ builder.setDataBindingRegistry(dataBindings);
builder.init();
}
Modified: incubator/tuscany/java/sca/modules/interface-java-runtime/src/main/java/org/apache/tuscany/interfacedef/java/module/JavaInterfaceRuntimeModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java-runtime/src/main/java/org/apache/tuscany/interfacedef/java/module/JavaInterfaceRuntimeModuleActivator.java?view=diff&rev=534755&r1=534754&r2=534755
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java-runtime/src/main/java/org/apache/tuscany/interfacedef/java/module/JavaInterfaceRuntimeModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/interface-java-runtime/src/main/java/org/apache/tuscany/interfacedef/java/module/JavaInterfaceRuntimeModuleActivator.java Thu May 3 01:53:16 2007
@@ -51,15 +51,12 @@
return map;
}
- /**
- * @see org.apache.tuscany.core.ModuleActivator#start(org.apache.tuscany.core.ExtensionPointRegistry)
- */
- public void start(ExtensionPointRegistry extensionPointRegistry) {
+ public void start(ExtensionPointRegistry registry) {
// Register <interface.java> processor
- StAXArtifactProcessorExtensionPoint staxProcessors = extensionPointRegistry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
+ StAXArtifactProcessorExtensionPoint processors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
JavaInterfaceProcessor javaInterfaceProcessor = new JavaInterfaceProcessor(javaFactory, introspector);
- staxProcessors.addExtension(javaInterfaceProcessor);
+ processors.addExtension(javaInterfaceProcessor);
}
Modified: incubator/tuscany/java/sca/modules/interface-wsdl-runtime/src/main/java/org/apache/tuscany/interfacedef/wsdl/module/WSDLInterfaceRuntimeModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-runtime/src/main/java/org/apache/tuscany/interfacedef/wsdl/module/WSDLInterfaceRuntimeModuleActivator.java?view=diff&rev=534755&r1=534754&r2=534755
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-runtime/src/main/java/org/apache/tuscany/interfacedef/wsdl/module/WSDLInterfaceRuntimeModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-runtime/src/main/java/org/apache/tuscany/interfacedef/wsdl/module/WSDLInterfaceRuntimeModuleActivator.java Thu May 3 01:53:16 2007
@@ -41,20 +41,17 @@
return null;
}
- /**
- * @see org.apache.tuscany.core.ModuleActivator#start(org.apache.tuscany.core.ExtensionPointRegistry)
- */
- public void start(ExtensionPointRegistry extensionPointRegistry) {
+ public void start(ExtensionPointRegistry registry) {
WSDLFactory wsdlFactory = new DefaultWSDLFactory();
WSDLInterfaceIntrospector interfaceIntrospector = new DefaultWSDLInterfaceIntrospector(wsdlFactory);
// Register <interface.wsdl> processor
- StAXArtifactProcessorExtensionPoint staxProcessors = extensionPointRegistry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
- staxProcessors.addExtension(new WSDLInterfaceProcessor(wsdlFactory, interfaceIntrospector));
+ StAXArtifactProcessorExtensionPoint processors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
+ processors.addExtension(new WSDLInterfaceProcessor(wsdlFactory, interfaceIntrospector));
// Register .wsdl document processor
- URLArtifactProcessorExtensionPoint documentProcessors = extensionPointRegistry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
+ URLArtifactProcessorExtensionPoint documentProcessors = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
documentProcessors.addExtension(new WSDLDocumentProcessor(wsdlFactory, null));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org