Merge r1022460 TUSCANY-3723: Add erlang modules and samples to binary distribution

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027551 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 457 insertions, 409 deletions

diff --git a/sca-java-1.x/trunk/distribution/bundle/pom.xml b/sca-java-1.x/trunk/distribution/bundle/pom.xml
index ee35aec42d..e19e95ae15 100644
--- a/sca-java-1.x/trunk/distribution/bundle/pom.xml
+++ b/sca-java-1.x/trunk/distribution/bundle/pom.xml
@@ -88,6 +88,16 @@
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-binding-erlang</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-binding-erlang-runtime</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-binding-gdata</artifactId>
             <version>${pom.version}</version>
         </dependency>
diff --git a/sca-java-1.x/trunk/distribution/manifest/pom.xml b/sca-java-1.x/trunk/distribution/manifest/pom.xml
index 24de91ba7a..b7de537f63 100644
--- a/sca-java-1.x/trunk/distribution/manifest/pom.xml
+++ b/sca-java-1.x/trunk/distribution/manifest/pom.xml
@@ -89,6 +89,16 @@
         </dependency>        
         <dependency>
             <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-binding-erlang</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-binding-erlang-runtime</artifactId>
+            <version>${pom.version}</version>
+        </dependency>        
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-binding-gdata</artifactId>
             <version>${pom.version}</version>
         </dependency>
diff --git a/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml b/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml
index bbb8d6861c..82c719432e 100644
--- a/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml
+++ b/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml
@@ -162,10 +162,6 @@
                 <exclude>customer-dojo-webapp/**/*</exclude>
                 <exclude>helloworld-distributed</exclude>
                 <exclude>helloworld-distributed/**/*</exclude>
-                <exclude>helloworld-erlang-reference</exclude>
-                <exclude>helloworld-erlang-reference/**/*</exclude>
-                <exclude>helloworld-erlang-service</exclude>
-                <exclude>helloworld-erlang-service/**/*</exclude>                
                 <exclude>helloworld-jsp</exclude>
                 <exclude>helloworld-jsp/**/*</exclude>
                 <exclude>helloworld-servlet</exclude>
diff --git a/sca-java-1.x/trunk/samples/build.xml b/sca-java-1.x/trunk/samples/build.xml
index 4784d85ff5..be9c338f52 100644
--- a/sca-java-1.x/trunk/samples/build.xml
+++ b/sca-java-1.x/trunk/samples/build.xml
@@ -57,6 +57,8 @@
         <ant dir="feed-aggregator-webapp" target="${target}"/>

         <ant dir="helloworld-bpel" target="${target}"/>

         <ant dir="helloworld-dojo-webapp" target="${target}"/>

+        <ant dir="helloworld-erlang-reference" target="${target}"/>

+        <ant dir="helloworld-erlang-service" target="${target}"/>

         <ant dir="helloworld-jsonrpc-webapp" target="${target}"/>

         <ant dir="helloworld-reference-jms" target="${target}"/>

         <ant dir="helloworld-service-jms" target="${target}"/>

diff --git a/sca-java-1.x/trunk/samples/helloworld-erlang-reference/README b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/README
index e61db16fda..e0c1a5c89f 100644
--- a/sca-java-1.x/trunk/samples/helloworld-erlang-reference/README
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/README
@@ -1,127 +1,127 @@
-Hello World Erlang References Sample

-=================================

-This sample demonstrates an SCA reference that uses a Erlang binding 

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-In order to run Erlang samples you need to have Erlang/OTP distribution installed - 

-epmd binary is required in your system path. See http://erlang.org for downloads.

-

-If you just want to run it to see what happens you need to run the server first 

-so open a command prompt, navigate to the helloworld-service-erlang sample directory 

-and do 

-

-ant run

-

-OR if you don't have ant, on Windows do

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-service-erlang.jar helloworld.HelloWorldServer

-

-and on *nix do

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-service-erlang.jar helloworld.HelloWorldServer

-

-

-Once the server is running open a command prompt, navigate to this sample 

