You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/06/22 01:02:33 UTC
svn commit: r416156 - in /incubator/tuscany/sandbox/jboynes/sca:
bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/
containers/container.java/src/main/java/org/apache/tuscany/container/java/
core2/src/main/java/org/apache/tuscany/...
Author: jboynes
Date: Wed Jun 21 16:02:33 2006
New Revision: 416156
URL: http://svn.apache.org/viewvc?rev=416156&view=rev
Log:
simplify primordial loader registration by allowing the bootstrapper to access the QName
Modified:
incubator/tuscany/sandbox/jboynes/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaImplementationLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemBindingLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemImplementationLoader.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/LoaderExtension.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/test/java/org/apache/tuscany/spi/extension/LoaderExtensionTestCase.java
Modified: incubator/tuscany/sandbox/jboynes/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java?rev=416156&r1=416155&r2=416156&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java Wed Jun 21 16:02:33 2006
@@ -59,7 +59,7 @@
}
}
- protected QName getXMLType() {
+ public QName getXMLType() {
return BINDING_WS;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaImplementationLoader.java?rev=416156&r1=416155&r2=416156&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaImplementationLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaImplementationLoader.java Wed Jun 21 16:02:33 2006
@@ -16,7 +16,7 @@
public static final QName IMPLEMENTATION_JAVA = new QName(AssemblyConstants.SCA_NAMESPACE, "implementation.java");
@Override
- protected QName getXMLType() {
+ public QName getXMLType() {
return IMPLEMENTATION_JAVA;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java?rev=416156&r1=416155&r2=416156&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java Wed Jun 21 16:02:33 2006
@@ -16,13 +16,6 @@
*/
package org.apache.tuscany.core.bootstrap;
-import org.apache.tuscany.spi.builder.BuilderRegistry;
-import org.apache.tuscany.spi.component.ScopeRegistry;
-import org.apache.tuscany.spi.deployer.Deployer;
-import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.loader.StAXPropertyFactory;
-import org.apache.tuscany.spi.monitor.MonitorFactory;
-
import org.apache.tuscany.core.builder.BuilderRegistryImpl;
import org.apache.tuscany.core.builder.Connector;
import org.apache.tuscany.core.builder.ConnectorImpl;
@@ -30,7 +23,6 @@
import org.apache.tuscany.core.component.scope.ScopeRegistryImpl;
import org.apache.tuscany.core.composite.CompositeLoader;
import org.apache.tuscany.core.deployer.DeployerImpl;
-import org.apache.tuscany.core.loader.AssemblyConstants;
import org.apache.tuscany.core.loader.ComponentLoader;
import org.apache.tuscany.core.loader.ComponentTypeElementLoader;
import org.apache.tuscany.core.loader.InterfaceJavaLoader;
@@ -49,6 +41,13 @@
import org.apache.tuscany.core.system.model.SystemBinding;
import org.apache.tuscany.core.system.model.SystemCompositeImplementation;
import org.apache.tuscany.core.system.model.SystemImplementation;
+import org.apache.tuscany.spi.builder.BuilderRegistry;
+import org.apache.tuscany.spi.component.ScopeRegistry;
+import org.apache.tuscany.spi.deployer.Deployer;
+import org.apache.tuscany.spi.extension.LoaderExtension;
+import org.apache.tuscany.spi.loader.LoaderRegistry;
+import org.apache.tuscany.spi.loader.StAXPropertyFactory;
+import org.apache.tuscany.spi.monitor.MonitorFactory;
/**
* A Tuscany runtime bootstrapper responsible for instantiating the runtime with the default primordial configuration
@@ -60,18 +59,16 @@
private final LoaderRegistry loaderRegistry;
private final Connector connector;
- public DefaultBootstrapper(LoaderRegistry loaderRegistry,
- BuilderRegistry builderRegistry,
- Connector connector) {
+ public DefaultBootstrapper(LoaderRegistry loaderRegistry, BuilderRegistry builderRegistry, Connector connector) {
this.builderRegistry = builderRegistry;
this.loaderRegistry = loaderRegistry;
this.connector = connector;
}
public DefaultBootstrapper(MonitorFactory monitorFactory) {
- this.builderRegistry = getDefaultBuilderRegistry();
- this.loaderRegistry = getDefaultLoaderRegistry(monitorFactory, new StringParserPropertyFactory());
- this.connector = getDefaultConnector();
+ this(getDefaultLoaderRegistry(monitorFactory, new StringParserPropertyFactory()),
+ getDefaultBuilderRegistry(),
+ getDefaultConnector());
}
public Deployer createDeployer() {
@@ -82,46 +79,44 @@
return deployer;
}
- private BuilderRegistry getDefaultBuilderRegistry() {
+ protected static BuilderRegistry getDefaultBuilderRegistry() {
ScopeRegistry scopeRegistry = new ScopeRegistryImpl(new WorkContextImpl());
BuilderRegistry builderRegistry = new BuilderRegistryImpl(scopeRegistry);
- builderRegistry.register(SystemCompositeImplementation.class,
- new SystemCompositeBuilder(builderRegistry));
+ builderRegistry.register(SystemCompositeImplementation.class, new SystemCompositeBuilder(builderRegistry));
builderRegistry.register(SystemImplementation.class, new SystemComponentBuilder());
builderRegistry.register(SystemBinding.class, new SystemBindingBuilder());
return builderRegistry;
}
- private LoaderRegistry getDefaultLoaderRegistry(MonitorFactory monitorFactory,
- StAXPropertyFactory propertyFactory) {
+ protected static LoaderRegistry getDefaultLoaderRegistry(MonitorFactory monitorFactory, StAXPropertyFactory propertyFactory) {
LoaderRegistryImpl loaderRegistry = new LoaderRegistryImpl();
loaderRegistry.setMonitor(monitorFactory.getMonitor(LoaderRegistryImpl.Monitor.class));
// register component type loaders
- loaderRegistry.registerLoader(SystemImplementation.class, new SystemComponentTypeLoader());
+ loaderRegistry.registerLoader(SystemImplementation.class,
+ new SystemComponentTypeLoader());
loaderRegistry.registerLoader(SystemCompositeImplementation.class,
- new SystemCompositeComponentTypeLoader(loaderRegistry));
+ new SystemCompositeComponentTypeLoader(loaderRegistry));
// register element loaders
- loaderRegistry.registerLoader(AssemblyConstants.COMPONENT, new ComponentLoader(loaderRegistry,
- propertyFactory));
- loaderRegistry.registerLoader(AssemblyConstants.COMPONENT_TYPE,
- new ComponentTypeElementLoader(loaderRegistry));
- loaderRegistry.registerLoader(AssemblyConstants.COMPOSITE, new CompositeLoader(loaderRegistry));
- loaderRegistry.registerLoader(AssemblyConstants.INTERFACE_JAVA,
- new InterfaceJavaLoader(loaderRegistry));
- loaderRegistry.registerLoader(AssemblyConstants.PROPERTY, new PropertyLoader(loaderRegistry));
- loaderRegistry.registerLoader(AssemblyConstants.REFERENCE, new ReferenceLoader(loaderRegistry));
- loaderRegistry.registerLoader(AssemblyConstants.SERVICE, new ServiceLoader(loaderRegistry));
-
- loaderRegistry.registerLoader(SystemImplementationLoader.SYSTEM_IMPLEMENTATION,
- new SystemImplementationLoader(loaderRegistry));
- loaderRegistry.registerLoader(SystemBindingLoader.SYSTEM_BINDING,
- new SystemBindingLoader(loaderRegistry));
+ registerLoader(loaderRegistry, new ComponentLoader(loaderRegistry, propertyFactory));
+ registerLoader(loaderRegistry, new ComponentTypeElementLoader(loaderRegistry));
+ registerLoader(loaderRegistry, new CompositeLoader(loaderRegistry));
+ registerLoader(loaderRegistry, new InterfaceJavaLoader(loaderRegistry));
+ registerLoader(loaderRegistry, new PropertyLoader(loaderRegistry));
+ registerLoader(loaderRegistry, new ReferenceLoader(loaderRegistry));
+ registerLoader(loaderRegistry, new ServiceLoader(loaderRegistry));
+
+ registerLoader(loaderRegistry, new SystemImplementationLoader(loaderRegistry));
+ registerLoader(loaderRegistry, new SystemBindingLoader(loaderRegistry));
return loaderRegistry;
}
- private Connector getDefaultConnector() {
+ protected static void registerLoader(LoaderRegistry registry, LoaderExtension<?> loader) {
+ registry.registerLoader(loader.getXMLType(), loader);
+ }
+
+ protected static Connector getDefaultConnector() {
return new ConnectorImpl();
}
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeLoader.java?rev=416156&r1=416155&r2=416156&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeLoader.java Wed Jun 21 16:02:33 2006
@@ -49,7 +49,7 @@
super(registry);
}
- protected QName getXMLType() {
+ public QName getXMLType() {
return AssemblyConstants.COMPOSITE;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java?rev=416156&r1=416155&r2=416156&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java Wed Jun 21 16:02:33 2006
@@ -16,6 +16,8 @@
*/
package org.apache.tuscany.core.deployer;
+import org.apache.tuscany.core.builder.Connector;
+import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.builder.Builder;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -27,9 +29,6 @@
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.Implementation;
-
-import org.apache.tuscany.core.builder.Connector;
-import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
/**
* Default implementation of Deployer.
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemBindingLoader.java?rev=416156&r1=416155&r2=416156&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemBindingLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemBindingLoader.java Wed Jun 21 16:02:33 2006
@@ -44,7 +44,7 @@
super(registry);
}
- protected QName getXMLType() {
+ public QName getXMLType() {
return SYSTEM_BINDING;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemImplementationLoader.java?rev=416156&r1=416155&r2=416156&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemImplementationLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemImplementationLoader.java Wed Jun 21 16:02:33 2006
@@ -56,7 +56,7 @@
return implementation;
}
- protected QName getXMLType() {
+ public QName getXMLType() {
return SYSTEM_IMPLEMENTATION;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/LoaderExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/LoaderExtension.java?rev=416156&r1=416155&r2=416156&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/LoaderExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/LoaderExtension.java Wed Jun 21 16:02:33 2006
@@ -87,5 +87,5 @@
*
* @return the QName of the element that this implementation handles
*/
- protected abstract QName getXMLType();
+ public abstract QName getXMLType();
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/test/java/org/apache/tuscany/spi/extension/LoaderExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/test/java/org/apache/tuscany/spi/extension/LoaderExtensionTestCase.java?rev=416156&r1=416155&r2=416156&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/test/java/org/apache/tuscany/spi/extension/LoaderExtensionTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/test/java/org/apache/tuscany/spi/extension/LoaderExtensionTestCase.java Wed Jun 21 16:02:33 2006
@@ -29,9 +29,9 @@
}
- private class Extension extends LoaderExtension {
+ private static class Extension extends LoaderExtension {
- protected QName getXMLType() {
+ public QName getXMLType() {
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org