Author: jsdelfino
Date: Sun Mar 16 23:12:42 2008
New Revision: 637735
URL: http://svn.apache.org/viewvc?rev=637735&view=rev
Log:
Use simpler URIs for the nodes.
Added:
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeA.composite
(with props)
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeB.composite
(with props)
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeC.composite
(with props)
Removed:
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/cloud.composite
Modified:
incubator/tuscany/java/sca/samples/calculator-distributed/cloud.composite
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
Modified:
incubator/tuscany/java/sca/samples/calculator-distributed/cloud.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/cloud.composite?rev=637735&r1=637734&r2=637735&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/cloud.composite
(original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/cloud.composite
Sun Mar 16 23:12:42 2008
@@ -20,5 +20,7 @@
<composite name="cloud.composite"
targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0";
xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0";>
- <include name="ns2:cloud"
uri="http://tuscany.apache.org/xmlns/sca/1.0/cloud";
xmlns:ns2="http://tuscany.apache.org/xmlns/sca/1.0/cloud"/>
+ <include name="ns2:NodeA"
uri="http://tuscany.apache.org/xmlns/sca/1.0/cloud";
xmlns:ns2="http://sample/cloud"/>
+ <include name="ns2:NodeB"
uri="http://tuscany.apache.org/xmlns/sca/1.0/cloud";
xmlns:ns2="http://sample/cloud"/>
+ <include name="ns2:NodeC"
uri="http://tuscany.apache.org/xmlns/sca/1.0/cloud";
xmlns:ns2="http://sample/cloud"/>
</composite>
Modified:
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java?rev=637735&r1=637734&r2=637735&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
(original)
+++
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
Sun Mar 16 23:12:42 2008
@@ -33,7 +33,7 @@
try {
SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
- node =
nodeFactory.createSCANode("http://localhost:9990/composite-image/?composite=composite:nodeA;http://sample;CalculatorA";);
+ node =
nodeFactory.createSCANode("http://localhost:9990/node-image/NodeA";);
node.start();
Modified:
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java?rev=637735&r1=637734&r2=637735&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
(original)
+++
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
Sun Mar 16 23:12:42 2008
@@ -23,6 +23,6 @@
public class LaunchCalculatorNodeB {
public static void main(String[] args) throws Exception {
- NodeImplementationLauncher.main(new String[]
{"http://localhost:9990/composite-image/?composite=composite:nodeB;http://sample;CalculatorB"});
+ NodeImplementationLauncher.main(new String[]
{"http://localhost:9990/node-image/NodeB"});
}
}
Modified:
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java?rev=637735&r1=637734&r2=637735&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
(original)
+++
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
Sun Mar 16 23:12:42 2008
@@ -23,6 +23,6 @@
public class LaunchCalculatorNodeC {
public static void main(String[] args) throws Exception {
- NodeImplementationLauncher.main(new String[]
{"http://localhost:9990/composite-image/?composite=composite:nodeC;http://sample;CalculatorC"});
+ NodeImplementationLauncher.main(new String[]
{"http://localhost:9990/node-image/NodeC"});
}
}
Added:
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeA.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeA.composite?rev=637735&view=auto
==============================================================================
---
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeA.composite
(added)
+++
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeA.composite
Sun Mar 16 23:12:42 2008
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0";
+ targetNamespace="http://sample/cloud";
+ xmlns:s="http://sample";
+ name="NodeA">
+
+ <component name="NodeA">
+ <t:implementation.node uri="nodeA" composite="s:CalculatorA"/>
+ <service name="Node">
+ <binding.sca uri="http://localhost:8100"/>
+ </service>
+ </component>
+
+</composite>
Propchange:
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeA.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeA.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeB.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeB.composite?rev=637735&view=auto
==============================================================================
---
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeB.composite
(added)
+++
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeB.composite
Sun Mar 16 23:12:42 2008
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0";
+ targetNamespace="http://sample/cloud";
+ xmlns:s="http://sample";
+ name="NodeB">
+
+ <component name="NodeB">
+ <t:implementation.node uri="nodeB" composite="s:CalculatorB"/>
+ <service name="Node">
+ <binding.sca uri="http://localhost:8200"/>
+ </service>
+ </component>
+
+</composite>
Propchange:
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeB.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeB.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeC.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeC.composite?rev=637735&view=auto
==============================================================================
---
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeC.composite
(added)
+++
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeC.composite
Sun Mar 16 23:12:42 2008
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0";
+ targetNamespace="http://sample/cloud";
+ xmlns:s="http://sample";
+ name="NodeC">
+
+ <component name="NodeC">
+ <t:implementation.node uri="nodeC" composite="s:CalculatorC"/>
+ <service name="Node">
+ <binding.sca uri="http://localhost:8300"/>
+ </service>
+ </component>
+
+</composite>
Propchange:
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeC.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/NodeC.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java?rev=637735&r1=637734&r2=637735&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
(original)
+++
incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
Sun Mar 16 23:12:42 2008
@@ -51,12 +51,10 @@
SCADomain.newInstance("DomainAdmin.composite");
- NodeProcessCollectionImpl nodes = new NodeProcessCollectionImpl();
-
SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
- nodeC =
nodeFactory.createSCANode("http://localhost:9990/composite-image/?composite=composite:nodeC;http://sample;CalculatorC";);
- nodeB =
nodeFactory.createSCANode("http://localhost:9990/composite-image/?composite=composite:nodeB;http://sample;CalculatorB";);
- nodeA =
nodeFactory.createSCANode("http://localhost:9990/composite-image/?composite=composite:nodeA;http://sample;CalculatorA";);
+ nodeC =
nodeFactory.createSCANode("http://localhost:9990/node-image/NodeC";);
+ nodeB =
nodeFactory.createSCANode("http://localhost:9990/node-image/NodeB";);
+ nodeA =
nodeFactory.createSCANode("http://localhost:9990/node-image/NodeA";);
nodeC.start();
nodeB.start();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
