You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/03/09 22:23:21 UTC
svn commit: r516556 - in /incubator/tuscany/branches/sca-java-integration:
samples/sca/bigbank/account/ samples/sca/bigbank/webclient/ sca/
sca/extensions/axis2/binding/
sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/
sca/e...
Author: jsdelfino
Date: Fri Mar 9 13:23:20 2007
New Revision: 516556
URL: http://svn.apache.org/viewvc?view=rev&rev=516556
Log:
Using a consistent level of servlet API across modules as Jetty6 and Tomcat6 depend on javax.servlet 2.5. Added one method to the Axis2 binding impl of ServletContext required in 2.5.
Modified:
incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/account/pom.xml
incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/webclient/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceServlet.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/kernel/core/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/kernel/host-api/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/services/transports/http.jetty/pom.xml
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/account/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/account/pom.xml?view=diff&rev=516556&r1=516555&r2=516556
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/account/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/account/pom.xml Fri Mar 9 13:23:20 2007
@@ -78,7 +78,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/webclient/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/webclient/pom.xml?view=diff&rev=516556&r1=516555&r2=516556
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/webclient/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/bigbank/webclient/pom.xml Fri Mar 9 13:23:20 2007
@@ -75,7 +75,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/pom.xml?view=diff&rev=516556&r1=516555&r2=516556
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/pom.xml Fri Mar 9 13:23:20 2007
@@ -62,6 +62,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.5</version>
</dependency>
<dependency>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceServlet.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceServlet.java?view=diff&rev=516556&r1=516555&r2=516556
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceServlet.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceServlet.java Fri Mar 9 13:23:20 2007
@@ -86,6 +86,10 @@
public ServletContext getContext(String uripath) {
return null;
}
+
+ public String getContextPath() {
+ return null;
+ }
public int getMajorVersion() {
return 0;
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/pom.xml?view=diff&rev=516556&r1=516555&r2=516556
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/pom.xml Fri Mar 9 13:23:20 2007
@@ -47,6 +47,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.5</version>
</dependency>
<dependency>
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/pom.xml?view=diff&rev=516556&r1=516555&r2=516556
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/pom.xml Fri Mar 9 13:23:20 2007
@@ -57,6 +57,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.5</version>
</dependency>
<dependency>
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/host-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/host-api/pom.xml?view=diff&rev=516556&r1=516555&r2=516556
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/host-api/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/host-api/pom.xml Fri Mar 9 13:23:20 2007
@@ -39,6 +39,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.5</version>
</dependency>
<dependency>
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/pom.xml?view=diff&rev=516556&r1=516555&r2=516556
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/pom.xml Fri Mar 9 13:23:20 2007
@@ -45,6 +45,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.5</version>
</dependency>
<dependency>
Modified: incubator/tuscany/branches/sca-java-integration/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/pom.xml?view=diff&rev=516556&r1=516555&r2=516556
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/pom.xml Fri Mar 9 13:23:20 2007
@@ -82,7 +82,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
<!-- javax.resource API -->
Modified: incubator/tuscany/branches/sca-java-integration/sca/services/transports/http.jetty/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/services/transports/http.jetty/pom.xml?view=diff&rev=516556&r1=516555&r2=516556
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/transports/http.jetty/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/services/transports/http.jetty/pom.xml Fri Mar 9 13:23:20 2007
@@ -50,6 +50,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.5</version>
<scope>compile</scope>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org