You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/03/24 02:17:41 UTC
svn commit: r521957 - in /incubator/tuscany/sandbox/rfeng/minicore: ./
src/main/java/org/apache/tuscany/core/bootstrap/
src/main/java/org/apache/tuscany/core/builder/
src/main/java/org/apache/tuscany/core/builder/interceptor/
src/main/java/org/apache/t...
Author: rfeng
Date: Fri Mar 23 18:17:38 2007
New Revision: 521957
URL: http://svn.apache.org/viewvc?view=rev&rev=521957
Log:
Experiment core without Java C&I support
Added:
incubator/tuscany/sandbox/rfeng/minicore/
- copied from r521574, incubator/tuscany/java/sca/kernel/core/
Removed:
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/builder/interceptor/
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/component/ComponentObjectFactory.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/component/InstanceFactoryProvider.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/component/ReflectiveInstanceFactory.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/component/ReflectiveInstanceFactoryProvider.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/component/instancefactory/
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/component/scope/ReflectiveInstanceWrapper.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/databinding/
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/deployer/federation/
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/generator/
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/idl/
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/implementation/IntrospectionRegistryImpl.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/implementation/POJOPhysicalComponentBuilder.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/implementation/PhysicalComponent.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/implementation/PojoComponent.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/implementation/PojoComponentContextFactory.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/implementation/PojoConfiguration.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTypeLoader.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/implementation/composite/Dependency.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoader.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/implementation/composite/SystemCompositeBuilder.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/implementation/java/
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/implementation/processor/
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/implementation/system/
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/injection/
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/loader/
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/marshaller/
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/model/physical/
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/property/
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/services/artifact/
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/services/deployment/
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/services/extension/
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/services/host/
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/services/work/
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/wire/jdk/
incubator/tuscany/sandbox/rfeng/minicore/src/main/resources/org/apache/tuscany/core/databinding.scdl
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/builder/ConnectorImplCreateWireTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/builder/ConnectorImplWireTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/builder/interceptor/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/ComponentContextImplTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/ReflectiveInstanceFactoryProviderTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/instancefactory/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeRestartTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ReflectiveInstanceWrapperTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeRestartTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/databinding/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/idl/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/implementation/IntrospectionRegistryTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/implementation/PhysicalComponentTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/implementation/PojoAtomicComponentTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/implementation/PojoComponentTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoaderTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/implementation/java/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/implementation/processor/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/implementation/system/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/injection/CallbackWireObjectFactory2TestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/injection/CallbackWireObjectFactoryTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/injection/FieldInjectorTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/injection/JNDIObjectFactoryTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/injection/MethodEventInvokerTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/injection/MethodInjectorTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/injection/PojoObjectFactoryTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/injection/RequestContextObjectFactoryTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/injection/ResourceObjectFactoryTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/integration/conversation/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/integration/implementation/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/integration/mock/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/integration/scope/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/integration/wire/ReferenceInjectionTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/loader/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/marshaller/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/mock/binding/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/policy/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/property/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/services/artifact/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/services/deployment/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/services/host/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/services/work/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/services/wsdl/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/wire/InvocationHandlerTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/wire/jdk/
incubator/tuscany/sandbox/rfeng/minicore/src/test/resources/org/apache/tuscany/core/databinding/
Modified:
incubator/tuscany/sandbox/rfeng/minicore/pom.xml
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/bootstrap/Bootstrapper.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/component/SimpleWorkContext.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl
Modified: incubator/tuscany/sandbox/rfeng/minicore/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/minicore/pom.xml?view=diff&rev=521957&r1=521574&r2=521957
==============================================================================
--- incubator/tuscany/sandbox/rfeng/minicore/pom.xml (original)
+++ incubator/tuscany/sandbox/rfeng/minicore/pom.xml Fri Mar 23 18:17:38 2007
@@ -25,7 +25,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>tuscany-core</artifactId>
+ <artifactId>tuscany-minicore</artifactId>
<packaging>jar</packaging>
<name>Apache Tuscany SCA Core</name>
<description>Core Tuscany runtime.</description>
@@ -39,32 +39,8 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
- <artifactId>commonj-api_r1.1</artifactId>
- <version>1.0-incubator-M2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- <version>1.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
</dependency>
<dependency>
Modified: incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/bootstrap/Bootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/bootstrap/Bootstrapper.java?view=diff&rev=521957&r1=521574&r2=521957
==============================================================================
--- incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/bootstrap/Bootstrapper.java (original)
+++ incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/bootstrap/Bootstrapper.java Fri Mar 23 18:17:38 2007
@@ -54,15 +54,6 @@
Deployer createDeployer();
/**
- * Create a Loader for parsing a system definition represented as a XML SCDL file.
- *
- * @param propertyFactory the StAXPropertyFactory to be used to parse property values
- * @param introspector the introspector to be used to extract component type information from a Java class
- * @return a new prmordial Loader
- */
- Loader createLoader(PropertyObjectFactory propertyFactory, Introspector introspector);
-
- /**
* Create a ScopeRegistry that supports the Scopes supported for primordial components
*
* @return a new primordial ScopeRegistry
Modified: incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java?view=diff&rev=521957&r1=521574&r2=521957
==============================================================================
--- incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java (original)
+++ incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java Fri Mar 23 18:17:38 2007
@@ -20,6 +20,14 @@
import javax.xml.stream.XMLInputFactory;
+import org.apache.tuscany.core.binding.local.LocalBindingBuilder;
+import org.apache.tuscany.core.binding.local.LocalBindingDefinition;
+import org.apache.tuscany.core.builder.BuilderRegistryImpl;
+import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
+import org.apache.tuscany.core.component.scope.ScopeRegistryImpl;
+import org.apache.tuscany.core.deployer.DeployerImpl;
+import org.apache.tuscany.core.resolver.AutowireResolver;
+import org.apache.tuscany.host.MonitorFactory;
import org.apache.tuscany.spi.builder.Builder;
import org.apache.tuscany.spi.builder.Connector;
import org.apache.tuscany.spi.component.ComponentManager;
@@ -27,52 +35,7 @@
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.idl.java.JavaInterfaceProcessorRegistry;
-import org.apache.tuscany.spi.implementation.java.ImplementationProcessorService;
-import org.apache.tuscany.spi.implementation.java.Introspector;
import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.loader.PropertyObjectFactory;
-
-import org.apache.tuscany.core.binding.local.LocalBindingBuilder;
-import org.apache.tuscany.core.binding.local.LocalBindingDefinition;
-import org.apache.tuscany.core.binding.local.LocalBindingLoader;
-import org.apache.tuscany.core.builder.BuilderRegistryImpl;
-import org.apache.tuscany.core.component.scope.ScopeRegistryImpl;
-import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
-import org.apache.tuscany.core.deployer.DeployerImpl;
-import org.apache.tuscany.core.idl.java.InterfaceJavaLoader;
-import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
-import org.apache.tuscany.core.implementation.IntrospectionRegistryImpl;
-import org.apache.tuscany.core.implementation.composite.CompositeLoader;
-import org.apache.tuscany.core.implementation.composite.SystemCompositeBuilder;
-import org.apache.tuscany.core.implementation.processor.ConstructorProcessor;
-import org.apache.tuscany.core.implementation.processor.DestroyProcessor;
-import org.apache.tuscany.core.implementation.processor.EagerInitProcessor;
-import org.apache.tuscany.core.implementation.processor.HeuristicPojoProcessor;
-import org.apache.tuscany.core.implementation.processor.ImplementationProcessorServiceImpl;
-import org.apache.tuscany.core.implementation.processor.InitProcessor;
-import org.apache.tuscany.core.implementation.processor.MonitorProcessor;
-import org.apache.tuscany.core.implementation.processor.PropertyProcessor;
-import org.apache.tuscany.core.implementation.processor.ReferenceProcessor;
-import org.apache.tuscany.core.implementation.processor.ResourceProcessor;
-import org.apache.tuscany.core.implementation.processor.ScopeProcessor;
-import org.apache.tuscany.core.implementation.processor.ServiceProcessor;
-import org.apache.tuscany.core.implementation.system.builder.SystemComponentBuilder;
-import org.apache.tuscany.core.implementation.system.loader.SystemComponentTypeLoader;
-import org.apache.tuscany.core.implementation.system.loader.SystemCompositeComponentTypeLoader;
-import org.apache.tuscany.core.implementation.system.loader.SystemImplementationLoader;
-import org.apache.tuscany.core.implementation.system.model.SystemCompositeImplementation;
-import org.apache.tuscany.core.implementation.system.model.SystemImplementation;
-import org.apache.tuscany.core.loader.ComponentLoader;
-import org.apache.tuscany.core.loader.ComponentTypeElementLoader;
-import org.apache.tuscany.core.loader.IncludeLoader;
-import org.apache.tuscany.core.loader.LoaderRegistryImpl;
-import org.apache.tuscany.core.loader.PropertyLoader;
-import org.apache.tuscany.core.loader.ReferenceLoader;
-import org.apache.tuscany.core.loader.ServiceLoader;
-import org.apache.tuscany.core.property.PropertyObjectFactoryImpl;
-import org.apache.tuscany.core.resolver.AutowireResolver;
-import org.apache.tuscany.host.MonitorFactory;
/**
* A default implementation of a Bootstrapper. Please see the documentation on the individual methods for how the
@@ -129,10 +92,7 @@
*/
public Deployer createDeployer() {
Builder builder = createBuilder(scopeRegistry);
- JavaInterfaceProcessorRegistry interfaceIntrospector = new JavaInterfaceProcessorRegistryImpl();
- Introspector introspector = createIntrospector(interfaceIntrospector);
- LoaderRegistry loader = createLoader(new PropertyObjectFactoryImpl(), introspector);
- DeployerImpl deployer = new DeployerImpl(xmlFactory, loader, builder, componentManager, resolver, connector);
+ DeployerImpl deployer = new DeployerImpl(xmlFactory, builder, componentManager, resolver, connector);
deployer.setMonitor(getMonitorFactory().getMonitor(ScopeContainerMonitor.class));
deployer.setScopeRegistry(scopeRegistry);
return deployer;
@@ -153,64 +113,6 @@
return scopeRegistry;
}
- /**
- * Create a Loader that can be used to parse an XML file containing the SCDL for the system definition. The
- * following Implementation types are supported: <ul> <li>SystemImplementation</li>
- * <li>SystemCompositeImplementation</li> </ul> and the following SCDL elements are supported: <ul>
- * <li>composite</li> <li>component</li> <li>componentType</li> <li>interface.java</li> <li>property</li>
- * <li>reference</li> <li>service</li> <li>implementation.system</li> </ul> Note the Java component type and the
- * WSDL interface type are not supported.
- *
- * @param propertyFactory the StAXPropertyFactory to be used for parsing Property values
- * @param introspector the Introspector to be used to inspect component implementations
- * @return a new StAX XML loader
- */
- public LoaderRegistry createLoader(PropertyObjectFactory propertyFactory, Introspector introspector) {
- LoaderRegistryImpl loaderRegistry =
- new LoaderRegistryImpl(monitorFactory.getMonitor(LoaderRegistryImpl.Monitor.class));
-
- // register component type loaders
- loaderRegistry.registerLoader(SystemImplementation.class, new SystemComponentTypeLoader(introspector));
- loaderRegistry.registerLoader(SystemCompositeImplementation.class,
- new SystemCompositeComponentTypeLoader(loaderRegistry));
-
- // register element loaders
- registerLoader(loaderRegistry, new ComponentLoader(loaderRegistry, propertyFactory));
- registerLoader(loaderRegistry, new ComponentTypeElementLoader(loaderRegistry));
- registerLoader(loaderRegistry, new CompositeLoader(loaderRegistry, null));
- registerLoader(loaderRegistry, new IncludeLoader(loaderRegistry));
- JavaInterfaceProcessorRegistryImpl processorRegistry = new JavaInterfaceProcessorRegistryImpl();
- registerLoader(loaderRegistry, new InterfaceJavaLoader(loaderRegistry, processorRegistry));
- registerLoader(loaderRegistry, new PropertyLoader(loaderRegistry));
- registerLoader(loaderRegistry, new ReferenceLoader(loaderRegistry));
- registerLoader(loaderRegistry, new ServiceLoader(loaderRegistry));
- registerLoader(loaderRegistry, new SystemImplementationLoader(loaderRegistry));
- registerLoader(loaderRegistry, new LocalBindingLoader(loaderRegistry));
- return loaderRegistry;
- }
-
- /**
- * Create new Introspector for extracting a ComponentType definition from a Java class.
- *
- * @return a new Introspector
- */
- public Introspector createIntrospector(JavaInterfaceProcessorRegistry registry) {
- ImplementationProcessorService service = new ImplementationProcessorServiceImpl(registry);
- IntrospectionRegistryImpl.Monitor monitor = monitorFactory.getMonitor(IntrospectionRegistryImpl.Monitor.class);
- IntrospectionRegistryImpl introspectionRegistry = new IntrospectionRegistryImpl(monitor);
- introspectionRegistry.registerProcessor(new ConstructorProcessor(service));
- introspectionRegistry.registerProcessor(new DestroyProcessor());
- introspectionRegistry.registerProcessor(new InitProcessor());
- introspectionRegistry.registerProcessor(new EagerInitProcessor());
- introspectionRegistry.registerProcessor(new ScopeProcessor());
- introspectionRegistry.registerProcessor(new PropertyProcessor(service));
- introspectionRegistry.registerProcessor(new ReferenceProcessor(registry));
- introspectionRegistry.registerProcessor(new ResourceProcessor());
- introspectionRegistry.registerProcessor(new ServiceProcessor(service));
- introspectionRegistry.registerProcessor(new HeuristicPojoProcessor(service));
- introspectionRegistry.registerProcessor(new MonitorProcessor(monitorFactory, service));
- return introspectionRegistry;
- }
/**
* Create a new Connector that can be used to wire primordial components together.
@@ -247,9 +149,6 @@
private Builder createBuilder(ScopeRegistry scopeRegistry) {
BuilderRegistryImpl builderRegistry =
new BuilderRegistryImpl(scopeRegistry);
- SystemCompositeBuilder builder = new SystemCompositeBuilder(builderRegistry);
- builderRegistry.register(SystemCompositeImplementation.class, builder);
- builderRegistry.register(SystemImplementation.class, new SystemComponentBuilder());
builderRegistry.register(LocalBindingDefinition.class, new LocalBindingBuilder());
return builderRegistry;
}
Modified: incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java?view=diff&rev=521957&r1=521574&r2=521957
==============================================================================
--- incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java (original)
+++ incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java Fri Mar 23 18:17:38 2007
@@ -301,6 +301,7 @@
protected Wire createWire(URI sourceURI, URI targetUri, ServiceContract<?> contract, QName bindingType) {
Wire wire = new WireImpl(bindingType);
wire.setSourceContract(contract);
+ wire.setTargetContract(contract);
wire.setSourceUri(sourceURI);
wire.setTargetUri(targetUri);
for (Operation<?> operation : contract.getOperations().values()) {
Modified: incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/component/SimpleWorkContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/component/SimpleWorkContext.java?view=diff&rev=521957&r1=521574&r2=521957
==============================================================================
--- incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/component/SimpleWorkContext.java (original)
+++ incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/component/SimpleWorkContext.java Fri Mar 23 18:17:38 2007
@@ -30,13 +30,14 @@
import org.apache.tuscany.spi.wire.Wire;
/**
- * A simple WorkContext implementation that provides basic thread-local support for storing work context
- * information. The implementation is <em>not</em> thread safe.
- *
+ * A simple WorkContext implementation that provides basic thread-local support
+ * for storing work context information. The implementation is <em>not</em>
+ * thread safe.
+ *
* @version $Rev$ $Date$
*/
public class SimpleWorkContext implements WorkContext {
- private final Map<Object, Object> identifiers = new HashMap<Object,Object>();
+ private final Map<Object, Object> identifiers = new HashMap<Object, Object>();
private final List<String> serviceNameStack = new ArrayList<String>();
private LinkedList<URI> callbackUris;
@@ -94,7 +95,7 @@
public String getCurrentServiceName() {
assert !serviceNameStack.isEmpty();
- return serviceNameStack.get(serviceNameStack.size()-1);
+ return serviceNameStack.get(serviceNameStack.size() - 1);
}
public void pushServiceName(String name) {
@@ -103,7 +104,7 @@
public String popServiceName() {
assert !serviceNameStack.isEmpty();
- return serviceNameStack.remove(serviceNameStack.size()-1);
+ return serviceNameStack.remove(serviceNameStack.size() - 1);
}
public void clearServiceNames() {
Modified: incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java?view=diff&rev=521957&r1=521574&r2=521957
==============================================================================
--- incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java (original)
+++ incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java Fri Mar 23 18:17:38 2007
@@ -57,20 +57,17 @@
private XMLInputFactory xmlFactory;
private Builder builder;
private ScopeContainerMonitor monitor;
- private Loader loader;
private AutowireResolver resolver;
private Connector connector;
private ComponentManager componentManager;
private ScopeRegistry scopeRegistry;
public DeployerImpl(XMLInputFactory xmlFactory,
- Loader loader,
Builder builder,
ComponentManager componentManager,
AutowireResolver resolver,
Connector connector) {
this.xmlFactory = xmlFactory;
- this.loader = loader;
this.builder = builder;
this.componentManager = componentManager;
this.resolver = resolver;
@@ -82,11 +79,6 @@
}
@Reference
- public void setLoader(LoaderRegistry loader) {
- this.loader = loader;
- }
-
- @Reference
public void setBuilder(BuilderRegistry builder) {
this.builder = builder;
}
@@ -125,7 +117,6 @@
DeploymentContext deploymentContext =
new RootDeploymentContext(null, null, groupId, xmlFactory, scopeContainer, false);
// load the model
- load(parent, componentDefinition, deploymentContext);
// resolve autowires
resolver.resolve(null, componentDefinition);
// build runtime artifacts
@@ -153,19 +144,6 @@
}
connector.connect(componentDefinition);
return components;
- }
-
- /**
- * Load the componentDefinition type information for the componentDefinition being deployed. For a typical
- * deployment this will result in the SCDL definition being loaded.
- *
- * @param componentDefinition the componentDefinition being deployed
- * @param deploymentContext the current deployment context
- */
- protected <I extends Implementation<?>> void load(Component parent,
- ComponentDefinition<I> componentDefinition,
- DeploymentContext deploymentContext) throws LoaderException {
- loader.loadComponentType(componentDefinition.getImplementation(), deploymentContext);
}
/**
Modified: incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java?view=diff&rev=521957&r1=521574&r2=521957
==============================================================================
--- incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java (original)
+++ incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java Fri Mar 23 18:17:38 2007
@@ -18,50 +18,23 @@
*/
package org.apache.tuscany.core.runtime;
+import static org.apache.tuscany.spi.bootstrap.ComponentNames.TUSCANY_DEPLOYER;
+import static org.apache.tuscany.spi.bootstrap.ComponentNames.TUSCANY_SYSTEM;
+import static org.apache.tuscany.spi.bootstrap.ComponentNames.TUSCANY_SYSTEM_ROOT;
+
import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
-import javax.xml.stream.XMLInputFactory;
-
-import org.osoa.sca.ComponentContext;
-import static org.apache.tuscany.spi.bootstrap.ComponentNames.TUSCANY_SYSTEM_ROOT;
-import static org.apache.tuscany.spi.bootstrap.ComponentNames.TUSCANY_SYSTEM;
-import static org.apache.tuscany.spi.bootstrap.ComponentNames.TUSCANY_DEPLOYER;
-import org.apache.tuscany.spi.builder.BuilderException;
-import org.apache.tuscany.spi.builder.Connector;
-import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.component.ComponentException;
-import org.apache.tuscany.spi.component.ComponentManager;
-import org.apache.tuscany.spi.component.RegistrationException;
-import org.apache.tuscany.spi.component.TargetResolutionException;
-import org.apache.tuscany.spi.component.ScopeRegistry;
-import org.apache.tuscany.spi.component.ScopeContainerMonitor;
-import org.apache.tuscany.spi.component.ScopeContainer;
-import org.apache.tuscany.spi.component.GroupInitializationException;
-import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.deployer.Deployer;
-import org.apache.tuscany.spi.idl.InvalidServiceContractException;
-import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
-import org.apache.tuscany.spi.idl.java.JavaServiceContract;
-import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.resolver.ResolutionException;
-import org.apache.tuscany.spi.services.management.TuscanyManagementService;
-import org.apache.tuscany.spi.services.classloading.ClassLoaderRegistry;
+import javax.xml.stream.XMLInputFactory;
import org.apache.tuscany.core.bootstrap.Bootstrapper;
import org.apache.tuscany.core.bootstrap.DefaultBootstrapper;
import org.apache.tuscany.core.builder.ConnectorImpl;
import org.apache.tuscany.core.component.ComponentManagerImpl;
-import org.apache.tuscany.core.component.scope.ScopeRegistryImpl;
import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
-import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
-import org.apache.tuscany.core.implementation.system.model.SystemCompositeImplementation;
+import org.apache.tuscany.core.component.scope.ScopeRegistryImpl;
import org.apache.tuscany.core.monitor.NullMonitorFactory;
import org.apache.tuscany.core.resolver.AutowireResolver;
import org.apache.tuscany.core.resolver.DefaultAutowireResolver;
@@ -72,6 +45,23 @@
import org.apache.tuscany.host.monitor.FormatterRegistry;
import org.apache.tuscany.host.runtime.InitializationException;
import org.apache.tuscany.host.runtime.TuscanyRuntime;
+import org.apache.tuscany.spi.builder.Connector;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.Component;
+import org.apache.tuscany.spi.component.ComponentManager;
+import org.apache.tuscany.spi.component.GroupInitializationException;
+import org.apache.tuscany.spi.component.RegistrationException;
+import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.ScopeContainerMonitor;
+import org.apache.tuscany.spi.component.ScopeRegistry;
+import org.apache.tuscany.spi.component.TargetResolutionException;
+import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.deployer.Deployer;
+import org.apache.tuscany.spi.idl.java.JavaServiceContract;
+import org.apache.tuscany.spi.model.Scope;
+import org.apache.tuscany.spi.services.classloading.ClassLoaderRegistry;
+import org.apache.tuscany.spi.services.management.TuscanyManagementService;
+import org.osoa.sca.ComponentContext;
/**
* @version $Rev$ $Date$
@@ -95,41 +85,41 @@
private static final URI BOOT_CLASSLOADER_ID = URI.create("sca://./bootClassLoader");
- private final XMLInputFactory xmlFactory;
- private URL systemScdl;
- private String applicationName;
- private URL applicationScdl;
- private Class<I> runtimeInfoType;
- private ManagementService<?> managementService;
+ protected final XMLInputFactory xmlFactory;
+ protected URL systemScdl;
+ protected String applicationName;
+ protected URL applicationScdl;
+ protected Class<I> runtimeInfoType;
+ protected ManagementService<?> managementService;
// primorial components automatically registered with the runtime
/**
* Information provided by the host about its runtime environment.
*/
- private I runtimeInfo;
+ protected I runtimeInfo;
/**
- * MonitorFactory provided by the host for directing events to its management framework.
+ * MonitorFactory provided by the host for directing events to its
+ * management framework.
*/
- private MonitorFactory monitorFactory;
+ protected MonitorFactory monitorFactory;
/**
* The ComponentManager that manages all components in this runtime.
*/
- private ComponentManager componentManager;
+ protected ComponentManager componentManager;
/**
* Registry for ClassLoaders used by this runtime.
*/
- private ClassLoaderRegistry classLoaderRegistry;
+ protected ClassLoaderRegistry classLoaderRegistry;
- private AutowireResolver resolver;
+ protected AutowireResolver resolver;
- private Component systemComponent;
- private Component tuscanySystem;
+ protected Component systemComponent;
+ protected Component tuscanySystem;
- private JavaInterfaceProcessorRegistry interfaceProcessorRegistry;
- private ScopeRegistry scopeRegistry;
+ protected ScopeRegistry scopeRegistry;
protected AbstractRuntime(Class<I> runtimeInfoType) {
this(runtimeInfoType, new NullMonitorFactory());
@@ -139,7 +129,6 @@
this.runtimeInfoType = runtimeInfoType;
this.monitorFactory = monitorFactory;
xmlFactory = XMLInputFactory.newInstance("javax.xml.stream.XMLInputFactory", getClass().getClassLoader());
- interfaceProcessorRegistry = new JavaInterfaceProcessorRegistryImpl();
classLoaderRegistry = new ClassLoaderRegistryImpl();
classLoaderRegistry.register(BOOT_CLASSLOADER_ID, getClass().getClassLoader());
}
@@ -206,28 +195,8 @@
registerBaselineSystemComponents();
- // deploy the system scdl
- Collection<Component> components;
- try {
- components = deploySystemScdl(bootstrapper.createDeployer(),
- systemComponent,
- name,
- getSystemScdl(),
- getClass().getClassLoader());
- } catch (LoaderException e) {
- throw new InitializationException(e);
- } catch (BuilderException e) {
- throw new InitializationException(e);
- } catch (ComponentException e) {
- throw new InitializationException(e);
- } catch (ResolutionException e) {
- throw new InitializationException(e);
- }
- for (Component component : components) {
- component.start();
- }
- Component composite = componentManager.getComponent(name);
- URI uri = composite.getUri();
+ systemComponent = componentManager.getComponent(name);
+ URI uri = systemComponent.getUri();
ScopeContainer scopeContainer = scopeRegistry.getScopeContainer(Scope.COMPOSITE);
try {
scopeContainer.startContext(uri, uri);
@@ -247,7 +216,6 @@
}
}
-
public ComponentContext getComponentContext(URI componentId) {
Component component = componentManager.getComponent(componentId);
if (component == null) {
@@ -257,21 +225,17 @@
}
protected Bootstrapper createBootstrapper() {
- TuscanyManagementService tms = (TuscanyManagementService) getManagementService();
+ TuscanyManagementService tms = (TuscanyManagementService)getManagementService();
resolver = new DefaultAutowireResolver();
componentManager = new ComponentManagerImpl(tms, resolver);
Connector connector = new ConnectorImpl(componentManager);
scopeRegistry = new ScopeRegistryImpl();
- CompositeScopeContainer scopeContainer =
- new CompositeScopeContainer(monitorFactory.getMonitor(ScopeContainerMonitor.class));
+ CompositeScopeContainer scopeContainer = new CompositeScopeContainer(monitorFactory
+ .getMonitor(ScopeContainerMonitor.class));
scopeContainer.start();
scopeRegistry.register(scopeContainer);
- return new DefaultBootstrapper(getMonitorFactory(),
- xmlFactory,
- componentManager,
- resolver,
- connector,
+ return new DefaultBootstrapper(getMonitorFactory(), xmlFactory, componentManager, resolver, connector,
scopeRegistry);
}
@@ -301,12 +265,10 @@
protected <S, I extends S> void registerSystemComponent(URI uri, Class<S> type, I component)
throws InitializationException {
try {
- JavaServiceContract<S> contract = interfaceProcessorRegistry.introspect(type);
+ JavaServiceContract<S> contract = new JavaServiceContract<S>(type);
componentManager.registerJavaObject(uri, contract, component);
} catch (RegistrationException e) {
throw new InitializationException(e);
- } catch (InvalidServiceContractException e) {
- throw new InitializationException(e);
}
}
@@ -315,34 +277,15 @@
try {
List<JavaServiceContract<?>> contracts = new ArrayList<JavaServiceContract<?>>();
for (Class<?> type : types) {
- contracts.add(interfaceProcessorRegistry.introspect(type));
+ contracts.add(new JavaServiceContract(type));
}
componentManager.registerJavaObject(uri, contracts, component);
} catch (RegistrationException e) {
throw new InitializationException(e);
- } catch (InvalidServiceContractException e) {
- throw new InitializationException(e);
}
}
- protected Collection<Component> deploySystemScdl(Deployer deployer,
- Component parent,
- URI name,
- URL systemScdl,
- ClassLoader systemClassLoader)
- throws LoaderException, BuilderException, ComponentException, ResolutionException {
-
- SystemCompositeImplementation impl = new SystemCompositeImplementation();
- impl.setScdlLocation(systemScdl);
- impl.setClassLoader(systemClassLoader);
- ComponentDefinition<SystemCompositeImplementation> definition =
- new ComponentDefinition<SystemCompositeImplementation>(name, impl);
-
- return deployer.deploy(parent, definition);
- }
-
-
protected ComponentManager getComponentManager() {
return componentManager;
}
@@ -353,20 +296,17 @@
protected WorkContext getWorkContext() {
try {
- AtomicComponent component =
- (AtomicComponent) getComponentManager().getComponent(WORK_CONTEXT_URI);
- return (WorkContext) component.getTargetInstance();
+ AtomicComponent component = (AtomicComponent)getComponentManager().getComponent(WORK_CONTEXT_URI);
+ return (WorkContext)component.getTargetInstance();
} catch (TargetResolutionException e) {
throw new AssertionError(e);
}
}
-
protected Deployer getDeployer() {
try {
- AtomicComponent component =
- (AtomicComponent) getComponentManager().getComponent(TUSCANY_DEPLOYER);
- return (Deployer) component.getTargetInstance();
+ AtomicComponent component = (AtomicComponent)getComponentManager().getComponent(TUSCANY_DEPLOYER);
+ return (Deployer)component.getTargetInstance();
} catch (TargetResolutionException e) {
throw new AssertionError(e);
}
Modified: incubator/tuscany/sandbox/rfeng/minicore/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/minicore/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl?view=diff&rev=521957&r1=521574&r2=521957
==============================================================================
--- incubator/tuscany/sandbox/rfeng/minicore/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl (original)
+++ incubator/tuscany/sandbox/rfeng/minicore/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl Fri Mar 23 18:17:38 2007
@@ -135,17 +135,17 @@
<!-- DataBinding registry -->
<component name="databinding.registry">
- <system:implementation.system class="org.apache.tuscany.core.databinding.impl.DataBindingRegistryImpl"/>
+ <system:implementation.system class="org.apache.tuscany.databinding.impl.DataBindingRegistryImpl"/>
</component>
<!-- DataBinding registry -->
<component name="databinding.mediator">
- <system:implementation.system class="org.apache.tuscany.core.databinding.impl.MediatorImpl"/>
+ <system:implementation.system class="org.apache.tuscany.databinding.impl.MediatorImpl"/>
</component>
<!-- Transformer registry -->
<component name="databinding.transformerRegistry" initLevel="90">
- <system:implementation.system class="org.apache.tuscany.core.databinding.impl.TransformerRegistryImpl"/>
+ <system:implementation.system class="org.apache.tuscany.databinding.impl.TransformerRegistryImpl"/>
</component>
<component name="propertyFactory">
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org