You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/03/19 20:03:44 UTC

svn commit: r756135 - in /tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly: Endpoint2.java EndpointReference2.java builder/impl/ComponentServiceEndpointBuilderImpl.java impl/Endpoint2Impl.java

Author: rfeng
Date: Thu Mar 19 19:03:43 2009
New Revision: 756135

URL: http://svn.apache.org/viewvc?rev=756135&view=rev
Log:
Minor cleanup of the Endpoint2

Modified:
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java

Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java?rev=756135&r1=756134&r2=756135&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java Thu Mar 19 19:03:43 2009
@@ -105,27 +105,5 @@
      * @return callbackEndpoint the reference callback endpoint
      */
     List<EndpointReference2> getCallbackEndpointReferences();
-    
-    /**
-     * Set the reference callback endpoint refefences
-     * 
-     * @param callbackEndpoint the reference callback endpoint
-     */
-    void setCallbackEndpointReferences(List<EndpointReference2> callbackEndpointReferences);   
-    
-    // not sure these are required
-  
-    /**
-     * Returns the binding specific URI for this endpoint.
-     * 
-     * @return uri the binding specific URI
-     */
-   // String getURI();
 
-    /**
-     * Sets the binding specific URI for this endpoint.
-     * 
-     * @param uri the binding specific URI
-     */
-   // void setURI(String uri);
 }

Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java?rev=756135&r1=756134&r2=756135&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java Thu Mar 19 19:03:43 2009
@@ -81,20 +81,6 @@
     void setBinding(Binding binding);
     
     /**
-     * Get the reference callback binding 
-     * 
-     * @return callbackBinding the reference callback binding
-     */
-//    Binding getCallbackBinding();
-    
-    /**
-     * Set the reference callback binding 
-     * 
-     * @param callbackBinding the reference callback binding
-     */
-//    void setCallbackBinding(Binding callbackBinding);
-
-    /**
      * Get the name of the target service that this endpoint reference refers to
      * 
      * @return target service name
@@ -151,25 +137,4 @@
      * @param callbackEndpoint the reference callback endpoint
      */
     void setCallbackEndpoint(Endpoint2 callbackEndpoint);
-    
-    
-    
-    
-    // not sure the methods below are required
-    
-
-    
-    /**
-     * Returns the binding specific target URI for this endpoint reference.
-     * 
-     * @return uri the binding specific target URI
-     */
-    //String getURI();
-
-    /**
-     * Sets the binding specific target URI for this endpoint reference.
-     * 
-     * @param uri the binding specific target URI
-     */
-    //void setURI(String uri);    
 }

Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java?rev=756135&r1=756134&r2=756135&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java Thu Mar 19 19:03:43 2009
@@ -24,17 +24,13 @@
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentReference;
 import org.apache.tuscany.sca.assembly.ComponentService;
 import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.CompositeReference;
 import org.apache.tuscany.sca.assembly.CompositeService;
 import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointFactory;
 import org.apache.tuscany.sca.assembly.EndpointReference2;
 import org.apache.tuscany.sca.assembly.Implementation;
 import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.SCABinding;
 import org.apache.tuscany.sca.assembly.Service;
 import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
 import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
@@ -142,7 +138,7 @@
                     endpoint.setComponent(endpointComponent);
                     endpoint.setService(endpointService);
                     endpoint.setBinding(binding);
-                    endpoint.setCallbackEndpointReferences(callbackEndpointReferences);
+                    endpoint.getCallbackEndpointReferences().addAll(callbackEndpointReferences);
                     endpoint.setUnresolved(false);
                     service.getEndpoints().add(endpoint);
                 }

Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java?rev=756135&r1=756134&r2=756135&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java Thu Mar 19 19:03:43 2009
@@ -44,7 +44,7 @@
     private ComponentService service;
     private Binding binding;
     private InterfaceContract interfaceContract;
-    private List<EndpointReference2> callbackEndpointReferences;
+    private List<EndpointReference2> callbackEndpointReferences = new ArrayList<EndpointReference2>();
     //private String uri;
     private List<PolicySet> policySets = new ArrayList<PolicySet>();
     private List<Intent> requiredIntents = new ArrayList<Intent>();