Author: nico
Date: 2010-03-05 15:17:27 +0100 (Fri, 05 Mar 2010)
New Revision: 41278
Added:
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/core/
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/core/impl/
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/core/impl/RenderResponseImpl.java
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/factory/
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/factory/impl/
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/factory/impl/RenderResponseFactoryImpl.java
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/core/
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/core/impl/
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/core/impl/RenderResponseImpl.java
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/factory/
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/factory/impl/
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/factory/impl/RenderResponseFactoryImpl.java
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation/PortletFragment.java
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/webapp/WEB-INF/config/services/FactoryManagerService.properties
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/JspPortlet.java
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation/PortletFragment.java
CMSContainer/trunk/CMSContainer/cmsc/portal/src/webapp/WEB-INF/config/services/FactoryManagerService.properties
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/JspPortlet.java
Log:
CMSC-1652 Portlets can not have a jspx view.
Added:
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/core/impl/RenderResponseImpl.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/core/impl/RenderResponseImpl.java
(rev 0)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/core/impl/RenderResponseImpl.java
2010-03-05 14:17:27 UTC (rev 41278)
@@ -0,0 +1,23 @@
+package com.finalist.cmsc.portalImpl.core.impl;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.pluto.om.window.PortletWindow;
+
+
+public class RenderResponseImpl extends
org.apache.pluto.core.impl.RenderResponseImpl {
+
+ public RenderResponseImpl(PortletWindow portletWindow, HttpServletRequest
servletRequest,
+ HttpServletResponse servletResponse, boolean
containerSupportsBuffering) {
+ super(portletWindow, servletRequest, servletResponse,
containerSupportsBuffering);
+ }
+
+ @Override
+ public void setContentType(String type) {
+ if (!isIncluded()) {
+ super.setContentType(type);
+ }
+ }
+
+}
Added:
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/factory/impl/RenderResponseFactoryImpl.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/factory/impl/RenderResponseFactoryImpl.java
(rev 0)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/factory/impl/RenderResponseFactoryImpl.java
2010-03-05 14:17:27 UTC (rev 41278)
@@ -0,0 +1,28 @@
+package com.finalist.cmsc.portalImpl.factory.impl;
+
+import javax.portlet.RenderResponse;
+
+import org.apache.pluto.factory.RenderResponseFactory;
+import org.apache.pluto.om.window.PortletWindow;
+
+import com.finalist.cmsc.portalImpl.core.impl.RenderResponseImpl;
+
+/**
+ * this factory creates a RenderResponse which works for jsp and jspx files
+ */
+public class RenderResponseFactoryImpl implements RenderResponseFactory {
+
+ public void init(javax.servlet.ServletConfig config, java.util.Map
properties) throws Exception {
+ }
+
+ public RenderResponse getRenderResponse(PortletWindow portletWindow,
+ javax.servlet.http.HttpServletRequest servletRequest,
+ javax.servlet.http.HttpServletResponse servletResponse, boolean
containerSupportsBuffering) {
+ RenderResponse renderResponse = new RenderResponseImpl(portletWindow,
servletRequest,
+ servletResponse, containerSupportsBuffering);
+ return renderResponse;
+ }
+
+ public void destroy() throws Exception {
+ }
+}
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation/PortletFragment.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation/PortletFragment.java
2010-03-05 14:04:53 UTC (rev 41277)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation/PortletFragment.java
2010-03-05 14:17:27 UTC (rev 41278)
@@ -46,7 +46,6 @@
import
com.finalist.pluto.portalImpl.om.servlet.impl.WebApplicationDefinitionImpl;
import com.finalist.pluto.portalImpl.om.window.impl.PortletWindowImpl;
import com.finalist.pluto.portalImpl.servlet.ServletObjectAccess;
-import com.finalist.pluto.portalImpl.servlet.ServletResponseImpl;
/**
* <p>
@@ -307,8 +306,7 @@
PrintWriter writer2 = new PrintWriter(storedWriter);
// create a wrapped response which the Portlet will be rendered to
- ServletResponseImpl wrappedResponse = (ServletResponseImpl)
ServletObjectAccess.getStoredServletResponse(
- response, writer2);
+ HttpServletResponse wrappedResponse =
ServletObjectAccess.getStoredServletResponse(response, writer2);
try {
// render the Portlet to the wrapped response, to be output
@@ -334,7 +332,6 @@
catch (Exception e) {
writer2.println(getErrorMsg(e));
}
-
}
else {
log.error("Error no servletDefinition!!!");
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/webapp/WEB-INF/config/services/FactoryManagerService.properties
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/webapp/WEB-INF/config/services/FactoryManagerService.properties
2010-03-05 14:04:53 UTC (rev 41277)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/portal/src/webapp/WEB-INF/config/services/FactoryManagerService.properties
2010-03-05 14:17:27 UTC (rev 41278)
@@ -23,7 +23,7 @@
factory.javax.portlet.ActionRequest =
org.apache.pluto.factory.impl.ActionRequestFactoryImpl
factory.javax.portlet.RenderRequest =
org.apache.pluto.factory.impl.RenderRequestFactoryImpl
factory.javax.portlet.RenderRequest.myproperty = myvalue
-factory.javax.portlet.RenderResponse =
org.apache.pluto.factory.impl.RenderResponseFactoryImpl
+factory.javax.portlet.RenderResponse =
com.finalist.cmsc.portalImpl.factory.impl.RenderResponseFactoryImpl
factory.javax.portlet.PortletSession =
org.apache.pluto.factory.impl.PortletSessionFactoryImpl
factory.javax.portlet.PortletConfig =
org.apache.pluto.factory.impl.PortletConfigFactoryImpl
factory.javax.portlet.PortletContext =
org.apache.pluto.factory.impl.PortletContextFactoryImpl
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/JspPortlet.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/JspPortlet.java
2010-03-05 14:04:53 UTC (rev 41277)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/JspPortlet.java
2010-03-05 14:17:27 UTC (rev 41278)
@@ -19,7 +19,6 @@
import javax.portlet.RenderResponse;
import com.finalist.cmsc.portalImpl.PortalConstants;
-import com.finalist.pluto.portalImpl.core.CmscPortletMode;
/**
* @author Wouter Heijke
@@ -38,24 +37,13 @@
getLogger().debug("===>MenuPortlet.EDIT mode");
PortletPreferences preferences = request.getPreferences();
String portletId =
preferences.getValue(PortalConstants.CMSC_OM_PORTLET_ID, null);
-
- String action = request.getParameter("action");
- if (action == null) {
- response.setPortletMode(CmscPortletMode.EDIT_DEFAULTS);
+ if (portletId != null) {
+ // get the values submitted with the form
+ setPortletView(portletId, request.getParameter(VIEW));
}
- else
- if (action.equals("edit")) {
- if (portletId != null) {
- // get the values submitted with the form
- setPortletView(portletId, request.getParameter(VIEW));
- }
- else {
- getLogger().error("No portletId");
- }
- }
- else {
- getLogger().error("Unknown action: '" + action + "'");
- }
+ else {
+ getLogger().error("No portletId");
+ }
super.processEditDefaults(request, response);
}
Added:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/core/impl/RenderResponseImpl.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/core/impl/RenderResponseImpl.java
(rev 0)
+++
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/core/impl/RenderResponseImpl.java
2010-03-05 14:17:27 UTC (rev 41278)
@@ -0,0 +1,23 @@
+package com.finalist.cmsc.portalImpl.core.impl;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.pluto.om.window.PortletWindow;
+
+
+public class RenderResponseImpl extends
org.apache.pluto.core.impl.RenderResponseImpl {
+
+ public RenderResponseImpl(PortletWindow portletWindow, HttpServletRequest
servletRequest,
+ HttpServletResponse servletResponse, boolean
containerSupportsBuffering) {
+ super(portletWindow, servletRequest, servletResponse,
containerSupportsBuffering);
+ }
+
+ @Override
+ public void setContentType(String type) {
+ if (!isIncluded()) {
+ super.setContentType(type);
+ }
+ }
+
+}
Added:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/factory/impl/RenderResponseFactoryImpl.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/factory/impl/RenderResponseFactoryImpl.java
(rev 0)
+++
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/factory/impl/RenderResponseFactoryImpl.java
2010-03-05 14:17:27 UTC (rev 41278)
@@ -0,0 +1,28 @@
+package com.finalist.cmsc.portalImpl.factory.impl;
+
+import javax.portlet.RenderResponse;
+
+import org.apache.pluto.factory.RenderResponseFactory;
+import org.apache.pluto.om.window.PortletWindow;
+
+import com.finalist.cmsc.portalImpl.core.impl.RenderResponseImpl;
+
+/**
+ * this factory creates a RenderResponse which works for jsp and jspx files
+ */
+public class RenderResponseFactoryImpl implements RenderResponseFactory {
+
+ public void init(javax.servlet.ServletConfig config, java.util.Map
properties) throws Exception {
+ }
+
+ public RenderResponse getRenderResponse(PortletWindow portletWindow,
+ javax.servlet.http.HttpServletRequest servletRequest,
+ javax.servlet.http.HttpServletResponse servletResponse, boolean
containerSupportsBuffering) {
+ RenderResponse renderResponse = new RenderResponseImpl(portletWindow,
servletRequest,
+ servletResponse, containerSupportsBuffering);
+ return renderResponse;
+ }
+
+ public void destroy() throws Exception {
+ }
+}
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation/PortletFragment.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation/PortletFragment.java
2010-03-05 14:04:53 UTC (rev 41277)
+++
CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/aggregation/PortletFragment.java
2010-03-05 14:17:27 UTC (rev 41278)
@@ -46,7 +46,6 @@
import
com.finalist.pluto.portalImpl.om.servlet.impl.WebApplicationDefinitionImpl;
import com.finalist.pluto.portalImpl.om.window.impl.PortletWindowImpl;
import com.finalist.pluto.portalImpl.servlet.ServletObjectAccess;
-import com.finalist.pluto.portalImpl.servlet.ServletResponseImpl;
/**
* <p>
@@ -307,8 +306,7 @@
PrintWriter writer2 = new PrintWriter(storedWriter);
// create a wrapped response which the Portlet will be rendered to
- ServletResponseImpl wrappedResponse = (ServletResponseImpl)
ServletObjectAccess.getStoredServletResponse(
- response, writer2);
+ HttpServletResponse wrappedResponse =
ServletObjectAccess.getStoredServletResponse(response, writer2);
try {
// render the Portlet to the wrapped response, to be output
@@ -334,7 +332,6 @@
catch (Exception e) {
writer2.println(getErrorMsg(e));
}
-
}
else {
log.error("Error no servletDefinition!!!");
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portal/src/webapp/WEB-INF/config/services/FactoryManagerService.properties
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/portal/src/webapp/WEB-INF/config/services/FactoryManagerService.properties
2010-03-05 14:04:53 UTC (rev 41277)
+++
CMSContainer/trunk/CMSContainer/cmsc/portal/src/webapp/WEB-INF/config/services/FactoryManagerService.properties
2010-03-05 14:17:27 UTC (rev 41278)
@@ -23,7 +23,7 @@
factory.javax.portlet.ActionRequest =
org.apache.pluto.factory.impl.ActionRequestFactoryImpl
factory.javax.portlet.RenderRequest =
org.apache.pluto.factory.impl.RenderRequestFactoryImpl
factory.javax.portlet.RenderRequest.myproperty = myvalue
-factory.javax.portlet.RenderResponse =
org.apache.pluto.factory.impl.RenderResponseFactoryImpl
+factory.javax.portlet.RenderResponse =
com.finalist.cmsc.portalImpl.factory.impl.RenderResponseFactoryImpl
factory.javax.portlet.PortletSession =
org.apache.pluto.factory.impl.PortletSessionFactoryImpl
factory.javax.portlet.PortletConfig =
org.apache.pluto.factory.impl.PortletConfigFactoryImpl
factory.javax.portlet.PortletContext =
org.apache.pluto.factory.impl.PortletContextFactoryImpl
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/JspPortlet.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/JspPortlet.java
2010-03-05 14:04:53 UTC (rev 41277)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/JspPortlet.java
2010-03-05 14:17:27 UTC (rev 41278)
@@ -19,7 +19,6 @@
import javax.portlet.RenderResponse;
import com.finalist.cmsc.portalImpl.PortalConstants;
-import com.finalist.pluto.portalImpl.core.CmscPortletMode;
/**
* @author Wouter Heijke
@@ -38,24 +37,13 @@
getLogger().debug("===>MenuPortlet.EDIT mode");
PortletPreferences preferences = request.getPreferences();
String portletId =
preferences.getValue(PortalConstants.CMSC_OM_PORTLET_ID, null);
-
- String action = request.getParameter("action");
- if (action == null) {
- response.setPortletMode(CmscPortletMode.EDIT_DEFAULTS);
+ if (portletId != null) {
+ // get the values submitted with the form
+ setPortletView(portletId, request.getParameter(VIEW));
}
- else
- if (action.equals("edit")) {
- if (portletId != null) {
- // get the values submitted with the form
- setPortletView(portletId, request.getParameter(VIEW));
- }
- else {
- getLogger().error("No portletId");
- }
- }
- else {
- getLogger().error("Unknown action: '" + action + "'");
- }
+ else {
+ getLogger().error("No portletId");
+ }
super.processEditDefaults(request, response);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
