From 5f3a2395d3ce770b7084a672c3173fc46fbd9da0 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 4 Dec 2011 11:39:52 +0000
Subject: TUSCANY-3990: Fix XML syntax errors

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1210090 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/resources/definitions.xml                      | 13 ++++++-------
 .../src/main/resources/definitions.xml                      |  9 ++++-----
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'sca-java-1.x')

diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml b/sca-java-1.x/trunk/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
index 0ab3a5a9f1..3b85430193 100644
--- a/sca-java-1.x/trunk/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
@@ -18,13 +18,12 @@
  * under the License.    
 -->
 <sca:definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- 			targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
+ 			targetNamespace="http://helloworld"
  			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
- 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- 			xmlns:hw="http://helloworld">
+ 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
  
  <!-- WS Security POLICY SETS -->
- <sca:policySet name="hw:wsClientAuthenticationPolicy"
+ <sca:policySet name="wsClientAuthenticationPolicy"
  	provides="authentication"
  	appliesTo="sca:reference/sca:binding.ws">
  	<tuscany:wsConfigParam>
@@ -40,7 +39,7 @@
  </sca:policySet>
  
  <!-- A policyset that uses WS Policy --> 
- <sca:policySet name="hw:wsSecurityPolicyForIntegrity"
+ <sca:policySet name="wsSecurityPolicyForIntegrity"
  	provides="integrity"
  	appliesTo="sca:reference/sca:binding.ws">
  	<wsp:Policy wsu:Id="SignOnly" 
@@ -116,7 +115,7 @@
  <!-- Since we use the helloworld-ws-service for the unit testing we need to 
 	 declare these policy sets and with the 'provides' set to the intents that the 
 	 composite in the helloworld-ws-service uses.  -->
- <sca:policySet name="hw:wsAuthenticationPolicy"
+ <sca:policySet name="wsAuthenticationPolicy"
  	provides="authentication"
  	appliesTo="sca:service/sca:binding.ws"
  	>
@@ -130,7 +129,7 @@
  	</tuscany:wsConfigParam>
  </sca:policySet>
  
- <sca:policySet name="hw:wsServerSecurityPolicyForIntegrity"
+ <sca:policySet name="wsServerSecurityPolicyForIntegrity"
  	provides="integrity"
  	appliesTo="sca:service/sca:binding.ws">
  	<wsp:Policy wsu:Id="SignOnly" 
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml b/sca-java-1.x/trunk/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
index 10fa7b8652..3567de88f5 100644
--- a/sca-java-1.x/trunk/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
@@ -18,13 +18,12 @@
  * under the License.    
 -->
 <sca:definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- 			targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
+ 			targetNamespace="http://helloworld"
  			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
- 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- 			xmlns:hw="http://helloworld">
+ 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
 
  <!-- WS Security POLICY SETS -->
-  <sca:policySet name="hw:wsAuthenticationPolicy"
+  <sca:policySet name="wsAuthenticationPolicy"
  	provides="authentication"
  	appliesTo="sca:binding.ws"
  	>
@@ -39,7 +38,7 @@
  </sca:policySet>
  
  <!-- A policyset that uses WS Policy --> 
- <sca:policySet name="hw:wsSecurityPolicyForIntegrity"
+ <sca:policySet name="wsSecurityPolicyForIntegrity"
  	provides="integrity"
  	appliesTo="sca:binding.ws">
  	<wsp:Policy wsu:Id="SignOnly" 
-- 
cgit v1.2.3