Author: slaws
Date: Thu Mar 20 07:09:50 2008
New Revision: 639293
URL: http://svn.apache.org/viewvc?rev=639293&view=rev
Log:
fixes for sample/calculator-distributed from the 1.2 branch
Modified:
incubator/tuscany/java/sca/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainNodeLauncher.java
incubator/tuscany/java/sca/samples/calculator-distributed/build.xml
incubator/tuscany/java/sca/samples/calculator-distributed/workspace.xml
Modified:
incubator/tuscany/java/sca/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainNodeLauncher.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainNodeLauncher.java?rev=639293&r1=639292&r2=639293&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainNodeLauncher.java
(original)
+++
incubator/tuscany/java/sca/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainNodeLauncher.java
Thu Mar 20 07:09:50 2008
@@ -39,7 +39,7 @@
Object admin;
try {
// Set up runtime classloader
- ClassLoader runtimeClassLoader =
NodeLauncherUtil.runtimeClassLoader(Object.class.getClassLoader());
+ ClassLoader runtimeClassLoader =
NodeLauncherUtil.runtimeClassLoader(DomainNodeLauncher.class.getClassLoader());
if (runtimeClassLoader != null) {
Thread.currentThread().setContextClassLoader(runtimeClassLoader);
}
Modified: incubator/tuscany/java/sca/samples/calculator-distributed/build.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/build.xml?rev=639293&r1=639292&r2=639293&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/build.xml
(original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/build.xml Thu Mar
20 07:09:50 2008
@@ -17,8 +17,6 @@
* under the License.
-->
<project name="calculator" default="runDomain">
- <property name="node.class" value="node.CalculatorNode" />
- <property name="domain.class" value="node.DomainNode" />
<property name="test.jar" value="sample-calculator-distributed.jar" />
<target name="init">
Modified:
incubator/tuscany/java/sca/samples/calculator-distributed/workspace.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/workspace.xml?rev=639293&r1=639292&r2=639293&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/workspace.xml
(original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/workspace.xml Thu
Mar 20 07:09:50 2008
@@ -18,8 +18,8 @@
* under the License.
-->
<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
- <contribution location="file:./target/classes/nodeA" uri="nodeA"/>
- <contribution location="file:./target/classes/nodeB" uri="nodeB"/>
- <contribution location="file:./target/classes/nodeC" uri="nodeC"/>
- <contribution location="file:./target/classes/cloud"
uri="http://tuscany.apache.org/xmlns/sca/1.0/cloud"/>
+ <contribution location="file:./src/main/resources/nodeA" uri="nodeA"/>
+ <contribution location="file:./src/main/resources/nodeB" uri="nodeB"/>
+ <contribution location="file:./src/main/resources/nodeC" uri="nodeC"/>
+ <contribution location="file:./src/main/resources/cloud"
uri="http://tuscany.apache.org/xmlns/sca/1.0/cloud"/>
</workspace>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]