svn commit: r752027 [1/4] - in /portals/pluto/trunk: pluto-container-api/src/main/java/org/apache/pluto/ pluto-container-api/src/main/java/org/apache/pluto/container/ pluto-container-api/src/main/java/org/apache/pluto/container/driver/ pluto-container-...

[at...@apache.org]

Author: ate
Date: Tue Mar 10 09:24:41 2009
New Revision: 752027

URL: http://svn.apache.org/viewvc?rev=752027&view=rev
Log:
PLUTO-537: Cleaning up Pluto packages
See: https://issues.apache.org/jira/browse/PLUTO-537
- start of moving to org.apache.pluto.container.* package

Added:
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/Constants.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/Constants.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerInvocation.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/ContainerInvocation.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventContainer.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/EventContainer.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletConfig.java   (with props)
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletContext.java   (with props)
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletPreference.java   (with props)
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/NamespaceMapper.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/NamespaceMapper.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/OptionalContainerServices.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/OptionalContainerServices.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PlutoConfigurationException.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PlutoConfigurationException.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainer.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletContainer.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainerException.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletContainerException.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainerRuntimeException.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletContainerRuntimeException.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEntity.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletEntity.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletWindow.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletWindow.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletWindowID.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletWindowID.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequestDispatcherPathInfo.java   (with props)
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequiredContainerServices.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/RequiredContainerServices.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/
      - copied from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/driver/
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/internal/
      - copied from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/internal/
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/
      - copied from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/services/
      - copied from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/services/
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/CCPPProfileService.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/CCPPProfileService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ContainerInvocationService.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/ContainerInvocationService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventCoordinationService.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/EventCoordinationService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventProvider.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/EventProvider.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/FilterManager.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/FilterManager.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortalCallbackService.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/PortalCallbackService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLListener.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/PortletURLListener.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLProvider.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/PortletURLProvider.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ResourceURLProvider.java   (contents, props changed)
      - copied, changed from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/ResourceURLProvider.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/
      - copied from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/
Removed:
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/Constants.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/ContainerInvocation.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/EventContainer.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/NamespaceMapper.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/OptionalContainerServices.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PlutoConfigurationException.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletContainer.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletContainerException.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletContainerRuntimeException.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletEntity.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletWindow.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletWindowID.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/RequiredContainerServices.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/internal/InternalPortletConfig.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/internal/InternalPortletContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/internal/InternalPortletPreference.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/internal/RequestDispatcherPathInfo.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/driver/
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/internal/
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/services/
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/CCPPProfileService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/ContainerInvocationService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/EventCoordinationService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/EventProvider.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/FilterManager.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/PortalCallbackService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/PortletURLListener.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/PortletURLProvider.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/ResourceURLProvider.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/
Modified:
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PlutoServices.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletServlet.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/ContainerRuntimeOption.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/CustomPortletMode.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/CustomWindowState.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Description.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/DisplayName.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/EventDefinition.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/EventDefinitionReference.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Filter.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/FilterMapping.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/InitParam.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Listener.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletApplicationDefinition.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletDefinition.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletInfo.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Preference.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Preferences.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PublicRenderParameter.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/SecurityConstraint.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/SecurityRoleRef.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Supports.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/UserAttribute.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/UserDataConstraint.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/services/ContainerServices.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/services/PortletAppDescriptorService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/AdministrativeRequestListener.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/P3PAttributes.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortalAdministrationService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletActionResponseContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletContextService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletEnvironmentService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletEventResponseContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInfoService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvocationEvent.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvocationListener.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvokerService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletMimeResponseContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletPreferencesService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryEvent.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryListener.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRenderResponseContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRequestContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRequestContextService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResourceRequestContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResourceResponseContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResponseContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletStateAwareResponseContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/UserInfoService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/ContainerInvocationImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/ContainerInvocationServiceImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultNamespaceMapper.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortalAdministrationService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletEnvironmentService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInfoService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInvokerService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletRequestContextService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultUserInfoService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DummyCCPPProfileServiceImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PlutoContainerServices.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/ContainerRuntimeOptionType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/CustomPortletModeType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/CustomWindowStateType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/DescriptionType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/DisplayNameType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/EventDefinitionReferenceType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/EventDefinitionType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/FilterMappingType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/FilterType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/InitParamType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/ListenerType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/PortletAppType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/PortletInfoType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/PortletPreferencesType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/PortletType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/PreferenceType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/PublicRenderParameterType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/SecurityConstraintType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/SecurityRoleRefType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/SupportsType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/UserAttributeType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/UserDataConstraintType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet10/PortletAppType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorServiceImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionRequestImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionResponseImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ClientDataRequestImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/EventRequestImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/EventResponseImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/HttpServletPortletRequestWrapper.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/InlinePortletResourceBundle.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferenceImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferencesImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestDispatcherImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletSessionImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletURLImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderResponseImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RequestDispatcherPathInfoImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceRequestImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceResponseImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletActionResponseContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletEventResponseContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletMimeResponseContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletRenderResponseContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletRequestContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResourceRequestContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResourceResponseContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResponseContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletStateAwareResponseContextImpl.java
    portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/DefaultNamespaceMapperTest.java
    portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java
    portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/PortletRequestImplTest.java
    portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java
    portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterChainImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterConfigImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterManagerImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortalCallbackServiceImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ResourceURLProviderImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalStartupListener.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/TCKDriverServlet.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalServletRequest.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowIDImpl.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/ResourceURLProviderImpl.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/SupportedModesService.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeDropDownTag.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTitleTag.java
    portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml
    portals/pluto/trunk/pluto-site/src/site/xdoc/v11/deploying.xml
    portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/Assembler.java
    portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/WebXmlStreamingAssembly.java
    portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java
    portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java
    portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java
    portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/assembled.web.xml
    portals/pluto/trunk/src/site/xdoc/v11/deploying.xml

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/Constants.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/Constants.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/Constants.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/Constants.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/Constants.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/Constants.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/Constants.java Tue Mar 10 09:24:41 2009
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto;
+package org.apache.pluto.container;
 
