Author: jsdelfino
Date: Sun Aug 24 22:41:04 2008
New Revision: 688623
URL: http://svn.apache.org/viewvc?rev=688623&view=rev
Log:
Added support for two parameters to NodeLauncher: composite URI and
contribution location.
Modified:
tuscany/java/sca/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java
tuscany/java/sca/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
Modified:
tuscany/java/sca/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java?rev=688623&r1=688622&r2=688623&view=diff
==============================================================================
---
tuscany/java/sca/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java
(original)
+++
tuscany/java/sca/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java
Sun Aug 24 22:41:04 2008
@@ -113,9 +113,22 @@
// Create a node
NodeLauncher launcher = newInstance();
- String configurationURI = args[0];
- logger.info("SCA Node configuration: " + configurationURI);
- Object node = launcher.createNodeFromURL(configurationURI);
+ Object node;
+ if (args.length ==1) {
+
+ // Create from a configuration URI
+ String configurationURI = args[0];
+ logger.info("SCA Node configuration: " + configurationURI);
+ node = launcher.createNodeFromURL(configurationURI);
+ } else {
+
+ // Create from a composite URI and a contribution location
+ String compositeURI = args[0];
+ String contributionLocation = args[1];
+ logger.info("SCA composite: " + compositeURI);
+ logger.info("SCA contribution: " + contributionLocation);
+ node = launcher.createNode(compositeURI, new
Contribution("default", contributionLocation));
+ }
// Start the node
try {
Modified:
tuscany/java/sca/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java?rev=688623&r1=688622&r2=688623&view=diff
==============================================================================
---
tuscany/java/sca/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
(original)
+++
tuscany/java/sca/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
Sun Aug 24 22:41:04 2008
@@ -113,9 +113,22 @@
// Create a node
NodeLauncher launcher = newInstance();
- String configurationURI = args[0];
- logger.info("SCA Node configuration: " + configurationURI);
- Object node = launcher.createNodeFromURL(configurationURI);
+ Object node;
+ if (args.length ==1) {
+
+ // Create from a configuration URI
+ String configurationURI = args[0];
+ logger.info("SCA Node configuration: " + configurationURI);
+ node = launcher.createNodeFromURL(configurationURI);
+ } else {
+
+ // Create from a composite URI and a contribution location
+ String compositeURI = args[0];
+ String contributionLocation = args[1];
+ logger.info("SCA composite: " + compositeURI);
+ logger.info("SCA contribution: " + contributionLocation);
+ node = launcher.createNode(compositeURI, new
Contribution("default", contributionLocation));
+ }
// Start the node
try {
