diff options
| author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-05-19 22:08:36 +0000 |
|---|---|---|
| committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-05-19 22:08:36 +0000 |
| commit | adeaf6445e3ef333e4c73a852ebc5a5850139748 (patch) | |
| tree | 3adc47a76ed45bb956d91cb853da234f8fb1187b /sca-java-1.x/trunk/tutorials/travelsample | |
| parent | 8eb7d31d9cd517c7dffec16cbd9355aece79117f (diff) | |
Merge revision r945741 from 1.0 release branch
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@946451 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/trunk/tutorials/travelsample')
2 files changed, 5 insertions, 5 deletions
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/definitions.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/definitions.xml index 5a2c58eaed..a6b35f8e19 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/definitions.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/definitions.xml @@ -18,11 +18,9 @@ * under the License. --> <definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://itest/policy" + targetNamespace="http://www.osoa.org/xmlns/sca/1.0" xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0" - xmlns:ip="http://itest/policy" > - + xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"> <policySet name="BasicAuthenticationPolicySet" provides="authentication" diff --git a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite index b26f71aa94..c54cfa3416 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite +++ b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite @@ -23,8 +23,10 @@ xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0"
xmlns:ns2="http://tuscanyscatours.com/">
+ <include name="ns2:payment" uri="fullapp-payment" />
+ <!-- The include for ns2:creditcard was moved after the include for ns2:payment as a
+ workaround for TUSCANY-3561. See the comments in TUSCANY-3562 for more details. -->
<include name="ns2:creditcard" uri="fullapp-creditcard" />
- <include name="ns2:payment" uri="fullapp-payment" />
<include name="ns2:fullapp-shoppingcart" uri="fullapp-shoppingcart" />
<include name="ns2:fullapp-currency" uri="fullapp-currency" />
<include name="ns2:fullapp-packagedtrip" uri="fullapp-packagedtrip" />
|