Merge revision r945361 from 1.0 release branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@946448 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 6 insertions, 1 deletions

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml
index 0b3926e913..45441d3098 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml
@@ -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"/>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml
index 273072562f..ee066f9692 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml
@@ -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>