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/04/16 01:12:31 UTC
svn commit: r765417 - in /tuscany/java/sca/modules:
node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/
node-impl/ node-impl/META-INF/
node-impl/src/main/java/org/apache/tuscany/sca/node/impl/
Author: rfeng
Date: Wed Apr 15 23:12:31 2009
New Revision: 765417
URL: http://svn.apache.org/viewvc?rev=765417&view=rev
Log:
Update the node-impl to use DefinitionsExtensionPoint to load definitions
Modified:
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java
tuscany/java/sca/modules/node-impl/META-INF/MANIFEST.MF
tuscany/java/sca/modules/node-impl/pom.xml
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
Modified: tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java?rev=765417&r1=765416&r2=765417&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java (original)
+++ tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java Wed Apr 15 23:12:31 2009
@@ -309,15 +309,18 @@
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()) {
Modified: tuscany/java/sca/modules/node-impl/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl/META-INF/MANIFEST.MF?rev=765417&r1=765416&r2=765417&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/node-impl/META-INF/MANIFEST.MF Wed Apr 15 23:12:31 2009
@@ -31,6 +31,7 @@
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 @@
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
Modified: tuscany/java/sca/modules/node-impl/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl/pom.xml?rev=765417&r1=765416&r2=765417&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl/pom.xml (original)
+++ tuscany/java/sca/modules/node-impl/pom.xml Wed Apr 15 23:12:31 2009
@@ -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>
Modified: tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=765417&r1=765416&r2=765417&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java (original)
+++ tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java Wed Apr 15 23:12:31 2009
@@ -75,6 +75,7 @@
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 @@
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 {