Re: svn commit: r394667 - in /incubator/tuscany/java/sca: containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/ core/src/main/java/org/apache/tuscany/core/context/ core/src/main/java/org/apache/tuscany/core/context/impl/ core/src/...

Mon, 17 Apr 2006 08:52:20 -0700

I think we may need something like this again when we support nested configuration...what do you think? 

On Apr 17, 2006, at 6:37 AM, [EMAIL PROTECTED] wrote:


Author: jboynes
Date: Mon Apr 17 06:37:49 2006
New Revision: 394667

URL: http://svn.apache.org/viewcvs?rev=394667&view=rev
Log:
refactor to remove ConfigurationContext.configure()
the only implementation is empty and all the action happens in build()

Modified:
incubator/tuscany/java/sca/containers/container.java/src/test/ java/org/apache/tuscany/container/java/mock/MockConfigContext.java incubator/tuscany/java/sca/core/src/main/java/org/apache/ tuscany/core/context/ConfigurationContext.java incubator/tuscany/java/sca/core/src/main/java/org/apache/ tuscany/core/context/impl/AbstractCompositeContext.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/mock/MockConfigContext.java
Modified: incubator/tuscany/java/sca/containers/container.java/src/ test/java/org/apache/tuscany/container/java/mock/ MockConfigContext.java URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/ containers/container.java/src/test/java/org/apache/tuscany/ container/java/mock/MockConfigContext.java? rev=394667&r1=394666&r2=394667&view=diff ====================================================================== ======== --- incubator/tuscany/java/sca/containers/container.java/src/test/ java/org/apache/tuscany/container/java/mock/MockConfigContext.java (original) +++ incubator/tuscany/java/sca/containers/container.java/src/test/ java/org/apache/tuscany/container/java/mock/MockConfigContext.java Mon Apr 17 06:37:49 2006 
@@ -21,12 +21,10 @@
 import org.apache.tuscany.core.builder.WireBuilder;
 import org.apache.tuscany.core.builder.impl.AssemblyVisitorImpl;
 import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
-import org.apache.tuscany.core.config.ConfigurationException;
 import org.apache.tuscany.core.context.ConfigurationContext;
 import org.apache.tuscany.core.context.ScopeContext;
 import org.apache.tuscany.core.wire.ProxyFactory;
 import org.apache.tuscany.model.assembly.AssemblyObject;
-import org.apache.tuscany.model.assembly.Extensible;

 /**
  *  A mock configuration context
@@ -38,7 +36,7 @@
     private List<ContextFactoryBuilder> builders;
private DefaultWireBuilder wireBuilder = new DefaultWireBuilder (); 
-
+
public MockConfigContext(List<ContextFactoryBuilder> builders, List<WireBuilder> wireBuilders) { this.builders = (builders == null) ? new ArrayList(1) : builders; 
         if (wireBuilders != null){
@@ -48,16 +46,13 @@
         }
     }
- public void configure(Extensible model) throws ConfigurationException { 
-    }
-
public void build(AssemblyObject model) throws BuilderConfigException { AssemblyVisitorImpl visitor = new AssemblyVisitorImpl (builders); 
         visitor.start(model);
     }
public void connect(ProxyFactory sourceFactory, ProxyFactory targetFactory, Class targetType, boolean downScope, - ScopeContext targetScopeContext) throws BuilderConfigException { + ScopeContext targetScopeContext) throws BuilderConfigException { wireBuilder.connect(sourceFactory, targetFactory, targetType, downScope, targetScopeContext); 
     }
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/ tuscany/core/context/ConfigurationContext.java URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/ src/main/java/org/apache/tuscany/core/context/ ConfigurationContext.java?rev=394667&r1=394666&r2=394667&view=diff ====================================================================== ======== --- incubator/tuscany/java/sca/core/src/main/java/org/apache/ tuscany/core/context/ConfigurationContext.java (original) +++ incubator/tuscany/java/sca/core/src/main/java/org/apache/ tuscany/core/context/ConfigurationContext.java Mon Apr 17 06:37:49 2006 
@@ -15,8 +15,6 @@

 import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.core.builder.WireBuilder;
-import org.apache.tuscany.core.config.ConfigurationException;
-import org.apache.tuscany.model.assembly.Extensible;

 /**
* Offers configuration services in the runtime. A ConfigurationContext is able to configure a model and then build the 
@@ -29,13 +27,4 @@
  * @version $Rev$ $Date$
  */
