cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r264772 - in /cocoon/branches/BRANCH_2_1_X/src/blocks/portal: java/org/apache/cocoon/portal/bridges/ mocks/ mocks/javax/ mocks/javax/servlet/ mocks/javax/servlet/http/
Date Tue, 30 Aug 2005 12:57:23 GMT
Author: cziegeler
Date: Tue Aug 30 05:57:18 2005
New Revision: 264772

URL: http://svn.apache.org/viewcvs?rev=264772&view=rev
Log:
Add mocks for servlet 2-3 spec

Added:
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletRequestWrapper.java
  (with props)
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletResponseWrapper.java
  (with props)
Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/bridges/ServletContextProviderImpl.java

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/bridges/ServletContextProviderImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/bridges/ServletContextProviderImpl.java?rev=264772&r1=264771&r2=264772&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/bridges/ServletContextProviderImpl.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/bridges/ServletContextProviderImpl.java
Tue Aug 30 05:57:18 2005
@@ -20,7 +20,9 @@
 import javax.portlet.PortletResponse;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
 
 import org.apache.pluto.core.impl.PortletContextImpl;
 import org.apache.portals.bridges.common.ServletContextProvider;
@@ -36,16 +38,14 @@
      * @see org.apache.portals.bridges.common.ServletContextProvider#getHttpServletRequest(javax.portlet.GenericPortlet,
javax.portlet.PortletRequest)
      */
     public HttpServletRequest getHttpServletRequest(GenericPortlet portlet, PortletRequest
request) {
-        //return (HttpServletRequest) ((HttpServletRequestWrapper) request).getRequest();
-        return null;
+        return (HttpServletRequest) ((HttpServletRequestWrapper) request).getRequest();
     }
 
     /**
      * @see org.apache.portals.bridges.common.ServletContextProvider#getHttpServletResponse(javax.portlet.GenericPortlet,
javax.portlet.PortletResponse)
      */
     public HttpServletResponse getHttpServletResponse(GenericPortlet portlet, PortletResponse
response) {
-        //return (HttpServletResponse) ((HttpServletResponseWrapper) response).getResponse();
-        return null;
+        return (HttpServletResponse) ((HttpServletResponseWrapper) response).getResponse();
     }
 
     /**

Added: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletRequestWrapper.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletRequestWrapper.java?rev=264772&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletRequestWrapper.java
(added)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletRequestWrapper.java
Tue Aug 30 05:57:18 2005
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed 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 License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.servlet.http;
+
+import javax.servlet.ServletRequest;
+
+/**
+ * Mock class providing the declarations required to compile the Cocoon code when
+ * the actual library is not present.
+ * 
+ * @version $Id$
+ */
+public class HttpServletRequestWrapper {
+
+    public ServletRequest getRequest() {
+        return null;
+    }
+}
\ No newline at end of file

Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletRequestWrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletRequestWrapper.java
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletResponseWrapper.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletResponseWrapper.java?rev=264772&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletResponseWrapper.java
(added)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletResponseWrapper.java
Tue Aug 30 05:57:18 2005
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed 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 License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.servlet.http;
+
+import javax.servlet.ServletResponse;
+
+/**
+ * Mock class providing the declarations required to compile the Cocoon code when
+ * the actual library is not present.
+ * 
+ * @version $Id$
+ */
+public class HttpServletResponseWrapper {
+
+    public ServletResponse getResponse() {
+        return null;
+    }
+}
\ No newline at end of file

Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletResponseWrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletResponseWrapper.java
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message