Refine echo binding to use EchoServer for the reference calls

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

1 files changed, 18 insertions, 24 deletions

diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/test/resources/EchoBinding.composite b/branches/sca-java-1.x/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
index 456dfbd94d..3b81be5bf4 100644
--- a/branches/sca-java-1.x/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
+++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
@@ -7,37 +7,31 @@
  * 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.    
+ * under the License.
 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://sample/echo"
-	xmlns:se="http://sample/echo"
-	xmlns:e="http://echo"
-	xmlns:p="http://sample/policy"
-        xmlns:t="http://test"
-	name="EchoBinding">
-
-    <service name="EchoService" promote="EchoComponent">
-        <interface.java interface="echo.Echo"/>
-        <e:binding.echo uri="http://example.com/temp"  />
-    </service>
-
+<composite
+    xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    targetNamespace="http://sample/echo"
+    xmlns:e="http://echo"
+    xmlns:t="http://test"
+    name="EchoBinding">
     <component name="EchoComponent">
-        <implementation.java class="echo.EchoComponentImpl"/>
+        <implementation.java
+            class="echo.EchoComponentImpl" />
+        <service name="Echo">
+            <e:binding.echo uri="http://example.com/server" />
+        </service>
+        <reference name="echoReference">
+            <e:binding.echo uri="http://example.com/client"
+                            policySets="t:EncryptionPolicy" />
+        </reference>
     </component>
-    
-    <reference name="EchoReference" promote="EchoComponent/echoReference">
-        <interface.java interface="echo.Echo"/>
-        <e:binding.echo uri="http://example.com/temp" policySets="t:EncryptionPolicy" />
-    </reference>
-    
 </composite>