summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-05-18 16:47:22 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-05-18 16:47:22 +0000
commit716856b69ca7334bc684924fc9f71cdc1e92c5b9 (patch)
tree8736df97f9358213865b0a74a6b8568793e49677 /sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig
parent705ddd00290c06881dffc7dcbf38b3b130bfed76 (diff)
Change policySet namespace and reorder domain includes as workaround for TUSCANY-3562
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@945741 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig')
-rw-r--r--sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/domain.composite4
1 files changed, 3 insertions, 1 deletions
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/domain.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/domain.composite
index b26f71aa94..c54cfa3416 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/domain.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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" />