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 2007/03/20 23:17:37 UTC
svn commit: r520623 - in
/incubator/tuscany/java/distribution/sca/demo/src/main/profiles:
master/system.scdl slave1/system.scdl slave2/system.scdl
Author: jboynes
Date: Tue Mar 20 15:17:36 2007
New Revision: 520623
URL: http://svn.apache.org/viewvc?view=rev&rev=520623
Log:
remove references so autowire works
add missing components
Modified:
incubator/tuscany/java/distribution/sca/demo/src/main/profiles/master/system.scdl
incubator/tuscany/java/distribution/sca/demo/src/main/profiles/slave1/system.scdl
incubator/tuscany/java/distribution/sca/demo/src/main/profiles/slave2/system.scdl
Modified: incubator/tuscany/java/distribution/sca/demo/src/main/profiles/master/system.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/distribution/sca/demo/src/main/profiles/master/system.scdl?view=diff&rev=520623&r1=520622&r2=520623
==============================================================================
--- incubator/tuscany/java/distribution/sca/demo/src/main/profiles/master/system.scdl (original)
+++ incubator/tuscany/java/distribution/sca/demo/src/main/profiles/master/system.scdl Tue Mar 20 15:17:36 2007
@@ -83,49 +83,42 @@
<component name="changeSetMarshaller">
<system:implementation.system
class="org.apache.tuscany.core.marshaller.PhysicalChangeSetMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
</component>
<!-- Wide definition marshaller -->
<component name="wireDefinitionMarshaller">
<system:implementation.system
class="org.apache.tuscany.core.marshaller.PhysicalWireDefinitionMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
</component>
<!-- Operation definition marshaller -->
<component name="operationMarshaller">
<system:implementation.system
class="org.apache.tuscany.core.marshaller.PhysicalOperationDefinitionMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
</component>
<!-- Java component definition marshaller -->
<component name="javaComponentDefinitionMarshaller">
<system:implementation.system
class="org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalComponentDefinitionMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
</component>
<!-- Reflective IF provider definition marshaller -->
<component name="reflectiveIfProviderDefinitionMarshaller">
<system:implementation.system
class="org.apache.tuscany.core.marshaller.extensions.instancefactory.ReflectiveIFProviderDefinitionMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
</component>
<!-- Java physical wire source definition marshaller -->
<component name="javaWireSourceDefinitionMarshaller">
<system:implementation.system
class="org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalWireSourceDefinitionMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
</component>
<!-- Java physical wire target definition marshaller -->
<component name="javaWireTargetDefinitionMarshaller">
<system:implementation.system
class="org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalWireTargetDefinitionMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
</component>
<!-- Builder registry -->
@@ -136,14 +129,18 @@
<component name="wireAttacherRegistry">
<system:implementation.system class="org.apache.tuscany.core.builder.physical.WireAttacherRegistryImpl"/>
</component>
+ <component name="providerBuilderRegistry">
+ <system:implementation.system class="org.apache.tuscany.core.component.instancefactory.impl.DefaultIFProviderBuilderRegistry"/>
+ </component>
+
+ <component name="reflectiveIFProviderBuilder">
+ <system:implementation.system class="org.apache.tuscany.core.component.instancefactory.impl.ReflectiveIFProviderBuilder"/>
+ </component>
<!-- Java physical component builder -->
<component name="javaPhysicalComponentBuilder">
<system:implementation.system
class="org.apache.tuscany.core.implementation.java.JavaPhysicalComponentBuilder"/>
- <reference name="builderRegistry" target="builderRegistry"/>
- <reference name="scopeRegistry" target="scopeRegistry"/>
- <reference name="classloaderRegistry" target="classLoaderRegistry"/>
</component>
<!-- Classloader registry -->
@@ -156,11 +153,6 @@
<component name="federateDeployer">
<system:implementation.system
class="org.apache.tuscany.core.deployer.federation.FederatedDeployer"/>
- <reference name="discoveryService" target="discoveryService"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
- <reference name="builderRegistry" target="builderRegistry"/>
- <reference name="connector" target="connector"/>
- <reference name="componentManager" target="componentManager"/>
</component>
<!-- Component manager -->
Modified: incubator/tuscany/java/distribution/sca/demo/src/main/profiles/slave1/system.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/distribution/sca/demo/src/main/profiles/slave1/system.scdl?view=diff&rev=520623&r1=520622&r2=520623
==============================================================================
--- incubator/tuscany/java/distribution/sca/demo/src/main/profiles/slave1/system.scdl (original)
+++ incubator/tuscany/java/distribution/sca/demo/src/main/profiles/slave1/system.scdl Tue Mar 20 15:17:36 2007
@@ -70,104 +70,82 @@
<!-- Changeset marshaller -->
<component name="changeSetMarshaller">
- <system:implementation.system
- class="org.apache.tuscany.core.marshaller.PhysicalChangeSetMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
+ <system:implementation.system class="org.apache.tuscany.core.marshaller.PhysicalChangeSetMarshaller"/>
</component>
<!-- Wide definition marshaller -->
<component name="wireDefinitionMarshaller">
- <system:implementation.system
- class="org.apache.tuscany.core.marshaller.PhysicalWireDefinitionMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
+ <system:implementation.system class="org.apache.tuscany.core.marshaller.PhysicalWireDefinitionMarshaller"/>
</component>
<!-- Operation definition marshaller -->
<component name="operationMarshaller">
- <system:implementation.system
- class="org.apache.tuscany.core.marshaller.PhysicalOperationDefinitionMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
+ <system:implementation.system class="org.apache.tuscany.core.marshaller.PhysicalOperationDefinitionMarshaller"/>
</component>
<!-- Java component definition marshaller -->
<component name="javaComponentDefinitionMarshaller">
- <system:implementation.system
- class="org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalComponentDefinitionMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
+ <system:implementation.system class="org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalComponentDefinitionMarshaller"/>
</component>
<!-- Reflective IF provider definition marshaller -->
<component name="reflectiveIfProviderDefinitionMarshaller">
- <system:implementation.system
- class="org.apache.tuscany.core.marshaller.extensions.instancefactory.ReflectiveIFProviderDefinitionMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
+ <system:implementation.system class="org.apache.tuscany.core.marshaller.extensions.instancefactory.ReflectiveIFProviderDefinitionMarshaller"/>
</component>
<!-- Java physical wire source definition marshaller -->
<component name="javaWireSourceDefinitionMarshaller">
- <system:implementation.system
- class="org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalWireSourceDefinitionMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
+ <system:implementation.system class="org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalWireSourceDefinitionMarshaller"/>
</component>
<!-- Java physical wire target definition marshaller -->
<component name="javaWireTargetDefinitionMarshaller">
- <system:implementation.system
- class="org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalWireTargetDefinitionMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
+ <system:implementation.system class="org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalWireTargetDefinitionMarshaller"/>
</component>
<!-- Builder registry -->
<component name="builderRegistry">
- <system:implementation.system
- class="org.apache.tuscany.core.builder.physical.DefaultPhysicalComponentBuilderRegistry"/>
+ <system:implementation.system class="org.apache.tuscany.core.builder.physical.DefaultPhysicalComponentBuilderRegistry"/>
</component>
<component name="wireAttacherRegistry">
<system:implementation.system class="org.apache.tuscany.core.builder.physical.WireAttacherRegistryImpl"/>
</component>
+ <component name="providerBuilderRegistry">
+ <system:implementation.system class="org.apache.tuscany.core.component.instancefactory.impl.DefaultIFProviderBuilderRegistry"/>
+ </component>
+ <component name="reflectiveIFProviderBuilder">
+ <system:implementation.system class="org.apache.tuscany.core.component.instancefactory.impl.ReflectiveIFProviderBuilder"/>
+ </component>
+
<!-- Java physical component builder -->
<component name="javaPhysicalComponentBuilder">
- <system:implementation.system
- class="org.apache.tuscany.core.implementation.java.JavaPhysicalComponentBuilder"/>
- <reference name="builderRegistry" target="builderRegistry"/>
- <reference name="scopeRegistry" target="scopeRegistry"/>
- <reference name="classloaderRegistry" target="classLoaderRegistry"/>
+ <system:implementation.system class="org.apache.tuscany.core.implementation.java.JavaPhysicalComponentBuilder"/>
</component>
<!-- Classloader registry -->
<component name="classLoaderRegistry">
- <system:implementation.system
- class="org.apache.tuscany.core.services.classloading.ClassLoaderRegistryImpl"/>
+ <system:implementation.system class="org.apache.tuscany.core.services.classloading.ClassLoaderRegistryImpl"/>
</component>
<!-- Federated deployer -->
<component name="federateDeployer">
- <system:implementation.system
- class="org.apache.tuscany.core.deployer.federation.FederatedDeployer"/>
- <reference name="discoveryService" target="discoveryService"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
- <reference name="builderRegistry" target="builderRegistry"/>
- <reference name="connector" target="connector"/>
- <reference name="componentManager" target="componentManager"/>
+ <system:implementation.system class="org.apache.tuscany.core.deployer.federation.FederatedDeployer"/>
</component>
<!-- Component manager -->
<component name="componentManager">
- <system:implementation.system
- class="org.apache.tuscany.core.component.ComponentManagerImpl"/>
+ <system:implementation.system class="org.apache.tuscany.core.component.ComponentManagerImpl"/>
</component>
<!-- Connector -->
<component name="connector">
- <system:implementation.system
- class="org.apache.tuscany.core.builder.ConnectorImpl"/>
+ <system:implementation.system class="org.apache.tuscany.core.builder.ConnectorImpl"/>
</component>
<!-- Jetty HTTP service -->
<component name="httpService">
- <system:implementation.system
- class="org.apache.tuscany.service.jetty.JettyServiceImpl"/>
+ <system:implementation.system class="org.apache.tuscany.service.jetty.JettyServiceImpl"/>
<property name="httpPort">8000</property>
</component>
@@ -180,67 +158,56 @@
<!-- Component that provides the Deployer service -->
<component name="deployer">
- <system:implementation.system
- class="org.apache.tuscany.core.deployer.DeployerImpl"/>
+ <system:implementation.system class="org.apache.tuscany.core.deployer.DeployerImpl"/>
</component>
<!-- Work management -->
<component name="WorkContext">
- <system:implementation.system
- class="org.apache.tuscany.core.component.WorkContextImpl"/>
+ <system:implementation.system class="org.apache.tuscany.core.component.WorkContextImpl"/>
</component>
<!-- Wire service -->
<component name="proxyService">
- <system:implementation.system
- class="org.apache.tuscany.core.wire.jdk.JDKProxyService"/>
+ <system:implementation.system class="org.apache.tuscany.core.wire.jdk.JDKProxyService"/>
</component>
<!-- Store infrastructure -->
<component name="store">
- <system:implementation.system
- class="org.apache.tuscany.core.services.store.memory.MemoryStore"/>
+ <system:implementation.system class="org.apache.tuscany.core.services.store.memory.MemoryStore"/>
</component>
<!-- Builder and BuilderRegistry -->
<component name="builder">
- <system:implementation.system
- class="org.apache.tuscany.core.builder.BuilderRegistryImpl"/>
+ <system:implementation.system class="org.apache.tuscany.core.builder.BuilderRegistryImpl"/>
</component>
<!-- Resource host registry -->
<component name="resourceHostRegistry">
- <system:implementation.system
- class="org.apache.tuscany.core.services.host.DelegatingResourceHostRegistry"/>
+ <system:implementation.system class="org.apache.tuscany.core.services.host.DelegatingResourceHostRegistry"/>
</component>
<!-- Loader and LoaderRegistry -->
<component name="loader">
- <system:implementation.system
- class="org.apache.tuscany.core.loader.LoaderRegistryImpl"/>
+ <system:implementation.system class="org.apache.tuscany.core.loader.LoaderRegistryImpl"/>
</component>
<!-- Introspector and IntrospectionRegistry -->
<component name="interfaceProcessorRegistry">
- <system:implementation.system
- class="org.apache.tuscany.core.implementation.IntrospectionRegistryImpl"/>
+ <system:implementation.system class="org.apache.tuscany.core.implementation.IntrospectionRegistryImpl"/>
</component>
<!-- Connector infrastructure -->
<component name="connector">
- <system:implementation.system
- class="org.apache.tuscany.core.builder.ConnectorImpl"/>
+ <system:implementation.system class="org.apache.tuscany.core.builder.ConnectorImpl"/>
</component>
<component name="wirePostProcessorRegistry">
- <system:implementation.system
- class="org.apache.tuscany.core.builder.WirePostProcessorRegistryImpl"/>
+ <system:implementation.system class="org.apache.tuscany.core.builder.WirePostProcessorRegistryImpl"/>
</component>
<!-- Default scopes -->
<component name="scope.stateless">
- <system:implementation.system
- class="org.apache.tuscany.core.component.scope.StatelessScopeContainer"/>
+ <system:implementation.system class="org.apache.tuscany.core.component.scope.StatelessScopeContainer"/>
</component>
<!--
<component name="scope.request">
@@ -254,12 +221,10 @@
-->
<!-- include loader configuration -->
- <include name="org.apache.tuscany.core.Loader"
- scdlResource="org/apache/tuscany/core/loader.scdl"/>
+ <include name="org.apache.tuscany.core.Loader" scdlResource="org/apache/tuscany/core/loader.scdl"/>
<!-- include databinding configuration -->
- <include name="org.apache.tuscany.core.DataBinding"
- scdlResource="org/apache/tuscany/core/databinding.scdl"/>
+ <include name="org.apache.tuscany.core.DataBinding" scdlResource="org/apache/tuscany/core/databinding.scdl"/>
<!-- include implementation processor configuration -->
<include name="org.apache.tuscany.core.Implementation"
Modified: incubator/tuscany/java/distribution/sca/demo/src/main/profiles/slave2/system.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/distribution/sca/demo/src/main/profiles/slave2/system.scdl?view=diff&rev=520623&r1=520622&r2=520623
==============================================================================
--- incubator/tuscany/java/distribution/sca/demo/src/main/profiles/slave2/system.scdl (original)
+++ incubator/tuscany/java/distribution/sca/demo/src/main/profiles/slave2/system.scdl Tue Mar 20 15:17:36 2007
@@ -72,49 +72,42 @@
<component name="changeSetMarshaller">
<system:implementation.system
class="org.apache.tuscany.core.marshaller.PhysicalChangeSetMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
</component>
<!-- Wide definition marshaller -->
<component name="wireDefinitionMarshaller">
<system:implementation.system
class="org.apache.tuscany.core.marshaller.PhysicalWireDefinitionMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
</component>
<!-- Operation definition marshaller -->
<component name="operationMarshaller">
<system:implementation.system
class="org.apache.tuscany.core.marshaller.PhysicalOperationDefinitionMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
</component>
<!-- Java component definition marshaller -->
<component name="javaComponentDefinitionMarshaller">
<system:implementation.system
class="org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalComponentDefinitionMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
</component>
<!-- Reflective IF provider definition marshaller -->
<component name="reflectiveIfProviderDefinitionMarshaller">
<system:implementation.system
class="org.apache.tuscany.core.marshaller.extensions.instancefactory.ReflectiveIFProviderDefinitionMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
</component>
<!-- Java physical wire source definition marshaller -->
<component name="javaWireSourceDefinitionMarshaller">
<system:implementation.system
class="org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalWireSourceDefinitionMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
</component>
<!-- Java physical wire target definition marshaller -->
<component name="javaWireTargetDefinitionMarshaller">
<system:implementation.system
class="org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalWireTargetDefinitionMarshaller"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
</component>
<!-- Builder registry -->
@@ -125,13 +118,18 @@
<component name="wireAttacherRegistry">
<system:implementation.system class="org.apache.tuscany.core.builder.physical.WireAttacherRegistryImpl"/>
</component>
-
+ <component name="providerBuilderRegistry">
+ <system:implementation.system class="org.apache.tuscany.core.component.instancefactory.impl.DefaultIFProviderBuilderRegistry"/>
+ </component>
+
+ <component name="reflectiveIFProviderBuilder">
+ <system:implementation.system class="org.apache.tuscany.core.component.instancefactory.impl.ReflectiveIFProviderBuilder"/>
+ </component>
+
<!-- Java physical component builder -->
<component name="javaPhysicalComponentBuilder">
<system:implementation.system
class="org.apache.tuscany.core.implementation.java.JavaPhysicalComponentBuilder"/>
- <reference name="builderRegistry" target="builderRegistry"/>
- <reference name="scopeRegistry" target="scopeRegistry"/>
</component>
<!-- Classloader registry -->
@@ -144,11 +142,6 @@
<component name="federateDeployer">
<system:implementation.system
class="org.apache.tuscany.core.deployer.federation.FederatedDeployer"/>
- <reference name="discoveryService" target="discoveryService"/>
- <reference name="marshallerRegistry" target="marshallerRegistry"/>
- <reference name="builderRegistry" target="builderRegistry"/>
- <reference name="connector" target="connector"/>
- <reference name="componentManager" target="componentManager"/>
</component>
<!-- Component manager -->
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org