From 59412d176cd4e7950cb48e48580a6de6fb8fec70 Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 9 Feb 2012 17:46:50 +0000
Subject: TUSCANY-4011 - stop the SCDL callback binding configuration from
 being overwritten. The JMS binding strangely relied on this so required some
 surgery. I've also simplified CallbackServiceReference and added a CALLBACK
 message header and CallbackHandler object to make is simpler to pass the
 callback address down the message chain. The existing approach of creating a
 CallbackEndpoint model is still supported at the moment.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1242412 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/resources/META-INF/definitions.xml    | 36 ++++++++++++++++++++++
 .../src/main/resources/helloworld.composite        |  5 +--
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/src/main/resources/META-INF/definitions.xml

(limited to 'sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/src/main/resources')

diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/src/main/resources/META-INF/definitions.xml
new file mode 100644
index 0000000000..cce5bbe403
--- /dev/null
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/src/main/resources/META-INF/definitions.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+    * 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.    
+-->
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+             targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
+             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
+    		 xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" >
+
+
+    <sca:policySet name="BasicAuthenticationPolicySet"
+                   provides="clientAuthentication.transport"
+                   appliesTo="//sca:binding.ws">
+        <tuscany:basicAuthentication>
+          <tuscany:userName>myname</tuscany:userName>
+          <tuscany:password>mypassword</tuscany:password>
+        </tuscany:basicAuthentication>
+    </sca:policySet>
+        
+      
+</definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld.composite
index 31414beb47..fc64de7b8a 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld.composite
@@ -19,6 +19,7 @@
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 		   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+		   xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
 		   targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2"
            name="HelloWorld">
                
@@ -33,7 +34,7 @@
         <reference name="helloWorldCallbackService">
             <binding.ws uri="http://localhost:8084/HelloWorldCallbackService"/>
             <callback>
-                <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorldCallback"/>
+                <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorldCallback" policySets="tuscany:BasicAuthenticationPolicySet"/>
             </callback>
         </reference>
     </component>
@@ -43,7 +44,7 @@
         <service name="HelloWorldCallbackService">
             <binding.ws uri="http://localhost:8084/HelloWorldCallbackService"/>
             <callback>
-                <binding.ws/>
+                <binding.ws  policySets="tuscany:BasicAuthenticationPolicySet"/>
             </callback>            
         </service>   
     </component>    
-- 
cgit v1.2.3