29 files changed, 6 insertions, 146 deletions
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 9c4373379c..f3c185b5ab 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
@@ -195,6 +195,10 @@
                 <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/helloworld-reference-erlang/README b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/README
index e61db16fda..e61db16fda 100644
--- a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/README
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/README
diff --git a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/helloworld-reference.png b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/helloworld-reference.png
index 5c80743d14..5c80743d14 100644
--- a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/helloworld-reference.png
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/helloworld-reference.png
diff --git a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/helloworld-reference.svg b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/helloworld-reference.svg
index 992d56875b..992d56875b 100644
--- a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/helloworld-reference.svg
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/helloworld-reference.svg
diff --git a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/pom.xml b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/pom.xml
index 0b820690b3..0b820690b3 100644
--- a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/pom.xml
diff --git a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/src/main/java/helloworld/HelloWorldErlangClient.java b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/src/main/java/helloworld/HelloWorldErlangClient.java
index 9b881b77ff..9b881b77ff 100644
--- a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/src/main/java/helloworld/HelloWorldErlangClient.java
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/src/main/java/helloworld/HelloWorldErlangClient.java
diff --git a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/src/main/java/helloworld/HelloWorldService.java
index c0259c6e07..c0259c6e07 100644
--- a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/src/main/java/helloworld/HelloWorldService.java
diff --git a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
index 6c833ab888..6c833ab888 100644
--- a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/src/main/resources/helloworlderlangreference.composite b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/src/main/resources/helloworlderlangreference.composite
index 5c2e8786f1..5c2e8786f1 100644
--- a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/src/main/resources/helloworlderlangreference.composite
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/src/main/resources/helloworlderlangreference.composite
diff --git a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/src/main/resources/helloworlderlangservice.composite b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/src/main/resources/helloworlderlangservice.composite
index d2ff8455d8..d2ff8455d8 100644
--- a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/src/main/resources/helloworlderlangservice.composite
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/src/main/resources/helloworlderlangservice.composite
diff --git a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/src/main/resources/logging.properties b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/src/main/resources/logging.properties
index a2a4067921..a2a4067921 100644
--- a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/src/main/resources/logging.properties
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/src/main/resources/logging.properties
diff --git a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/src/test/java/helloworld/HelloWorldErlangClientTestCase.java b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/src/test/java/helloworld/HelloWorldErlangClientTestCase.java
index 03d98f817f..03d98f817f 100644
--- a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/src/test/java/helloworld/HelloWorldErlangClientTestCase.java
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/src/test/java/helloworld/HelloWorldErlangClientTestCase.java
diff --git a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/src/test/java/helloworld/dynaignore/IgnorableRunner.java b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/src/test/java/helloworld/dynaignore/IgnorableRunner.java
index 6943c1df80..6943c1df80 100644
--- a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/src/test/java/helloworld/dynaignore/IgnorableRunner.java
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/src/test/java/helloworld/dynaignore/IgnorableRunner.java
diff --git a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/src/test/java/helloworld/dynaignore/IgnoreTest.java b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/src/test/java/helloworld/dynaignore/IgnoreTest.java
index 99d961bdea..99d961bdea 100644
--- a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/src/test/java/helloworld/dynaignore/IgnoreTest.java
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-reference/src/test/java/helloworld/dynaignore/IgnoreTest.java
diff --git a/sca-java-1.x/trunk/samples/helloworld-service-erlang/README b/sca-java-1.x/trunk/samples/helloworld-erlang-service/README
index c17483b613..c17483b613 100644
--- a/sca-java-1.x/trunk/samples/helloworld-service-erlang/README
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-service/README
diff --git a/sca-java-1.x/trunk/samples/helloworld-service-erlang/helloworld-service.png b/sca-java-1.x/trunk/samples/helloworld-erlang-service/helloworld-service.png
index 506c258274..506c258274 100644
--- a/sca-java-1.x/trunk/samples/helloworld-service-erlang/helloworld-service.png
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-service/helloworld-service.png
diff --git a/sca-java-1.x/trunk/samples/helloworld-service-erlang/helloworld-service.svg b/sca-java-1.x/trunk/samples/helloworld-erlang-service/helloworld-service.svg
index c3a89c6cd2..c3a89c6cd2 100644
--- a/sca-java-1.x/trunk/samples/helloworld-service-erlang/helloworld-service.svg
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-service/helloworld-service.svg
diff --git a/sca-java-1.x/trunk/samples/helloworld-service-erlang/pom.xml b/sca-java-1.x/trunk/samples/helloworld-erlang-service/pom.xml
index ae85faf0d9..ae85faf0d9 100644
--- a/sca-java-1.x/trunk/samples/helloworld-service-erlang/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-service/pom.xml
diff --git a/sca-java-1.x/trunk/samples/helloworld-service-erlang/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/trunk/samples/helloworld-erlang-service/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/sca-java-1.x/trunk/samples/helloworld-service-erlang/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-service/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-1.x/trunk/samples/helloworld-service-erlang/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/trunk/samples/helloworld-erlang-service/src/main/java/helloworld/HelloWorldServer.java
index 83dbfe03ff..83dbfe03ff 100644
--- a/sca-java-1.x/trunk/samples/helloworld-service-erlang/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-service/src/main/java/helloworld/HelloWorldServer.java
diff --git a/sca-java-1.x/trunk/samples/helloworld-service-erlang/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/samples/helloworld-erlang-service/src/main/java/helloworld/HelloWorldService.java
index 4b019b21bf..4b019b21bf 100644
--- a/sca-java-1.x/trunk/samples/helloworld-service-erlang/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-service/src/main/java/helloworld/HelloWorldService.java
diff --git a/sca-java-1.x/trunk/samples/helloworld-service-erlang/src/main/resources/helloworlderlangservice.composite b/sca-java-1.x/trunk/samples/helloworld-erlang-service/src/main/resources/helloworlderlangservice.composite
index 1e0c57c74d..1e0c57c74d 100644
--- a/sca-java-1.x/trunk/samples/helloworld-service-erlang/src/main/resources/helloworlderlangservice.composite
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-service/src/main/resources/helloworlderlangservice.composite
diff --git a/sca-java-1.x/trunk/samples/helloworld-service-erlang/src/test/java/helloworld/HelloWorldErlangServerTestCase.java b/sca-java-1.x/trunk/samples/helloworld-erlang-service/src/test/java/helloworld/HelloWorldErlangServerTestCase.java
index 7f7d78c50d..7f7d78c50d 100644
--- a/sca-java-1.x/trunk/samples/helloworld-service-erlang/src/test/java/helloworld/HelloWorldErlangServerTestCase.java
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-service/src/test/java/helloworld/HelloWorldErlangServerTestCase.java
diff --git a/sca-java-1.x/trunk/samples/helloworld-service-erlang/src/test/java/helloworld/dynaignore/IgnorableRunner.java b/sca-java-1.x/trunk/samples/helloworld-erlang-service/src/test/java/helloworld/dynaignore/IgnorableRunner.java
index 6943c1df80..6943c1df80 100644
--- a/sca-java-1.x/trunk/samples/helloworld-service-erlang/src/test/java/helloworld/dynaignore/IgnorableRunner.java
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-service/src/test/java/helloworld/dynaignore/IgnorableRunner.java
diff --git a/sca-java-1.x/trunk/samples/helloworld-service-erlang/src/test/java/helloworld/dynaignore/IgnoreTest.java b/sca-java-1.x/trunk/samples/helloworld-erlang-service/src/test/java/helloworld/dynaignore/IgnoreTest.java
index 99d961bdea..99d961bdea 100644
--- a/sca-java-1.x/trunk/samples/helloworld-service-erlang/src/test/java/helloworld/dynaignore/IgnoreTest.java
+++ b/sca-java-1.x/trunk/samples/helloworld-erlang-service/src/test/java/helloworld/dynaignore/IgnoreTest.java
diff --git a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/build.xml b/sca-java-1.x/trunk/samples/helloworld-reference-erlang/build.xml
deleted file mode 100644
index bc5c6ed8a8..0000000000
--- a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/build.xml
+++ /dev/null
@@ -1,72 +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.    
--->
-<project name="helloworld-ws-reference-erlang" default="compile">
-    <property name="test.class" value="helloworld.HelloWorldErlangClient" />
-	<property name="test.jar"   value="sample-helloworld-reference-erlang.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/sca-java-1.x/trunk/samples/helloworld-service-erlang/build.xml b/sca-java-1.x/trunk/samples/helloworld-service-erlang/build.xml
deleted file mode 100644
index cd374bfe14..0000000000
--- a/sca-java-1.x/trunk/samples/helloworld-service-erlang/build.xml
+++ /dev/null
@@ -1,72 +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.    
--->
-<project name="helloworld-service-erlang" default="compile">
-    <property name="test.class" value="helloworld.HelloWorldServer" />
-	<property name="test.jar"   value="sample-helloworld-service-erlang.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/sca-java-1.x/trunk/samples/pom.xml b/sca-java-1.x/trunk/samples/pom.xml
index 8e62ab0f5f..55f79263c5 100644
--- a/sca-java-1.x/trunk/samples/pom.xml
+++ b/sca-java-1.x/trunk/samples/pom.xml
@@ -73,11 +73,11 @@
                 <module>feed-aggregator-webapp</module>
                 <module>helloworld-bpel</module>
                 <module>helloworld-dojo-webapp</module>
+                <module>helloworld-erlang-reference</module>
+                <module>helloworld-erlang-service</module>                
                 <module>helloworld-jms-webapp</module>
                 <module>helloworld-jsonrpc-webapp</module>
-                <module>helloworld-reference-erlang</module>
                 <module>helloworld-reference-jms</module>
-                <module>helloworld-service-erlang</module>
                 <module>helloworld-service-jms</module>
                 <module>helloworld-ws-service</module>
                 <module>helloworld-ws-service-jms</module>