Fix for TUSCANT-2763 & TUSCANY-2764

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

4 files changed, 12 insertions, 14 deletions

diff --git a/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java b/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
index 28eede693d..67bd07dfb6 100644
--- a/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
+++ b/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
@@ -94,7 +94,7 @@ import org.xml.sax.SAXException;
  * @version $Rev$ $Date$
  */
 public class DistributeAndRunComponents {
-    
+    private static ExtensionPointRegistry extensionPoints;
     private static URLArtifactProcessor<Contribution> contributionProcessor;
     private static ModelResolverExtensionPoint modelResolvers;
     private static ModelFactoryExtensionPoint modelFactories;
@@ -113,7 +113,7 @@ public class DistributeAndRunComponents {
     private static void init() {
         
         // Create extension point registry 
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
+        extensionPoints = new DefaultExtensionPointRegistry();
         
         // Create a monitor
         UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
@@ -171,7 +171,7 @@ public class DistributeAndRunComponents {
 
         // Create workspace model
         Workspace workspace = workspaceFactory.createWorkspace();
-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
+        workspace.setModelResolver(new ExtensibleModelResolver(workspace, extensionPoints));
 
         // Read the sample store contribution
         URI storeURI = URI.create("store");
diff --git a/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/DistributeComponents.java b/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/DistributeComponents.java
index def0a1894f..08ddc8875e 100644
--- a/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/DistributeComponents.java
+++ b/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/DistributeComponents.java
@@ -49,7 +49,6 @@ import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
 import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
 import org.apache.tuscany.sca.binding.atom.AtomBindingFactory;
 import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
 import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
 import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
@@ -71,7 +70,6 @@ import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
 import org.apache.tuscany.sca.workspace.Workspace;
 import org.apache.tuscany.sca.workspace.WorkspaceFactory;
 import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder;
@@ -107,7 +105,7 @@ import org.xml.sax.SAXException;
  * @version $Rev$ $Date$
  */
 public class DistributeComponents {
-    
+    private static ExtensionPointRegistry extensionPoints;
     private static URLArtifactProcessor<Contribution> contributionProcessor;
     private static ModelResolverExtensionPoint modelResolvers;
     private static ModelFactoryExtensionPoint modelFactories;
@@ -126,7 +124,7 @@ public class DistributeComponents {
     private static void init() {
         
         // Create extension point registry 
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
+        extensionPoints = new DefaultExtensionPointRegistry();
         
         // Create a monitor
         UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
@@ -184,7 +182,7 @@ public class DistributeComponents {
 
         // Create workspace model
         Workspace workspace = workspaceFactory.createWorkspace();
-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
+        workspace.setModelResolver(new ExtensibleModelResolver(workspace, extensionPoints));
 
         // Read the sample store contribution
         URI storeURI = URI.create("store");
diff --git a/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/ListComponents.java b/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/ListComponents.java
index 27cb31d57f..7b3950833a 100644
--- a/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/ListComponents.java
+++ b/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/ListComponents.java
@@ -66,7 +66,7 @@ import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuild
  * @version $Rev$ $Date$
  */
 public class ListComponents {
-    
+    private static ExtensionPointRegistry extensionPoints;
     private static URLArtifactProcessor<Contribution> contributionProcessor;
     private static ModelResolverExtensionPoint modelResolvers;
     private static ModelFactoryExtensionPoint modelFactories;
@@ -76,7 +76,7 @@ public class ListComponents {
     private static void init() {
         
         // Create extension point registry 
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
+        extensionPoints = new DefaultExtensionPointRegistry();
         
         // Initialize the Tuscany module activators
         ModuleActivatorExtensionPoint moduleActivators = extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class);
@@ -110,7 +110,7 @@ public class ListComponents {
 
         // Create workspace model
         Workspace workspace = workspaceFactory.createWorkspace();
-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
+        workspace.setModelResolver(new ExtensibleModelResolver(workspace, extensionPoints));
 
         // Read the sample store contribution
         URI storeURI = URI.create("store");
diff --git a/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/WireComponents.java b/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/WireComponents.java
index d24d5c67c9..16cda9d3e7 100644
--- a/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/WireComponents.java
+++ b/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/WireComponents.java
@@ -86,7 +86,7 @@ import org.w3c.dom.Document;
  * @version $Rev$ $Date$
  */
 public class WireComponents {
-    
+    private static ExtensionPointRegistry extensionPoints;
     private static URLArtifactProcessor<Contribution> contributionProcessor;
     private static ModelResolverExtensionPoint modelResolvers;
     private static ModelFactoryExtensionPoint modelFactories;
@@ -102,7 +102,7 @@ public class WireComponents {
     private static void init() {
         
         // Create extension point registry 
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
+        extensionPoints = new DefaultExtensionPointRegistry();
         
         // Create a monitor
         UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
@@ -155,7 +155,7 @@ public class WireComponents {
 
         // Create workspace model
         Workspace workspace = workspaceFactory.createWorkspace();
-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
+        workspace.setModelResolver(new ExtensibleModelResolver(workspace, extensionPoints));
 
         // Read the sample store contribution
         URI storeURI = URI.create("store");