Author: antelder
Date: Wed May 14 23:57:57 2008
New Revision: 656521
URL: http://svn.apache.org/viewvc?rev=656521&view=rev
Log:
TUSCANY-1867: Apply patch from Vamsavardhana Reddy to fix @OneWay with String
return type causes NullPointerException
Modified:
incubator/tuscany/java/sca/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestNodeManagerServiceImpl.java
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java
incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
Modified:
incubator/tuscany/java/sca/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestNodeManagerServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestNodeManagerServiceImpl.java?rev=656521&r1=656520&r2=656521&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestNodeManagerServiceImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestNodeManagerServiceImpl.java
Wed May 14 23:57:57 2008
@@ -58,7 +58,7 @@
System.out.println("stop");
}
- public void destroyNode() throws NodeException {
+ public void destroyNode() {
System.out.println("destroy");
}
Modified:
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java?rev=656521&r1=656520&r2=656521&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
Wed May 14 23:57:57 2008
@@ -175,12 +175,12 @@
if (nonBlocking) {
if (!(returnType == void.class)) {
throw new InvalidOperationException(
- "Method should return 'void' when declared with
[EMAIL PROTECTED] annotation.",
+ "Method should return 'void' when declared with
an @OneWay annotation. "+method,
method);
}
if (!(faultTypes.length == 0)) {
throw new InvalidOperationException(
- "Method should not declare exceptions with an
@OneWay annotation.",
+ "Method should not declare exceptions with an
@OneWay annotation. "+method,
method);
}
}
Modified:
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java?rev=656521&r1=656520&r2=656521&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java
Wed May 14 23:57:57 2008
@@ -90,7 +90,7 @@
node.stopFromDomain();
}
- public void destroyNode() throws NodeException {
+ public void destroyNode() {
// do nothing - the domain can't destroy nodes
}
Modified:
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java?rev=656521&r1=656520&r2=656521&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java
(original)
+++
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java
Wed May 14 23:57:57 2008
@@ -77,7 +77,7 @@
* as the WSDL processing struggles with methods called destroy
*/
@OneWay
- void destroyNode() throws NodeException;
+ void destroyNode();
/**
* Pass in an updated version of a composite in base64 encoded XML form.
The node will compare
Modified:
incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=656521&r1=656520&r2=656521&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
Wed May 14 23:57:57 2008
@@ -86,6 +86,39 @@
/**
* Constructs a new SCA node.
*
+ * @param configuration the the node configuration information.
+ */
+ NodeImpl(ConfiguredNodeImplementation configuration) {
+ configurationName = configuration.getURI();
+ logger.log(Level.INFO, "Creating node: " + configuration.getURI());
+
+ try {
+ // Initialize the runtime
+ initRuntime();
+
+ URL configurationURL = new URL(configuration.getURI());
+
+ // Resolve contribution URLs
+ for (Contribution contribution: configuration.getContributions()) {
+ URL contributionURL = new URL(configurationURL,
contribution.getLocation());
+ contribution.setLocation(contributionURL.toString());
+ }
+
+ // Resolve composite URL
+ URL compositeURL = new URL(configurationURL,
configuration.getComposite().getURI());
+ configuration.getComposite().setURI(compositeURL.toString());
+
+ // Configure the node
+ configureNode(configuration);
+
+ } catch (Exception e) {
+ throw new ServiceRuntimeException(e);
+ }
+ }
+
+ /**
+ * Constructs a new SCA node.
+ *
* @param configurationURI the URI of the node configuration information.
*/
NodeImpl(String configurationURI) {
