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/25 21:51:40 UTC

svn commit: r380991 - in /incubator/tuscany/java/sca/container.java/src: main/java/org/apache/tuscany/container/java/builder/ test/java/org/apache/tuscany/container/java/builder/ test/java/org/apache/tuscany/container/java/integration/ test/java/org/ap...

Author: jmarino
Date: Sat Feb 25 12:51:37 2006
New Revision: 380991

URL: http://svn.apache.org/viewcvs?rev=380991&view=rev
Log:
rename setReferenceBuilder to setPolicyBuilder on JavaComponentContextBuilder as it is more descriptive; add Javadoc on mock Foo binding

Modified:
    incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.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/integration/JavaBuilderContextIntegrationTestCase.java
    incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/JavaToExternalServiceTestCase.java
    incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java

Modified: incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.java?rev=380991&r1=380990&r2=380991&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.java (original)
+++ incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilder.java Sat Feb 25 12:51:37 2006
@@ -62,13 +62,17 @@
  */
 @org.osoa.sca.annotations.Scope("MODULE")
 public class JavaComponentContextBuilder implements RuntimeConfigurationBuilder<AggregateContext> {
-    
+
     private RuntimeContext runtimeContext;
+
     private ProxyFactoryFactory proxyFactoryFactory;
+
     private MessageFactory messageFactory;
-    private RuntimeConfigurationBuilder referenceBuilder;
 
-    @Init(eager=true)
+    /* the top-level builder responsible for evaluating policies */
+    private RuntimeConfigurationBuilder policyBuilder;
+
+    @Init(eager = true)
     public void init() {
         runtimeContext.addBuilder(this);
     }
@@ -80,7 +84,7 @@
     public void setRuntimeContext(RuntimeContext runtimeContext) {
         this.runtimeContext = runtimeContext;
     }
-    
+
     /**
      * Sets the factory used to construct proxies implmementing the business interface required by a reference
      */
@@ -106,8 +110,8 @@
      * 
      * @see org.apache.tuscany.core.builder.impl.HierarchicalBuilder
      */
-    public void setReferenceBuilder(RuntimeConfigurationBuilder builder) {
-        this.referenceBuilder = builder;
+    public void setPolicyBuilder(RuntimeConfigurationBuilder builder) {
+        this.policyBuilder = builder;
     }
 
     // ----------------------------------
@@ -215,9 +219,9 @@
                     proxyFactory.setProxyConfiguration(pConfiguration);
                     config.addTargetProxyFactory(service.getName(), proxyFactory);
                     configuredService.setProxyFactory(proxyFactory);
-                    if (referenceBuilder != null) {
+                    if (policyBuilder != null) {
                         // invoke the reference builder to handle target-side metadata
-                        referenceBuilder.build(configuredService, parentContext);
+                        policyBuilder.build(configuredService, parentContext);
                     }
                     // add tail interceptor
                     for (InvocationConfiguration iConfig : (Collection<InvocationConfiguration>) iConfigMap.values()) {
@@ -249,9 +253,9 @@
                         proxyFactory.setProxyConfiguration(pConfiguration);
                         config.addSourceProxyFactory(reference.getReference().getName(), proxyFactory);
                         reference.setProxyFactory(proxyFactory);
-                        if (referenceBuilder != null) {
+                        if (policyBuilder != null) {
                             // invoke the reference builder to handle metadata associated with the reference
-                            referenceBuilder.build(reference, parentContext);
+                            policyBuilder.build(reference, parentContext);
                         }
                         Injector injector = createReferenceInjector(reference.getReference().getName(), proxyFactory, fields,
                                 methods);

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=380991&r1=380990&r2=380991&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 Sat Feb 25 12:51:37 2006
@@ -59,7 +59,7 @@
         HierarchicalBuilder refBuilder = new HierarchicalBuilder();
         MockSyncInterceptor interceptor = new MockSyncInterceptor();
         refBuilder.addBuilder(new MockInterceptorBuilder(interceptor, true));
-        builder.setReferenceBuilder(refBuilder);
+        builder.setPolicyBuilder(refBuilder);
         AggregateContext ctx = createContext();
         builder.setProxyFactoryFactory(new JDKProxyFactoryFactory());
         JavaTargetWireBuilder javaWireBuilder = new JavaTargetWireBuilder();

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=380991&r1=380990&r2=380991&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 Sat Feb 25 12:51:37 2006
@@ -82,7 +82,7 @@
         MockInterceptorBuilder interceptorBuilder = new MockInterceptorBuilder(mockInterceptor, true);
         HierarchicalBuilder refBuilder = new HierarchicalBuilder();
         refBuilder.addBuilder(interceptorBuilder);
-        javaBuilder.setReferenceBuilder(refBuilder);
+        javaBuilder.setPolicyBuilder(refBuilder);
         builders.add(javaBuilder);
 
         DefaultWireBuilder defaultWireBuilder = new DefaultWireBuilder();
@@ -125,7 +125,7 @@
         MockHandlerBuilder handlerBuilder = new MockHandlerBuilder(mockHandler, true, true);
         refBuilder.addBuilder(handlerBuilder);
 
-        javaBuilder.setReferenceBuilder(refBuilder);
+        javaBuilder.setPolicyBuilder(refBuilder);
         builders.add(javaBuilder);
 
         DefaultWireBuilder defaultWireBuilder = new DefaultWireBuilder();
@@ -170,7 +170,7 @@
         MockHandlerBuilder handlerBuilder = new MockHandlerBuilder(mockHandler, false, true);
         refBuilder.addBuilder(handlerBuilder);
 
-        javaBuilder.setReferenceBuilder(refBuilder);
+        javaBuilder.setPolicyBuilder(refBuilder);
         builders.add(javaBuilder);
 
         DefaultWireBuilder defaultWireBuilder = new DefaultWireBuilder();
@@ -213,7 +213,7 @@
         HierarchicalBuilder refBuilder = new HierarchicalBuilder();
         refBuilder.addBuilder(interceptorBuilder);
 
-        javaBuilder.setReferenceBuilder(refBuilder);
+        javaBuilder.setPolicyBuilder(refBuilder);
         builders.add(javaBuilder);
 
         DefaultWireBuilder defaultWireBuilder = new DefaultWireBuilder();

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/JavaToExternalServiceTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/JavaToExternalServiceTestCase.java?rev=380991&r1=380990&r2=380991&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/JavaToExternalServiceTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/JavaToExternalServiceTestCase.java Sat Feb 25 12:51:37 2006
@@ -69,7 +69,7 @@
         MockInterceptorBuilder interceptorBuilder = new MockInterceptorBuilder(mockInterceptor, true);
         HierarchicalBuilder refBuilder = new HierarchicalBuilder();
         refBuilder.addBuilder(interceptorBuilder);
-        javaBuilder.setReferenceBuilder(refBuilder);
+        javaBuilder.setPolicyBuilder(refBuilder);
         builders.add(javaBuilder);
 
         FooBindingBuilder fooBindingBuilder = new FooBindingBuilder();

Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java?rev=380991&r1=380990&r2=380991&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java Sat Feb 25 12:51:37 2006
@@ -92,6 +92,13 @@
         this.messageFactory = msgFactory;
     }
 
+    /**
+     * Sets a builder responsible for creating source-side and target-side invocation chains for a reference. The
+     * reference builder may be hierarchical, containing other child reference builders that operate on specific
+     * metadata used to construct and invocation chain.
+     * 
+     * @see org.apache.tuscany.core.builder.impl.HierarchicalBuilder
+     */
     public void setPolicyBuilder(RuntimeConfigurationBuilder builder) {
         policyBuilder = builder;
     }