Author: nash
Date: Wed May 19 22:06:30 2010
New Revision: 946448
URL: http://svn.apache.org/viewvc?rev=946448&view=rev
Log:
Merge revision r945361 from 1.0 release branch
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml?rev=946448&r1=946447&r2=946448&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml
Wed May 19 22:06:30 2010
@@ -138,7 +138,6 @@
<include name="rampart-core-1.4.jar"/>
<include name="rampart-policy-1.4.jar"/>
<include name="rampart-trust-1.4.jar"/>
- <include name="servlet-api-2.5.jar"/>
<include name="stax-api-1.0-2.jar"/>
<include name="woden-api-1.0M8.jar"/>
<include name="woden-impl-dom-1.0M8.jar"/>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml?rev=946448&r1=946447&r2=946448&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml
Wed May 19 22:06:30 2010
@@ -57,6 +57,12 @@
<artifactId>scatours-contribution-creditcard-payment-jaxb</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
