From 7fad291b69b1b034b0b1462500203bdfd1b4a271 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 13 Sep 2008 07:44:57 +0000
Subject: Update to use new node-dynamic module

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@694889 13f79535-47bb-0310-9956-ffa450edef68
---
 .../helloworld-distributed/helloworld-node/pom.xml | 20 ++---------
 .../src/main/java/sample/HelloworldNode.java       | 40 ----------------------
 .../src/main/resources/Helloworld.composite        | 28 ---------------
 .../META-INF/sca-deployables/Helloworld.composite  | 28 +++++++++++++++
 4 files changed, 31 insertions(+), 85 deletions(-)
 delete mode 100644 java/sca/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldNode.java
 delete mode 100644 java/sca/samples/helloworld-distributed/helloworld-node/src/main/resources/Helloworld.composite
 create mode 100644 java/sca/samples/helloworld-distributed/helloworld-node/src/main/resources/META-INF/sca-deployables/Helloworld.composite

(limited to 'java/sca')

diff --git a/java/sca/samples/helloworld-distributed/helloworld-node/pom.xml b/java/sca/samples/helloworld-distributed/helloworld-node/pom.xml
index 941cb2b4ed..94b44edb40 100644
--- a/java/sca/samples/helloworld-distributed/helloworld-node/pom.xml
+++ b/java/sca/samples/helloworld-distributed/helloworld-node/pom.xml
@@ -31,29 +31,15 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
+            <artifactId>tuscany-sca-api</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
+            <artifactId>tuscany-node-dynamic</artifactId>
             <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-jms</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
diff --git a/java/sca/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldNode.java b/java/sca/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldNode.java
deleted file mode 100644
index 3cd8fe547a..0000000000
--- a/java/sca/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldNode.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.    
- */
-
-package sample;
-
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-/**
- */
-public class HelloworldNode {
-
-    public static void main(String[] args) throws Exception {
-
-        SCANode node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("Helloworld.composite", null);
-        node.start();
-        
-        System.out.println("Hit enter to stop node...");
-        System.in.read();
-
-        node.stop();
-    }
-
-}
diff --git a/java/sca/samples/helloworld-distributed/helloworld-node/src/main/resources/Helloworld.composite b/java/sca/samples/helloworld-distributed/helloworld-node/src/main/resources/Helloworld.composite
deleted file mode 100644
index 0f827390c8..0000000000
--- a/java/sca/samples/helloworld-distributed/helloworld-node/src/main/resources/Helloworld.composite
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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"
-           targetNamespace="http://sample"
-           name="Helloworld">
-
-    <component name="HelloworldComponent">
-		<implementation.java class="sample.HelloworldImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca/samples/helloworld-distributed/helloworld-node/src/main/resources/META-INF/sca-deployables/Helloworld.composite b/java/sca/samples/helloworld-distributed/helloworld-node/src/main/resources/META-INF/sca-deployables/Helloworld.composite
new file mode 100644
index 0000000000..0f827390c8
--- /dev/null
+++ b/java/sca/samples/helloworld-distributed/helloworld-node/src/main/resources/META-INF/sca-deployables/Helloworld.composite
@@ -0,0 +1,28 @@
+<?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"
+           targetNamespace="http://sample"
+           name="Helloworld">
+
+    <component name="HelloworldComponent">
+		<implementation.java class="sample.HelloworldImpl"/>
+    </component>
+
+</composite>
-- 
cgit v1.2.3