-directory and do:

-

-ant run

-

-OR if you don't have ant, on Windows do

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-reference-erlang.jar helloworld.HelloWorldErlangClient

-

-and on *nix do

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-reference-erlang.jar helloworld.HelloWorldErlangClient

-

-

-Sample Overview

----------------

-The sample provides a component that has a reference with a Erlang binding. 

-The binding refers to Erlang module and communicates with a service

-exposed by the helloworld-service-erlang sample. 

-

-helloworld-reference-erlang/

-  src/

-    main/

-      java/

-        helloworld/

-          HelloWorldImpl                  - HelloWorld service implementation

-          HelloWorldService.java          - interface description for 

-                                            HelloWorldServiceComponent

-          HelloWorldServiceComponent.java - component implementation

-          HelloWorldErlangClient.java         - starts the SCA Runtime and 

-                                            deploys the helloworldwserlangclient

-                                            .composite. It then calls the 

-                                            HelloWorldServiceComponent

-      resources/

-        helloworlderlangreference.composite     - the SCA assembly for this sample

-        helloworlderlangservice.composite       - the SCA assembly for the server

-                                                  that is used by the JUnit tests

-        logging.properties                      - log4j configuration file

-    test/

-      java/

-        helloworld/

-          HelloWorldErlangClientTestCase.java - JUnit test case

-        dynaignore/							  - internal Java classes for ignoring test 

-        										in case of missing Erlang/OTP distribution

-          

-  helloworld-reference.png                - a pictorial representation of the 

-                                            sample .composite file

-  build.xml                               - the Ant build file

-  pom.xml                                 - the Maven build file        

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant. Before

-you do this start up the service that the reference will talk to. To do this

-run up the helloworld-service-erlang test. Take a look at the README in that sample

-and you will see you need the following commands

-

-cd helloworld-service-erlang

-ant run

-

-Once done you can now compile and run this sample using the following commands;

-

-cd helloworld-reference-erlang

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-     [java] 2009-05-26 12:03:54 org.apache.tuscany.sca.node.impl.NodeImpl <init>

-     [java] INFO: Creating node: helloworlderlangreference.composite

-     [java] 2009-05-26 12:03:55 org.apache.tuscany.sca.node.impl.NodeImpl configureNode

-     [java] 2009-05-26 12:03:56 org.apache.tuscany.sca.node.impl.NodeImpl configureNode

-     [java] 2009-05-26 12:03:56 org.apache.tuscany.sca.node.impl.NodeImpl start

-     [java] INFO: Starting node: helloworlderlangreference.composite

-     [java] Hello World

-     [java] 2009-05-26 12:03:56 org.apache.tuscany.sca.node.impl.NodeImpl stop

-     [java] INFO: Stopping node: helloworlderlangreference.composite

-

-BUILD SUCCESSFUL

-

-

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. When using Maven you don't need to run the helloworld-

-service-erlang sample first as the JUnit test does this for you. 

-

-cd helloworld-reference-erlang

-mvn

-

-You should see the following output from the test phase.

-

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.569 sec

-

-Results :

-

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0

-

-

-This shows that the Junit test cases have run successfully. 

