cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r441952 - in /cocoon/trunk: blocks/cocoon-auth/cocoon-auth-impl/ blocks/cocoon-axis/cocoon-axis-impl/ blocks/cocoon-batik/cocoon-batik-impl/ blocks/cocoon-chaperon/cocoon-chaperon-impl/ blocks/cocoon-databases/cocoon-databases-hsqldb-client...
Date Sun, 10 Sep 2006 14:12:33 GMT
Author: cziegeler
Date: Sun Sep 10 07:12:31 2006
New Revision: 441952

URL: http://svn.apache.org/viewvc?view=rev&rev=441952
Log:
Update to servlet 2.4

Modified:
    cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/pom.xml
    cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/pom.xml
    cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml
    cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-oracle-client/pom.xml
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-postgresql-client/pom.xml
    cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/pom.xml
    cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/src/main/java/org/apache/cocoon/components/deli/DeliImpl.java
    cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml
    cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/pom.xml
    cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/pom.xml
    cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/pom.xml
    cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/src/main/java/org/apache/cocoon/components/jsp/JSPEngineServletRequest.java
    cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/src/main/java/org/apache/cocoon/components/jsp/JSPEngineServletResponse.java
    cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/pom.xml
    cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/src/main/java/weblogic/servlet/internal/ServletResponseImpl.java
    cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml
    cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/pom.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-bridges-impl/pom.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/pom.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/pom.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/pom.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/pom.xml
    cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-impl/pom.xml
    cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/pom.xml
    cocoon/trunk/blocks/cocoon-slide/cocoon-slide-impl/pom.xml
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml
    cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-impl/pom.xml
    cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
    cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo1/pom.xml
    cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo2/pom.xml
    cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml
    cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml
    cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockCallHttpServletRequest.java
    cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockCallHttpServletResponse.java
    cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml
    cocoon/trunk/core/cocoon-bootstrap/pom.xml
    cocoon/trunk/core/cocoon-core/pom.xml

Modified: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/pom.xml Sun Sep 10 07:12:31 2006
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/pom.xml Sun Sep 10 07:12:31 2006
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml Sun Sep 10 07:12:31 2006
@@ -156,7 +156,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml Sun Sep 10 07:12:31 2006
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
 <!--  test dependencies  -->

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml Sun Sep 10
07:12:31 2006
@@ -46,9 +46,9 @@
       <version>1.8.0.2</version>
     </dependency>
     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml Sun Sep 10 07:12:31
2006
@@ -41,9 +41,9 @@
       <version>2.2.0-M2-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-oracle-client/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-oracle-client/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-oracle-client/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-oracle-client/pom.xml Sun Sep 10
07:12:31 2006
@@ -41,9 +41,9 @@
       <version>2.2.0-M2-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-postgresql-client/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-postgresql-client/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-postgresql-client/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-postgresql-client/pom.xml Sun Sep
10 07:12:31 2006
@@ -41,9 +41,9 @@
       <version>2.2.0-M2-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/pom.xml Sun Sep 10 07:12:31 2006
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/src/main/java/org/apache/cocoon/components/deli/DeliImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/src/main/java/org/apache/cocoon/components/deli/DeliImpl.java?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/src/main/java/org/apache/cocoon/components/deli/DeliImpl.java
(original)
+++ cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/src/main/java/org/apache/cocoon/components/deli/DeliImpl.java
Sun Sep 10 07:12:31 2006
@@ -326,6 +326,26 @@
         /** @deprecated use {@link #isRequestedSessionIdFromURL()} instead */
         public boolean isRequestedSessionIdFromUrl() { return false; }
         public int getIntHeader(String s) { return 0; }
+
+        public String getLocalAddr() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        public String getLocalName() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        public int getLocalPort() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        public int getRemotePort() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
     }
 
 }

Modified: cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml Sun Sep 10 07:12:31
2006
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/pom.xml Sun Sep 10 07:12:31 2006
@@ -46,9 +46,9 @@
       <version>1.8.0.2</version>
     </dependency>
     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/pom.xml Sun Sep 10 07:12:31 2006
@@ -51,9 +51,9 @@
       <version>0.9.5</version>
     </dependency>
     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/pom.xml Sun Sep 10 07:12:31 2006
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/src/main/java/org/apache/cocoon/components/jsp/JSPEngineServletRequest.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/src/main/java/org/apache/cocoon/components/jsp/JSPEngineServletRequest.java?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/src/main/java/org/apache/cocoon/components/jsp/JSPEngineServletRequest.java
(original)
+++ cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/src/main/java/org/apache/cocoon/components/jsp/JSPEngineServletRequest.java
Sun Sep 10 07:12:31 2006
@@ -102,4 +102,8 @@
     public java.lang.StringBuffer getRequestURL() { return null; }
     public java.util.Map getParameterMap() { return null; }
     public void setCharacterEncoding(java.lang.String s) { }
