You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ed...@apache.org on 2010/05/21 19:50:37 UTC
svn commit: r947094 - in /portals/pluto/branches/pluto-2.0.x: ./
pluto-container-api/src/main/java/org/apache/pluto/container/
pluto-container-driver-api/src/main/java/org/apache/pluto/container/driver/
pluto-container/src/main/java/org/apache/pluto/co...
Author: edalquist
Date: Fri May 21 17:50:35 2010
New Revision: 947094
URL: http://svn.apache.org/viewvc?rev=947094&view=rev
Log:
r947085 | edalquist | 2010-05-21 12:43:28 CDT
PLUTO-590 Delegate getContextPath() to PortletRequest
----------------------------------------------------------------------------
r944069 | edalquist | 2010-05-13 19:38:15 CDT
PLUTO-590 Don't trim leading /'s from portlet application names as this will break for a portlet application deployed to the root servlet context.
----------------------------------------------------------------------------
Modified:
portals/pluto/branches/pluto-2.0.x/ (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container-api/src/main/java/org/apache/pluto/container/PortletAppDescriptorService.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container-driver-api/src/main/java/org/apache/pluto/container/driver/ (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ContainerRuntimeOptionType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/CustomPortletModeType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/CustomWindowStateType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/DescriptionType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/DisplayNameType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/EventDefinitionReferenceType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/EventDefinitionType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/FilterMappingType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/FilterType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/InitParamType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ListenerType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ObjectFactory.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletAppType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletCollectionType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletInfoType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletPreferencesType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PreferenceType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PublicRenderParameterType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SecurityConstraintType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SecurityRoleRefType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SupportsType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/UserAttributeType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/UserDataConstraintType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/package-info.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/ContainerRuntimeOptionType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/CustomPortletModeType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/CustomWindowStateType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/DescriptionType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/DisplayNameType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/InitParamType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/ObjectFactory.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletAppType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletCollectionType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletInfoType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletPreferencesType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PreferenceType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SecurityConstraintType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SecurityRoleRefType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SupportsType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/UserAttributeType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/UserDataConstraintType.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/package-info.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_1_0.xsd (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_2_0.xsd (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-container/src/test/java/org/apache/pluto/container/impl/JaxBDescriptorServiceImplTest.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventCoordinationServiceImpl.java
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ApplicationIdResolver.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/AttributeApplicationIdResolver.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/CombinedPortletResourceBundle.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Configuration.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultApplicationIdResolver.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultNamespaceMapper.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultOptionalContainerServices.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortalAdministrationService.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletInvokerService.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletPreferencesService.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultUserInfoService.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletConfigImpl.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletContextImpl.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DummyCCPPProfileServiceImpl.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DummyProfile.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Environment.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/InitParameterApplicationIdResolver.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/InlinePortletResourceBundle.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PlutoContainerInfo.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortalDriverServicesImpl.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java (contents, props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletDescriptorRegistry.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ResourceBundleFactory.java (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.java
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/resources/META-INF/pluto.properties (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/resources/org/apache/pluto/driver/container/LocalStrings.properties (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/resources/org/apache/pluto/driver/container/pluto-configuration.properties (props changed)
portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/ (props changed)
Propchange: portals/pluto/branches/pluto-2.0.x/
------------------------------------------------------------------------------
svn:mergeinfo = /portals/pluto/trunk:944069,947085
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container-api/src/main/java/org/apache/pluto/container/PortletAppDescriptorService.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container-driver-api/src/main/java/org/apache/pluto/container/driver/
('svn:mergeinfo' removed)
Modified: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java?rev=947094&r1=947093&r2=947094&view=diff
==============================================================================
--- portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java (original)
+++ portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java Fri May 21 17:50:35 2010
@@ -198,7 +198,7 @@ public class HttpServletPortletRequestWr
protected PathMethodValues dispPathMethodValues = new PathMethodValues();
/**
- * PATH method values provided to the invoking servlet as derived fro the current (initial or nested) request dispatch
+ * PATH method values provided to the invoking servlet as derived for the current (initial or nested) request dispatch
*/
protected PathMethodValues pathMethodValues = new PathMethodValues();
@@ -976,10 +976,7 @@ public class HttpServletPortletRequestWr
@Override
public String getContextPath()
{
- // synchronize the derived path state values first
- updateRequestPathState();
- // return the derived path method value
- return pathMethodValues.contextPath;
+ return portletRequest.getContextPath();
}
@Override
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ContainerRuntimeOptionType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/CustomPortletModeType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/CustomWindowStateType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/DescriptionType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/DisplayNameType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/EventDefinitionReferenceType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/EventDefinitionType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/FilterMappingType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/FilterType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/InitParamType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ListenerType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ObjectFactory.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletAppType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletCollectionType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletInfoType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletPreferencesType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PreferenceType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PublicRenderParameterType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SecurityConstraintType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SecurityRoleRefType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SupportsType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/UserAttributeType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/UserDataConstraintType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/package-info.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/ContainerRuntimeOptionType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/CustomPortletModeType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/CustomWindowStateType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/DescriptionType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/DisplayNameType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/InitParamType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/ObjectFactory.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletAppType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletCollectionType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletInfoType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletPreferencesType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PreferenceType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SecurityConstraintType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SecurityRoleRefType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SupportsType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/UserAttributeType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/UserDataConstraintType.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/package-info.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_1_0.xsd
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_2_0.xsd
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-container/src/test/java/org/apache/pluto/container/impl/JaxBDescriptorServiceImplTest.java
('svn:mergeinfo' removed)
Modified: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventCoordinationServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-2.0.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventCoordinationServiceImpl.java?rev=947094&r1=947093&r2=947094&view=diff
==============================================================================
--- portals/pluto/branches/pluto-2.0.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventCoordinationServiceImpl.java (original)
+++ portals/pluto/branches/pluto-2.0.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventCoordinationServiceImpl.java Fri May 21 17:50:35 2010
@@ -125,10 +125,6 @@ public class EventCoordinationServiceImp
for (PortletWindowConfig portlet : portlets) {
String contextPath = portlet.getContextPath();
String applicationName = contextPath;
- if (applicationName.length() >0 )
- {
- applicationName = applicationName.substring(1);
- }
PortletApplicationDefinition portletAppDD = null;
try {
portletAppDD = portletRegistry.getPortletApplication(applicationName);
Modified: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-2.0.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java?rev=947094&r1=947093&r2=947094&view=diff
==============================================================================
--- portals/pluto/branches/pluto-2.0.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java (original)
+++ portals/pluto/branches/pluto-2.0.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java Fri May 21 17:50:35 2010
@@ -102,10 +102,6 @@ public class SupportedModesServiceImpl i
{
String applicationId = PortletWindowConfig.parseContextPath(portletId);
String applicationName = applicationId;
- if (applicationName.length() > 0)
- {
- applicationName = applicationName.substring(1);
- }
String portletName = PortletWindowConfig.parsePortletName(portletId);
try
@@ -177,10 +173,10 @@ public class SupportedModesServiceImpl i
{
String applicationId = PortletWindowConfig.parseContextPath(portletId);
String applicationName = applicationId;
- if (applicationName.length() > 0)
- {
- applicationName = applicationName.substring(1);
- }
+// if (applicationName.length() > 0)
+// {
+// applicationName = applicationName.substring(1);
+// }
try
{
PortletApplicationDefinition portletApp = portletRegistry.getPortletApplication(applicationName);
@@ -217,10 +213,10 @@ public class SupportedModesServiceImpl i
String applicationId = PortletWindowConfig.parseContextPath(portletId);
String applicationName = applicationId;
- if (applicationName.length() > 0)
- {
- applicationName = applicationName.substring(1);
- }
+// if (applicationName.length() > 0)
+// {
+// applicationName = applicationName.substring(1);
+// }
String portletName = PortletWindowConfig.parsePortletName(portletId);
if (portletRegistry == null)
@@ -261,10 +257,10 @@ public class SupportedModesServiceImpl i
{
String applicationId = PortletWindowConfig.parseContextPath(portletId);
String applicationName = applicationId;
- if (applicationName.length() > 0)
- {
- applicationName = applicationName.substring(1);
- }
+// if (applicationName.length() > 0)
+// {
+// applicationName = applicationName.substring(1);
+// }
String portletName = PortletWindowConfig.parsePortletName(portletId);
return portletContextService.getPortletConfig(applicationName, portletName);
Modified: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-2.0.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java?rev=947094&r1=947093&r2=947094&view=diff
==============================================================================
--- portals/pluto/branches/pluto-2.0.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java (original)
+++ portals/pluto/branches/pluto-2.0.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java Fri May 21 17:50:35 2010
@@ -162,10 +162,6 @@ public class SupportedWindowStateService
String appId = PortletWindowConfig.parseContextPath(portletId);
String applicationName = appId;
- if (applicationName.length() > 0)
- {
- applicationName = applicationName.substring(1);
- }
PortletApplicationDefinition portletAppDD = null;
if (portletRegistry == null)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ApplicationIdResolver.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/AttributeApplicationIdResolver.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/CombinedPortletResourceBundle.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Configuration.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultApplicationIdResolver.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultNamespaceMapper.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultOptionalContainerServices.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortalAdministrationService.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletInvokerService.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletPreferencesService.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultUserInfoService.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletConfigImpl.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletContextImpl.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DummyCCPPProfileServiceImpl.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DummyProfile.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Environment.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/InitParameterApplicationIdResolver.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/InlinePortletResourceBundle.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PlutoContainerInfo.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortalDriverServicesImpl.java
('svn:mergeinfo' removed)
Modified: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java?rev=947094&r1=947093&r2=947094&view=diff
==============================================================================
--- portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java (original)
+++ portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java Fri May 21 17:50:35 2010
@@ -114,19 +114,18 @@ public class PortletContextManager imple
public String register(ServletConfig config) throws PortletContainerException {
ServletContext servletContext = config.getServletContext();
String contextPath = getContextPath(servletContext);
- String applicationName = contextPath.substring(1);
- if (!portletContexts.containsKey(applicationName)) {
+ if (!portletContexts.containsKey(contextPath)) {
- PortletApplicationDefinition portletApp = portletRegistry.getPortletAppDD(servletContext, applicationName, contextPath);
+ PortletApplicationDefinition portletApp = portletRegistry.getPortletAppDD(servletContext, contextPath, contextPath);
DriverPortletContext portletContext = new DriverPortletContextImpl(servletContext, portletApp, rdService);
- portletContexts.put(applicationName, portletContext);
+ portletContexts.put(contextPath, portletContext);
fireRegistered(portletContext);
if (LOG.isInfoEnabled()) {
- LOG.info("Registered portlet application for context '/" + applicationName + "'");
+ LOG.info("Registered portlet application for context '" + contextPath + "'");
LOG.info("Registering "+portletApp.getPortlets().size()+" portlets for context /"+portletContext.getApplicationName());
}
@@ -144,10 +143,10 @@ public class PortletContextManager imple
}
} else {
if (LOG.isInfoEnabled()) {
- LOG.info("Portlet application for context '/" + applicationName + "' already registered.");
+ LOG.info("Portlet application for context '" + contextPath + "' already registered.");
}
}
- return applicationName;
+ return contextPath;
}
/**
@@ -262,7 +261,7 @@ public class PortletContextManager imple
for (PortletRegistryListener l: registryListeners) {
l.portletApplicationRegistered(event);
}
- LOG.info("Portlet Context '/" + context.getApplicationName() + "' registered.");
+ LOG.info("Portlet Context '" + context.getApplicationName() + "' registered.");
}
private void fireRemoved(DriverPortletContext context) {
@@ -273,7 +272,7 @@ public class PortletContextManager imple
l.portletApplicationRemoved(event);
}
- LOG.info("Portlet Context '/" + context.getApplicationName() + "' removed.");
+ LOG.info("Portlet Context '" + context.getApplicationName() + "' removed.");
}
//
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletDescriptorRegistry.java
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ResourceBundleFactory.java
('svn:mergeinfo' removed)
Modified: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.java?rev=947094&r1=947093&r2=947094&view=diff
==============================================================================
--- portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.java (original)
+++ portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.java Fri May 21 17:50:35 2010
@@ -59,10 +59,6 @@ public class PortletWindowImpl implement
try
{
String applicationName = config.getContextPath();
- if (applicationName.length() >0 )
- {
- applicationName = applicationName.substring(1);
- }
this.portlet = PlutoServices.getServices().getPortletRegistryService().getPortlet(applicationName, config.getPortletName());
}
catch (PortletContainerException ex)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/resources/META-INF/pluto.properties
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/resources/org/apache/pluto/driver/container/LocalStrings.properties
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/main/resources/org/apache/pluto/driver/container/pluto-configuration.properties
('svn:mergeinfo' removed)
Propchange: portals/pluto/branches/pluto-2.0.x/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/
('svn:mergeinfo' removed)