-import org.apache.pluto.spi.optional.PortletRequestContext;
+import org.apache.pluto.container.spi.optional.PortletRequestContext;
 
 /**
  * Constant values used to bind internal portlet objects as attributes,
@@ -72,7 +72,7 @@
 
     /**
      * The unique method identifier for render requests.  Render requests are
-     * requested through a call to the {@link PortletContainer#doRender(org.apache.pluto.PortletWindow,
+     * requested through a call to the {@link PortletContainer#doRender(org.apache.pluto.container.PortletWindow,
         * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
      * method.
      */
@@ -80,7 +80,7 @@
 
     /**
      * The unique method identifier for render requests.  Render requests are
-     * requested through a call to the {@link PortletContainer#doAction(org.apache.pluto.PortletWindow,
+     * requested through a call to the {@link PortletContainer#doAction(org.apache.pluto.container.PortletWindow,
         * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
      * method.
      */
@@ -88,7 +88,7 @@
 
     /**
      * The unique method identifier for noop (load) requests.  Load requests are
-     * requested through a call to the {@link PortletContainer#doLoad(org.apache.pluto.PortletWindow,
+     * requested through a call to the {@link PortletContainer#doLoad(org.apache.pluto.container.PortletWindow,
         * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
      * method.
      */
@@ -104,7 +104,7 @@
     
     /**
      * The unique method identifier for render requests.  Render requests are
-     * requested through a call to the {@link PortletContainer#doEvent(org.apache.pluto.PortletWindow,
+     * requested through a call to the {@link PortletContainer#doEvent(org.apache.pluto.container.PortletWindow,
      * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
      * method.
      */

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/Constants.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerInvocation.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/ContainerInvocation.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerInvocation.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerInvocation.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/ContainerInvocation.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/ContainerInvocation.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerInvocation.java Tue Mar 10 09:24:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto;
+package org.apache.pluto.container;
 
 public interface ContainerInvocation
 {

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerInvocation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventContainer.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/EventContainer.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventContainer.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventContainer.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/EventContainer.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/EventContainer.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventContainer.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto;
+package org.apache.pluto.container;
 
 
 import java.io.IOException;

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventContainer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletConfig.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletConfig.java?rev=752027&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletConfig.java (added)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletConfig.java Tue Mar 10 09:24:41 2009
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pluto.container;
+
+import javax.portlet.PortletConfig;
+
+import org.apache.pluto.container.om.portlet.PortletDefinition;
+
+public interface InternalPortletConfig extends PortletConfig {
+
+    PortletDefinition getPortletDefinition();
+    InternalPortletContext getPortletContext();
+}
+
+

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletConfig.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletContext.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletContext.java?rev=752027&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletContext.java (added)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletContext.java Tue Mar 10 09:24:41 2009
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pluto.container;
+
+import javax.portlet.PortletContext;
+import javax.servlet.ServletContext;
+
+import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
+
+public interface InternalPortletContext extends PortletContext {
+
+    /**
+     * Retrieve the unique identifier for the portlet context.
+     * @return unique identifier.
+     */
+    public String getApplicationName();
+
+    /**
+     *
+     * @return servlet context within which we belong
+     */
+    public ServletContext getServletContext();
+    
+    /**
+     *
+     * @return the context path for this PortletContext
+     */
+    public String getContextPath();
+    
+    /**
+     *
+     * @return application config
+     */
+    public PortletApplicationDefinition getPortletApplicationDefinition();
+    
+    RequestDispatcherPathInfo getPathInfo(String path);
+}
+
+

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletPreference.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletPreference.java?rev=752027&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletPreference.java (added)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletPreference.java Tue Mar 10 09:24:41 2009
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pluto.container;
+
+/**
+ * This class represents a portlet preference, which is a name-value pair.
+ *
+ */
+public interface InternalPortletPreference {
+
+	/**
+	 * Returns the name of this portlet preference.
+	 * @return the name of this portlet preference.
+	 */
+    public String getName();
+
+    /**
+     * Returns the values of this portlet preference, which is a string array.
+     * @return the values of this portlet preference as a string array.
+     */
+    public String[] getValues();
+
+    /**
+     * Sets values of this portlet preference.
+     * @param values  values of this portlet preference to set.
+     */
+    public void setValues(String[] values);
+
+    /**
+     * Returns true if this portlet preference is marked as read-only.
+     * @return true if this portlet preference is marked as read-only.
+     */
+    public boolean isReadOnly();
+
+    /**
+     * Clone a copy of itself.
+     * @return a copy of itself.
+     */
+    public InternalPortletPreference clone();
+
+}

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletPreference.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/NamespaceMapper.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/NamespaceMapper.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/NamespaceMapper.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/NamespaceMapper.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/NamespaceMapper.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/NamespaceMapper.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/NamespaceMapper.java Tue Mar 10 09:24:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto;
+package org.apache.pluto.container;
 
 
 /**

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/NamespaceMapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/OptionalContainerServices.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/OptionalContainerServices.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/OptionalContainerServices.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/OptionalContainerServices.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/OptionalContainerServices.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/OptionalContainerServices.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/OptionalContainerServices.java Tue Mar 10 09:24:41 2009
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto;
+package org.apache.pluto.container;
 
-import org.apache.pluto.spi.optional.PortalAdministrationService;
-import org.apache.pluto.spi.optional.PortletContextService;
-import org.apache.pluto.spi.optional.PortletEnvironmentService;
-import org.apache.pluto.spi.optional.PortletInfoService;
-import org.apache.pluto.spi.optional.PortletInvokerService;
-import org.apache.pluto.spi.optional.PortletPreferencesService;
-import org.apache.pluto.spi.optional.PortletRegistryService;
-import org.apache.pluto.spi.optional.PortletRequestContextService;
-import org.apache.pluto.spi.optional.UserInfoService;
+import org.apache.pluto.container.spi.optional.PortalAdministrationService;
+import org.apache.pluto.container.spi.optional.PortletContextService;
+import org.apache.pluto.container.spi.optional.PortletEnvironmentService;
+import org.apache.pluto.container.spi.optional.PortletInfoService;
+import org.apache.pluto.container.spi.optional.PortletInvokerService;
+import org.apache.pluto.container.spi.optional.PortletPreferencesService;
+import org.apache.pluto.container.spi.optional.PortletRegistryService;
+import org.apache.pluto.container.spi.optional.PortletRequestContextService;
+import org.apache.pluto.container.spi.optional.UserInfoService;
 
 /**
  * Defines the services necessary for integration between the Pluto Container

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/OptionalContainerServices.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PlutoConfigurationException.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PlutoConfigurationException.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PlutoConfigurationException.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PlutoConfigurationException.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PlutoConfigurationException.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PlutoConfigurationException.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PlutoConfigurationException.java Tue Mar 10 09:24:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto;
+package org.apache.pluto.container;
 
 /**
  * Exception thrown when Pluto configuration fails.

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PlutoConfigurationException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainer.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletContainer.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainer.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainer.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletContainer.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletContainer.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainer.java Tue Mar 10 09:24:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto;
+package org.apache.pluto.container;
 
 import java.io.IOException;
 

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainerException.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletContainerException.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainerException.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainerException.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletContainerException.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletContainerException.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainerException.java Tue Mar 10 09:24:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto;
+package org.apache.pluto.container;
 
 /**
  * Thrown when an internal portlet container exception occurs within Pluto.

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainerException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainerRuntimeException.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletContainerRuntimeException.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainerRuntimeException.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainerRuntimeException.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletContainerRuntimeException.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletContainerRuntimeException.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainerRuntimeException.java Tue Mar 10 09:24:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto;
+package org.apache.pluto.container;
 
 /**
  * Runtime exception thrown when an unexpected condition is encountered.

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainerRuntimeException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEntity.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletEntity.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEntity.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEntity.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletEntity.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletEntity.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEntity.java Tue Mar 10 09:24:41 2009
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto;
+package org.apache.pluto.container;
 
-import org.apache.pluto.om.portlet.PortletDefinition;
+import org.apache.pluto.container.om.portlet.PortletDefinition;
 
 /**
  * The PortletEntity encapsulates all data pertaining to a single portlet

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEntity.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletWindow.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletWindow.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletWindow.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletWindow.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletWindow.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletWindow.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletWindow.java Tue Mar 10 09:24:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto;
+package org.apache.pluto.container;
 
 import javax.portlet.PortletMode;
 import javax.portlet.WindowState;
@@ -25,7 +25,7 @@
  * request should be processed.  The PortletWindow is used internally
  * to map the request to the configured Portlet Application and Portlet.
  *
- * @see org.apache.pluto.om.portlet.PortletDefinition
+ * @see org.apache.pluto.container.om.portlet.PortletDefinition
  *
  * @version 1.0
  * @since Sep 22, 2004

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletWindow.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletWindowID.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletWindowID.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletWindowID.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletWindowID.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletWindowID.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/PortletWindowID.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletWindowID.java Tue Mar 10 09:24:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto;
+package org.apache.pluto.container;
 
 /**
  * The portlet window ID.

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletWindowID.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequestDispatcherPathInfo.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequestDispatcherPathInfo.java?rev=752027&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequestDispatcherPathInfo.java (added)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequestDispatcherPathInfo.java Tue Mar 10 09:24:41 2009
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.pluto.container;
+
+/**
+ * @version $Id$
+ *
+ */
+public interface RequestDispatcherPathInfo
+{
+    boolean isNamedRequestDispatcher();
+    String getRequestURI();
+    String getServletPath();
+    String getPathInfo();
+    String getQueryString();
+}

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequestDispatcherPathInfo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequestDispatcherPathInfo.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequestDispatcherPathInfo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequiredContainerServices.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/RequiredContainerServices.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequiredContainerServices.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequiredContainerServices.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/RequiredContainerServices.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/RequiredContainerServices.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequiredContainerServices.java Tue Mar 10 09:24:41 2009
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto;
+package org.apache.pluto.container;
 
 import javax.portlet.PortalContext;
 
-import org.apache.pluto.spi.CCPPProfileService;
-import org.apache.pluto.spi.ContainerInvocationService;
-import org.apache.pluto.spi.EventCoordinationService;
-import org.apache.pluto.spi.PortalCallbackService;
+import org.apache.pluto.container.spi.CCPPProfileService;
+import org.apache.pluto.container.spi.ContainerInvocationService;
+import org.apache.pluto.container.spi.EventCoordinationService;
+import org.apache.pluto.container.spi.PortalCallbackService;
 
 /**
  * This interface defines the services required for integration between the

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequiredContainerServices.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PlutoServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PlutoServices.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PlutoServices.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PlutoServices.java Tue Mar 10 09:24:41 2009
@@ -14,25 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.driver;
+package org.apache.pluto.container.driver;
 
 import javax.portlet.PortalContext;
 
-import org.apache.pluto.NamespaceMapper;
-import org.apache.pluto.services.ContainerServices;
-import org.apache.pluto.spi.CCPPProfileService;
-import org.apache.pluto.spi.ContainerInvocationService;
-import org.apache.pluto.spi.EventCoordinationService;
-import org.apache.pluto.spi.PortalCallbackService;
-import org.apache.pluto.spi.optional.PortalAdministrationService;
-import org.apache.pluto.spi.optional.PortletContextService;
-import org.apache.pluto.spi.optional.PortletEnvironmentService;
-import org.apache.pluto.spi.optional.PortletInfoService;
-import org.apache.pluto.spi.optional.PortletInvokerService;
-import org.apache.pluto.spi.optional.PortletPreferencesService;
-import org.apache.pluto.spi.optional.PortletRegistryService;
-import org.apache.pluto.spi.optional.PortletRequestContextService;
-import org.apache.pluto.spi.optional.UserInfoService;
+import org.apache.pluto.container.NamespaceMapper;
+import org.apache.pluto.container.services.ContainerServices;
+import org.apache.pluto.container.spi.CCPPProfileService;
+import org.apache.pluto.container.spi.ContainerInvocationService;
+import org.apache.pluto.container.spi.EventCoordinationService;
+import org.apache.pluto.container.spi.PortalCallbackService;
+import org.apache.pluto.container.spi.optional.PortalAdministrationService;
+import org.apache.pluto.container.spi.optional.PortletContextService;
+import org.apache.pluto.container.spi.optional.PortletEnvironmentService;
+import org.apache.pluto.container.spi.optional.PortletInfoService;
+import org.apache.pluto.container.spi.optional.PortletInvokerService;
+import org.apache.pluto.container.spi.optional.PortletPreferencesService;
+import org.apache.pluto.container.spi.optional.PortletRegistryService;
+import org.apache.pluto.container.spi.optional.PortletRequestContextService;
+import org.apache.pluto.container.spi.optional.UserInfoService;
 
 
 public class PlutoServices implements ContainerServices

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletServlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletServlet.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletServlet.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletServlet.java Tue Mar 10 09:24:41 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.driver;
+package org.apache.pluto.container.driver;
 
 import java.io.IOException;
 import java.util.Timer;
@@ -43,21 +43,21 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.pluto.Constants;
-import org.apache.pluto.ContainerInvocation;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.internal.InternalPortletConfig;
-import org.apache.pluto.internal.InternalPortletContext;
-import org.apache.pluto.om.portlet.PortletDefinition;
-import org.apache.pluto.spi.ContainerInvocationService;
-import org.apache.pluto.spi.FilterManager;
-import org.apache.pluto.spi.optional.AdministrativeRequestListener;
-import org.apache.pluto.spi.optional.PortalAdministrationService;
-import org.apache.pluto.spi.optional.PortletContextService;
-import org.apache.pluto.spi.optional.PortletInvocationEvent;
-import org.apache.pluto.spi.optional.PortletInvocationListener;
-import org.apache.pluto.spi.optional.PortletRequestContext;
+import org.apache.pluto.container.Constants;
+import org.apache.pluto.container.ContainerInvocation;
+import org.apache.pluto.container.InternalPortletConfig;
+import org.apache.pluto.container.InternalPortletContext;
+import org.apache.pluto.container.PortletContainerException;
+import org.apache.pluto.container.PortletWindow;
+import org.apache.pluto.container.om.portlet.PortletDefinition;
+import org.apache.pluto.container.spi.ContainerInvocationService;
+import org.apache.pluto.container.spi.FilterManager;
+import org.apache.pluto.container.spi.optional.AdministrativeRequestListener;
+import org.apache.pluto.container.spi.optional.PortalAdministrationService;
+import org.apache.pluto.container.spi.optional.PortletContextService;
+import org.apache.pluto.container.spi.optional.PortletInvocationEvent;
+import org.apache.pluto.container.spi.optional.PortletInvocationListener;
+import org.apache.pluto.container.spi.optional.PortletRequestContext;
 
 /**
  * Portlet Invocation Servlet. This servlet recieves cross context requests from

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/ContainerRuntimeOption.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/ContainerRuntimeOption.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/ContainerRuntimeOption.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/ContainerRuntimeOption.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import java.util.List;
 

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/CustomPortletMode.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/CustomPortletMode.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/CustomPortletMode.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/CustomPortletMode.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import java.util.List;
 import java.util.Locale;

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/CustomWindowState.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/CustomWindowState.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/CustomWindowState.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/CustomWindowState.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import java.util.List;
 import java.util.Locale;

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Description.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Description.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Description.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Description.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import java.util.Locale;
 

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/DisplayName.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/DisplayName.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/DisplayName.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/DisplayName.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import java.util.Locale;
 

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/EventDefinition.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/EventDefinition.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/EventDefinition.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/EventDefinition.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import java.util.List;
 import java.util.Locale;

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/EventDefinitionReference.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/EventDefinitionReference.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/EventDefinitionReference.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/EventDefinitionReference.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import javax.xml.namespace.QName;
 

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Filter.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Filter.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Filter.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Filter.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import java.util.List;
 import java.util.Locale;

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/FilterMapping.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/FilterMapping.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/FilterMapping.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/FilterMapping.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import java.util.List;
 

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/InitParam.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/InitParam.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/InitParam.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/InitParam.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import java.util.List;
 import java.util.Locale;

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Listener.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Listener.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Listener.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Listener.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import java.util.List;
 import java.util.Locale;

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletApplicationDefinition.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletApplicationDefinition.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletApplicationDefinition.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletApplicationDefinition.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import java.util.List;
 import java.util.Locale;

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletDefinition.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletDefinition.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletDefinition.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletDefinition.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import java.util.List;
 import java.util.Locale;

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletInfo.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletInfo.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletInfo.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletInfo.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 public interface PortletInfo {
 

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Preference.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Preference.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Preference.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Preference.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import java.util.List;
 

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Preferences.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Preferences.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Preferences.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Preferences.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import java.util.List;
 

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PublicRenderParameter.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PublicRenderParameter.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PublicRenderParameter.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PublicRenderParameter.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import java.util.List;
 import java.util.Locale;

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/SecurityConstraint.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/SecurityConstraint.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/SecurityConstraint.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/SecurityConstraint.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import java.util.List;
 import java.util.Locale;

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/SecurityRoleRef.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/SecurityRoleRef.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/SecurityRoleRef.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/SecurityRoleRef.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import java.util.List;
 import java.util.Locale;

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Supports.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Supports.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Supports.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Supports.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import java.util.List;
 

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/UserAttribute.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/UserAttribute.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/UserAttribute.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/UserAttribute.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import java.util.List;
 import java.util.Locale;

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/UserDataConstraint.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/UserDataConstraint.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/UserDataConstraint.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/UserDataConstraint.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.om.portlet;
+package org.apache.pluto.container.om.portlet;
 
 import java.util.List;
 import java.util.Locale;

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/services/ContainerServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/services/ContainerServices.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/services/ContainerServices.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/services/ContainerServices.java Tue Mar 10 09:24:41 2009
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.services;
+package org.apache.pluto.container.services;
 
-import org.apache.pluto.OptionalContainerServices;
-import org.apache.pluto.RequiredContainerServices;
+import org.apache.pluto.container.OptionalContainerServices;
+import org.apache.pluto.container.RequiredContainerServices;
 
 
 public interface ContainerServices extends RequiredContainerServices, OptionalContainerServices