You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/02/24 20:25:15 UTC

svn commit: r380792 - in /incubator/tuscany/java/sca: container.java/src/main/java/org/apache/tuscany/container/java/builder/ container.java/src/test/java/org/apache/tuscany/container/java/integration/ container.js/src/main/java/org/apache/tuscany/cont...

Author: jmarino
Date: Fri Feb 24 11:25:11 2006
New Revision: 380792

URL: http://svn.apache.org/viewcvs?rev=380792&view=rev
Log:
wire builder bootstrap refactor; wiring should now work in the samples

Added:
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/HierarchicalWireBuilder.java
Modified:
    incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilder.java
    incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java
    incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptTargetWireBuilder.java
    incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/integration/JSComponentContextTestCase.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
    incubator/tuscany/java/sca/core/src/test/resources/system.fragment

Modified: incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilder.java?rev=380792&r1=380791&r2=380792&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilder.java (original)
+++ incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilder.java Fri Feb 24 11:25:11 2006
@@ -20,6 +20,8 @@
 import org.apache.tuscany.core.context.ScopeContext;
 import org.apache.tuscany.core.invocation.InvocationConfiguration;
 import org.apache.tuscany.core.invocation.spi.ProxyFactory;
+import org.apache.tuscany.core.runtime.RuntimeContext;
+import org.apache.tuscany.core.system.annotation.Autowire;
 import org.osoa.sca.annotations.Init;
 import org.osoa.sca.annotations.Scope;
 