+Hello World Erlang Reference Sample
+===================================
+This sample demonstrates an SCA reference that uses a Erlang binding 
+
+The README in the samples directory (the directory above this) provides 
+general instructions about building and running samples. Take a look there 
+first. 
+
+In order to run Erlang samples you need to have Erlang/OTP distribution installed - 
+epmd binary is required in your system path. See http://erlang.org for downloads.
+
+If you just want to run it to see what happens you need to run the server first 
+so open a command prompt, navigate to the helloworld-erlang-service sample directory 
+and do 
+
+ant run
+
+OR if you don't have ant, on Windows do
+
+java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-erlang-service.jar helloworld.HelloWorldServer
+
+and on *nix do
+
+java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-erlang-service.jar helloworld.HelloWorldServer
+
+
+Once the server is running open a command prompt, navigate to this sample 
+directory and do:
+
+ant run
+
+OR if you don't have ant, on Windows do
+
+java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-erlang-reference.jar helloworld.HelloWorldErlangClient
+
+and on *nix do
+
+java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-erlang-reference.jar helloworld.HelloWorldErlangClient
+
+
+Sample Overview
+---------------
+The sample provides a component that has a reference with a Erlang binding. 
+The binding refers to Erlang module and communicates with a service
+exposed by the helloworld-service-erlang sample. 
+
+helloworld-erlang-reference/
+  src/
+    main/
+      java/
+        helloworld/
+          HelloWorldImpl                  - HelloWorld service implementation
+          HelloWorldService.java          - interface description for 
+                                            HelloWorldServiceComponent
+          HelloWorldServiceComponent.java - component implementation
+          HelloWorldErlangClient.java         - starts the SCA Runtime and 
+                                            deploys the helloworldwserlangclient
+                                            .composite. It then calls the 
+                                            HelloWorldServiceComponent
+      resources/
+        helloworlderlangreference.composite     - the SCA assembly for this sample
+        helloworlderlangservice.composite       - the SCA assembly for the server
+                                                  that is used by the JUnit tests
+        logging.properties                      - log4j configuration file
+    test/
+      java/
+        helloworld/
+          HelloWorldErlangClientTestCase.java - JUnit test case
+        dynaignore/							  - internal Java classes for ignoring test 
+        										in case of missing Erlang/OTP distribution
+          
+  helloworld-reference.png                - a pictorial representation of the 
+                                            sample .composite file
+  build.xml                               - the Ant build file
+  pom.xml                                 - the Maven build file        
+
+Building And Running The Sample Using Ant
+-----------------------------------------
+With the binary distribution the sample can be built and run using Ant. Before
+you do this start up the service that the reference will talk to. To do this
+run up the helloworld-erlang-service sample. Take a look at the README in that sample
+and you will see you need the following commands
+
+cd helloworld-erlang-service
+ant run
+
+Once done you can now compile and run this sample using the following commands;
+
+cd helloworld-erlang-reference
+ant compile
+ant run
+
+You should see the following output from the run target.
+
+run:
+     [java] 2009-05-26 12:03:54 org.apache.tuscany.sca.node.impl.NodeImpl <init>
+     [java] INFO: Creating node: helloworlderlangreference.composite
+     [java] 2009-05-26 12:03:55 org.apache.tuscany.sca.node.impl.NodeImpl configureNode
+     [java] 2009-05-26 12:03:56 org.apache.tuscany.sca.node.impl.NodeImpl configureNode
+     [java] 2009-05-26 12:03:56 org.apache.tuscany.sca.node.impl.NodeImpl start
+     [java] INFO: Starting node: helloworlderlangreference.composite
+     [java] Hello World
+     [java] 2009-05-26 12:03:56 org.apache.tuscany.sca.node.impl.NodeImpl stop
+     [java] INFO: Stopping node: helloworlderlangreference.composite
+
+BUILD SUCCESSFUL
+
+
+Building And Running The Sample Using Maven 
+-------------------------------------------
+With either the binary or source distributions the sample can be built and run 
+using Maven as follows. When using Maven you don't need to run the helloworld-
+erlang-service sample first as the JUnit test does this for you. 
+
+cd helloworld-erlang-reference
+mvn
+
+You should see the following output from the test phase.
+
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.569 sec
+
+Results :
+
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
+
+
+This shows that the Junit test cases have run successfully. 
diff --git a/sca-java-1.x/trunk/samples/helloworld-erlang-reference/pom.xml b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/pom.xml
index 0b820690b3..f1a1e8ce8d 100644
--- a/sca-java-1.x/trunk/samples/helloworld-erlang-reference/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/pom.xml
@@ -1,89 +1,106 @@
-<?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.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>1.7-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-helloworld-reference-erlang</artifactId>

-    <name>Apache Tuscany SCA Sample HelloWorld Reference Erlang</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.7-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.7-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-erlang-runtime</artifactId>

