Added configurable timeout and cookies for service bindings. Consequence is that one SCA-Erlang node is created excusively for one service binding, so service bindings cannot share the same value in 'node' attribute like it was before. Made some other fixes.

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

3 files changed, 18 insertions, 40 deletions

diff --git a/sandbox/wjaniszewski/binding-erlang-runtime/src/test/resources/ErlangReference.composite b/sandbox/wjaniszewski/binding-erlang-runtime/src/test/resources/ErlangReference.composite
index 0d52cbae32..aa9d9f973e 100644
--- a/sandbox/wjaniszewski/binding-erlang-runtime/src/test/resources/ErlangReference.composite
+++ b/sandbox/wjaniszewski/binding-erlang-runtime/src/test/resources/ErlangReference.composite
@@ -14,8 +14,8 @@
         	<tuscany:binding.erlang node="MboxServer" mbox="true" timeout="500"/>
         </reference>
         
-        <reference name="timeoutMboxReference">
-        	<tuscany:binding.erlang node="MboxServer" mbox="true" timeout="500"/>
+        <reference name="cookieMboxReference">
+        	<tuscany:binding.erlang node="MboxServer" mbox="true" cookie="cookie"/>
         </reference>
         
         <reference name="moduleReference">
@@ -23,16 +23,17 @@
         </reference>
         
         <reference name="cookieModuleReference">
-        	<tuscany:binding.erlang node="RPCServer" module="hello" cookie="cookie"/>
+        	<tuscany:binding.erlang node="RPCServerCookie" module="hello_cookie" cookie="cookie"/>
         </reference>
         
-        <reference name="timeoutModuleReference">
-        	<tuscany:binding.erlang node="RPCServer" module="hello_timeout" timeout="500"/>
+        <reference name="invalidCookieModuleReference">
+        	<tuscany:binding.erlang node="RPCServerCookie" module="hello_cookie" cookie="invalid_cookie"/>
         </reference>
         
-        <reference name="clonedModuleReference">
-        	<tuscany:binding.erlang node="RPCServer" module="hello_clone"/>
+        <reference name="timeoutModuleReference">
+        	<tuscany:binding.erlang node="RPCServerTimeout" module="hello_timeout" timeout="500"/>
         </reference>
+        
     </component>
 	
 </composite>
\ No newline at end of file
diff --git a/sandbox/wjaniszewski/binding-erlang-runtime/src/test/resources/ErlangService.composite b/sandbox/wjaniszewski/binding-erlang-runtime/src/test/resources/ErlangService.composite
index d946cd6141..6da602cffd 100644
--- a/sandbox/wjaniszewski/binding-erlang-runtime/src/test/resources/ErlangService.composite
+++ b/sandbox/wjaniszewski/binding-erlang-runtime/src/test/resources/ErlangService.composite
@@ -13,15 +13,7 @@
     </service>
     <service name="ServiceTestMbox" promote="ServiceTest">
     	<interface.java interface="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponent" />
-       	<tuscany:binding.erlang node="RPCServer" mbox="true"/>
-    </service>
-
-	<component name="ServiceTestClone">
-        <implementation.java class="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponentImplClone" />
-    </component>
-    <service name="ServiceTestClone" promote="ServiceTestClone">
-    	<interface.java interface="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponent" />
-       	<tuscany:binding.erlang node="RPCServer" module="hello_clone"/>
+       	<tuscany:binding.erlang node="RPCServerMbox" mbox="true"/>
     </service>
     
 	<component name="ServiceTestTimeout">
@@ -29,7 +21,15 @@
     </component>    
     <service name="ServiceTestTimeout" promote="ServiceTestTimeout">
     	<interface.java interface="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponent" />
-       	<tuscany:binding.erlang node="RPCServer" module="hello_timeout"/>
+       	<tuscany:binding.erlang node="RPCServerTimeout" module="hello_timeout" timeout="500"/>
+    </service>
+    
+    <component name="ServiceTestCookie">
+        <implementation.java class="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponentImpl" />
+    </component>    
+    <service name="ServiceTestCookie" promote="ServiceTestCookie">
+    	<interface.java interface="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponent" />
+       	<tuscany:binding.erlang node="RPCServerCookie" module="hello_cookie" cookie="cookie"/>
     </service>
 	
 </composite>
\ No newline at end of file
diff --git a/sandbox/wjaniszewski/binding-erlang-runtime/src/test/resources/ErlangServiceModuleDuplicate.composite b/sandbox/wjaniszewski/binding-erlang-runtime/src/test/resources/ErlangServiceModuleDuplicate.composite
deleted file mode 100644
index 008b186955..0000000000
--- a/sandbox/wjaniszewski/binding-erlang-runtime/src/test/resources/ErlangServiceModuleDuplicate.composite
+++ /dev/null
@@ -1,23 +0,0 @@
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="ErlangServiceBinding">
-    
-	<component name="ServiceTest">
-        <implementation.java class="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponentImpl" />
-    </component>
-    <service name="ServiceTest" promote="ServiceTest">
-    	<interface.java interface="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponent" />
-       	<tuscany:binding.erlang node="DuplicateTest" module="hello"/>
-    </service>
-
-	<component name="ServiceTestClone">
-        <implementation.java class="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponentImplClone" />
-    </component>
-    <service name="ServiceTestClone" promote="ServiceTestClone">
-    	<interface.java interface="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponent" />
-       	<tuscany:binding.erlang node="DuplicateTest" module="hello"/>
-    </service>
-	
-</composite>
\ No newline at end of file