You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/09/05 14:50:58 UTC
svn commit: r278731 - in
/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal:
coplet/adapter/impl/PortletAdapter.java pluto/PortletURLProviderImpl.java
pluto/servlet/ServletRequestImpl.java
Author: cziegeler
Date: Mon Sep 5 05:50:53 2005
New Revision: 278731
URL: http://svn.apache.org/viewcvs?rev=278731&view=rev
Log:
Clean up
Modified:
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/PortletAdapter.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/PortletAdapter.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/PortletAdapter.java?rev=278731&r1=278730&r2=278731&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/PortletAdapter.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/PortletAdapter.java Mon Sep 5 05:50:53 2005
@@ -395,6 +395,7 @@
final ServletRequestImpl req = (ServletRequestImpl) objectModel.get("portlet-request");
final ServletResponseImpl res= (ServletResponseImpl)objectModel.get("portlet-response");
this.portletContainer.processPortletAction(actionWindow, req.getRequest(actionWindow), res);
+ System.out.println("Redirecting**********************");
} catch (Exception ignore) {
this.getLogger().error("Error during processing of portlet action.", ignore);
}
@@ -417,7 +418,7 @@
final Map objectModel = aspectContext.getObjectModel();
// don't generate a response, if we issued a redirect
- if (objectModel.get("portlet-event") == null) {
+ if (objectModel.remove("portlet-event") == null) {
aspectContext.invokeNext(ch, parameters);
}
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java?rev=278731&r1=278730&r2=278731&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java Mon Sep 5 05:50:53 2005
@@ -74,7 +74,7 @@
/** The generated url */
protected String generatedURL;
- private LinkService linkService;
+ private final LinkService linkService;
private static final String DEFAULT_PORTLET_URL_REQUEST_PARAM = "url";
/**
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java?rev=278731&r1=278730&r2=278731&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java Mon Sep 5 05:50:53 2005
@@ -138,9 +138,10 @@
}
//get request params
- Enumeration parameters = this.request.getParameterNames();
+ /* Enumeration parameters = this.request.getParameterNames();
while (parameters.hasMoreElements()) {
String paramName = (String) parameters.nextElement();
+ System.out.println("Adding: " + paramName);
String[] paramValues =
this.request.getParameterValues(paramName);
String[] values =
@@ -164,7 +165,7 @@
paramValues = temp;
}
this.portletParameterMap.put(paramName, paramValues);
- }
+ }*/
}
}