-            <version>1.7-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.activemq</groupId>

-            <artifactId>activemq-all</artifactId>

-            <version>5.2.0</version>

-            <scope>test</scope>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.apache.activemq</groupId>

-                    <artifactId>activemq-web-demo</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-        <dependency>

-            <groupId>backport-util-concurrent</groupId>

-            <artifactId>backport-util-concurrent</artifactId>

-            <version>3.1</version>

-        </dependency>  

-        

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

+<?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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.7-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>sample-helloworld-erlang-reference</artifactId>
+    <name>Apache Tuscany SCA Sample HelloWorld Erlang Reference</name>
+
+    <repositories>
+       <repository>
+          <id>apache.incubator</id>
+          <url>http://people.apache.org/repo/m2-incubating-repository</url>
+       </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.7-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.7-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-erlang-runtime</artifactId>
+            <version>1.7-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-all</artifactId>
+            <version>5.2.0</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activemq-web-demo</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>3.1</version>
+        </dependency>  
+        
+    </dependencies>
+    
+    <build>
+        <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-maven-ant-generator</artifactId>
+                <version>1.6.1-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>helloworld.HelloWorldErlangClient</mainClass>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/sca-java-1.x/trunk/samples/helloworld-erlang-service/README b/sca-java-1.x/trunk/samples/helloworld-erlang-service/README
index c17483b613..ed21c91098 100644
--- a/sca-java-1.x/trunk/samples/helloworld-erlang-service/README
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-service/README
@@ -1,111 +1,111 @@
-Hello World Erlang Service Sample

-==============================

-This sample demonstrates an SCA service that uses a Erlang binding 

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-In order to run Erlang samples you need to have Erlang/OTP distribution installed - 

-epmd binary is required in your system path. See http://erlang.org for downloads.

-

-If you just want to run it to see what happens open a command prompt, navigate

-to this sample directory and do:

-

-ant run

-

-OR if you don't have ant, on Windows do

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-service-erlang.jar helloworld.HelloWorldServer

-

-and on *nix do

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-service-erlang.jar helloworld.HelloWorldServer

-

-Now the server is started you can use the helloworld-reference-erlang sample to 

-exercise it. 

-

-Sample Overview

----------------

-The sample provides a single component that is wired to a service with a 

-Erlang binding.

-

-helloworld-service-erlang/

-  src/

-    main/

-      java/

-        helloworld/

-          HelloWorldService.java          - interface description for 

-                                            HelloWorldServiceComponent

-          HelloWorldImpl.java             - component implementation

-          HelloWorldServer.java           - starts the SCA Runtime and 

-                                            deploys the helloworlderlangservice

-                                            .composite and then waits for the

-                                            service to be called via Erlang

-      resources/

-        helloworlderlangservice.composite    - the SCA assembly for this sample

-

-    test/

-      java/

-        helloworld/

-          HelloWorldErlangServerTestCase.java - JUnit test case

-        dynaignore/    						  - internal Java classes for ignoring test 

-        										in case of missing Erlang/OTP distribution

-  helloworld-service.png                  - a pictorial representation of the 

-                                            sample .composite file

-  build.xml                               - the Ant build file

-  pom.xml                                 - the Maven build file        

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant using the 

-following commands

-

-cd helloworld-service-erlang

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-     [java] EPMD server started

-     [java] 2009-05-26 11:59:07 org.apache.tuscany.sca.node.impl.NodeImpl <init>

-     [java] INFO: Creating node: helloworlderlangservice.composite

-     [java] 2009-05-26 11:59:08 org.apache.tuscany.sca.node.impl.NodeImpl configureNode

-     [java] 2009-05-26 11:59:08 org.apache.tuscany.sca.node.impl.NodeImpl configureNode

-     [java] 2009-05-26 11:59:08 org.apache.tuscany.sca.node.impl.NodeImpl start

-     [java] INFO: Starting node: helloworlderlangservice.composite

-     [java] HelloWorld server started (press enter to shutdown)

