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 2006/08/05 13:02:52 UTC
svn commit: r428984 - in
/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main:
java/org/apache/cocoon/portal/pluto/
java/org/apache/cocoon/portal/pluto/adapter/
java/org/apache/cocoon/portal/pluto/factory/ java/org/apache/cocoon/porta...
Author: cziegeler
Date: Sat Aug 5 04:02:51 2006
New Revision: 428984
URL: http://svn.apache.org/viewvc?rev=428984&view=rev
Log:
Code cleanup
Modified:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletContainerEnvironmentImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletPreferencesProviderImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLConverter.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/ActionRequestFactoryImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/PortletInvokerFactoryImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/RenderRequestFactoryImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/WebApplicationDefinitionImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/common/PreferenceImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/PortletServlet.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/resources/org/apache/cocoon/portal/pluto/portal-pluto.roles
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletContainerEnvironmentImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletContainerEnvironmentImpl.java?rev=428984&r1=428983&r2=428984&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletContainerEnvironmentImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletContainerEnvironmentImpl.java Sat Aug 5 04:02:51 2006
@@ -85,15 +85,15 @@
/**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager) {
- this.manager = manager;
+ public void service(ServiceManager serviceManager) {
+ this.manager = serviceManager;
}
/**
* @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
*/
- public void contextualize(Context context) {
- this.context = context;
+ public void contextualize(Context avalonContext) {
+ this.context = avalonContext;
}
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletPreferencesProviderImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletPreferencesProviderImpl.java?rev=428984&r1=428983&r2=428984&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletPreferencesProviderImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletPreferencesProviderImpl.java Sat Aug 5 04:02:51 2006
@@ -74,8 +74,8 @@
/**
* @see org.apache.cocoon.portal.impl.AbstractComponent#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager) throws ServiceException {
- super.service(manager);
+ public void service(ServiceManager serviceManager) throws ServiceException {
+ super.service(serviceManager);
this.loader = (ProfileLS)this.manager.lookup(ProfileLS.ROLE);
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLConverter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLConverter.java?rev=428984&r1=428983&r2=428984&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLConverter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLConverter.java Sat Aug 5 04:02:51 2006
@@ -243,16 +243,17 @@
}
private String decodeValue(String value) {
- value = StringUtils.replace(value, "0x1", "_");
- value = StringUtils.replace(value, "0x2", ".");
- value = StringUtils.replace(value, "0x3", "/");
- value = StringUtils.replace(value, "0x4", "\r");
- value = StringUtils.replace(value, "0x5", "\n");
- value = StringUtils.replace(value, "0x6", "<");
- value = StringUtils.replace(value, "0x7", ">");
- value = StringUtils.replace(value, "0x8", " ");
- value = StringUtils.replace(value, "0x0", "0x");
- return value;
+ String result = value;
+ result = StringUtils.replace(result, "0x1", "_");
+ result = StringUtils.replace(result, "0x2", ".");
+ result = StringUtils.replace(result, "0x3", "/");
+ result = StringUtils.replace(result, "0x4", "\r");
+ result = StringUtils.replace(result, "0x5", "\n");
+ result = StringUtils.replace(result, "0x6", "<");
+ result = StringUtils.replace(result, "0x7", ">");
+ result = StringUtils.replace(result, "0x8", " ");
+ result = StringUtils.replace(result, "0x0", "0x");
+ return result;
}
private String encodeParameterName(String paramName) {
@@ -272,15 +273,16 @@
}
private String encodeValue(String value) {
- value = StringUtils.replace(value, "0x", "0x0");
- value = StringUtils.replace(value, "_", "0x1");
- value = StringUtils.replace(value, ".", "0x2");
- value = StringUtils.replace(value, "/", "0x3");
- value = StringUtils.replace(value, "\r", "0x4");
- value = StringUtils.replace(value, "\n", "0x5");
- value = StringUtils.replace(value, "<", "0x6");
- value = StringUtils.replace(value, ">", "0x7");
- value = StringUtils.replace(value, " ", "0x8");
- return value;
+ String result = value;
+ result = StringUtils.replace(result, "0x", "0x0");
+ result = StringUtils.replace(result, "_", "0x1");
+ result = StringUtils.replace(result, ".", "0x2");
+ result = StringUtils.replace(result, "/", "0x3");
+ result = StringUtils.replace(result, "\r", "0x4");
+ result = StringUtils.replace(result, "\n", "0x5");
+ result = StringUtils.replace(result, "<", "0x6");
+ result = StringUtils.replace(result, ">", "0x7");
+ result = StringUtils.replace(result, " ", "0x8");
+ return result;
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java?rev=428984&r1=428983&r2=428984&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java Sat Aug 5 04:02:51 2006
@@ -403,13 +403,13 @@
public void render(PortalManagerAspectRenderContext aspectContext,
PortalService service,
ContentHandler ch,
- Parameters parameters)
+ Parameters contextParameters)
throws SAXException {
final Map objectModel = aspectContext.getObjectModel();
// don't generate a response, if we issued a redirect
if (objectModel.remove("portlet-event") == null) {
- aspectContext.invokeNext(ch, parameters);
+ aspectContext.invokeNext(ch, contextParameters);
}
}
@@ -499,9 +499,8 @@
states.add(new DecorationAction(DecorationAction.WINDOW_STATE_MAXIMIZED, url.toString()));
}
}
- // TODO - Implement full screen for portlets (= own mode)
if ( this.enableFullScreen ) {
-
+ // TODO - Implement full screen for portlets (= own mode)
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java?rev=428984&r1=428983&r2=428984&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java Sat Aug 5 04:02:51 2006
@@ -39,10 +39,10 @@
/**
* @see org.apache.pluto.factory.Factory#init(javax.servlet.ServletConfig, java.util.Map)
*/
- public void init(ServletConfig config, Map properties)
+ public void init(ServletConfig config, Map factoryProperties)
throws Exception {
this.servletConfig = config;
- this.properties = properties;
+ this.properties = factoryProperties;
}
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/ActionRequestFactoryImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/ActionRequestFactoryImpl.java?rev=428984&r1=428983&r2=428984&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/ActionRequestFactoryImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/ActionRequestFactoryImpl.java Sat Aug 5 04:02:51 2006
@@ -56,8 +56,8 @@
/**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager) throws ServiceException {
- this.manager = manager;
+ public void service(ServiceManager serviceManager) throws ServiceException {
+ this.manager = serviceManager;
this.portalService = (PortalService)this.manager.lookup(PortalService.ROLE);
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java?rev=428984&r1=428983&r2=428984&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java Sat Aug 5 04:02:51 2006
@@ -69,15 +69,15 @@
/**
* @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
*/
- public void contextualize(Context context) throws ContextException {
- this.context = context;
+ public void contextualize(Context avalonContext) throws ContextException {
+ this.context = avalonContext;
}
/**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager) throws ServiceException {
- this.manager = manager;
+ public void service(ServiceManager serviceManager) throws ServiceException {
+ this.manager = serviceManager;
}
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/PortletInvokerFactoryImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/PortletInvokerFactoryImpl.java?rev=428984&r1=428983&r2=428984&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/PortletInvokerFactoryImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/PortletInvokerFactoryImpl.java Sat Aug 5 04:02:51 2006
@@ -55,15 +55,15 @@
/**
* @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
*/
- public void contextualize(Context context) throws ContextException {
- this.context = context;
+ public void contextualize(Context avalonContext) throws ContextException {
+ this.context = avalonContext;
}
/**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager) throws ServiceException {
- this.manager = manager;
+ public void service(ServiceManager serviceManager) throws ServiceException {
+ this.manager = serviceManager;
}
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/RenderRequestFactoryImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/RenderRequestFactoryImpl.java?rev=428984&r1=428983&r2=428984&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/RenderRequestFactoryImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/RenderRequestFactoryImpl.java Sat Aug 5 04:02:51 2006
@@ -56,8 +56,8 @@
/**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager) throws ServiceException {
- this.manager = manager;
+ public void service(ServiceManager serviceManager) throws ServiceException {
+ this.manager = serviceManager;
this.portalService = (PortalService)this.manager.lookup(PortalService.ROLE);
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java?rev=428984&r1=428983&r2=428984&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java Sat Aug 5 04:02:51 2006
@@ -114,12 +114,12 @@
throws Exception {
Vector structure = (Vector)parameter;
String contextRoot = (String)structure.get(0);
- WebApplicationDefinition webApplication = (WebApplicationDefinition)structure.get(1);
+ WebApplicationDefinition webApp = (WebApplicationDefinition)structure.get(1);
Map servletMap = (Map)structure.get(2);
this.setContextRoot(contextRoot);
- setWebApplicationDefinition(webApplication);
+ setWebApplicationDefinition(webApp);
Vector structure2 = new Vector();
structure2.add(this);
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java?rev=428984&r1=428983&r2=428984&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java Sat Aug 5 04:02:51 2006
@@ -137,9 +137,9 @@
/**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager)
+ public void service(ServiceManager serviceManager)
throws ServiceException {
- super.service(manager);
+ super.service(serviceManager);
this.entityResolver = (EntityResolver) this.manager.lookup(EntityResolver.ROLE);
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java?rev=428984&r1=428983&r2=428984&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java Sat Aug 5 04:02:51 2006
@@ -61,7 +61,6 @@
this.applicationEntity = pae;
this.service = service;
this.prefProvider = (PortletPreferencesProvider)PortletContainerServices.get(PortletPreferencesProvider.class);
-;
}
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/WebApplicationDefinitionImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/WebApplicationDefinitionImpl.java?rev=428984&r1=428983&r2=428984&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/WebApplicationDefinitionImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/WebApplicationDefinitionImpl.java Sat Aug 5 04:02:51 2006
@@ -237,14 +237,13 @@
setId(id);
}
- protected void setContextRoot(String contextPath)
- {
+ protected void setContextRoot(String contextRoot) {
// Test for IBM WebSphere
- if (contextPath != null && contextPath.endsWith(".war"))
- {
- contextPath = contextPath.substring(0, contextPath.length()-4);
+ if (contextRoot != null && contextRoot.endsWith(".war")) {
+ this.contextPath = contextRoot.substring(0, contextRoot.length()-4);
+ } else {
+ this.contextPath = contextRoot;
}
- this.contextPath = contextPath;
}
public void setDescriptions(DescriptionSet descriptions) {
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java?rev=428984&r1=428983&r2=428984&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java Sat Aug 5 04:02:51 2006
@@ -145,13 +145,13 @@
// internal methods.
private ArrayList toList(String value) {
- ArrayList keywords = new ArrayList();
+ ArrayList elements = new ArrayList();
for (StringTokenizer st = new StringTokenizer(value, ","); st.hasMoreTokens();) {
- keywords.add(st.nextToken().trim());
+ elements.add(st.nextToken().trim());
}
- return keywords;
+ return elements;
}
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/common/PreferenceImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/common/PreferenceImpl.java?rev=428984&r1=428983&r2=428984&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/common/PreferenceImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/common/PreferenceImpl.java Sat Aug 5 04:02:51 2006
@@ -158,8 +158,7 @@
Iterator iter = value.iterator();
while (iter.hasNext()) {
- String value = (String) iter.next();
- returnValue.add(value);
+ returnValue.add(iter.next());
}
return returnValue;
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/PortletServlet.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/PortletServlet.java?rev=428984&r1=428983&r2=428984&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/PortletServlet.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/PortletServlet.java Sat Aug 5 04:02:51 2006
@@ -54,7 +54,7 @@
public static final String PORTLET_DEFINITION = PortletServlet.class.getName() + "/portlet-definition";
- protected ServletConfig config;
+ protected ServletConfig servletConfig;
protected Map portlets = new HashMap();
/**
@@ -62,7 +62,7 @@
*/
public void init(ServletConfig config) throws ServletException {
super.init(config);
- this.config = config;
+ this.servletConfig = config;
}
protected synchronized void init(PortletDefinition pd, HttpServletRequest request)
@@ -84,9 +84,9 @@
PortletDefinitionCtrl portletDefCtrl = (PortletDefinitionCtrl)ControllerObjectAccess.get(pd);
portletDefCtrl.setPortletClassLoader(Thread.currentThread().getContextClassLoader());
- info.context = PortletObjectAccess.getPortletContext(this.config.getServletContext(),
+ info.context = PortletObjectAccess.getPortletContext(this.servletConfig.getServletContext(),
pd.getPortletApplicationDefinition());
- info.config = PortletObjectAccess.getPortletConfig(this.config,
+ info.config = PortletObjectAccess.getPortletConfig(this.servletConfig,
info.context,
pd);
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java?rev=428984&r1=428983&r2=428984&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java Sat Aug 5 04:02:51 2006
@@ -48,7 +48,7 @@
final protected PortletURLProviderImpl provider;
- final protected PortletWindow window;
+ final protected PortletWindow portletWindow;
public ServletRequestImpl(HttpServletRequest request,
PortletURLProviderImpl provider) {
@@ -60,7 +60,7 @@
PortletWindow window) {
super(request);
this.provider = provider;
- this.window = window;
+ this.portletWindow = window;
this.originalRequest = request;
}
@@ -111,7 +111,7 @@
// get control params
if (this.provider != null
- && this.provider.getPortletWindow().equals(this.window)) {
+ && this.provider.getPortletWindow().equals(this.portletWindow)) {
this.portletParameterMap = new HashMap();
@@ -151,8 +151,8 @@
}
} else {
// provider is null or different window, use stored render parameters
- if ( window != null ) {
- final CopletInstance cid = ((PortletWindowImpl)this.window).getCopletInstanceData();
+ if ( portletWindow != null ) {
+ final CopletInstance cid = ((PortletWindowImpl)this.portletWindow).getCopletInstanceData();
this.portletParameterMap = (Map)cid.getTemporaryAttribute("render-parameters");
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/resources/org/apache/cocoon/portal/pluto/portal-pluto.roles
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/resources/org/apache/cocoon/portal/pluto/portal-pluto.roles?rev=428984&r1=428983&r2=428984&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/resources/org/apache/cocoon/portal/pluto/portal-pluto.roles (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/resources/org/apache/cocoon/portal/pluto/portal-pluto.roles Sat Aug 5 04:02:51 2006
@@ -26,4 +26,10 @@
<role name="org.apache.cocoon.portal.coplet.adapter.CopletAdapter/portlet"
default-class="org.apache.cocoon.portal.pluto.adapter.PortletAdapter"/>
+ <!--+
+ | The portlet preferences provider.
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.pluto.PortletPreferencesProvider"
+ default-class="org.apache.cocoon.portal.pluto.PortletPreferencesProviderImpl"/>
</role-list>