@@ -31,11 +33,19 @@
 @Scope("MODULE")
 public class JavaTargetWireBuilder implements WireBuilder {
 
+    private RuntimeContext runtimeContext;
+
+    @Autowire
+    public void setRuntimeContext(RuntimeContext context) {
+        runtimeContext = context;
+    }
+
     public JavaTargetWireBuilder() {
     }
 
-    @Init(eager = true)
+    @Init(eager=true)
     public void init() {
+        runtimeContext.addBuilder(this);
     }
 
     public void connect(ProxyFactory sourceFactory, ProxyFactory targetFactory, Class targetType, boolean downScope,

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java?rev=380792&r1=380791&r2=380792&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java Fri Feb 24 11:25:11 2006
@@ -29,7 +29,6 @@
 import org.apache.tuscany.container.java.mock.MockModuleFactory;
 import org.apache.tuscany.container.java.mock.components.GenericComponent;
 import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
-import org.apache.tuscany.core.builder.WireBuilder;
 import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
 import org.apache.tuscany.core.builder.impl.HierarchicalBuilder;
 import org.apache.tuscany.core.context.AggregateContext;
@@ -83,13 +82,10 @@
         javaBuilder.setReferenceBuilder(refBuilder);
         builders.add(javaBuilder);
 
-        List<WireBuilder> wireBuilders = new ArrayList();
         DefaultWireBuilder defaultWireBuilder = new DefaultWireBuilder();
-        defaultWireBuilder.addWireBuilder(new JavaTargetWireBuilder());
 
-        wireBuilders.add(defaultWireBuilder);
-
-        RuntimeContext runtime = new RuntimeContextImpl(null, null, builders, wireBuilders);
+        RuntimeContext runtime = new RuntimeContextImpl(null, null, builders, defaultWireBuilder);
+        runtime.addBuilder(new JavaTargetWireBuilder());
         runtime.start();
         runtime.getRootContext().registerModelObject(
                 MockAssemblyFactory.createSystemComponent("test.module", AggregateContextImpl.class.getName(), Scope.AGGREGATE));
@@ -129,12 +125,9 @@
         javaBuilder.setReferenceBuilder(refBuilder);
         builders.add(javaBuilder);
 
-        List<WireBuilder> wireBuilders = new ArrayList();
         DefaultWireBuilder defaultWireBuilder = new DefaultWireBuilder();
-        defaultWireBuilder.addWireBuilder(new JavaTargetWireBuilder());
-        wireBuilders.add(defaultWireBuilder);
-
-        RuntimeContext runtime = new RuntimeContextImpl(null, null, builders, wireBuilders);
+        RuntimeContext runtime = new RuntimeContextImpl(null, null, builders, defaultWireBuilder);
+        runtime.addBuilder(new JavaTargetWireBuilder());
         runtime.start();
         runtime.getRootContext().registerModelObject(
                 MockAssemblyFactory.createSystemComponent("test.module", AggregateContextImpl.class.getName(),
@@ -177,12 +170,10 @@
         javaBuilder.setReferenceBuilder(refBuilder);
         builders.add(javaBuilder);
 
-        List<WireBuilder> wireBuilders = new ArrayList();
         DefaultWireBuilder defaultWireBuilder = new DefaultWireBuilder();
-        defaultWireBuilder.addWireBuilder(new JavaTargetWireBuilder());
-        wireBuilders.add(defaultWireBuilder);
 
-        RuntimeContext runtime = new RuntimeContextImpl(null, null, builders, wireBuilders);
+        RuntimeContext runtime = new RuntimeContextImpl(null, null, builders, defaultWireBuilder);
+        runtime.addBuilder(new JavaTargetWireBuilder());
         runtime.start();
         runtime.getRootContext().registerModelObject(
                 MockAssemblyFactory.createSystemComponent("test.module", AggregateContextImpl.class.getName(),
@@ -222,12 +213,11 @@
         javaBuilder.setReferenceBuilder(refBuilder);
         builders.add(javaBuilder);
 
-        List<WireBuilder> wireBuilders = new ArrayList();
         DefaultWireBuilder defaultWireBuilder = new DefaultWireBuilder();
-        defaultWireBuilder.addWireBuilder(new JavaTargetWireBuilder());
-        wireBuilders.add(defaultWireBuilder);
 
-        RuntimeContext runtime = new RuntimeContextImpl(null, null, builders, wireBuilders);
+        RuntimeContext runtime = new RuntimeContextImpl(null, null, builders, defaultWireBuilder);
+        runtime.addBuilder(new JavaTargetWireBuilder());
+        
         runtime.start();
         runtime.getRootContext().registerModelObject(
                 MockAssemblyFactory.createSystemComponent("test.module", AggregateContextImpl.class.getName(),

Modified: incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptTargetWireBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptTargetWireBuilder.java?rev=380792&r1=380791&r2=380792&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptTargetWireBuilder.java (original)
+++ incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptTargetWireBuilder.java Fri Feb 24 11:25:11 2006
@@ -9,6 +9,9 @@
 import org.apache.tuscany.core.context.ScopeContext;
 import org.apache.tuscany.core.invocation.InvocationConfiguration;
 import org.apache.tuscany.core.invocation.spi.ProxyFactory;
+import org.apache.tuscany.core.runtime.RuntimeContext;
+import org.apache.tuscany.core.system.annotation.Autowire;
+import org.osoa.sca.annotations.Init;
 import org.osoa.sca.annotations.Scope;
 
 /**
@@ -20,9 +23,21 @@
 @Scope("MODULE")
 public class JavaScriptTargetWireBuilder implements WireBuilder {
 
+    private RuntimeContext runtimeContext;
+
+    @Autowire
+    public void setRuntimeContext(RuntimeContext context) {
+        runtimeContext = context;
+    }
+
     public JavaScriptTargetWireBuilder() {
     }
 
+    @Init(eager=true)
+    public void init() {
+        runtimeContext.addBuilder(this);
+    }
+
     public void connect(ProxyFactory sourceFactory, ProxyFactory targetFactory, Class targetType, boolean downScope,
             ScopeContext targetScopeContext) throws BuilderConfigException {
         if (!(JavaScriptComponentRuntimeConfiguration.class.isAssignableFrom(targetType))) {
@@ -43,7 +58,8 @@
         }
     }
 
-    public void completeTargetChain(ProxyFactory targetFactory, Class targetType, ScopeContext targetScopeContext) throws BuilderConfigException {
+    public void completeTargetChain(ProxyFactory targetFactory, Class targetType, ScopeContext targetScopeContext)
+            throws BuilderConfigException {
         if (!(JavaScriptComponentRuntimeConfiguration.class.isAssignableFrom(targetType))) {
             return;
         }

Modified: incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/integration/JSComponentContextTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/integration/JSComponentContextTestCase.java?rev=380792&r1=380791&r2=380792&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/integration/JSComponentContextTestCase.java (original)
+++ incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/integration/JSComponentContextTestCase.java Fri Feb 24 11:25:11 2006
@@ -27,7 +27,6 @@
 import org.apache.tuscany.container.js.mock.MockAssemblyFactory;
 import org.apache.tuscany.container.js.mock.MockModuleFactory;
 import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
-import org.apache.tuscany.core.builder.WireBuilder;
 import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
 import org.apache.tuscany.core.builder.impl.HierarchicalBuilder;
 import org.apache.tuscany.core.context.AggregateContext;
@@ -69,13 +68,10 @@
         javaBuilder.setReferenceBuilder(refBuilder);
         builders.add(javaBuilder);
 
-        List<WireBuilder> wireBuilders = new ArrayList();
         DefaultWireBuilder defaultWireBuilder = new DefaultWireBuilder();
-        defaultWireBuilder.addWireBuilder(new JavaScriptTargetWireBuilder());
 
-        wireBuilders.add(defaultWireBuilder);
-
-        RuntimeContext runtime = new RuntimeContextImpl(null, null, builders, wireBuilders);
+        RuntimeContext runtime = new RuntimeContextImpl(null, null, builders, defaultWireBuilder);
+        runtime.addBuilder(new JavaScriptTargetWireBuilder());
         runtime.start();
         runtime.getRootContext().registerModelObject(
                 MockAssemblyFactory.createSystemComponent("test.module", AggregateContextImpl.class.getName(),

Added: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/HierarchicalWireBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/HierarchicalWireBuilder.java?rev=380792&view=auto
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/HierarchicalWireBuilder.java (added)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/HierarchicalWireBuilder.java Fri Feb 24 11:25:11 2006
@@ -0,0 +1,29 @@
+/**
+ * 
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package org.apache.tuscany.core.builder;
+
+/**
+ * A wire builder that delegates to child wire builders 
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface HierarchicalWireBuilder extends WireBuilder{
+
+    /**
+     * Registers a child wire builder
+     */
+    public void addWireBuilder(WireBuilder builder);
+
+}
+

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java?rev=380792&r1=380791&r2=380792&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java Fri Feb 24 11:25:11 2006
@@ -19,16 +19,13 @@
 import java.util.Map;
 
 import org.apache.tuscany.core.builder.BuilderConfigException;
+import org.apache.tuscany.core.builder.HierarchicalWireBuilder;
 import org.apache.tuscany.core.builder.WireBuilder;
 import org.apache.tuscany.core.context.QualifiedName;
 import org.apache.tuscany.core.context.ScopeContext;
 import org.apache.tuscany.core.invocation.InvocationConfiguration;
 import org.apache.tuscany.core.invocation.impl.MessageChannelImpl;
 import org.apache.tuscany.core.invocation.spi.ProxyFactory;
-import org.apache.tuscany.core.runtime.RuntimeContext;
-import org.apache.tuscany.core.system.annotation.Autowire;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
 
 /**
  * The top-most wire builder configured in a runtime. Responsible for constructing wires from source and target chains,
@@ -36,25 +33,13 @@
  * 
  * @version $Rev$ $Date$
  */
-@Scope("MODULE")
-public class DefaultWireBuilder implements WireBuilder {
+public class DefaultWireBuilder implements HierarchicalWireBuilder {
 
     // collection configured wire builders
     private List<WireBuilder> builders = new ArrayList();
 
-    private RuntimeContext runtimeContext;
-
-    @Autowire
-    public void setRuntimeContext(RuntimeContext ctx) {
-        runtimeContext = ctx;
-    }
 
     public DefaultWireBuilder() {
-    }
-
-    @Init(eager = true)
-    public void init() {
-        runtimeContext.addBuilder(this);
     }
 
     /**

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java?rev=380792&r1=380791&r2=380792&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java Fri Feb 24 11:25:11 2006
@@ -24,6 +24,7 @@
 import org.apache.tuscany.common.resource.ResourceLoader;
 import org.apache.tuscany.common.resource.impl.ResourceLoaderImpl;
 import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
+import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
 import org.apache.tuscany.core.config.ConfigurationException;
 import org.apache.tuscany.core.config.ModuleComponentConfigurationLoader;
 import org.apache.tuscany.core.config.impl.ModuleComponentConfigurationLoaderImpl;
@@ -110,7 +111,7 @@
         configBuilders.add(new SystemExternalServiceBuilder());
 
         // Create a runtime context and start it
-        runtimeContext = new RuntimeContextImpl(monitorFactory, scdlLoaders, configBuilders,null);
+        runtimeContext = new RuntimeContextImpl(monitorFactory, scdlLoaders, configBuilders,new DefaultWireBuilder());
         runtimeContext.start();
         monitor.started(runtimeContext);
 

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java?rev=380792&r1=380791&r2=380792&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java Fri Feb 24 11:25:11 2006
@@ -19,9 +19,11 @@
 import org.apache.tuscany.common.monitor.MonitorFactory;
 import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
 import org.apache.tuscany.core.builder.BuilderConfigException;
+import org.apache.tuscany.core.builder.HierarchicalWireBuilder;
 import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
 import org.apache.tuscany.core.builder.WireBuilder;
 import org.apache.tuscany.core.builder.impl.AssemblyVisitor;
+import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
 import org.apache.tuscany.core.config.ConfigurationException;
 import org.apache.tuscany.core.context.AbstractContext;
 import org.apache.tuscany.core.context.AggregateContext;
@@ -54,7 +56,9 @@
 
     private final List<SCDLModelLoader> loaders;
 
-    private final List<WireBuilder> wireBuilders;
+    // private final List<WireBuilder> wireBuilders;
+    // the top-level wire builder in the runtime
+    private final HierarchicalWireBuilder wireBuilder;
 
     private final List<RuntimeEventListener> listeners = new ArrayList(1);
 
@@ -76,15 +80,15 @@
      * 
      * @param monitorFactory the default {@link MonitorFactory} for this runtime
      * @param builders a list of builders automatically made available; may be null
-     * @param wireBuilders a list of wire builders automatically made available; may be null
+     * @param wireBuilder the top-level hierarchical wire builder for the runtime; may be null
      */
-    public RuntimeContextImpl(MonitorFactory monitorFactory, List<SCDLModelLoader> loaders, List<RuntimeConfigurationBuilder> builders,
-            List<WireBuilder> wireBuilders) {
+    public RuntimeContextImpl(MonitorFactory monitorFactory, List<SCDLModelLoader> loaders,
+            List<RuntimeConfigurationBuilder> builders, HierarchicalWireBuilder wireBuilder) {
         super(RUNTIME);
         this.monitorFactory = monitorFactory;
         this.builders = (builders == null) ? new ArrayList(1) : builders;
         this.loaders = (loaders == null) ? new ArrayList(1) : loaders;
-        this.wireBuilders = (wireBuilders == null) ? new ArrayList(1) : wireBuilders;
+        this.wireBuilder = (wireBuilder == null) ? new DefaultWireBuilder() : wireBuilder;
 
         rootContext = new AggregateContextImpl(ROOT, this, this, new RuntimeScopeStrategy(), new EventContextImpl(), this,
                 monitorFactory);
@@ -100,17 +104,17 @@
      * @param rootContext the context to use for the root of the user context tree
      * @param systemContext the context to use for the root of the system context tree
      * @param builders a list of builders automatically made available; may be null
-     * @param wireBuilders a list of wire builders automatically made available; may be null
+     * @param wireBuilder the top-level hierarchical wire builder for the runtime; may be null
      */
     public RuntimeContextImpl(MonitorFactory monitorFactory, AggregateContext rootContext, SystemAggregateContext systemContext,
-            List<SCDLModelLoader> loaders, List<RuntimeConfigurationBuilder> builders, List<WireBuilder> wireBuilders) {
+            List<SCDLModelLoader> loaders, List<RuntimeConfigurationBuilder> builders, HierarchicalWireBuilder wireBuilder) {
         super(RUNTIME);
         this.rootContext = rootContext;
         this.systemContext = systemContext;
         this.monitorFactory = monitorFactory;
         this.loaders = (loaders == null) ? new ArrayList(1) : loaders;
         this.builders = (builders == null) ? new ArrayList(1) : builders;
-        this.wireBuilders = (wireBuilders == null) ? new ArrayList(1) : wireBuilders;
+        this.wireBuilder = (wireBuilder == null) ? new DefaultWireBuilder() : wireBuilder;
     }
 
     public void start() throws CoreRuntimeException {
@@ -138,7 +142,7 @@
 
     public void addBuilder(WireBuilder builder) {
         assert (builder != null) : "Builder was null";
-        wireBuilders.add(builder);
+        wireBuilder.addWireBuilder(builder);
     }
 
     public void addLoader(SCDLModelLoader loader) {
@@ -228,20 +232,17 @@
 
     public void wire(ProxyFactory sourceFactory, ProxyFactory targetFactory, Class targetType, boolean downScope,
             ScopeContext targetScopeContext) throws BuilderConfigException {
-        for (WireBuilder wireBuilder : wireBuilders) {
-            wireBuilder.connect(sourceFactory, targetFactory, targetType, downScope, targetScopeContext);
-        }
+        wireBuilder.connect(sourceFactory, targetFactory, targetType, downScope, targetScopeContext);
     }
 
     public void wire(ProxyFactory targetFactory, Class targetType, ScopeContext targetScopeContext) throws BuilderConfigException {
-        for (WireBuilder wireBuilder : wireBuilders) {
-            wireBuilder.completeTargetChain(targetFactory, targetType, targetScopeContext);
-        }
+        wireBuilder.completeTargetChain(targetFactory, targetType, targetScopeContext);
     }
+
     // ----------------------------------
     // AutowireContext methods
     // ----------------------------------
-    
+
     public <T> T resolveInstance(Class<T> instanceInterface) throws AutowireResolutionException {
         if (MonitorFactory.class.equals(instanceInterface)) {
             return instanceInterface.cast(monitorFactory);
@@ -257,18 +258,18 @@
         }
     }
 
-    //----------------------------------
+    // ----------------------------------
     // InstanceContext methods
-    //----------------------------------
+    // ----------------------------------
 
-    public Object getImplementationInstance() throws TargetException{
+    public Object getImplementationInstance() throws TargetException {
         return this;
     }
 
-    public Object getImplementationInstance(boolean notify) throws TargetException{
+    public Object getImplementationInstance(boolean notify) throws TargetException {
         return this;
     }
-    
+
     // ----------------------------------
     // Private methods
     // ----------------------------------

Modified: incubator/tuscany/java/sca/core/src/test/resources/system.fragment
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/resources/system.fragment?rev=380792&r1=380791&r2=380792&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/resources/system.fragment (original)
+++ incubator/tuscany/java/sca/core/src/test/resources/system.fragment Fri Feb 24 11:25:11 2006
@@ -17,10 +17,5 @@
 <moduleFragment xmlns="http://www.osoa.org/xmlns/sca/0.9" xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9"
         xmlns:system="http://org.apache.tuscany/xmlns/system/0.9"
 		name="org.apache.tuscany.container.java">
-
-    <component name="org.apache.tuscany.core.builder.impl.DefaultWireBuilder">
-        <system:implementation.system class="org.apache.tuscany.core.builder.impl.DefaultWireBuilder"/>
-    </component>
-
 
 </moduleFragment>