-

-     

-As this point the SCA service is exposed as a Erlang module via Erlang RPC which is

-started automatically by the SCA runtime. To stop the server just press 

-enter.

-

-To exercise the service run up the helloworld-reference-erlang sample. Take a look at 

-the README in that sample and you will see you need the following commands

-

-cd helloworld-reference-erlang

-ant run

-

-Building Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built 

-using Maven as follows. 

-

-cd helloworld-service-erlang

-mvn

-

-You should see the following output 

-

-...

-[INFO] ------------------------------------------------------------------------

-[INFO] BUILD SUCCESSFUL

-[INFO] ------------------------------------------------------------------------

-[INFO] Total time: 15 seconds

-[INFO] Finished at: Wed Jul 02 12:50:24 BST 2008

-[INFO] Final Memory: 13M/51M

-[INFO] ------------------------------------------------------------------------

-

-

-This shows that the module has compiled successfully. 

+Hello World Erlang Service Sample
+=================================
+This sample demonstrates an SCA service that uses a Erlang binding 
+
+The README in the samples directory (the directory above this) provides 
+general instructions about building and running samples. Take a look there 
+first. 
+
+In order to run Erlang samples you need to have Erlang/OTP distribution installed - 
+epmd binary is required in your system path. See http://erlang.org for downloads.
+
+If you just want to run it to see what happens open a command prompt, navigate
+to this sample directory and do:
+
+ant run
+
+OR if you don't have ant, on Windows do
+
+java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-erlang-service.jar helloworld.HelloWorldServer
+
+and on *nix do
+
+java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-erlang-service.jar helloworld.HelloWorldServer
+
+Now the server is started you can use the helloworld-erlang-reference sample to 
+exercise it. 
+
+Sample Overview
+---------------
+The sample provides a single component that is wired to a service with a 
+Erlang binding.
+
+helloworld-erlang-service/
+  src/
+    main/
+      java/
+        helloworld/
+          HelloWorldService.java          - interface description for 
+                                            HelloWorldServiceComponent
+          HelloWorldImpl.java             - component implementation
+          HelloWorldServer.java           - starts the SCA Runtime and 
+                                            deploys the helloworlderlangservice
+                                            .composite and then waits for the
+                                            service to be called via Erlang
+      resources/
+        helloworlderlangservice.composite    - the SCA assembly for this sample
+
+    test/
+      java/
+        helloworld/
+          HelloWorldErlangServerTestCase.java - JUnit test case
+        dynaignore/    						  - internal Java classes for ignoring test 
+        										in case of missing Erlang/OTP distribution
+  helloworld-service.png                  - a pictorial representation of the 
+                                            sample .composite file
+  build.xml                               - the Ant build file
+  pom.xml                                 - the Maven build file        
+
+Building And Running The Sample Using Ant
+-----------------------------------------
+With the binary distribution the sample can be built and run using Ant using the 
+following commands
+
+cd helloworld-erlang-service
+ant compile
+ant run
+
+You should see the following output from the run target.
+
+run:
+     [java] EPMD server started
+     [java] 2009-05-26 11:59:07 org.apache.tuscany.sca.node.impl.NodeImpl <init>
+     [java] INFO: Creating node: helloworlderlangservice.composite
+     [java] 2009-05-26 11:59:08 org.apache.tuscany.sca.node.impl.NodeImpl configureNode
+     [java] 2009-05-26 11:59:08 org.apache.tuscany.sca.node.impl.NodeImpl configureNode
+     [java] 2009-05-26 11:59:08 org.apache.tuscany.sca.node.impl.NodeImpl start
+     [java] INFO: Starting node: helloworlderlangservice.composite
+     [java] HelloWorld server started (press enter to shutdown)
+
+     
+As this point the SCA service is exposed as a Erlang module via Erlang RPC which is
+started automatically by the SCA runtime. To stop the server just press 
+enter.
+
+To exercise the service run up the helloworld-erlang-reference sample. Take a look at 
+the README in that sample and you will see you need the following commands
+
+cd helloworld-erlang-reference
+ant run
+
+Building Sample Using Maven 
+-------------------------------------------
+With either the binary or source distributions the sample can be built 
+using Maven as follows. 
+
+cd helloworld-erlang-service
+mvn
+
+You should see the following output 
+
+...
+[INFO] ------------------------------------------------------------------------
+[INFO] BUILD SUCCESSFUL
+[INFO] ------------------------------------------------------------------------
+[INFO] Total time: 15 seconds
+[INFO] Finished at: Wed Jul 02 12:50:24 BST 2008
+[INFO] Final Memory: 13M/51M
+[INFO] ------------------------------------------------------------------------
+
+
+This shows that the module has compiled successfully. 
diff --git a/sca-java-1.x/trunk/samples/helloworld-erlang-service/pom.xml b/sca-java-1.x/trunk/samples/helloworld-erlang-service/pom.xml
index ae85faf0d9..7f55e8416c 100644
--- a/sca-java-1.x/trunk/samples/helloworld-erlang-service/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-service/pom.xml
@@ -1,72 +1,89 @@
-<?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.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>1.7-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-helloworld-service-erlang</artifactId>

