Author: nash
Date: Wed May 19 22:08:36 2010
New Revision: 946451
URL: http://svn.apache.org/viewvc?rev=946451&view=rev
Log:
Merge revision r945741 from 1.0 release branch
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/definitions.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/definitions.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/definitions.xml?rev=946451&r1=946450&r2=946451&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/definitions.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/definitions.xml
Wed May 19 22:08:36 2010
@@ -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"
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite?rev=946451&r1=946450&r2=946451&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite
Wed May 19 22:08:36 2010
@@ -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" />
