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/23 00:33:29 UTC

svn commit: r379981 - 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/builder/ container.js/src/main/java/org/apache/tuscany/containe...

Author: jmarino
Date: Wed Feb 22 15:33:22 2006
New Revision: 379981

URL: http://svn.apache.org/viewcvs?rev=379981&view=rev
Log:
javadoc additions; removal of dead code; refactory WireBuilder interface

Removed:
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/SimpleComponentRuntimeConfiguration.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemRuntimeConfigurationImpl.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/builder/JavaComponentContextBuilderTestCase.java
    incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.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/builder/JSComponentContextBuilderTestCase.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextCreationException.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/NoAccessorException.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ProxyObjectFactory.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/RuntimeConfigurationBuilder.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/WireBuilder.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/runtime/RuntimeContextImpl.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java

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=379981&r1=379980&r2=379981&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 Wed Feb 22 15:33:22 2006
@@ -33,7 +33,7 @@
     public JavaTargetWireBuilder() {
     }
 
-    public void wire(ProxyFactory sourceFactory, ProxyFactory targetFactory, Class targetType, boolean downScope,
+    public void connect(ProxyFactory sourceFactory, ProxyFactory targetFactory, Class targetType, boolean downScope,
             ScopeContext targetScopeContext) throws BuilderConfigException {
         if (!(JavaComponentRuntimeConfiguration.class.isAssignableFrom(targetType))) {
             return;
@@ -52,7 +52,7 @@
         }
     }
 
-    public void wire(ProxyFactory targetFactory, Class targetType, ScopeContext targetScopeContext) throws BuilderConfigException {
+    public void completeTargetChain(ProxyFactory targetFactory, Class targetType, ScopeContext targetScopeContext) throws BuilderConfigException {
         //TODO implement. 
 //        if (!(JavaComponentRuntimeConfiguration.class.isAssignableFrom(targetType))) {
 //            return;

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilderTestCase.java?rev=379981&r1=379980&r2=379981&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilderTestCase.java Wed Feb 22 15:33:22 2006
@@ -91,7 +91,7 @@
                     RuntimeConfiguration targetConfig = (RuntimeConfiguration) target.getComponentImplementation()
                             .getRuntimeConfiguration();
                     boolean downScope = strategy.downScopeReference(source.getScope(), targetConfig.getScope());
-                    wireBuilder.wire(pFactory, targetConfig.getTargetProxyFactory(pFactory.getProxyConfiguration().getTargetName()
+                    wireBuilder.connect(pFactory, targetConfig.getTargetProxyFactory(pFactory.getProxyConfiguration().getTargetName()
                             .getPortName()), targetConfig.getClass(), downScope, scopeContext);
                 }
                 pFactory.initialize();

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java?rev=379981&r1=379980&r2=379981&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java Wed Feb 22 15:33:22 2006
@@ -91,7 +91,7 @@
         DefaultWireBuilder builder = new DefaultWireBuilder();
         builder.addWireBuilder(new JavaTargetWireBuilder());
         
-        builder.wire(sourceFactory, targetFactory, JavaComponentRuntimeConfiguration.class, true, scopeCtx);
+        builder.connect(sourceFactory, targetFactory, JavaComponentRuntimeConfiguration.class, true, scopeCtx);
         source.build();
         target.build();
         Assert.assertNotNull(source.getTargetInvoker());

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=379981&r1=379980&r2=379981&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 Wed Feb 22 15:33:22 2006
@@ -23,7 +23,7 @@
     public JavaScriptTargetWireBuilder() {
     }
 
-    public void wire(ProxyFactory sourceFactory, ProxyFactory targetFactory, Class targetType, boolean downScope,
+    public void connect(ProxyFactory sourceFactory, ProxyFactory targetFactory, Class targetType, boolean downScope,
             ScopeContext targetScopeContext) throws BuilderConfigException {
         if (!(JavaScriptComponentRuntimeConfiguration.class.isAssignableFrom(targetType))) {
             return;
@@ -43,7 +43,7 @@
         }
     }
 
-    public void wire(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/builder/JSComponentContextBuilderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSComponentContextBuilderTestCase.java?rev=379981&r1=379980&r2=379981&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSComponentContextBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSComponentContextBuilderTestCase.java Wed Feb 22 15:33:22 2006
@@ -40,7 +40,7 @@
         context.start();
         context.onEvent(EventContext.MODULE_START, null);
         for (ProxyFactory proxyFactory : (Collection<ProxyFactory>) config.getTargetProxyFactories().values()) {
-            jsWireBuilder.wire(proxyFactory, JavaScriptComponentRuntimeConfiguration.class, context);
+            jsWireBuilder.completeTargetChain(proxyFactory, JavaScriptComponentRuntimeConfiguration.class, context);
             proxyFactory.initialize();
         }
         InstanceContext ctx = config.createInstanceContext();

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextCreationException.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextCreationException.java?rev=379981&r1=379980&r2=379981&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextCreationException.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextCreationException.java Wed Feb 22 15:33:22 2006
@@ -1,3 +1,16 @@
+/**
+ * 
+ * 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;
 
 

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/NoAccessorException.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/NoAccessorException.java?rev=379981&r1=379980&r2=379981&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/NoAccessorException.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/NoAccessorException.java Wed Feb 22 15:33:22 2006
@@ -1,3 +1,16 @@
+/**
+ * 
+ * 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;
 
 /**

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ProxyObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ProxyObjectFactory.java?rev=379981&r1=379980&r2=379981&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ProxyObjectFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ProxyObjectFactory.java Wed Feb 22 15:33:22 2006
@@ -1,3 +1,16 @@
+/**
+ * 
+ * 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;
 
 import org.apache.tuscany.core.injection.ObjectCreationException;
@@ -5,6 +18,11 @@
 import org.apache.tuscany.core.invocation.spi.ProxyCreationException;
 import org.apache.tuscany.core.invocation.spi.ProxyFactory;
 
+/**
+ * Uses a proxy factory to return an object instance
+ * 
+ * @version $Rev$ $Date$
+ */
 public class ProxyObjectFactory implements ObjectFactory {
 
     private ProxyFactory factory;

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/RuntimeConfigurationBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/RuntimeConfigurationBuilder.java?rev=379981&r1=379980&r2=379981&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/RuntimeConfigurationBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/RuntimeConfigurationBuilder.java Wed Feb 22 15:33:22 2006
@@ -4,18 +4,17 @@
 import org.apache.tuscany.model.assembly.AssemblyModelObject;
 
 /**
- * Implementations are responsible for generating a runtime configuration model
- * from a logical configuration model. The logical configuration model (LCM) is
- * decorated with the runtime configuration model (RCM).
- *
+ * Implementations are responsible for generating a runtime configuration model from a logical configuration model. The
+ * logical configuration model (LCM) is decorated with the runtime configuration model (RCM).
+ * 
  * @version $Rev$ $Date$
  * @see RuntimeConfiguration
  */
 public interface RuntimeConfigurationBuilder<Y extends Context> {
+    
     /**
-     * Builds a runtime configuration for the supplied model object for registration
-     * under the supplied context.
-     *
+     * Builds a runtime configuration for the supplied model object for registration under the supplied context.
+     * 
      * @param object the logical configuration model node
      * @param context the context that will be the parent of the built context
      * @throws BuilderException

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/WireBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/WireBuilder.java?rev=379981&r1=379980&r2=379981&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/WireBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/WireBuilder.java Wed Feb 22 15:33:22 2006
@@ -17,7 +17,7 @@
 import org.apache.tuscany.core.invocation.spi.ProxyFactory;
 
 /**
- * Responsible finalizing target-side proxy factories and bridging
+ * Responsible for finalizing target-side proxy factories and bridging
  * {@link org.apache.tuscany.core.invocation.InvocationConfiguration}s held by source- and target-side proxy factories.
  * <p>
  * Wire builders may optimize the invocation chains based on certain characteristics of th wire, such as source and
@@ -41,16 +41,20 @@
      *        type
      * @throws BuilderConfigException if an error occurs during the wire build process
      */
-    public void wire(ProxyFactory sourceFactory, ProxyFactory targetFactory, Class targetType, boolean downScope,
+    public void connect(ProxyFactory sourceFactory, ProxyFactory targetFactory, Class targetType, boolean downScope,
             ScopeContext targetScopeContext) throws BuilderConfigException;
 
     /**
+     * Finishes processing the target side invocation chain. For example, a
+     * {@link org.apache.tuscany.core.invocation.TargetInvoker} used by target-side proxies is usually set during this
+     * phase.
      * 
-     * @param targetFactory
-     * @param targetType
-     * @param targetScopeContext
-     * @throws BuilderConfigException
+     * @param targetFactory the target-side proxy factory
+     * @param targetType the target context type
+     * @param targetScopeContext the target scope
+     * @throws BuilderConfigException if an error occurs during the wire build process
      */
-    public void wire(ProxyFactory targetFactory, Class targetType, ScopeContext targetScopeContext) throws BuilderConfigException;
+    public void completeTargetChain(ProxyFactory targetFactory, Class targetType, ScopeContext targetScopeContext)
+            throws BuilderConfigException;
 
 }

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=379981&r1=379980&r2=379981&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 Wed Feb 22 15:33:22 2006
@@ -49,7 +49,7 @@
         builders.add(builder);
     }
 
-    public void wire(ProxyFactory sourceFactory, ProxyFactory targetFactory, Class targetType, boolean downScope,
+    public void connect(ProxyFactory sourceFactory, ProxyFactory targetFactory, Class targetType, boolean downScope,
             ScopeContext targetScopeContext) {
         QualifiedName targetName = sourceFactory.getProxyConfiguration().getTargetName();
         // get the proxy chain for the target
@@ -90,7 +90,7 @@
         }
         // delegate to other wire builders
         for (WireBuilder builder : builders) {
-            builder.wire(sourceFactory, targetFactory, targetType, downScope, targetScopeContext);
+            builder.connect(sourceFactory, targetFactory, targetType, downScope, targetScopeContext);
         }
         // signal that wire build process is complete
         boolean optimizable = true;
@@ -101,10 +101,10 @@
         }
     }
     
-    public void wire(ProxyFactory targetFactory, Class targetType,ScopeContext targetScopeContext) throws BuilderConfigException {
+    public void completeTargetChain(ProxyFactory targetFactory, Class targetType,ScopeContext targetScopeContext) throws BuilderConfigException {
         // delegate to other wire builders
         for (WireBuilder builder : builders) {
-            builder.wire(targetFactory, targetType, targetScopeContext);
+            builder.completeTargetChain(targetFactory, targetType, targetScopeContext);
         }
     }
 

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=379981&r1=379980&r2=379981&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 Wed Feb 22 15:33:22 2006
@@ -214,13 +214,13 @@
     public void wire(ProxyFactory sourceFactory, ProxyFactory targetFactory, Class targetType, boolean downScope,
             ScopeContext targetScopeContext) throws BuilderConfigException {
         for (WireBuilder wireBuilder : wireBuilders) {
-            wireBuilder.wire(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.wire(targetFactory, targetType, targetScopeContext);
+            wireBuilder.completeTargetChain(targetFactory, targetType, targetScopeContext);
         }
     }
     // ----------------------------------

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java?rev=379981&r1=379980&r2=379981&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java Wed Feb 22 15:33:22 2006
@@ -81,7 +81,7 @@
         // connect the source to the target
         DefaultWireBuilder builder = new DefaultWireBuilder();
         // no need for scopes since we use a static invoker
-        builder.wire(sourceFactory, targetFactory, null, true, null);
+        builder.connect(sourceFactory, targetFactory, null, true, null);
        // source.build();
         target.build();
         // set a static invoker
@@ -136,7 +136,7 @@
         // connect the source to the target
         DefaultWireBuilder builder = new DefaultWireBuilder();
         // no need for scopes since we use a static invoker
-        builder.wire(sourceFactory, targetFactory, null, true, null);
+        builder.connect(sourceFactory, targetFactory, null, true, null);
         //source.build();
         target.build();
         // set a static invoker
@@ -190,7 +190,7 @@
         // connect the source to the target
         DefaultWireBuilder builder = new DefaultWireBuilder();
         // no need for scopes since we use a static invoker
-        builder.wire(sourceFactory, targetFactory, null, true, null);
+        builder.connect(sourceFactory, targetFactory, null, true, null);
         //source.build();
         target.build();
         // set a static invoker
@@ -239,7 +239,7 @@
         // connect the source to the target
         DefaultWireBuilder builder = new DefaultWireBuilder();
         // no need for scopes since we use a static invoker
-        builder.wire(sourceFactory, targetFactory, null, true, null);
+        builder.connect(sourceFactory, targetFactory, null, true, null);
         //source.build();
         target.build();
         // set a static invoker
@@ -291,7 +291,7 @@
         // connect the source to the target
         DefaultWireBuilder builder = new DefaultWireBuilder();
         // no need for scopes since we use a static invoker
-        builder.wire(sourceFactory, targetFactory, null, true, null);
+        builder.connect(sourceFactory, targetFactory, null, true, null);
         //source.build();
         target.build();
         // set a static invoker
@@ -343,7 +343,7 @@
         // connect the source to the target
         DefaultWireBuilder builder = new DefaultWireBuilder();
         // no need for scopes since we use a static invoker
-        builder.wire(sourceFactory, targetFactory, null, true, null);
+        builder.connect(sourceFactory, targetFactory, null, true, null);
 //        source.build();
         target.build();
         // set a static invoker
@@ -389,7 +389,7 @@
         // connect the source to the target
         DefaultWireBuilder builder = new DefaultWireBuilder();
         // no need for scopes since we use a static invoker
-        builder.wire(sourceFactory, targetFactory, null, true, null);
+        builder.connect(sourceFactory, targetFactory, null, true, null);
         target.build();
         // set a static invoker
         MockStaticInvoker invoker = new MockStaticInvoker(hello, new SimpleTargetImpl());

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java?rev=379981&r1=379980&r2=379981&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java Wed Feb 22 15:33:22 2006
@@ -61,7 +61,7 @@
         // connect the source to the target
         DefaultWireBuilder builder = new DefaultWireBuilder();
         try {
-            builder.wire(sourceFactory, targetFactory, null, true, null);
+            builder.connect(sourceFactory, targetFactory, null, true, null);
             fail("Expected " + BuilderConfigException.class.getName());
         } catch (BuilderConfigException e) {
             // success