+    public String getLocalAddr() { return request.getLocalAddr(); }
+    public String getLocalName() { return request.getLocalName(); }
+    public int getLocalPort() { return request.getLocalPort(); }
+    public int getRemotePort() { return request.getRemotePort(); }
 }

Modified: cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/src/main/java/org/apache/cocoon/components/jsp/JSPEngineServletResponse.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/src/main/java/org/apache/cocoon/components/jsp/JSPEngineServletResponse.java?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/src/main/java/org/apache/cocoon/components/jsp/JSPEngineServletResponse.java
(original)
+++ cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/src/main/java/org/apache/cocoon/components/jsp/JSPEngineServletResponse.java
Sun Sep 10 07:12:31 2006
@@ -129,5 +129,7 @@
     public void setBufferSize(int size) {}
     public void flushBuffer() throws IOException {}
     public boolean isCommitted() { return false; }
+    public String getContentType() { return servletResponse.getContentType(); }
+    public void setCharacterEncoding(String arg0) { servletResponse.setCharacterEncoding(arg0);
}
 
 }

Modified: cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/pom.xml Sun Sep 10 07:12:31 2006
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/src/main/java/weblogic/servlet/internal/ServletResponseImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/src/main/java/weblogic/servlet/internal/ServletResponseImpl.java?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/src/main/java/weblogic/servlet/internal/ServletResponseImpl.java
(original)
+++ cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/src/main/java/weblogic/servlet/internal/ServletResponseImpl.java
Sun Sep 10 07:12:31 2006
@@ -184,4 +184,12 @@
 
     public void setupOutputStream(ServletOutputStream anOutputStream) {
     }
+
+    public String getContentType() {
+        return null;
+    }
+
+    public void setCharacterEncoding(String arg0) {
+    }
+
 }

Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml Sun Sep 10 07:12:31 2006
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/pom.xml Sun Sep 10 07:12:31 2006
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-bridges-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-bridges-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-bridges-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-bridges-impl/pom.xml Sun Sep 10 07:12:31
2006
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml Sun Sep 10 07:12:31 2006
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/pom.xml Sun Sep 10 07:12:31
2006
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/pom.xml Sun Sep 10 07:12:31
2006
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/pom.xml Sun Sep 10 07:12:31
2006
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/pom.xml Sun Sep 10 07:12:31
2006
@@ -92,7 +92,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-impl/pom.xml Sun Sep 10 07:12:31 2006
@@ -46,9 +46,9 @@
       <version>2.0.2</version>
     </dependency>
     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/pom.xml Sun Sep 10 07:12:31
2006
@@ -111,7 +111,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: cocoon/trunk/blocks/cocoon-slide/cocoon-slide-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-slide/cocoon-slide-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-slide/cocoon-slide-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-slide/cocoon-slide-impl/pom.xml Sun Sep 10 07:12:31 2006
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml Sun Sep 10 07:12:31 2006
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-impl/pom.xml Sun Sep 10 07:12:31 2006
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml Sun Sep 10 07:12:31 2006
@@ -122,7 +122,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo1/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo1/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo1/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo1/pom.xml Sun Sep 10 07:12:31
2006
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo2/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo2/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo2/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo2/pom.xml Sun Sep 10 07:12:31
2006
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml Sun Sep 10 07:12:31
2006
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml Sun Sep 10 07:12:31 2006
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockCallHttpServletRequest.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockCallHttpServletRequest.java?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockCallHttpServletRequest.java
(original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockCallHttpServletRequest.java
Sun Sep 10 07:12:31 2006
@@ -422,4 +422,25 @@
     public void setCharacterEncoding(String encoding) throws UnsupportedEncodingException
{
         this.encoding = encoding;
     }
+
+    public String getLocalAddr() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public String getLocalName() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public int getLocalPort() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    public int getRemotePort() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
 }

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockCallHttpServletResponse.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockCallHttpServletResponse.java?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockCallHttpServletResponse.java
(original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockCallHttpServletResponse.java
Sun Sep 10 07:12:31 2006
@@ -286,4 +286,14 @@
     public void setStatus(int sc, String sm) {
         // Ignore
     }
+
+    public String getContentType() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public void setCharacterEncoding(String arg0) {
+        // TODO Auto-generated method stub
+        
+    }
 }

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml Sun Sep 10 07:12:31
2006
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: cocoon/trunk/core/cocoon-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/pom.xml (original)
+++ cocoon/trunk/core/cocoon-bootstrap/pom.xml Sun Sep 10 07:12:31 2006
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/core/cocoon-core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/pom.xml?view=diff&rev=441952&r1=441951&r2=441952
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Sun Sep 10 07:12:31 2006
@@ -287,7 +287,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>



Mime
View raw message