-    <name>Apache Tuscany SCA Sample HelloWorld Service Erlang</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>           

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.7-SNAPSHOT</version>

-            <scope>compile</scope>            

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.7-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-erlang-runtime</artifactId>

-            <version>1.7-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency> 

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

+<?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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.7-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>sample-helloworld-erlang-service</artifactId>
+    <name>Apache Tuscany SCA Sample HelloWorld Erlang Service</name>
+
+    <repositories>
+       <repository>
+          <id>apache.incubator</id>
+          <url>http://people.apache.org/repo/m2-incubating-repository</url>
+       </repository>
+    </repositories>
+
+    <dependencies>           
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.7-SNAPSHOT</version>
+            <scope>compile</scope>            
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.7-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-erlang-runtime</artifactId>
+            <version>1.7-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency> 
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+    <build>
+       <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-maven-ant-generator</artifactId>
+                <version>1.6.1-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>helloworld.HelloWorldServer</mainClass>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/sca-java-1.x/trunk/samples/pom-distribution.xml b/sca-java-1.x/trunk/samples/pom-distribution.xml
index 4b6665e98d..2034f3a77e 100644
--- a/sca-java-1.x/trunk/samples/pom-distribution.xml
+++ b/sca-java-1.x/trunk/samples/pom-distribution.xml
@@ -93,10 +93,8 @@
                 <module>feed-aggregator-webapp</module>

                 <module>helloworld-bpel</module>

                 <module>helloworld-dojo-webapp</module>

-                <!-- the following is excluded from pom-distribution.xml

-                <module>helloworld-erlang-reference</module -->

-                <!-- the following is excluded from pom-distribution.xml

-                <module>helloworld-erlang-service</module -->

+                <module>helloworld-erlang-reference</module>

+                <module>helloworld-erlang-service</module>

                 <!-- the following is excluded from pom-distribution.xml

                 <module>helloworld-jms-webapp</module -->

                 <module>helloworld-jsonrpc-webapp</module>

diff --git a/sca-java-1.x/trunk/samples/pom.xml b/sca-java-1.x/trunk/samples/pom.xml
index 7825f293d9..8c78ae010f 100644
--- a/sca-java-1.x/trunk/samples/pom.xml
+++ b/sca-java-1.x/trunk/samples/pom.xml
@@ -93,9 +93,7 @@
                 <module>feed-aggregator-webapp</module>
                 <module>helloworld-bpel</module>
                 <module>helloworld-dojo-webapp</module>
-                <!-- the following is excluded from pom-distribution.xml -->
                 <module>helloworld-erlang-reference</module>
-                <!-- the following is excluded from pom-distribution.xml -->
                 <module>helloworld-erlang-service</module>
                 <!-- the following is excluded from pom-distribution.xml -->
                 <module>helloworld-jms-webapp</module>