Author: rfeng
Date: Fri Sep 14 16:10:59 2007
New Revision: 575819
URL: http://svn.apache.org/viewvc?rev=575819&view=rev
Log:
Exclude servlet-api from the rampart.mar so that it won't be packaged into the
WAR
Modified:
incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml
Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml?rev=575819&r1=575818&r2=575819&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml Fri Sep 14
16:10:59 2007
@@ -44,13 +44,13 @@
<artifactId>tuscany-core</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-interface-wsdl-xml</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-assembly-xml</artifactId>
@@ -80,7 +80,7 @@
<artifactId>tuscany-host-http</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-policy-security</artifactId>
@@ -132,16 +132,16 @@
</dependency>
<dependency>
- <groupId>org.apache.woden</groupId>
- <artifactId>woden</artifactId>
- <version>1.0-incubating-M7b</version>
- <scope>runtime</scope>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ <version>1.0-incubating-M7b</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
@@ -153,7 +153,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version> <!-- to keep compatible with older servlet
containers -->
+ <version>2.4</version><!-- to keep compatible with older servlet
containers -->
<scope>provided</scope>
</dependency>
@@ -163,37 +163,37 @@
<artifactId>neethi</artifactId>
<version>2.0.2</version>
</dependency>
-
+
<dependency>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>1.3.2</version>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>1.3.2</version>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0.1</version>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.0.1</version>
</dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4</version>
</dependency>
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>2.2</version>
- <scope>runtime</scope>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>2.2</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- <scope>runtime</scope>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
@@ -221,55 +221,55 @@
<artifactId>axis2-mtompolicy</artifactId>
<version>1.3</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
<version>1.4.0</version>
</dependency>
-
+
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.0</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
<version>1.5.3</version>
</dependency>
-
+
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.03</version>
</dependency>
-
+
<dependency>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
<version>136</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-core</artifactId>
<version>1.3</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
<version>1.3</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
<version>1.3</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart</artifactId>
@@ -277,6 +277,10 @@
<type>mar</type>
<scope>runtime</scope>
<exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
