incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1141085 - in /sling/trunk/bundles/engine: pom.xml src/main/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapper.java
Date Wed, 29 Jun 2011 13:07:22 GMT
Author: cziegeler
Date: Wed Jun 29 13:07:21 2011
New Revision: 1141085

URL: http://svn.apache.org/viewvc?rev=1141085&view=rev
Log:
SLING-2116 : Support servlet api 2.5

Modified:
    sling/trunk/bundles/engine/pom.xml
    sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapper.java

Modified: sling/trunk/bundles/engine/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/pom.xml?rev=1141085&r1=1141084&r2=1141085&view=diff
==============================================================================
--- sling/trunk/bundles/engine/pom.xml (original)
+++ sling/trunk/bundles/engine/pom.xml Wed Jun 29 13:07:21 2011
@@ -129,6 +129,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>

Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapper.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapper.java?rev=1141085&r1=1141084&r2=1141085&view=diff
==============================================================================
--- sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapper.java
(original)
+++ sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapper.java
Wed Jun 29 13:07:21 2011
@@ -5,9 +5,9 @@
  * licenses this file to You under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -143,6 +143,10 @@ class ExternalServletContextWrapper impl
         return delegate.getServletContextName();
     }
 
+    public String getContextPath() {
+        return delegate.getContextPath();
+    }
+
     static class RequestDispatcherWrapper implements RequestDispatcher {
 
         private final RequestDispatcher delegate;



Mime
View raw message