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/02 10:45:25 UTC
svn commit: r267121 - in
/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto:
om/PortletDefinitionRegistryImpl.java servlet/ServletRequestImpl.java
Author: cziegeler
Date: Fri Sep 2 01:45:19 2005
New Revision: 267121
URL: http://svn.apache.org/viewcvs?rev=267121&view=rev
Log:
Fix class cast exception
Modified:
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java?rev=267121&r1=267120&r2=267121&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java Fri Sep 2 01:45:19 2005
@@ -17,7 +17,6 @@
import java.io.File;
import java.io.FileInputStream;
-import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -45,12 +44,6 @@
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.xml.EntityResolver;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
-import org.apache.pluto.descriptors.services.PortletAppDescriptorService;
-import org.apache.pluto.descriptors.services.WebAppDescriptorService;
-import org.apache.pluto.descriptors.services.impl.FilePortletAppDescriptorServiceImpl;
-import org.apache.pluto.descriptors.services.impl.FileWebAppDescriptorServiceImpl;
-import org.apache.pluto.descriptors.servlet.WebAppDD;
import org.apache.pluto.om.common.ObjectID;
import org.apache.pluto.om.entity.PortletApplicationEntityList;
import org.apache.pluto.om.entity.PortletApplicationEntityListCtrl;
@@ -327,7 +320,7 @@
load(portletSource, webSource, webModule, portletXMLMapping, webXMLMapping);
}
}
-
+/*
private void loadWebApp(String baseDir,
String webModule) {
final File directory = new File(baseDir + webModule);
@@ -361,7 +354,7 @@
}
}
-
+*/
private void load(InputSource portletXml, InputSource webXml, String webModule,
Mapping portletXMLMapping, Mapping webXMLMapping) throws Exception {
if (this.getLogger().isDebugEnabled()) {
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=267121&r1=267120&r2=267121&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 Fri Sep 2 01:45:19 2005
@@ -65,18 +65,14 @@
return new ServletRequestImpl(request, provider, window);
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see javax.servlet.http.HttpServletRequest#getQueryString()
*/
public String getQueryString() {
return null;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see javax.servlet.http.HttpServletRequest#getRequestURL()
*/
public StringBuffer getRequestURL() {
@@ -84,9 +80,7 @@
return null;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see javax.servlet.ServletRequest#setCharacterEncoding(java.lang.String)
*/
public void setCharacterEncoding(String arg0)
@@ -94,9 +88,7 @@
//this.request.setCharacterEncoding(arg0);
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see javax.servlet.ServletRequest#getContentType()
*/
public String getContentType() {
@@ -107,24 +99,24 @@
return contentType;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see javax.servlet.ServletRequest#getParameter(java.lang.String)
*/
public String getParameter(String name) {
- return (String) this.getParameterMap().get(name);
+ final String[] values = (String[])this.getParameterMap().get(name);
+ if ( values != null && values.length > 0 ) {
+ return values[0];
+ }
+ return null;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see javax.servlet.ServletRequest#getParameterMap()
*/
public Map getParameterMap() {
if (this.portletParameterMap == null) {
- //get control params
+ // get control params
this.portletParameterMap = new HashMap();
if (this.provider != null
@@ -179,18 +171,14 @@
return this.portletParameterMap;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see javax.servlet.ServletRequest#getParameterNames()
*/
public Enumeration getParameterNames() {
return Collections.enumeration(this.getParameterMap().keySet());
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see javax.servlet.ServletRequest#getParameterValues(java.lang.String)
*/
public String[] getParameterValues(String name) {