Update the node-impl to use DefinitionsExtensionPoint to load definitions

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

4 files changed, 21 insertions, 10 deletions

diff --git a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java
index 46fa9281e3..618a97602f 100644
--- a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java
+++ b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java
@@ -309,15 +309,18 @@ public class NodeFactoryImpl {
 
         workScheduler = utilities.getUtility(WorkScheduler.class);
 
-        DefinitionsExtensionPoint definitionsExtensionPoint = extensionPoints.getExtensionPoint(DefinitionsExtensionPoint.class);
-        List<Definitions> definitions = definitionsExtensionPoint.getDefinitions();
-
         // Load the system definitions.xml from all of the loaded extension points
-        DefinitionsProviderExtensionPoint definitionsProviders =
-            extensionPoints.getExtensionPoint(DefinitionsProviderExtensionPoint.class);
         DefinitionsFactory definitionsFactory = modelFactories.getFactory(DefinitionsFactory.class);
         systemDefinitions = definitionsFactory.createDefinitions();
 
+        DefinitionsExtensionPoint definitionsExtensionPoint = extensionPoints.getExtensionPoint(DefinitionsExtensionPoint.class);
+        for(Definitions defs: definitionsExtensionPoint.getDefinitions()) {
+            DefinitionsUtil.aggregate(systemDefinitions, defs);
+        }
+        
+        DefinitionsProviderExtensionPoint definitionsProviders =
+            extensionPoints.getExtensionPoint(DefinitionsProviderExtensionPoint.class);
+
         // aggregate all the definitions into a single definitions model
         try {
             for (DefinitionsProvider definitionsProvider : definitionsProviders.getDefinitionsProviders()) {
diff --git a/java/sca/modules/node-impl/META-INF/MANIFEST.MF b/java/sca/modules/node-impl/META-INF/MANIFEST.MF
index a27795f6b9..bbaea9ceee 100644
--- a/java/sca/modules/node-impl/META-INF/MANIFEST.MF
+++ b/java/sca/modules/node-impl/META-INF/MANIFEST.MF
@@ -31,6 +31,7 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.core.invocation;version="2.0.0",

  org.apache.tuscany.sca.definitions;version="2.0.0",

  org.apache.tuscany.sca.definitions.util;version="2.0.0",

+ org.apache.tuscany.sca.definitions.xml;version="2.0.0",

  org.apache.tuscany.sca.implementation.node;version="2.0.0",

  org.apache.tuscany.sca.monitor;version="2.0.0",

  org.apache.tuscany.sca.node;version="2.0.0",

@@ -42,8 +43,8 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.workspace;version="2.0.0",

  org.apache.tuscany.sca.workspace.builder;version="2.0.0",

  org.oasisopen.sca;version="2.0.0",

- org.oasisopen.sca.client;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional

+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional,

+ org.oasisopen.sca.client;version="2.0.0"

 Bundle-SymbolicName: org.apache.tuscany.sca.node.impl

 Bundle-DocURL: http://www.apache.org/

 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca/modules/node-impl/pom.xml b/java/sca/modules/node-impl/pom.xml
index 4b31d80f69..43a68256a9 100644
--- a/java/sca/modules/node-impl/pom.xml
+++ b/java/sca/modules/node-impl/pom.xml
@@ -91,7 +91,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
             <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
index f874da80a1..f87e1f56e2 100644
--- a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
+++ b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
@@ -75,6 +75,7 @@ import org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint;
 import org.apache.tuscany.sca.definitions.Definitions;
 import org.apache.tuscany.sca.definitions.DefinitionsFactory;
 import org.apache.tuscany.sca.definitions.util.DefinitionsUtil;
+import org.apache.tuscany.sca.definitions.xml.DefinitionsExtensionPoint;
 import org.apache.tuscany.sca.implementation.node.ConfiguredNodeImplementation;
 import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory;
 import org.apache.tuscany.sca.monitor.Monitor;
@@ -400,10 +401,16 @@ public class NodeImpl implements Node, Client, SCAClient {
 
         workScheduler = utilities.getUtility(WorkScheduler.class);
 
-        // Load the system definitions.xml from all of the loaded extension points
-        DefinitionsProviderExtensionPoint definitionsProviders = extensionPoints.getExtensionPoint(DefinitionsProviderExtensionPoint.class);
         DefinitionsFactory definitionsFactory = modelFactories.getFactory(DefinitionsFactory.class);
         systemDefinitions = definitionsFactory.createDefinitions();
+        
+        DefinitionsExtensionPoint definitionsExtensionPoint = extensionPoints.getExtensionPoint(DefinitionsExtensionPoint.class);
+        for(Definitions defs: definitionsExtensionPoint.getDefinitions()) {
+            DefinitionsUtil.aggregate(systemDefinitions, defs);
+        }
+        
+        // Load the system definitions.xml from all of the loaded extension points
+        DefinitionsProviderExtensionPoint definitionsProviders = extensionPoints.getExtensionPoint(DefinitionsProviderExtensionPoint.class);
 
         // aggregate all the definitions into a single definitions model
         try {