Author: nash
Date: Wed May 19 22:07:54 2010
New Revision: 946450
URL: http://svn.apache.org/viewvc?rev=946450&view=rev
Log:
Merge revision r945740 from 1.0 release branch
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/META-INF/sca-contribution.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/META-INF/sca-contribution.xml?rev=946450&r1=946449&r2=946450&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/META-INF/sca-contribution.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/META-INF/sca-contribution.xml
Wed May 19 22:07:54 2010
@@ -19,6 +19,5 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:scatours="http://tuscanyscatours.com/";>
- <export.java package="com.tuscanyscatours.payment.creditcard" />
<deployable composite="scatours:creditcard" />
</contribution>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml?rev=946450&r1=946449&r2=946450&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml
Wed May 19 22:07:54 2010
@@ -19,6 +19,5 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:scatours="http://tuscanyscatours.com/";>
- <export.java package="com.tuscanyscatours.payment.creditcard" />
<deployable composite="scatours:creditcard" />
</contribution>
