Return-Path: 
 <commits-return-35175-apmail-tuscany-commits-archive=tuscany.apache.org@tuscany.apache.org>
X-Original-To: apmail-tuscany-commits-archive@www.apache.org
Delivered-To: apmail-tuscany-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 08B2A9ECB
	for <apmail-tuscany-commits-archive@www.apache.org>;
 Sun,  4 Dec 2011 11:40:16 +0000 (UTC)
Received: (qmail 73151 invoked by uid 500); 4 Dec 2011 11:40:16 -0000
Delivered-To: apmail-tuscany-commits-archive@tuscany.apache.org
Received: (qmail 73112 invoked by uid 500); 4 Dec 2011 11:40:15 -0000
Mailing-List: contact commits-help@tuscany.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@tuscany.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@tuscany.apache.org>
List-Post: <mailto:commits@tuscany.apache.org>
List-Id: <commits.tuscany.apache.org>
Reply-To: dev@tuscany.apache.org
Delivered-To: mailing list commits@tuscany.apache.org
Received: (qmail 73105 invoked by uid 99); 4 Dec 2011 11:40:15 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Dec 2011 11:40:15 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Dec 2011 11:40:14 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 51A012388980
	for <commits@tuscany.apache.org>; Sun,  4 Dec 2011 11:39:53 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1210090 - in /tuscany/sca-java-1.x/trunk/samples:
 helloworld-ws-reference-secure/src/main/resources/definitions.xml
 helloworld-ws-service-secure/src/main/resources/definitions.xml
Date: Sun, 04 Dec 2011 11:39:53 -0000
To: commits@tuscany.apache.org
From: nash@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111204113953.51A012388980@eris.apache.org>

Author: nash
Date: Sun Dec  4 11:39:52 2011
New Revision: 1210090

URL: http://svn.apache.org/viewvc?rev=1210090&view=rev
Log:
TUSCANY-3990: Fix XML syntax errors

Modified:
    tuscany/sca-java-1.x/trunk/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
    tuscany/sca-java-1.x/trunk/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml

Modified: tuscany/sca-java-1.x/trunk/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml?rev=1210090&r1=1210089&r2=1210090&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml (original)
+++ tuscany/sca-java-1.x/trunk/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml Sun Dec  4 11:39:52 2011
@@ -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" 

Modified: tuscany/sca-java-1.x/trunk/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml?rev=1210090&r1=1210089&r2=1210090&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml (original)
+++ tuscany/sca-java-1.x/trunk/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml Sun Dec  4 11:39:52 2011
@@ -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"