public interface ConfigurationContext extends ContextFactoryBuilder, WireBuilder { 
-
-    /**
-     * Adds additional configuration information to a model object.
-     *
-     * @param model the model object to be configured
-     * @throws ConfigurationException
-     */
- public void configure(Extensible model) throws ConfigurationException; 
-
 }
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/ tuscany/core/context/impl/AbstractCompositeContext.java URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/ src/main/java/org/apache/tuscany/core/context/impl/ AbstractCompositeContext.java?rev=394667&r1=394666&r2=394667&view=diff ====================================================================== ======== --- incubator/tuscany/java/sca/core/src/main/java/org/apache/ tuscany/core/context/impl/AbstractCompositeContext.java (original) +++ incubator/tuscany/java/sca/core/src/main/java/org/apache/ tuscany/core/context/impl/AbstractCompositeContext.java Mon Apr 17 06:37:49 2006 
@@ -256,11 +256,7 @@
         initializeScopes();
         if (configurationContext != null) {
             try {
-                configurationContext.configure(model);
                 configurationContext.build(model);
-            } catch (ConfigurationException e) {
-                e.addContextName(getName());
-                throw e;
             } catch (BuilderConfigException e) {
                 e.addContextName(getName());
                 throw e;
@@ -761,17 +757,6 @@
         }
     }

-
- public void configure(Extensible model) throws ConfigurationException { 
-        if (configurationContext != null) {
-            try {
-                configurationContext.configure(model);
-            } catch (ConfigurationException e) {
-                e.addContextName(getName());
-                throw e;
-            }
-        }
-    }
public void build(AssemblyObject model) throws BuilderConfigException { 
         if (configurationContext != null) {
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=394667&r1=394666&r2=394667&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 Mon Apr 17 06:37:49 2006 
@@ -211,11 +211,8 @@
         visitor.start(model);
     }
- public void configure(Extensible model) throws ConfigurationException { 
-    }
-
public void connect(ProxyFactory sourceFactory, ProxyFactory targetFactory, Class targetType, boolean downScope, - ScopeContext targetScopeContext) throws BuilderConfigException { + ScopeContext targetScopeContext) throws BuilderConfigException { wireBuilder.connect(sourceFactory, targetFactory, targetType, downScope, targetScopeContext); 
     }
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/ tuscany/core/mock/MockConfigContext.java URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/ src/test/java/org/apache/tuscany/core/mock/MockConfigContext.java? rev=394667&r1=394666&r2=394667&view=diff ====================================================================== ======== --- incubator/tuscany/java/sca/core/src/test/java/org/apache/ tuscany/core/mock/MockConfigContext.java (original) +++ incubator/tuscany/java/sca/core/src/test/java/org/apache/ tuscany/core/mock/MockConfigContext.java Mon Apr 17 06:37:49 2006 
@@ -16,12 +16,10 @@
 import org.apache.tuscany.core.builder.BuilderConfigException;
 import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.core.builder.impl.AssemblyVisitorImpl;
-import org.apache.tuscany.core.config.ConfigurationException;
 import org.apache.tuscany.core.context.ConfigurationContext;
 import org.apache.tuscany.core.context.ScopeContext;
 import org.apache.tuscany.core.wire.ProxyFactory;
 import org.apache.tuscany.model.assembly.AssemblyObject;
-import org.apache.tuscany.model.assembly.Extensible;

 import java.util.ArrayList;
 import java.util.List;
@@ -37,9 +35,6 @@

     public MockConfigContext(List<ContextFactoryBuilder> builders) {
         this.builders = builders;
-    }
-
- public void configure(Extensible model) throws ConfigurationException { 
     }
public void build(AssemblyObject model) throws BuilderConfigException {

Reply via email to