Author: antelder
Date: Thu Feb 12 07:14:16 2009
New Revision: 743635
URL: http://svn.apache.org/viewvc?rev=743635&view=rev
Log:
Simplify so you can use createNode() instead of createNode(null, null)
Modified:
tuscany/branches/sca-java-1.x/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
Modified:
tuscany/branches/sca-java-1.x/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java?rev=743635&r1=743634&r2=743635&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
Thu Feb 12 07:14:16 2009
@@ -150,6 +150,13 @@
}
/**
+ * Create a SCA node based on the discovery of the contribution on the
classpath.
+ *
+ * @return a new SCA node.
+ */
+ public abstract SCANode createSCANode();
+
+ /**
* Create a SCA node based on the discovery of the contribution on the
classpath for the
* given classloader. This method should be treated a convinient shortcut
with the following
* assumptions:
Modified:
tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java?rev=743635&r1=743634&r2=743635&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
Thu Feb 12 07:14:16 2009
@@ -52,4 +52,9 @@
return new NodeImpl(compositeURI, compositeContent, contributions);
}
+ @Override
+ public SCANode createSCANode() {
+ return new NodeImpl();
+ }
+
}
Modified:
tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=743635&r1=743634&r2=743635&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
Thu Feb 12 07:14:16 2009
@@ -145,6 +145,27 @@
}
/**
+ * Construct a node by discovering the node configuration on the classpath
+ * @param classLoader
+ * @param compositeURI
+ */
+ NodeImpl() {
+ configurationName = "default";
+ logger.log(Level.INFO, "Creating node: " + configurationName);
+
+ try {
+ initRuntime();
+
+ ConfiguredNodeImplementation config = findNodeConfiguration(null,
null);
+ configureNode(config);
+ } catch (ServiceRuntimeException e) {
+ throw e;
+ } catch (Throwable e) {
+ throw new ServiceRuntimeException(e);
+ }
+ }
+
+ /**
* Construct a node by discovering the node configuration
(composite+contrbutions) on the classpath
* @param classLoader
* @param compositeURI
