ate 2004/08/04 14:05:28
Modified: commons/src/java/org/apache/jetspeed/portlet
ServletContextProviderImpl.java
portals-bridges/struts/src/java/org/apache/portals/bridges/struts
StrutsPortlet.java
Added: portals-bridges/common/src/java/org/apache/portals/bridges/common
ServletContextProvider.java
Removed: portals-bridges/common/src/java/org/apache/portals/bridges/common
StrutsServletContextProvider.java
Log:
Accidently forgot to rename StrutsServletContextProvider to the more generic
ServletContextProvider as I indicated in my message to the list
Revision Changes Path
1.2 +3 -3
jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/portlet/ServletContextProviderImpl.java
Index: ServletContextProviderImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/portlet/ServletContextProviderImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletContextProviderImpl.java 29 Jul 2004 22:25:51 -0000 1.1
+++ ServletContextProviderImpl.java 4 Aug 2004 21:05:28 -0000 1.2
@@ -25,7 +25,7 @@
import javax.servlet.http.HttpServletResponseWrapper;
import org.apache.jetspeed.container.JetspeedPortletContext;
-import org.apache.portals.bridges.common.StrutsServletContextProvider;
+import org.apache.portals.bridges.common.ServletContextProvider;
/**
* ServletContextProviderImpl supplies access to the
@@ -33,7 +33,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Ate Douma</a>
* @version $Id$
*/
-public class ServletContextProviderImpl implements StrutsServletContextProvider
+public class ServletContextProviderImpl implements ServletContextProvider
{
public ServletContext getServletContext(GenericPortlet portlet)
{
1.2 +6 -6
jakarta-jetspeed-2/portals-bridges/struts/src/java/org/apache/portals/bridges/struts/StrutsPortlet.java
Index: StrutsPortlet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portals-bridges/struts/src/java/org/apache/portals/bridges/struts/StrutsPortlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StrutsPortlet.java 29 Jul 2004 22:16:40 -0000 1.1
+++ StrutsPortlet.java 4 Aug 2004 21:05:28 -0000 1.2
@@ -35,7 +35,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.portals.bridges.common.StrutsServletContextProvider;
+import org.apache.portals.bridges.common.ServletContextProvider;
import org.apache.portals.bridges.struts.util.EmptyHttpServletResponseImpl;
/**
@@ -47,7 +47,7 @@
public class StrutsPortlet extends GenericPortlet
{
/**
- * Name of class implementing [EMAIL PROTECTED] StrutsServletContextProvider}
+ * Name of class implementing [EMAIL PROTECTED] ServletContextProvider}
*/
public static final String PARAM_SERVLET_CONTEXT_PROVIDER =
"ServletContextProvider";
/**
@@ -90,7 +90,7 @@
* Default URL for the view page.
*/
private String defaultViewPage = null;
- private StrutsServletContextProvider servletContextProvider;
+ private ServletContextProvider servletContextProvider;
private static final Log log = LogFactory.getLog(StrutsPortlet.class);
public static final String REQUEST_TYPE =
"org.apache.portals.bridges.struts.request_type";
public static final String PAGE_URL =
"org.apache.portals.bridges.struts.page_url";
@@ -120,8 +120,8 @@
if (clazz != null)
{
Object obj = clazz.newInstance();
- if (StrutsServletContextProvider.class.isInstance(obj))
- servletContextProvider = (StrutsServletContextProvider) obj;
+ if (ServletContextProvider.class.isInstance(obj))
+ servletContextProvider = (ServletContextProvider) obj;
else
throw new PortletException("class not found");
}
1.1
jakarta-jetspeed-2/portals-bridges/common/src/java/org/apache/portals/bridges/common/ServletContextProvider.java
Index: ServletContextProvider.java
===================================================================
/*
* Copyright 2000-2004 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 org.apache.portals.bridges.common;
import javax.portlet.GenericPortlet;
import javax.portlet.PortletRequest;
import javax.portlet.PortletResponse;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
* ServletContextProvider
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ate Douma</a>
* @version $Id: ServletContextProvider.java,v 1.1 2004/08/04 21:05:28 ate Exp $
*/
public interface ServletContextProvider
{
ServletContext getServletContext(GenericPortlet portlet);
HttpServletRequest getHttpServletRequest(GenericPortlet portlet, PortletRequest
request);
HttpServletResponse getHttpServletResponse(GenericPortlet portlet,
PortletResponse response);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
