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 21:12:19 UTC
svn commit: r278815 - in /cocoon/blocks/portal/trunk:
java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java pom.xml
Author: cziegeler
Date: Mon Sep 5 12:11:38 2005
New Revision: 278815
URL: http://svn.apache.org/viewcvs?rev=278815&view=rev
Log:
Fixing wrapper
Modified:
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java
cocoon/blocks/portal/trunk/pom.xml
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=278815&r1=278814&r2=278815&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 12:11:38 2005
@@ -39,8 +39,6 @@
/** Cache the parameter map */
protected Map portletParameterMap;
- final protected HttpServletRequest request;
-
final protected PortletURLProviderImpl provider;
protected PortletWindow window;
@@ -48,7 +46,6 @@
public ServletRequestImpl(HttpServletRequest request,
PortletURLProviderImpl provider) {
super(request);
- this.request = request;
this.provider = provider;
}
@@ -56,13 +53,12 @@
PortletURLProviderImpl provider,
PortletWindow window) {
super(request);
- this.request = request;
this.provider = provider;
this.window = window;
}
public ServletRequestImpl getRequest(PortletWindow window) {
- return new ServletRequestImpl(request, provider, window);
+ return new ServletRequestImpl((HttpServletRequest)this.getRequest(), provider, window);
}
/**
@@ -76,7 +72,6 @@
* @see javax.servlet.http.HttpServletRequest#getRequestURL()
*/
public StringBuffer getRequestURL() {
- //return this.request.getRequestURL();
return null;
}
@@ -115,37 +110,36 @@
* @see javax.servlet.ServletRequest#getParameterMap()
*/
public Map getParameterMap() {
- if (this.portletParameterMap == null) {
- // get control params
- this.portletParameterMap = new HashMap();
-
- if (this.provider != null
- && this.provider.getPortletWindow().equals(this.window)) {
- // get render parameters
- Iterator i = this.provider.getParameters().entrySet().iterator();
- while (i.hasNext()) {
- Map.Entry entry = (Map.Entry) i.next();
- // convert simple values to string arrays
- if (entry.getValue() instanceof String) {
- this.portletParameterMap.put(
- entry.getKey(),
- new String[] {(String) entry.getValue()});
- } else {
- this.portletParameterMap.put(
- entry.getKey(),
- entry.getValue());
- }
+ // TODO - readd caching
+ // get control params
+ this.portletParameterMap = new HashMap();
+
+ if (this.provider != null
+ && this.provider.getPortletWindow().equals(this.window)) {
+ // get render parameters
+ Iterator i = this.provider.getParameters().entrySet().iterator();
+ while (i.hasNext()) {
+ Map.Entry entry = (Map.Entry) i.next();
+ // convert simple values to string arrays
+ if (entry.getValue() instanceof String) {
+ this.portletParameterMap.put(
+ entry.getKey(),
+ new String[] {(String) entry.getValue()});
+ } else {
+ this.portletParameterMap.put(
+ entry.getKey(),
+ entry.getValue());
}
+ }
- //get request params
- /* Enumeration parameters = this.request.getParameterNames();
- while (parameters.hasMoreElements()) {
- String paramName = (String) parameters.nextElement();
- String[] paramValues =
- this.request.getParameterValues(paramName);
- String[] values =
- (String[]) this.portletParameterMap.get(paramName);
+ //get request params
+ Enumeration parameters = this.getRequest().getParameterNames();
+ while (parameters.hasMoreElements()) {
+ String paramName = (String) parameters.nextElement();
+ String[] paramValues = this.getRequest().getParameterValues(paramName);
+ String[] values = (String[]) this.portletParameterMap.get(paramName);
+ if ( !paramName.startsWith("cocoon-") ) {
if (values != null) {
String[] temp =
new String[paramValues.length + values.length];
@@ -164,7 +158,7 @@
paramValues = temp;
}
this.portletParameterMap.put(paramName, paramValues);
- }*/
+ }
}
}
Modified: cocoon/blocks/portal/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/pom.xml?rev=278815&r1=278814&r2=278815&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/pom.xml (original)
+++ cocoon/blocks/portal/trunk/pom.xml Mon Sep 5 12:11:38 2005
@@ -48,9 +48,85 @@
</dependency>
<dependency>
<groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-cron</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+<!--
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-forms</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>apache-cocoon</groupId>
<artifactId>cocoon-session-fw</artifactId>
<version>2.2-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-saaj</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-jaxrpc</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-wsdl4j</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>castor</groupId>
+ <artifactId>castor</artifactId>
+ <version>0.9.7</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>jtidy</groupId>
+ <artifactId>jtidy</artifactId>
+ <version>4aug2000r7-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto</artifactId>
+ <version>1.0.1-rc4</version>
+ </dependency>
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>servletapi</groupId>
+ <artifactId>servletapi</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+<!--
+ <library name="nekohtml"/>
+ <library name="portals-bridges-common"/>
+ <library name="cowarp"/>
+ <library name="wsrp4j-shared"/>
+ <library name="wsrp4j-consumer"/>
+ -->
</dependencies>
<repositories>
<repository>