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 at...@apache.org on 2009/03/10 17:25:15 UTC
svn commit: r752156 [1/3] - in /portals/pluto/trunk:
pluto-container-api/src/main/java/org/apache/pluto/container/
pluto-container/src/main/java/org/apache/pluto/
pluto-container/src/main/java/org/apache/pluto/container/
pluto-container/src/main/java/o...
Author: ate
Date: Tue Mar 10 16:25:11 2009
New Revision: 752156
URL: http://svn.apache.org/viewvc?rev=752156&view=rev
Log:
PLUTO-537: Cleaning up Pluto packages
See: https://issues.apache.org/jira/browse/PLUTO-537
- applying new packaging structure to pluto-container as well
Still TODO: resources, tests and of course portal-driver configuration alignment
Added:
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/
- copied from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ActionResponseImpl.java
- copied, changed from r752145, 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/container/impl/PortletAppDescriptorServiceImpl.java (contents, props changed)
- copied, changed from r752101, 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/container/impl/PortletContainerFactory.java (contents, props changed)
- copied, changed from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerImpl.java (with props)
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletRequestImpl.java
- copied, changed from r752145, 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/container/impl/PortletResponseImpl.java
- copied, changed from r752145, 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/container/impl/PortletURLImpl.java
- copied, changed from r752145, 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/container/impl/StateAwareResponseImpl.java
- copied, changed from r752145, 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/container/om/
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/
- copied from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/
- copied from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet10/
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/
- copied from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/
- copied from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultOptionalContainerServices.java
- copied, changed from r752145, 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/driver/impl/PlutoContainerServices.java
- copied, changed from r752145, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PlutoContainerServices.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletActionResponseContextImpl.java (contents, props changed)
- copied, changed from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletActionResponseContextImpl.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletEventResponseContextImpl.java (contents, props changed)
- copied, changed from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletEventResponseContextImpl.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletMimeResponseContextImpl.java (contents, props changed)
- copied, changed from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletMimeResponseContextImpl.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletRenderResponseContextImpl.java (contents, props changed)
- copied, changed from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletRenderResponseContextImpl.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletRequestContextImpl.java (contents, props changed)
- copied, changed from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletRequestContextImpl.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletRequestContextServiceImpl.java (with props)
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletResourceRequestContextImpl.java (contents, props changed)
- copied, changed from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResourceRequestContextImpl.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletResourceResponseContextImpl.java (contents, props changed)
- copied, changed from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResourceResponseContextImpl.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletResponseContextImpl.java (contents, props changed)
- copied, changed from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResponseContextImpl.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletStateAwareResponseContextImpl.java (contents, props changed)
- copied, changed from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletStateAwareResponseContextImpl.java
Removed:
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/
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/package.html
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet10/
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/ContainerInvocationImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/ContainerInvocationServiceImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortletInfoService.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortletRequestContextService.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/PortletContainerImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/UserInfoAttribute.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/package.html
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/
Modified:
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEntity.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ActionRequestImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/CacheControlImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ClientDataRequestImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/CombinedPortletResourceBundle.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/Configuration.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/DummyProfile.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/Environment.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/EventImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/EventRequestImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/EventResponseImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletResponseWrapper.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/InlinePortletResourceBundle.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/MimeResponseImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletConfigImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContextImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletEntityImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletPreferenceImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletPreferencesImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletRequestDispatcherImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletSessionImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RandomStringUtils.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RenderRequestImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RenderResponseImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RequestDispatcherPathInfoImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ResourceBundleFactory.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ResourceRequestImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ResourceResponseImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ContainerRuntimeOptionType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/CustomPortletModeType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/CustomWindowStateType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/DescriptionType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/DisplayNameType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/EventDefinitionReferenceType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/EventDefinitionType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/FilterMappingType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/FilterType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/InitParamType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ListenerType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ObjectFactory.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletAppType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletCollectionType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletInfoType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletPreferencesType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PortletType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PreferenceType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/PublicRenderParameterType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SecurityConstraintType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SecurityRoleRefType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/SupportsType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/UserAttributeType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/UserDataConstraintType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/package-info.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/ContainerRuntimeOptionType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/CustomPortletModeType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/CustomWindowStateType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/DescriptionType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/DisplayNameType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/InitParamType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/ObjectFactory.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletAppType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletCollectionType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletInfoType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletPreferencesType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PortletType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/PreferenceType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/SecurityConstraintType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/SecurityRoleRefType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/SupportsType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/UserAttributeType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/UserDataConstraintType.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/package-info.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ArgumentUtility.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/ClasspathScanner.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/DummyPrintWriter.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/DummyServletOutputStream.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/Enumerator.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/PrintWriterServletOutputStream.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/StringManager.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/StringUtils.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/ApplicationIdResolver.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/AttributeApplicationIdResolver.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/Configuration.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultApplicationIdResolver.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultNamespaceMapper.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortalAdministrationService.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortletEnvironmentService.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortletInvokerService.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultPortletPreferencesService.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DefaultUserInfoService.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/DummyCCPPProfileServiceImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/InitParameterApplicationIdResolver.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/PortletContextManager.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/PortletDescriptorRegistry.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/ConfigurationTest.java
portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/EnvironmentTest.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/ArgumentUtilityTest.java
portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java
portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/StringUtilsTest.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/PortletWindowThread.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/src/main/java/org/apache/pluto/driver/PortalStartupListener.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.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
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEntity.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEntity.java?rev=752156&r1=752155&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEntity.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEntity.java Tue Mar 10 16:25:11 2009
@@ -22,7 +22,7 @@
* The PortletEntity encapsulates all data pertaining to a single portlet
* instance. This instance may appear zero or more times per user. The
* PortletEntity consists of two primary peices of information, the Portlet
- * Definition as defined by the {@link org.apache.pluto.descriptors.portlet.PortletType} and the Wrapping Servlet
+ * Definition as defined by the {@link org.apache.pluto.container.om.portlet.impl.PortletType} and the Wrapping Servlet
* information as defined by the{@link ServletDD}
*
*/
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ActionRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ActionRequestImpl.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ActionRequestImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ActionRequestImpl.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import javax.portlet.ActionRequest;
import javax.portlet.PortletRequest;
Copied: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ActionResponseImpl.java (from r752145, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionResponseImpl.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ActionResponseImpl.java?p2=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ActionResponseImpl.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionResponseImpl.java&r1=752145&r2=752156&rev=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionResponseImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ActionResponseImpl.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.io.IOException;
@@ -22,7 +22,7 @@
import org.apache.pluto.container.PortletActionResponseContext;
import org.apache.pluto.container.ResourceURLProvider;
-import org.apache.pluto.util.ArgumentUtility;
+import org.apache.pluto.container.util.ArgumentUtility;
public class ActionResponseImpl extends StateAwareResponseImpl implements ActionResponse
{
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/CacheControlImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/CacheControlImpl.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/CacheControlImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/CacheControlImpl.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import javax.portlet.CacheControl;
import javax.portlet.MimeResponse;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ClientDataRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ClientDataRequestImpl.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ClientDataRequestImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ClientDataRequestImpl.java Tue Mar 10 16:25:11 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.io.BufferedReader;
import java.io.IOException;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/CombinedPortletResourceBundle.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/CombinedPortletResourceBundle.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/CombinedPortletResourceBundle.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/CombinedPortletResourceBundle.java Tue Mar 10 16:25:11 2009
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.ResourceBundle;
import java.util.Vector;
-import org.apache.pluto.util.StringManager;
+import org.apache.pluto.container.util.StringManager;
/**
*
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/Configuration.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/Configuration.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/Configuration.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/Configuration.java Tue Mar 10 16:25:11 2009
@@ -1,4 +1,4 @@
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.util.ArrayList;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/DummyProfile.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/DummyProfile.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/DummyProfile.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/DummyProfile.java Tue Mar 10 16:25:11 2009
@@ -1,7 +1,7 @@
/**
*
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.util.Set;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/Environment.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/Environment.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/Environment.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/Environment.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.util.ResourceBundle;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/EventImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/EventImpl.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/EventImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/EventImpl.java Tue Mar 10 16:25:11 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import javax.portlet.Event;
import javax.xml.namespace.QName;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/EventRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/EventRequestImpl.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/EventRequestImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/EventRequestImpl.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import javax.portlet.Event;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/EventResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/EventResponseImpl.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/EventResponseImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/EventResponseImpl.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.util.Map;
@@ -23,7 +23,7 @@
import org.apache.pluto.container.PortletEventResponseContext;
import org.apache.pluto.container.PortletStateAwareResponseContext;
-import org.apache.pluto.util.ArgumentUtility;
+import org.apache.pluto.container.util.ArgumentUtility;
/**
* Implementation of JSR-286 <code>EventResponse</code>.
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java Tue Mar 10 16:25:11 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.io.BufferedReader;
import java.io.IOException;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletResponseWrapper.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletResponseWrapper.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletResponseWrapper.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletResponseWrapper.java Tue Mar 10 16:25:11 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.io.IOException;
import java.io.PrintWriter;
@@ -31,8 +31,8 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
-import org.apache.pluto.util.DummyPrintWriter;
-import org.apache.pluto.util.DummyServletOutputStream;
+import org.apache.pluto.container.util.DummyPrintWriter;
+import org.apache.pluto.container.util.DummyServletOutputStream;
/**
* @author <a href="mailto:ate@douma.nu">Ate Douma</a>
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/InlinePortletResourceBundle.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/InlinePortletResourceBundle.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/InlinePortletResourceBundle.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/InlinePortletResourceBundle.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.util.ArrayList;
import java.util.ListResourceBundle;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/MimeResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/MimeResponseImpl.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/MimeResponseImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/MimeResponseImpl.java Tue Mar 10 16:25:11 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.io.IOException;
import java.io.OutputStream;
Copied: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java (from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorServiceImpl.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java?p2=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorServiceImpl.java&r1=752101&r2=752156&rev=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorServiceImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java Tue Mar 10 16:25:11 2009
@@ -1,4 +1,4 @@
-package org.apache.pluto.descriptors.services.jaxb;
+package org.apache.pluto.container.impl;
import java.io.IOException;
import java.io.InputStream;
@@ -21,7 +21,7 @@
import org.apache.pluto.container.PortletAppDescriptorService;
import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
-import org.apache.pluto.descriptors.portlet.PortletAppType;
+import org.apache.pluto.container.om.portlet.impl.PortletAppType;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -130,8 +130,8 @@
JAXBElement app = null;
try {
JAXBContext jc = JAXBContext.newInstance(
- "org.apache.pluto.descriptors.portlet10" + ":" +
- "org.apache.pluto.descriptors.portlet", PortletAppDescriptorServiceImpl.class.getClassLoader());
+ "org.apache.pluto.container.om.portlet10.impl" + ":" +
+ "org.apache.pluto.container.om.portlet.impl", PortletAppDescriptorServiceImpl.class.getClassLoader());
Unmarshaller u = jc.createUnmarshaller();
u.setEventHandler(new javax.xml.bind.helpers.DefaultValidationEventHandler());
@@ -144,9 +144,9 @@
catch(Exception me) {
throw new IOException(me.getLocalizedMessage());
}
- if (app.getValue() instanceof org.apache.pluto.descriptors.portlet10.PortletAppType)
+ if (app.getValue() instanceof org.apache.pluto.container.portlet10.impl.PortletAppType)
{
- return ((org.apache.pluto.descriptors.portlet10.PortletAppType)app.getValue()).upgrade();
+ return ((org.apache.pluto.container.portlet10.impl.PortletAppType)app.getValue()).upgrade();
}
return (PortletApplicationDefinition)app.getValue();
}
@@ -260,12 +260,12 @@
Object src = null;
if (PortletApplicationDefinition.JSR_168_VERSION.equals(app.getVersion()))
{
- jc = JAXBContext.newInstance("org.apache.pluto.descriptors.portlet10");
- src = new org.apache.pluto.descriptors.portlet10.PortletAppType(app);
+ jc = JAXBContext.newInstance("org.apache.pluto.container.om.portlet10.impl");
+ src = new org.apache.pluto.container.portlet10.impl.PortletAppType(app);
}
else
{
- jc = JAXBContext.newInstance("org.apache.pluto.descriptors.portlet");
+ jc = JAXBContext.newInstance("org.apache.pluto.container.om.portlet.impl");
src = app;
}
Marshaller m = jc.createMarshaller();
Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletConfigImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletConfigImpl.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletConfigImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletConfigImpl.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.util.ArrayList;
import java.util.Collections;
Copied: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerFactory.java (from r752101, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerFactory.java?p2=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerFactory.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java&r1=752101&r2=752156&rev=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerFactory.java Tue Mar 10 16:25:11 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.impl;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -22,9 +22,8 @@
import org.apache.pluto.container.PortletContainer;
import org.apache.pluto.container.PortletContainerException;
import org.apache.pluto.container.RequiredContainerServices;
-import org.apache.pluto.core.DefaultOptionalContainerServices;
-import org.apache.pluto.core.PortletContainerImpl;
-import org.apache.pluto.util.ArgumentUtility;
+import org.apache.pluto.container.util.ArgumentUtility;
+import org.apache.pluto.driver.impl.DefaultOptionalContainerServices;
/**
* Factory used to create new PortletContainer instances. The factor constructs
Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerImpl.java?rev=752156&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerImpl.java (added)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerImpl.java Tue Mar 10 16:25:11 2009
@@ -0,0 +1,531 @@
+/*
+ * 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.impl;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.Event;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequest;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pluto.container.Constants;
+import org.apache.pluto.container.EventContainer;
+import org.apache.pluto.container.FilterManager;
+import org.apache.pluto.container.OptionalContainerServices;
+import org.apache.pluto.container.PortletActionResponseContext;
+import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletContainerException;
+import org.apache.pluto.container.PortletEntity;
+import org.apache.pluto.container.PortletEnvironmentService;
+import org.apache.pluto.container.PortletEventResponseContext;
+import org.apache.pluto.container.PortletInvokerService;
+import org.apache.pluto.container.PortletRenderResponseContext;
+import org.apache.pluto.container.PortletRequestContext;
+import org.apache.pluto.container.PortletRequestContextService;
+import org.apache.pluto.container.PortletResourceRequestContext;
+import org.apache.pluto.container.PortletResourceResponseContext;
+import org.apache.pluto.container.PortletWindow;
+import org.apache.pluto.container.RequiredContainerServices;
+import org.apache.pluto.container.util.StringManager;
+
+
+/**
+ * Default Pluto Container implementation.
+ *
+ * @version 1.0
+ * @since Sep 18, 2004
+ */
+public class PortletContainerImpl implements PortletContainer,
+ EventContainer {
+
+ /** Internal logger. */
+ private static final Log LOG = LogFactory.getLog(PortletContainerImpl.class);
+
+
+ // Private Member Variables ------------------------------------------------
+
+ private static final StringManager EXCEPTIONS = StringManager.getManager(
+ PortletContainerImpl.class.getPackage().getName());
+
+ /** The portlet container name. */
+ private final String name;
+
+ /** The required container services associated with this container. */
+ private final RequiredContainerServices requiredContainerServices;
+
+ /** The optional container services associated with this container. */
+ private final OptionalContainerServices optionalContainerServices;
+
+
+ /** Flag indicating whether or not we've been initialized. */
+ private boolean initialized = false;
+
+
+ // Constructor -------------------------------------------------------------
+
+ /** Default Constructor. Create a container implementation
+ * whith the given name and given services.
+ *
+ * @param name the name of the container.
+ * @param requiredServices the required container services implementation.
+ * @param optionalServices the optional container services implementation.
+ */
+ public PortletContainerImpl(String name,
+ RequiredContainerServices requiredServices,
+ OptionalContainerServices optionalServices) {
+ this.name = name;
+ this.requiredContainerServices = requiredServices;
+ this.optionalContainerServices = optionalServices;
+ }
+
+
+ // PortletContainer Impl ---------------------------------------------------
+
+ /**
+ * Initialize the container for use within the given configuration scope.
+ * @param servletContext the servlet context of the portal webapp.
+ */
+ public void init()
+ throws PortletContainerException {
+ this.initialized = true;
+ infoWithName("Container initialized successfully.");
+ }
+
+ /**
+ * Determine whether this container has been initialized or not.
+ * @return true if the container has been initialized.
+ */
+ public boolean isInitialized() {
+ return initialized;
+ }
+
+ /**
+ * Destroy this container.
+ */
+ public void destroy() {
+ this.initialized = false;
+ infoWithName("Container destroyed.");
+ }
+
+
+ /**
+ * Renders the portlet associated with the specified portlet window.
+ * @param portletWindow the portlet window.
+ * @param request the servlet request.
+ * @param response the servlet response.
+ * @throws IllegalStateException if the container is not initialized.
+ * @throws PortletException
+ * @throws IOException
+ * @throws PortletContainerException
+ *
+ * @see javax.portlet.Portlet#render(RenderRequest, RenderResponse)
+ */
+ public void doRender(PortletWindow portletWindow,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws PortletException, IOException, PortletContainerException
+ {
+ ensureInitialized();
+
+ debugWithName("Render request received for portlet: "
+ + portletWindow.getPortletEntity().getPortletDefinition().getPortletName());
+
+ PortletRequestContextService rcService = getRequiredContainerServices().getPortletRequestContextService();
+ PortletEnvironmentService envService = getOptionalContainerServices().getPortletEnvironmentService();
+ PortletInvokerService invoker = optionalContainerServices.getPortletInvokerService();
+
+ PortletRequestContext requestContext = rcService.getPortletRenderRequestContext(this, request, response, portletWindow);
+ PortletRenderResponseContext responseContext = rcService.getPortletRenderResponseContext(this, request, response, portletWindow);
+ RenderRequest portletRequest = envService.createRenderRequest(requestContext, responseContext.getCacheControl());
+ RenderResponse portletResponse = envService.createRenderResponse(responseContext);
+
+ FilterManager filterManager = filterInitialisation(portletWindow,PortletRequest.RENDER_PHASE);
+
+ try
+ {
+ invoker.render(requestContext, portletRequest, portletResponse, filterManager);
+ // Mark portlet interaction is completed: backend implementation can flush response state now
+ responseContext.close();
+ }
+ finally
+ {
+ responseContext.release();
+ }
+
+ debugWithName("Portlet render done for: " + portletWindow.getPortletEntity().getPortletDefinition().getPortletName());
+ }
+
+ /**
+ * Indicates that a portlet resource Serving occured in the current request and calls
+ * the processServeResource method of this portlet.
+ * @param PortletWindow the portlet Window
+ * @param request the servlet request
+ * @param response the servlet response
+ * @throws PortletException if one portlet has trouble fulfilling
+ * the request
+ * @throws PortletContainerException if the portlet container implementation
+ * has trouble fulfilling the request
+ */
+ public void doServeResource(PortletWindow portletWindow,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws PortletException, IOException, PortletContainerException
+ {
+ ensureInitialized();
+
+ debugWithName("Resource request received for portlet: "
+ + portletWindow.getPortletEntity().getPortletDefinition().getPortletName());
+
+ PortletRequestContextService rcService = getRequiredContainerServices().getPortletRequestContextService();
+ PortletEnvironmentService envService = getOptionalContainerServices().getPortletEnvironmentService();
+ PortletInvokerService invoker = optionalContainerServices.getPortletInvokerService();
+
+ PortletResourceRequestContext requestContext = rcService.getPortletResourceRequestContext(this, request, response, portletWindow);
+ PortletResourceResponseContext responseContext = rcService.getPortletResourceResponseContext(this, request, response, portletWindow);
+ ResourceRequest portletRequest = envService.createResourceRequest(requestContext, responseContext.getCacheControl());
+ ResourceResponse portletResponse = envService.createResourceResponse(responseContext, requestContext.getCacheability());
+
+ FilterManager filterManager = filterInitialisation(portletWindow,PortletRequest.RESOURCE_PHASE);
+
+ try
+ {
+ invoker.serveResource(requestContext, portletRequest, portletResponse, filterManager);
+ // Mark portlet interaction is completed: backend implementation can flush response state now
+ responseContext.close();
+ }
+ finally
+ {
+ responseContext.release();
+ }
+
+ debugWithName("Portlet resource done for: " + portletWindow.getPortletEntity().getPortletDefinition().getPortletName());
+ }
+
+ /**
+ * Process action for the portlet associated with the given portlet window.
+ * @param portletWindow the portlet window.
+ * @param request the servlet request.
+ * @param response the servlet response.
+ * @throws PortletException
+ * @throws IOException
+ * @throws PortletContainerException
+ *
+ * @see javax.portlet.Portlet#processAction(ActionRequest, ActionResponse)
+ */
+ public void doAction(PortletWindow portletWindow,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws PortletException, IOException, PortletContainerException
+ {
+ ensureInitialized();
+
+ debugWithName("Action request received for portlet: "
+ + portletWindow.getPortletEntity().getPortletDefinition().getPortletName());
+
+ PortletRequestContextService rcService = getRequiredContainerServices().getPortletRequestContextService();
+ PortletEnvironmentService envService = getOptionalContainerServices().getPortletEnvironmentService();
+ PortletInvokerService invoker = optionalContainerServices.getPortletInvokerService();
+
+ PortletRequestContext requestContext = rcService.getPortletActionRequestContext(this, request, response, portletWindow);
+ PortletActionResponseContext responseContext = rcService.getPortletActionResponseContext(this, request, response, portletWindow);
+ ActionRequest portletRequest = envService.createActionRequest(requestContext);
+ ActionResponse portletResponse = envService.createActionResponse(responseContext);
+
+ FilterManager filterManager = filterInitialisation(portletWindow,PortletRequest.ACTION_PHASE);
+
+ String location = null;
+
+ try
+ {
+ invoker.action(requestContext, portletRequest, portletResponse, filterManager);
+
+ debugWithName("Portlet action processed for: "
+ + portletWindow.getPortletEntity().getPortletDefinition().getPortletName());
+
+ // Mark portlet interaction is completed: backend implementation can flush response state now
+ responseContext.close();
+
+ if (!responseContext.isRedirect())
+ {
+ List<Event> events = responseContext.getEvents();
+ if (!events.isEmpty())
+ {
+ requiredContainerServices.getEventCoordinationService().processEvents(portletWindow, events);
+ }
+ }
+
+ // After processing action and possible event handling, retrieve the target response URL to be redirected to
+ // This can either be a renderURL or an external URL (optionally containing a future renderURL as query parameter
+ location = response.encodeRedirectURL(responseContext.getResponseURL());
+ }
+ finally
+ {
+ responseContext.release();
+ }
+ redirect(request, response, location);
+
+ debugWithName("Portlet action done for: " + portletWindow.getPortletEntity().getPortletDefinition().getPortletName());
+ }
+
+ protected void redirect(HttpServletRequest request, HttpServletResponse response, String location) throws IOException
+ {
+ // Here we intentionally use the original response
+ // instead of the wrapped internal response.
+ response.sendRedirect(location);
+ debugWithName("Redirect URL sent.");
+ }
+
+ /**
+ * Loads the portlet associated with the specified portlet window.
+ * @param portletWindow the portlet window.
+ * @param request the servlet request.
+ * @param response the servlet response.
+ * @throws PortletException
+ * @throws IOException
+ * @throws PortletContainerException
+ */
+ public void doLoad(PortletWindow portletWindow,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws PortletException, IOException, PortletContainerException
+ {
+ ensureInitialized();
+
+ debugWithName("Load request received for portlet: "
+ + portletWindow.getPortletEntity().getPortletDefinition().getPortletName());
+
+ PortletRequestContextService rcService = getRequiredContainerServices().getPortletRequestContextService();
+ PortletEnvironmentService envService = getOptionalContainerServices().getPortletEnvironmentService();
+ PortletInvokerService invoker = optionalContainerServices.getPortletInvokerService();
+
+ PortletRequestContext requestContext = rcService.getPortletRenderRequestContext(this, request, response, portletWindow);
+ PortletRenderResponseContext responseContext = rcService.getPortletRenderResponseContext(this, request, response, portletWindow);
+ RenderRequest portletRequest = envService.createRenderRequest(requestContext, responseContext.getCacheControl());
+ RenderResponse portletResponse = envService.createRenderResponse(responseContext);
+
+ try
+ {
+ invoker.load(requestContext, portletRequest, portletResponse);
+ // Mark portlet interaction is completed: backend implementation can flush response state now
+ responseContext.close();
+ }
+ finally
+ {
+ responseContext.release();
+ }
+
+ debugWithName("Portlet load done for: " + portletWindow.getPortletEntity().getPortletDefinition().getPortletName());
+ }
+
+
+ public void doAdmin(PortletWindow portletWindow,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws PortletException, IOException, PortletContainerException
+ {
+ ensureInitialized();
+
+ debugWithName("Admin request received for portlet: "
+ +portletWindow.getPortletEntity().getPortletDefinition().getPortletName());
+
+ PortletRequestContextService rcService = getRequiredContainerServices().getPortletRequestContextService();
+ PortletEnvironmentService envService = getOptionalContainerServices().getPortletEnvironmentService();
+ PortletInvokerService invoker = optionalContainerServices.getPortletInvokerService();
+
+ PortletRequestContext requestContext = rcService.getPortletRenderRequestContext(this, request, response, portletWindow);
+ PortletRenderResponseContext responseContext = rcService.getPortletRenderResponseContext(this, request, response, portletWindow);
+ RenderRequest portletRequest = envService.createRenderRequest(requestContext, responseContext.getCacheControl());
+ RenderResponse portletResponse = envService.createRenderResponse(responseContext);
+
+ try
+ {
+ invoker.admin(requestContext, portletRequest, portletResponse);
+ // Mark portlet interaction is completed: backend implementation can flush response state now
+ responseContext.close();
+ }
+ finally
+ {
+ responseContext.release();
+ }
+
+ debugWithName("Portlet admin request done for: " + portletWindow.getPortletEntity().getPortletDefinition().getPortletName());
+ }
+
+
+ public String getName() {
+ return name;
+ }
+
+ public RequiredContainerServices getRequiredContainerServices() {
+ return requiredContainerServices;
+ }
+
+ /**
+ * Retrieve the optional container services used by the container.
+ * If no implementation was provided during construction, the default
+ * instance will be returned.
+ *
+ * @return services used by the container.
+ */
+ public OptionalContainerServices getOptionalContainerServices() {
+ return optionalContainerServices;
+ }
+
+ /**
+ * Fire Event for the portlet associated with the given portlet window and eventName
+ * @param portletWindow the portlet window.
+ * @param request the servlet request.
+ * @param response the servlet response.
+ * @param eventName the event name
+ * @throws PortletException
+ * @throws IOException
+ * @throws PortletContainerException
+ *
+ * @see {@link javax.portlet.EventPortlet#processEvent(javax.portlet.EventRequest, javax.portlet.EventResponse)
+ */
+ public void fireEvent(HttpServletRequest request, HttpServletResponse response,
+ PortletWindow portletWindow, Event event)
+ throws PortletException, IOException, PortletContainerException
+ {
+ ensureInitialized();
+
+ debugWithName("Event: "+event.getName()+" received for portlet: "
+ + portletWindow.getPortletEntity().getPortletDefinition().getPortletName());
+
+ PortletRequestContextService rcService = getRequiredContainerServices().getPortletRequestContextService();
+ PortletEnvironmentService envService = getOptionalContainerServices().getPortletEnvironmentService();
+ PortletInvokerService invoker = optionalContainerServices.getPortletInvokerService();
+
+ PortletRequestContext requestContext = rcService.getPortletEventRequestContext(this, request, response, portletWindow);
+ PortletEventResponseContext responseContext = rcService.getPortletEventResponseContext(this, request, response, portletWindow);
+ EventRequest portletRequest = envService.createEventRequest(requestContext, event);
+ EventResponse portletResponse = envService.createEventResponse(responseContext);
+
+ FilterManager filterManager = filterInitialisation(portletWindow,PortletRequest.EVENT_PHASE);
+
+ List<Event> events = null;
+ try
+ {
+ invoker.event(requestContext, portletRequest, portletResponse, filterManager);
+
+ debugWithName("Portlet event processed for: "
+ + portletWindow.getPortletEntity().getPortletDefinition().getPortletName());
+
+ // Mark portlet interaction is completed: backend implementation can flush response state now
+ responseContext.close();
+ events = responseContext.getEvents();
+ }
+ finally
+ {
+ responseContext.release();
+ }
+
+ if (events != null && !events.isEmpty())
+ {
+ requiredContainerServices.getEventCoordinationService().processEvents(portletWindow, events);
+ }
+
+ debugWithName("Portlet event: "+ event.getName() +" fired for: " + portletWindow.getPortletEntity().getPortletDefinition().getPortletName());
+ }
+
+ // Private Methods ---------------------------------------------------------
+
+ /**
+ * Ensures that the portlet container is initialized.
+ * @throws IllegalStateException if the container is not initialized.
+ */
+ private void ensureInitialized() throws IllegalStateException {
+ if (!isInitialized()) {
+ throw new IllegalStateException(
+ "Portlet container [" + name + "] is not initialized.");
+ }
+ }
+
+ /**
+ * Prints a message at DEBUG level with the container name prefix.
+ * @param message log message.
+ */
+ private void debugWithName(String message) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Portlet Container [" + name + "]: " + message);
+ }
+ }
+
+ /**
+ * Prints a message at INFO level with the container name prefix.
+ * @param message log message.
+ */
+ private void infoWithName(String message) {
+ if (LOG.isInfoEnabled()) {
+ LOG.info("Portlet Container [" + name + "]: " + message);
+ }
+ }
+
+ /**
+ * Prints a message at ERROR level with the container name prefix.
+ * @param message log message.
+ */
+ private void errorWithName(String message) {
+ if (LOG.isErrorEnabled()) {
+ LOG.info("Portlet Container [" + name + "]: " + message);
+ }
+ }
+
+ /**
+ * Checks if render parameter are already cleared,
+ * bye storing/reading an ID in the request
+ *
+ * @param request the portlet request
+ *
+ * @return true, if already cleared
+ */
+ protected boolean isAlreadyCleared(PortletRequest request)
+ {
+ String cleared = (String) request.getAttribute(Constants.RENDER_ALREADY_CLEARED);
+ if (cleared == null || cleared.equals("false")) {
+ request.setAttribute(Constants.RENDER_ALREADY_CLEARED,"true");
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * The method initialise the FilterManager for later use in the PortletServlet
+ * @param PortletWindow the PortletWindow
+ * @param lifeCycle like ACTION_PHASE, RENDER_PHASE,...
+ * @return FilterManager
+ * @throws PortletContainerException
+ */
+ private FilterManager filterInitialisation(PortletWindow portletWindow,String lifeCycle) throws PortletContainerException{
+ PortletEntity pe = portletWindow.getPortletEntity();
+ return requiredContainerServices.getFilterManagerService().getFilterManager(pe.getPortletDefinition().getApplication(),pe.getPortletDefinition().getPortletName(),lifeCycle);
+ }
+}
+
Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContextImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContextImpl.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContextImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContextImpl.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.io.InputStream;
import java.net.MalformedURLException;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletEntityImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletEntityImpl.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletEntityImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletEntityImpl.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import org.apache.pluto.container.PortletEntity;
import org.apache.pluto.container.om.portlet.PortletDefinition;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletPreferenceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletPreferenceImpl.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletPreferenceImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletPreferenceImpl.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import org.apache.pluto.container.PortletPreference;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletPreferencesImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletPreferencesImpl.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletPreferencesImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletPreferencesImpl.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.io.IOException;
import java.util.Collections;
@@ -37,7 +37,7 @@
import org.apache.pluto.container.PortletPreferencesService;
import org.apache.pluto.container.PortletWindow;
import org.apache.pluto.container.om.portlet.PortletDefinition;
-import org.apache.pluto.util.StringManager;
+import org.apache.pluto.container.util.StringManager;
/**
* Implementation of the <code>javax.portlet.PortletPreferences</code>
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletRequestDispatcherImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletRequestDispatcherImpl.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletRequestDispatcherImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletRequestDispatcherImpl.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.io.IOException;
Copied: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletRequestImpl.java (from r752145, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletRequestImpl.java?p2=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletRequestImpl.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java&r1=752145&r2=752156&rev=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletRequestImpl.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.security.Principal;
import java.util.ArrayList;
@@ -52,8 +52,8 @@
import org.apache.pluto.container.om.portlet.PortletDefinition;
import org.apache.pluto.container.om.portlet.SecurityRoleRef;
import org.apache.pluto.container.om.portlet.Supports;
-import org.apache.pluto.util.ArgumentUtility;
-import org.apache.pluto.util.StringManager;
+import org.apache.pluto.container.util.ArgumentUtility;
+import org.apache.pluto.container.util.StringManager;
/**
Copied: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletResponseImpl.java (from r752145, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletResponseImpl.java?p2=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletResponseImpl.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java&r1=752145&r2=752156&rev=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletResponseImpl.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.util.Enumeration;
@@ -35,7 +35,7 @@
import org.apache.pluto.container.PortletWindow;
import org.apache.pluto.container.ResourceURLProvider;
import org.apache.pluto.container.om.portlet.Supports;
-import org.apache.pluto.util.ArgumentUtility;
+import org.apache.pluto.container.util.ArgumentUtility;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletSessionImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletSessionImpl.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletSessionImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletSessionImpl.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.util.ArrayList;
import java.util.Enumeration;
@@ -31,7 +31,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.container.PortletWindow;
-import org.apache.pluto.util.ArgumentUtility;
+import org.apache.pluto.container.util.ArgumentUtility;
/**
* Implementation of the <code>javax.portlet.PortletSession</code> interface.
Copied: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletURLImpl.java (from r752145, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletURLImpl.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletURLImpl.java?p2=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletURLImpl.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletURLImpl.java&r1=752145&r2=752156&rev=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletURLImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletURLImpl.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.io.IOException;
import java.io.Writer;
@@ -40,7 +40,7 @@
import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.container.om.portlet.PortletDefinition;
import org.apache.pluto.container.om.portlet.Supports;
-import org.apache.pluto.util.ArgumentUtility;
+import org.apache.pluto.container.util.ArgumentUtility;
/**
* Refactoring where functionality was pushed into JSR-286 <code>BaseURL</code>.
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RandomStringUtils.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RandomStringUtils.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RandomStringUtils.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RandomStringUtils.java Tue Mar 10 16:25:11 2009
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.util.Random;
/**
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RenderRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RenderRequestImpl.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RenderRequestImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RenderRequestImpl.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import javax.portlet.CacheControl;
import javax.portlet.PortletRequest;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RenderResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RenderResponseImpl.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RenderResponseImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RenderResponseImpl.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.util.ArrayList;
import java.util.Collection;
@@ -23,8 +23,8 @@
import javax.portlet.RenderResponse;
import org.apache.pluto.container.PortletRenderResponseContext;
-import org.apache.pluto.util.ArgumentUtility;
-import org.apache.pluto.util.StringUtils;
+import org.apache.pluto.container.util.ArgumentUtility;
+import org.apache.pluto.container.util.StringUtils;
/**
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RequestDispatcherPathInfoImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RequestDispatcherPathInfoImpl.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RequestDispatcherPathInfoImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RequestDispatcherPathInfoImpl.java Tue Mar 10 16:25:11 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import org.apache.pluto.container.RequestDispatcherPathInfo;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ResourceBundleFactory.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ResourceBundleFactory.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ResourceBundleFactory.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ResourceBundleFactory.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.util.HashMap;
import java.util.Locale;
@@ -26,7 +26,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.container.om.portlet.PortletDefinition;
import org.apache.pluto.container.om.portlet.PortletInfo;
-import org.apache.pluto.util.StringManager;
+import org.apache.pluto.container.util.StringManager;
/**
* Factory object used to create Portlet Resource Bundles.
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ResourceRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ResourceRequestImpl.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ResourceRequestImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ResourceRequestImpl.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.util.Enumeration;
import java.util.Map;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ResourceResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ResourceResponseImpl.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ResourceResponseImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ResourceResponseImpl.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.util.Locale;
Copied: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/StateAwareResponseImpl.java (from r752145, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/StateAwareResponseImpl.java?p2=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/StateAwareResponseImpl.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java&r1=752145&r2=752156&rev=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/StateAwareResponseImpl.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.internal.impl;
+package org.apache.pluto.container.impl;
import java.io.Serializable;
import java.util.Enumeration;
@@ -30,7 +30,7 @@
import org.apache.pluto.container.PortletStateAwareResponseContext;
import org.apache.pluto.container.PortletWindow;
-import org.apache.pluto.util.ArgumentUtility;
+import org.apache.pluto.container.util.ArgumentUtility;
/**
* Implementation of JSR-286 <code>StateAwareResponse</code>.
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ContainerRuntimeOptionType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ContainerRuntimeOptionType.java?rev=752156&r1=752101&r2=752156&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ContainerRuntimeOptionType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ContainerRuntimeOptionType.java Tue Mar 10 16:25:11 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.descriptors.portlet;
+package org.apache.pluto.container.om.portlet.impl;
import java.util.ArrayList;
import java.util.List;