Remove the non-OASIS code from the endpoint builder and set up build-time and runt-time operations so that I can reorganize the endpoint reference build process and get all of the endpoint building code in on place.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@802401 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 5 deletions

diff --git a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
index ea8b00a489..41531a7b10 100644
--- a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
+++ b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
@@ -57,6 +57,7 @@ import org.apache.tuscany.sca.assembly.Composite;
 import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
 import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
 import org.apache.tuscany.sca.assembly.builder.CompositeBuilderTmp;
+import org.apache.tuscany.sca.assembly.builder.EndpointReferenceBuilder;
 import org.apache.tuscany.sca.contribution.Artifact;
 import org.apache.tuscany.sca.contribution.Contribution;
 import org.apache.tuscany.sca.contribution.ContributionFactory;
@@ -118,7 +119,7 @@ public class NodeFactoryImpl extends NodeFactory {
     private StAXArtifactProcessor<Composite> compositeProcessor;
     private ContributionFactory contributionFactory;
     private ExtendedURLArtifactProcessor<Contribution> contributionProcessor;
-    private CompositeBuilder endpointReferenceBuilder;
+    private EndpointReferenceBuilder endpointReferenceBuilder;
     protected ExtensionPointRegistry extensionPoints;
     private XMLInputFactory inputFactory;
     protected FactoryExtensionPoint modelFactories;
@@ -417,9 +418,8 @@ public class NodeFactoryImpl extends NodeFactory {
         CompositeBuilderExtensionPoint compositeBuilders = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class);
         compositeBuilder = compositeBuilders.getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
 
-        // Get endpoint builders
-        // TODO - new extension point?
-        endpointReferenceBuilder = compositeBuilders.getCompositeBuilder("org.apache.tuscany.sca.endpoint.impl.EndpointReferenceBuilderImpl");
+        // Get endpoint builder
+        endpointReferenceBuilder = utilities.getUtility(EndpointReferenceBuilder.class);
 
         // Initialize runtime
 
@@ -548,7 +548,7 @@ public class NodeFactoryImpl extends NodeFactory {
         ((CompositeBuilderTmp)compositeBuilder).build(tempComposite, systemDefinitions, bindingMap, monitor);
         analyzeProblems();
 
-        endpointReferenceBuilder.build(tempComposite, systemDefinitions, monitor);
+        endpointReferenceBuilder.buildtimeBuild(tempComposite);
         analyzeProblems();
 
         return tempComposite;