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 2008/10/15 02:01:11 UTC
svn commit: r704743 [1/7] - in /portals/pluto/branches/2.0-spi-refactoring:
./ pluto-container-api/src/main/java/org/apache/pluto/
pluto-container-api/src/main/java/org/apache/pluto/om/
pluto-container-api/src/main/java/org/apache/pluto/om/common/ plut...
Author: ate
Date: Tue Oct 14 17:01:07 2008
New Revision: 704743
URL: http://svn.apache.org/viewvc?rev=704743&view=rev
Log:
Combined solution for:
- PLUTO-509: JAXB portlet descriptor model handling broken with respect to the different namespace handling for portlet API 1.0 and 2.0
- PLUTO-510: Web deployment descriptor model loading and rewriting broken and out-dated
See:
http://issues.apache.org/jira/browse/PLUTO-509
http://issues.apache.org/jira/browse/PLUTO-510
Added:
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/ElementFactoryList.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PublicRenderParameter.java
- copied, changed from r702850, portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PublicRenderParam.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/ContainerRuntimeOptionType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/CustomPortletModeType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/CustomWindowStateType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/DescriptionType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/DisplayNameType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/FilterMappingType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/FilterType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/InitParamType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/ObjectFactory.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletAppType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletCollectionType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletInfoType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletPreferencesType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PortletType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/PreferenceType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/SecurityConstraintType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/SecurityRoleRefType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/SupportsType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/UserAttributeType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/UserDataConstraintType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet10/package-info.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/
- copied from r702850, portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/ContainerRuntimeOptionType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/CustomPortletModeType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/CustomWindowStateType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/DescriptionType.java (contents, props changed)
- copied, changed from r702850, portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/DescriptionDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/DisplayNameType.java (contents, props changed)
- copied, changed from r702850, portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/DisplayNameDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/EventDefinitionReferenceType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/EventDefinitionType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/FilterMappingType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/FilterType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/InitParamType.java (contents, props changed)
- copied, changed from r702850, portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/InitParamDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/ListenerType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletAppType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletCollectionType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletInfoType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletPreferencesType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PreferenceType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PublicRenderParameterType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/SecurityConstraintType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/SecurityRoleRefType.java (contents, props changed)
- copied, changed from r702850, portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/SecurityRoleRefDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/SupportsType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/UserAttributeType.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/UserDataConstraintType.java (contents, props changed)
- copied, changed from r702850, portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/UserDataConstraintDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/jaxb/portlet-app_1_0.xsd (contents, props changed)
- copied, changed from r702850, portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/portlet-app_1_0.xsd
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/descriptors/
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/descriptors/web/
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/descriptors/web/PlutoWebXmlRewriter.java (with props)
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/resources/
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/resources/org/
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/resources/org/apache/
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/resources/org/apache/pluto/
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/resources/org/apache/pluto/util/
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/resources/org/apache/pluto/util/descriptors/
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/resources/org/apache/pluto/util/descriptors/web/
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/resources/org/apache/pluto/util/descriptors/web/web-app_2_3.dtd (with props)
Removed:
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Event.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/ExpirationCache.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PublicRenderParam.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/servlet/
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/ContainerRuntimeOptionDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/CustomPortletModeDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/CustomWindowStateDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/EventDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/EventDefinitionDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/EventDefinitionReferenceDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/ExpirationCacheDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/FilterDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/FilterMappingDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/ListenerDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletAppDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletCollectionDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletInfoDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletPreferenceDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PortletPreferencesDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/PublicRenderParamDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/SecurityConstraintDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/SupportsDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/UserAttributeDD.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/jaxb.index
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/Constants.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/WebAppDescriptorService.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/servlet/
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/
Modified:
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/PortletEntity.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/Description.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/DisplayName.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/Icon.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/InitParam.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/SecurityRoleRef.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/UserDataConstraint.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/ContainerRuntimeOption.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/CustomPortletMode.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/CustomWindowState.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/EventDefinition.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/EventDefinitionReference.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Filter.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/FilterMapping.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Listener.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Portlet.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletApp.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletCollection.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletInfo.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletPreference.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletPreferences.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/SecurityConstraint.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Supports.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/UserAttribute.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultRequestAttributeService.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletURLImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/ObjectFactory.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet20/package-info.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/pom.xml
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorServiceImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/site/apt/index.apt
portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java
portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterChainImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterManagerImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java
portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/file/FileAssemblerAnt.java
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/WebXmlStreamingAssembly.java
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java
portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java
portals/pluto/branches/2.0-spi-refactoring/pom.xml
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/PortletEntity.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/PortletEntity.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/PortletEntity.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/PortletEntity.java Tue Oct 14 17:01:07 2008
@@ -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 PortletDD} and the Wrapping Servlet
+ * Definition as defined by the {@link PortletType} and the Wrapping Servlet
* information as defined by the{@link ServletDD}
*
*/
Added: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/ElementFactoryList.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/ElementFactoryList.java?rev=704743&view=auto
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/ElementFactoryList.java (added)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/ElementFactoryList.java Tue Oct 14 17:01:07 2008
@@ -0,0 +1,80 @@
+/*
+ * 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.om;
+
+import java.util.ArrayList;
+
+/**
+ * @version $Id$
+ *
+ */
+public class ElementFactoryList<E> extends ArrayList<E>
+{
+ private static final long serialVersionUID = 8828577482341849961L;
+
+ public interface Factory<E>
+ {
+ public E newElement();
+ public Class<? extends E> getElementClass();
+ }
+
+ private Factory<E> factory;
+
+ public ElementFactoryList(Factory<E> factory)
+ {
+ super();
+ }
+
+ public E newElement()
+ {
+ return factory.newElement();
+ }
+
+ private void checkElementType(E element)
+ {
+ if (element == null)
+ {
+ throw new NullPointerException("Adding or setting a null value not allowed.");
+ }
+ if (element.getClass() != factory.getElementClass())
+ {
+ throw new IllegalArgumentException("Incorrect object type: "+element.getClass().getName()+". Required type: "+factory.getElementClass().getName()+".");
+ }
+ }
+
+ @Override
+ public boolean add(E element)
+ {
+ checkElementType(element);
+ return super.add(element);
+ }
+
+ @Override
+ public void add(int index, E element)
+ {
+ checkElementType(element);
+ super.add(index, element);
+ }
+
+ @Override
+ public E set(int index, E element)
+ {
+ checkElementType(element);
+ return super.set(index, element);
+ }
+}
Propchange: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/ElementFactoryList.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/ElementFactoryList.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/ElementFactoryList.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/Description.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/Description.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/Description.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/Description.java Tue Oct 14 17:01:07 2008
@@ -17,12 +17,11 @@
public interface Description {
- public abstract String getDescription();
+ String getDescription();
- public abstract void setDescription(String description);
+ void setDescription(String description);
- public abstract String getLang();
-
- public abstract void setLang(String lang);
+ String getLang();
+ void setLang(String lang);
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/DisplayName.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/DisplayName.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/DisplayName.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/DisplayName.java Tue Oct 14 17:01:07 2008
@@ -17,12 +17,11 @@
public interface DisplayName {
- public abstract String getDisplayName();
+ String getDisplayName();
- public abstract void setDisplayName(String displayName);
+ void setDisplayName(String displayName);
- public abstract String getLang();
-
- public abstract void setLang(String lang);
+ String getLang();
+ void setLang(String lang);
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/Icon.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/Icon.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/Icon.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/Icon.java Tue Oct 14 17:01:07 2008
@@ -21,24 +21,23 @@
* Retrieve the large icon uri.
* @return the uri to the large icon (relative to the context path).
*/
- public abstract String getLargeIcon();
+ String getLargeIcon();
/**
* Set the large icon uri.
* @param largeIcon the relative path to the icon resource.
*/
- public abstract void setLargeIcon(String largeIcon);
+ void setLargeIcon(String largeIcon);
/**
* Retrieve the small icon uri.
* @return the uri to the small icon (relative to the context path).
*/
- public abstract String getSmallIcon();
+ String getSmallIcon();
/**
* Set the small Icon uri.
* @param smallIcon the relative path to the icon resource.
*/
- public abstract void setSmallIcon(String smallIcon);
-
+ void setSmallIcon(String smallIcon);
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/InitParam.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/InitParam.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/InitParam.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/InitParam.java Tue Oct 14 17:01:07 2008
@@ -15,7 +15,7 @@
*/
package org.apache.pluto.om.common;
-import java.util.List;
+import org.apache.pluto.om.ElementFactoryList;
public interface InitParam {
@@ -23,48 +23,33 @@
* Retrieve the name of the parameter.
* @return
*/
- public abstract String getParamName();
+ String getParamName();
/**
* Set the name of the parameter.
* @param paramName
*/
- public abstract void setParamName(String paramName);
+ void setParamName(String paramName);
/**
* Get the name of the parameter.
* @return
*/
- public abstract String getParamValue();
+ String getParamValue();
/**
* Set the value of the parameter.
* @param paramValue
*/
- public abstract void setParamValue(String paramValue);
-
- /**
- * Retrieve the description.
- * @return
- */
- public abstract String getDescription();
-
- /**
- * Set the description of the parameter.
- * @param description
- */
- public abstract void setDescription(String description);
+ void setParamValue(String paramValue);
/**
* Retrieve the description list.
* @return
*/
- public abstract List getDescriptions();
-
- /**
- * Set the description list.
- * @param description
- */
- public abstract void setDescriptions(List<String> descriptions);
-
+ public ElementFactoryList<Description> getDescriptions();
+
+ String getId();
+
+ void setId(String id);
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/SecurityRoleRef.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/SecurityRoleRef.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/SecurityRoleRef.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/SecurityRoleRef.java Tue Oct 14 17:01:07 2008
@@ -15,56 +15,21 @@
*/
package org.apache.pluto.om.common;
-import java.util.List;
+import org.apache.pluto.om.ElementFactoryList;
public interface SecurityRoleRef {
- /**
- * Retrieve the name of the role reference.
- * @return
- */
- public abstract String getRoleName();
-
- /**
- * Set the name of the role reference.
- * @param roleName
- */
- public abstract void setRoleName(String roleName);
-
- /**
- * Retrieve then role to which the reference is linked.
- * @return
- */
- public abstract String getRoleLink();
-
- /**
- * Set the role to which the reference is linked.
- * @param roleLink
- */
- public abstract void setRoleLink(String roleLink);
-
- /**
- * Retrieve the description of the role reference.
- * @return
- */
- public abstract String getDescription();
-
- /**
- * Set the description of the role reference.
- * @param description
- */
- public abstract void setDescription(String description);
-
- /**
- * Retrieve the description list.
- * @return
- */
- public abstract List getDescriptions();
-
- /**
- * Set the description list.
- * @param description
- */
- public abstract void setDescriptions(List<String> descriptions);
+ String getRoleName();
+ void setRoleName(String roleName);
+
+ String getRoleLink();
+
+ void setRoleLink(String roleLink);
+
+ ElementFactoryList<Description> getDescriptions();
+
+ String getId();
+
+ void setId(String id);
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/UserDataConstraint.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/UserDataConstraint.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/UserDataConstraint.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/common/UserDataConstraint.java Tue Oct 14 17:01:07 2008
@@ -15,20 +15,21 @@
*/
package org.apache.pluto.om.common;
-import java.util.List;
+import org.apache.pluto.om.ElementFactoryList;
public interface UserDataConstraint {
- public static final String NONE = "NONE";
- public static final String INTEGRAL = "INTEGRAL";
- public static final String CONFIDENTIAL = "CONFIDENTIAL";
-
- public abstract List<String> getDescriptions();
-
- public abstract void setDescriptions(List<String> descriptions);
-
- public abstract String getTransportGuarantee();
-
- public abstract void setTransportGuarantee(String transportGuarantee);
-
+ String NONE = "NONE";
+ String INTEGRAL = "INTEGRAL";
+ String CONFIDENTIAL = "CONFIDENTIAL";
+
+ ElementFactoryList<Description> getDescriptions();
+
+ String getTransportGuarantee();
+
+ void setTransportGuarantee(String transportGuarantee);
+
+ String getId();
+
+ void setId(String id);
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/ContainerRuntimeOption.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/ContainerRuntimeOption.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/ContainerRuntimeOption.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/ContainerRuntimeOption.java Tue Oct 14 17:01:07 2008
@@ -19,8 +19,7 @@
public interface ContainerRuntimeOption {
- public abstract String getName();
-
- public abstract List<String> getValue();
+ String getName();
+ List<String> getValues();
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/CustomPortletMode.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/CustomPortletMode.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/CustomPortletMode.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/CustomPortletMode.java Tue Oct 14 17:01:07 2008
@@ -15,20 +15,20 @@
*/
package org.apache.pluto.om.portlet;
-public interface CustomPortletMode {
-
- public abstract boolean isPortalManaged();
-
- public abstract String getDecorationName();
+import org.apache.pluto.om.ElementFactoryList;
+import org.apache.pluto.om.common.Description;
- public abstract void setDecorationName(String decorationName);
-
- public abstract String getDescription();
+public interface CustomPortletMode {
- public abstract void setDescription(String description);
+ boolean isPortalManaged();
- public abstract String getPortletMode();
+ ElementFactoryList<Description> getDescriptions();
- public abstract void setPortletMode(String portletMode);
+ String getPortletMode();
+ void setPortletMode(String portletMode);
+
+ String getId();
+
+ void setId(String id);
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/CustomWindowState.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/CustomWindowState.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/CustomWindowState.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/CustomWindowState.java Tue Oct 14 17:01:07 2008
@@ -15,14 +15,18 @@
*/
package org.apache.pluto.om.portlet;
-public interface CustomWindowState {
-
- public abstract String getDescription();
+import org.apache.pluto.om.ElementFactoryList;
+import org.apache.pluto.om.common.Description;
- public abstract void setDescription(String description);
+public interface CustomWindowState {
- public abstract String getWindowState();
+ ElementFactoryList<Description> getDescriptions();
- public abstract void setWindowState(String windowState);
+ String getWindowState();
+ void setWindowState(String windowState);
+
+ String getId();
+
+ void setId(String id);
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/EventDefinition.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/EventDefinition.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/EventDefinition.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/EventDefinition.java Tue Oct 14 17:01:07 2008
@@ -19,76 +19,30 @@
import javax.xml.namespace.QName;
-public interface EventDefinition {
+import org.apache.pluto.om.ElementFactoryList;
+import org.apache.pluto.om.common.Description;
- /**
- * @return Returns the alias.
- */
- public abstract List<QName> getAlias();
-
- /**
- * @param alias The alias to set.
- */
- public abstract void setAlias(List<QName> alias);
-
- /**
- * @return Returns the description.
- */
- public abstract String getDescription();
-
- /**
- * @param description The description to set.
- */
- public abstract void setDescription(String description);
-
- /**
- * @return Returns the iD.
- */
- public abstract String getID();
-
- /**
- * @param id The iD to set.
- */
- public abstract void setID(String id);
-
- /**
- * @return Returns the javaType.
- */
- public abstract String getJavaClass();
-
- /**
- * @param javaType The javaType to set.
- */
- public abstract void setJavaClass(String javaType);
-
- /**
- * @return Returns the qName.
- */
- public abstract QName getQName();
-
- /**
- * @param name The qName to set.
- */
- public abstract void setQName(QName qname);
-
- /**
- * @return Returns the name.
- */
- public abstract String getName();
-
- /**
- * @param name The qName to set.
- */
- public abstract void setName(String name);
-
- /**
- * @return Returns the xmlType.
- */
- public abstract String getXmlType();
-
- /**
- * @param xmlType The xmlType to set.
- */
- public abstract void setXmlType(String xmlType);
+public interface EventDefinition
+{
+ List<QName> getAliases();
+ ElementFactoryList<Description> getDescriptions();
+
+ String getId();
+
+ void setId(String id);
+
+ String getValueType();
+
+ void setValueType(String valueType);
+
+ QName getQName();
+
+ void setQName(QName qname);
+
+ String getName();
+
+ void setName(String name);
+
+ QName getQualifiedName(String defaultNamespace);
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/EventDefinitionReference.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/EventDefinitionReference.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/EventDefinitionReference.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/EventDefinitionReference.java Tue Oct 14 17:01:07 2008
@@ -19,14 +19,17 @@
public interface EventDefinitionReference {
- /**
- * @return Returns the name.
- */
- public abstract QName getName();
+ QName getQName();
- /**
- * @param name The name to set.
- */
- public abstract void setName(QName qname);
+ void setQName(QName qname);
+ String getName();
+
+ void setName(String name);
+
+ String getId();
+
+ void setId(String id);
+
+ QName getQualifiedName(String defaultNamespace);
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Filter.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Filter.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Filter.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Filter.java Tue Oct 14 17:01:07 2008
@@ -17,32 +17,28 @@
import java.util.List;
+import org.apache.pluto.om.ElementFactoryList;
+import org.apache.pluto.om.common.Description;
+import org.apache.pluto.om.common.DisplayName;
import org.apache.pluto.om.common.InitParam;
public interface Filter {
- public abstract String getDescription();
+ ElementFactoryList<Description> getDescriptions();
- public abstract void setDescription(String description);
+ ElementFactoryList<DisplayName> getDisplayNames();
- public abstract String getDisplayName();
+ String getFilterClass();
- public abstract void setDisplayName(String displayName);
+ void setFilterClass(String filterClass);
- public abstract String getFilterClass();
+ String getFilterName();
- public abstract void setFilterClass(String filterClass);
+ void setFilterName(String filterName);
- public abstract String getFilterName();
+ ElementFactoryList<InitParam> getInitParams();
- public abstract void setFilterName(String filterName);
-
- public abstract List<InitParam> getInitParam();
-
- public abstract void setInitParam(List<InitParam> initParam);
-
- public abstract List<String> getLifecycle();
-
- public abstract void setLifecycle(List<String> lifecycle);
+ List<String> getLifecycles();
+ void setLifecycles(List<String> lifecycles);
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/FilterMapping.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/FilterMapping.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/FilterMapping.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/FilterMapping.java Tue Oct 14 17:01:07 2008
@@ -19,12 +19,12 @@
public interface FilterMapping {
- public abstract String getFilterName();
+ String getFilterName();
- public abstract void setFilterName(String filterName);
+ void setFilterName(String filterName);
- public abstract List<String> getPortletName();
+ List<String> getPortletNames();
- public abstract void setPortletName(List<String> portletName);
+ void setPortletNames(List<String> portletNames);
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Listener.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Listener.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Listener.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Listener.java Tue Oct 14 17:01:07 2008
@@ -15,24 +15,22 @@
*/
package org.apache.pluto.om.portlet;
-import java.util.List;
+import org.apache.pluto.om.ElementFactoryList;
+import org.apache.pluto.om.common.Description;
+import org.apache.pluto.om.common.DisplayName;
public interface Listener {
- public abstract String getDescription();
+ ElementFactoryList<Description> getDescriptions();
+
+ ElementFactoryList<DisplayName> getDisplayNames();
+
+ String getId();
- public abstract void setDescription(String description);
+ void setId(String id);
- public abstract List<String> getDisplayName();
+ String getListenerClass();
- public abstract void setDisplayName(List<String> displayName);
-
- public abstract String getID();
-
- public abstract void setID(String id);
-
- public abstract String getListenerClass();
-
- public abstract void setListenerClass(String listenerClass);
+ void setListenerClass(String listenerClass);
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Portlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Portlet.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Portlet.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Portlet.java Tue Oct 14 17:01:07 2008
@@ -17,103 +17,82 @@
import java.util.List;
-import javax.xml.namespace.QName;
-
+import org.apache.pluto.om.ElementFactoryList;
+import org.apache.pluto.om.common.Description;
+import org.apache.pluto.om.common.DisplayName;
import org.apache.pluto.om.common.InitParam;
import org.apache.pluto.om.common.SecurityRoleRef;
public interface Portlet {
-
- // Private Member Variables ------------------------------------------------
- /**
- * The value of the expirationCache property when no expiration cache was configured
- * in portlet.xml for this portlet descriptor.
- */
- public static final int EXPIRATION_CACHE_UNSET = Integer.MIN_VALUE;
- // private static final int EXPIRATION_CACHE_DEFAULT = -2;
- public static final String QNAME_JSR168 = "http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd";
-
+
/**
* Returns a string representation of this instance.
* FIXME: more info!
* @return a string representation of this instance.
*/
- public abstract String toString();
+ String toString();
/**
* Returns the hash code for this instance.
* @return the hash code for this instance.
*/
- public abstract int hashCode();
+ int hashCode();
- public PortletApp getApplication();
-
- public abstract List<InitParam> getInitParams();
-
- public abstract void setInitParams(List<InitParam> initParams);
-
- public abstract String getPortletClass();
-
- public abstract void setPortletClass(String portletClass);
-
- public abstract PortletInfo getPortletInfo();
-
- public abstract void setPortletInfo(PortletInfo portletInfo);
-
- public abstract String getPortletName();
-
- public abstract void setPortletName(String portletName);
+ String getId();
+
+ void setId(String id);
+
+ PortletApp getApplication();
- public abstract PortletPreferences getPortletPreferences();
+ ElementFactoryList<InitParam> getInitParams();
- public abstract void setPortletPreferences(
- PortletPreferences portletPreferences);
+ String getPortletClass();
- public abstract List<QName> getProcessingEvents();
+ void setPortletClass(String portletClass);
- public abstract void setProcessingEvents(
- List<EventDefinitionReference> processingEvents);
+ PortletInfo getPortletInfo();
- public abstract List<QName> getPublishingEvents();
+ PortletInfo getPortletInfo(boolean create);
- public abstract void setPublishingEvents(
- List<EventDefinitionReference> publishingEvents);
+ String getPortletName();
- public abstract List<String> getPublicRenderParameter();
+ void setPortletName(String portletName);
- public abstract void setPublicRenderParameter(
- List<String> publicRenderParameter);
+ PortletPreferences getPortletPreferences();
- public abstract String getResourceBundle();
+ PortletPreferences getPortletPreferences(boolean create);
- public abstract void setResourceBundle(String resourceBundle);
+ ElementFactoryList<EventDefinitionReference> getSupportedProcessingEvents();
- public abstract List<SecurityRoleRef> getSecurityRoleRefs();
+ ElementFactoryList<EventDefinitionReference> getSupportedPublishingEvents();
- public abstract void setSecurityRoleRefs(
- List<SecurityRoleRef> securityRoleRefs);
+ List<String> getSupportedPublicRenderParameters();
- public abstract List<Supports> getSupports();
+ void setSupportedPublicRenderParameters(List<String> publicRenderParameters);
- public abstract void setSupports(List<Supports> supports);
+ String getResourceBundle();
- public abstract String getDescription();
+ void setResourceBundle(String resourceBundle);
- public abstract void setDescription(String description);
+ ElementFactoryList<SecurityRoleRef> getSecurityRoleRefs();
- public abstract String getDisplayName();
+ ElementFactoryList<Supports> getSupports();
- public abstract void setDisplayName(String displayName);
+ ElementFactoryList<Description> getDescriptions();
- public abstract List<String> getSupportedLocale();
+ ElementFactoryList<DisplayName> getDisplayNames();
- public abstract void setSupportedLocale(List<String> supportedLocale);
+ List<String> getSupportedLocales();
- public abstract ExpirationCache getExpirationCache();
+ void setSupportedLocales(List<String> supportedLocales);
- public abstract void setExpirationCache(
- ExpirationCache expirationCache);
+ int getExpirationCache();
+
+ String getCacheScope();
+
+ void setCacheScope(String cacheScope);
- public abstract List<ContainerRuntimeOption> getContainerRuntimeOption();
+ void setExpirationCache(int expirationCache);
+ ElementFactoryList<ContainerRuntimeOption> getContainerRuntimeOptions();
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletApp.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletApp.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletApp.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletApp.java Tue Oct 14 17:01:07 2008
@@ -15,7 +15,7 @@
*/
package org.apache.pluto.om.portlet;
-import java.util.List;
+import org.apache.pluto.om.ElementFactoryList;
public interface PortletApp {
@@ -24,13 +24,13 @@
* The name of the Portlet Application
* <br/>
*/
- public String getName();
+ String getName();
/**
* Set the name for the Portlet Application
* @param name
*/
- public void setName(String name);
+ void setName(String name);
/**
* The id the Portlet Application
@@ -39,7 +39,7 @@
* to the contextPath of the Web Applications
* @return
*/
- public String getId();
+ String getId();
/**
* Set the id the Portlet Application
@@ -48,83 +48,49 @@
* to the contextPath of the Web Applications
* @return
*/
- public void setId(String id);
+ void setId(String id);
/**
* Retrieve the portlets which exist within this application.
* @return
*/
- public abstract List<Portlet> getPortlets();
-
- /**
- * Set the portlets that exist within this application.
- * @param portlets
- */
- public abstract void setPortlets(List<Portlet> portlets);
+ ElementFactoryList<Portlet> getPortlets();
/**
* @return Returns the events.
*/
- public abstract List<EventDefinition> getEvents();
-
- /**
- * @param events The events to set.
- */
- public abstract void setEvents(List<EventDefinition> events);
+ ElementFactoryList<EventDefinition> getEventDefinitions();
/**
* @return Returns the public render parameter.
*/
- public abstract List<PublicRenderParam> getRender();
-
- /**
- * @param render The public render parameter to set.
- */
- public abstract void setRender(List<PublicRenderParam> render);
-
- public abstract String getVersion();
-
- public abstract void setVersion(String version);
-
- public abstract List<CustomPortletMode> getCustomPortletMode();
-
- public abstract void setCustomPortletMode(
- List<CustomPortletMode> customPortletMode);
-
- public abstract List<CustomWindowState> getCustomWindowState();
-
- public abstract void setCustomWindowState(
- List<CustomWindowState> customWindowState);
-
- public abstract List<UserAttribute> getUserAttribute();
-
- public abstract void setUserAttribute(List<UserAttribute> userAttribute);
+ ElementFactoryList<PublicRenderParameter> getPublicRenderParameters();
- public abstract List<SecurityConstraint> getSecurityConstraint();
+ String getVersion();
- public abstract void setSecurityConstraint(
- List<SecurityConstraint> securityConstraint);
+ void setVersion(String version);
- public abstract String getResourceBundle();
+ ElementFactoryList<CustomPortletMode> getCustomPortletModes();
- public abstract void setResourceBundle(String resourceBundle);
+ ElementFactoryList<CustomWindowState> getCustomWindowStates();
- public abstract List<Filter> getFilter();
+ ElementFactoryList<UserAttribute> getUserAttributes();
- public abstract void setFilter(List<Filter> filter);
+ ElementFactoryList<SecurityConstraint> getSecurityConstraints();
- public abstract List<FilterMapping> getFilterMapping();
+ String getResourceBundle();
- public abstract void setFilterMapping(List<FilterMapping> filterMapping);
+ void setResourceBundle(String resourceBundle);
- public abstract List<Listener> getListener();
+ ElementFactoryList<Filter> getFilters();
- public abstract void setListener(List<Listener> listener);
+ ElementFactoryList<FilterMapping> getFilterMappings();
- public abstract String getDefaultNamespace();
+ ElementFactoryList<Listener> getListeners();
- public abstract void setDefaultNamespace(String defaultNamespace);
+ String getDefaultNamespace();
- public abstract List<ContainerRuntimeOption> getContainerRuntimeOption();
+ void setDefaultNamespace(String defaultNamespace);
+ ElementFactoryList<ContainerRuntimeOption> getContainerRuntimeOptions();
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletCollection.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletCollection.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletCollection.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletCollection.java Tue Oct 14 17:01:07 2008
@@ -19,8 +19,8 @@
public interface PortletCollection {
- public abstract List<String> getPortletName();
+ List<String> getPortletNames();
- public abstract void setPortletName(List<String> portletName);
+ void setPortletNames(List<String> portletNames);
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletInfo.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletInfo.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletInfo.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletInfo.java Tue Oct 14 17:01:07 2008
@@ -17,16 +17,19 @@
public interface PortletInfo {
- public abstract String getTitle();
+ String getTitle();
- public abstract void setTitle(String title);
+ void setTitle(String title);
- public abstract String getKeywords();
+ String getKeywords();
- public abstract void setKeywords(String keywords);
+ void setKeywords(String keywords);
- public abstract String getShortTitle();
-
- public abstract void setShortTitle(String shortTitle);
+ String getShortTitle();
+ void setShortTitle(String shortTitle);
+
+ String getId();
+
+ void setId(String id);
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletPreference.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletPreference.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletPreference.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletPreference.java Tue Oct 14 17:01:07 2008
@@ -19,16 +19,19 @@
public interface PortletPreference {
- public abstract String getName();
+ String getName();
- public abstract void setName(String name);
+ void setName(String name);
- public abstract List<String> getValues();
+ List<String> getValues();
- public abstract void setValues(List<String> values);
+ void setValues(List<String> values);
- public abstract boolean isReadOnly();
-
- public abstract void setReadOnly(boolean readOnly);
+ boolean isReadOnly();
+ void setReadOnly(boolean readOnly);
+
+ String getId();
+
+ void setId(String id);
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletPreferences.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletPreferences.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletPreferences.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PortletPreferences.java Tue Oct 14 17:01:07 2008
@@ -15,17 +15,17 @@
*/
package org.apache.pluto.om.portlet;
-import java.util.List;
+import org.apache.pluto.om.ElementFactoryList;
public interface PortletPreferences {
- public abstract List<PortletPreference> getPortletPreferences();
+ ElementFactoryList<PortletPreference> getPortletPreferences();
- public abstract void setPortletPreferences(
- List<PortletPreference> portletPreferences);
-
- public abstract String getPreferencesValidator();
-
- public abstract void setPreferencesValidator(String preferencesValidator);
+ String getPreferencesValidator();
+ void setPreferencesValidator(String preferencesValidator);
+
+ String getId();
+
+ void setId(String id);
}
\ No newline at end of file
Copied: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PublicRenderParameter.java (from r702850, portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PublicRenderParam.java)
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PublicRenderParameter.java?p2=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PublicRenderParameter.java&p1=portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PublicRenderParam.java&r1=702850&r2=704743&rev=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PublicRenderParam.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/PublicRenderParameter.java Tue Oct 14 17:01:07 2008
@@ -19,46 +19,30 @@
import javax.xml.namespace.QName;
-public interface PublicRenderParam {
+import org.apache.pluto.om.ElementFactoryList;
+import org.apache.pluto.om.common.Description;
- /**
- * @return the description
- */
- public abstract String getDescription();
-
- /**
- * @param description The description to set
- */
- public abstract void setDescription(String description);
-
- /**
- * @return the ID
- */
- public abstract String getIdentifier();
-
- /**
- * @param id The ID to set
- */
- public abstract void setIdentifier(String id);
-
- /**
- * @return the name
- */
- public abstract QName getName();
-
- /**
- * @param name The name to set
- */
- public abstract void setName(QName qname);
-
- /**
- * @return Returns the alias.
- */
- public abstract List<QName> getAlias();
-
- /**
- * @param alias The alias to set.
- */
- public abstract void setAlias(List<QName> alias);
+public interface PublicRenderParameter {
+ ElementFactoryList<Description> getDescriptions();
+
+ String getIdentifier();
+
+ void setIdentifier(String id);
+
+ QName getQName();
+
+ void setQName(QName qname);
+
+ List<QName> getAliases();
+
+ String getName();
+
+ void setName(String name);
+
+ void setAliases(List<QName> aliases);
+
+ String getId();
+
+ void setId(String id);
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/SecurityConstraint.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/SecurityConstraint.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/SecurityConstraint.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/SecurityConstraint.java Tue Oct 14 17:01:07 2008
@@ -15,22 +15,19 @@
*/
package org.apache.pluto.om.portlet;
+import org.apache.pluto.om.ElementFactoryList;
+import org.apache.pluto.om.common.DisplayName;
import org.apache.pluto.om.common.UserDataConstraint;
public interface SecurityConstraint {
- public abstract String getDisplayName();
-
- public abstract void setDisplayName(String displayName);
-
- public abstract PortletCollection getPortletCollection();
-
- public abstract void setPortletCollection(
- PortletCollection portletCollection);
-
- public abstract UserDataConstraint getUserDataConstraint();
-
- public abstract void setUserDataConstraint(
- UserDataConstraint userDataConstraint);
-
+ ElementFactoryList<DisplayName> getDisplayNames();
+
+ PortletCollection getPortletCollection();
+
+ UserDataConstraint getUserDataConstraint();
+
+ String getId();
+
+ void setId(String id);
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Supports.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Supports.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Supports.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/Supports.java Tue Oct 14 17:01:07 2008
@@ -19,12 +19,15 @@
public interface Supports {
- public abstract String getMimeType();
+ String getMimeType();
- public abstract void setMimeType(String mimeType);
+ void setMimeType(String mimeType);
- public abstract List<String> getPortletModes();
-
- public abstract void setPortletModes(List<String> portletModes);
+ List<String> getPortletModes();
+ void setPortletModes(List<String> portletModes);
+
+ String getId();
+
+ void setId(String id);
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/UserAttribute.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/UserAttribute.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/UserAttribute.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/om/portlet/UserAttribute.java Tue Oct 14 17:01:07 2008
@@ -15,14 +15,18 @@
*/
package org.apache.pluto.om.portlet;
-public interface UserAttribute {
-
- public abstract String getDescription();
-
- public abstract void setDescription(String description);
+import org.apache.pluto.om.ElementFactoryList;
+import org.apache.pluto.om.common.Description;
- public abstract String getName();
-
- public abstract void setName(String name);
+public interface UserAttribute {
+ ElementFactoryList<Description> getDescriptions();
+
+ String getName();
+
+ void setName(String name);
+
+ String getId();
+
+ void setId(String id);
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.java Tue Oct 14 17:01:07 2008
@@ -91,7 +91,7 @@
* </p>
* @return the default preferences set
*
- * @see org.apache.pluto.descriptors.portlet.PortletPreferenceDD
+ * @see org.apache.pluto.descriptors.portlet20.PreferenceType
*/
public Map<String,InternalPortletPreference> getDefaultPreferences( PortletWindow portletWindow,
PortletRequest request )
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultRequestAttributeService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultRequestAttributeService.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultRequestAttributeService.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/DefaultRequestAttributeService.java Tue Oct 14 17:01:07 2008
@@ -33,7 +33,6 @@
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.PortletWindow;
import org.apache.pluto.PortletWindowID;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
import org.apache.pluto.om.portlet.UserAttribute;
import org.apache.pluto.spi.optional.PortletRegistryService;
import org.apache.pluto.spi.optional.RequestAttributeService;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java Tue Oct 14 17:01:07 2008
@@ -105,7 +105,7 @@
throw new IllegalArgumentException(
"name and value must not be null");
}
- List<String> publicRenderParameterNames = portletWindow.getPortletEntity().getPortletDefinition().getPublicRenderParameter();
+ List<String> publicRenderParameterNames = portletWindow.getPortletEntity().getPortletDefinition().getSupportedPublicRenderParameters();
if (publicRenderParameterNames == null){
parameters.put(name, new String[]{value});
}
@@ -124,7 +124,7 @@
throw new IllegalArgumentException(
"name and values must not be null or values be an empty array");
}
- List<String> publicRenderParameterNames = portletWindow.getPortletEntity().getPortletDefinition().getPublicRenderParameter();
+ List<String> publicRenderParameterNames = portletWindow.getPortletEntity().getPortletDefinition().getSupportedPublicRenderParameters();
if (publicRenderParameterNames == null){
parameters.put(name, StringUtils.copy(values));
@@ -160,7 +160,7 @@
this.parameters.clear();
this.publicRenderParameters.clear();
- List<String> publicPortletRenderParameterNames = portletWindow.getPortletEntity().getPortletDefinition().getPublicRenderParameter();
+ List<String> publicPortletRenderParameterNames = portletWindow.getPortletEntity().getPortletDefinition().getSupportedPublicRenderParameters();
if (parameters.keySet()!= null){
for (Object key : parameters.keySet()) {
if (publicPortletRenderParameterNames == null)
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java Tue Oct 14 17:01:07 2008
@@ -34,7 +34,6 @@
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletEntity;
import org.apache.pluto.PortletWindow;
-import org.apache.pluto.om.portlet.ExpirationCache;
import org.apache.pluto.om.portlet.Portlet;
import org.apache.pluto.om.portlet.Supports;
import org.apache.pluto.util.StringManager;
@@ -114,15 +113,8 @@
this.cacheControl = new CacheControlImpl();
PortletEntity portletEntity = portletWindow.getPortletEntity();
Portlet portletDefinition = portletEntity.getPortletDefinition();
- ExpirationCache expirationCacheDD = portletDefinition
- .getExpirationCache();
- if (expirationCacheDD != null) {
- int expirationTime = expirationCacheDD.getExpirationTime();
- this.setProperty(EXPIRATION_CACHE, String.valueOf(expirationTime));
- String scope = expirationCacheDD.getScope();
- this.setProperty(CACHE_SCOPE, scope);
- }
-
+ this.setProperty(EXPIRATION_CACHE, String.valueOf(portletDefinition.getExpirationCache()));
+ this.setProperty(CACHE_SCOPE, portletDefinition.getCacheScope());
}
@Override
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java Tue Oct 14 17:01:07 2008
@@ -37,6 +37,7 @@
import org.apache.pluto.internal.InternalPortletConfig;
import org.apache.pluto.om.common.InitParam;
import org.apache.pluto.om.portlet.ContainerRuntimeOption;
+import org.apache.pluto.om.portlet.EventDefinitionReference;
import org.apache.pluto.om.portlet.Portlet;
import org.apache.pluto.om.portlet.PortletApp;
@@ -138,8 +139,8 @@
// --------------------------------------------------------------------------------------------
public Enumeration<String> getPublicRenderParameterNames() {
- if (portletDD.getPublicRenderParameter() != null){
- return Collections.enumeration(portletDD.getPublicRenderParameter());
+ if (portletDD.getSupportedPublicRenderParameters() != null){
+ return Collections.enumeration(portletDD.getSupportedPublicRenderParameters());
}
return Collections.enumeration(new ArrayList<String>());
}
@@ -151,50 +152,44 @@
}
public Enumeration<QName> getProcessingEventQNames() {
- List<QName> qnameList = portletDD.getProcessingEvents();
- if (qnameList != null){
- for (int index = 0; index < qnameList.size();index++) {
- QName qname = qnameList.get(index);
- if (qname.getNamespaceURI().equals("")){
- qnameList.remove(index);
- qnameList.add(index, new QName(portletAppDD.getDefaultNamespace(),qname.getLocalPart()));
- }
- }
- return Collections.enumeration(qnameList);
- }
- else
- return Collections.enumeration(new ArrayList<QName>());
-
-// return (portletDD.getProcessingEvents() != null) ?
-// Collections.enumeration(portletDD.getProcessingEvents()) :
-// Collections.enumeration(new ArrayList<QName>());
+ ArrayList<QName> qnameList = new ArrayList<QName>();
+ for (EventDefinitionReference ref : portletDD.getSupportedProcessingEvents())
+ {
+ QName name = ref.getQualifiedName(portletAppDD.getDefaultNamespace());
+ if (name == null)
+ {
+ continue;
+ }
+ else
+ {
+ qnameList.add(name);
+ }
+ }
+ return Collections.enumeration(qnameList);
}
public Enumeration<QName> getPublishingEventQNames() {
- List<QName> qnameList = portletDD.getPublishingEvents();
- if (qnameList != null){
- for (int index = 0; index < qnameList.size();index++) {
- QName qname = qnameList.get(index);
- if (qname.getNamespaceURI().equals("")){
- qnameList.remove(index);
- qnameList.add(index, new QName(portletAppDD.getDefaultNamespace(),qname.getLocalPart()));
- }
- }
- return Collections.enumeration(qnameList);
- }
- else
- return Collections.enumeration(new ArrayList<QName>());
-
-// return (portletDD.getPublishingEvents() != null) ?
-// Collections.enumeration(portletDD.getPublishingEvents()) :
-// Collections.enumeration(new ArrayList<QName>());
+ ArrayList<QName> qnameList = new ArrayList<QName>();
+ for (EventDefinitionReference ref : portletDD.getSupportedPublishingEvents())
+ {
+ QName name = ref.getQualifiedName(portletAppDD.getDefaultNamespace());
+ if (name == null)
+ {
+ continue;
+ }
+ else
+ {
+ qnameList.add(name);
+ }
+ }
+ return Collections.enumeration(qnameList);
}
public Enumeration<Locale> getSupportedLocales() {
// for each String entry in SupportedLocales (portletDD)
// add an entry in the resut list (new Locale(string))
List<Locale> locals = new ArrayList<Locale>();
- List<String> localsAsStrings = portletDD.getSupportedLocale();
+ List<String> localsAsStrings = portletDD.getSupportedLocales();
if (localsAsStrings!=null){
for (String string : localsAsStrings) {
locals.add(new Locale(string));
@@ -205,10 +200,10 @@
public Map<String, String[]> getApplicationRuntimeOptions() {
Map<String, String[]> resultMap = new HashMap<String, String[]>();
- if (portletAppDD.getContainerRuntimeOption() != null){
- for (ContainerRuntimeOption option : portletAppDD.getContainerRuntimeOption()) {
+ if (portletAppDD.getContainerRuntimeOptions() != null){
+ for (ContainerRuntimeOption option : portletAppDD.getContainerRuntimeOptions()) {
if (Configuration.getSupportedContainerRuntimeOptions().contains(option.getName())){
- List<String> values = option.getValue();
+ List<String> values = option.getValues();
String [] tempValues = new String[values.size()];
for (int i=0;i<values.size();i++){
tempValues[i] = values.get(i);
@@ -222,10 +217,10 @@
public Map<String, String[]> getPortletRuntimeOptions() {
Map<String, String[]> resultMap = new HashMap<String, String[]>();
- if (portletDD.getContainerRuntimeOption() != null) {
- for (ContainerRuntimeOption option : portletDD.getContainerRuntimeOption()) {
+ if (portletDD.getContainerRuntimeOptions() != null) {
+ for (ContainerRuntimeOption option : portletDD.getContainerRuntimeOptions()) {
if (Configuration.getSupportedContainerRuntimeOptions().contains(option.getName())){
- List<String> values = option.getValue();
+ List<String> values = option.getValues();
String [] tempValues = new String[values.size()];
for (int i=0;i<values.size();i++){
tempValues[i] = values.get(i);
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java Tue Oct 14 17:01:07 2008
@@ -275,10 +275,10 @@
public Map<String, String[]> getApplicationRuntimeOptions() {
Map<String, String[]> resultMap = new HashMap<String, String[]>();
- if (portletApp.getContainerRuntimeOption() != null){
- for (ContainerRuntimeOption option : portletApp.getContainerRuntimeOption()) {
+ if (portletApp.getContainerRuntimeOptions() != null){
+ for (ContainerRuntimeOption option : portletApp.getContainerRuntimeOptions()) {
if (Configuration.getSupportedContainerRuntimeOptions().contains(option.getName())){
- List<String> values = option.getValue();
+ List<String> values = option.getValues();
String [] tempValues = new String[values.size()];
for (int i=0;i<values.size();i++){
tempValues[i] = values.get(i);
@@ -292,10 +292,10 @@
public Map<String, String[]> getPortletRuntimeOptions() {
Map<String, String[]> resultMap = new HashMap<String, String[]>();
- if (portlet.getContainerRuntimeOption() != null) {
- for (ContainerRuntimeOption option : portlet.getContainerRuntimeOption()) {
+ if (portlet.getContainerRuntimeOptions() != null) {
+ for (ContainerRuntimeOption option : portlet.getContainerRuntimeOptions()) {
if (Configuration.getSupportedContainerRuntimeOptions().contains(option.getName())){
- List<String> values = option.getValue();
+ List<String> values = option.getValues();
String [] tempValues = new String[values.size()];
for (int i=0;i<values.size();i++){
tempValues[i] = values.get(i);
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java Tue Oct 14 17:01:07 2008
@@ -27,7 +27,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 PortletDD} and the Wrapping Servlet
+ * Definition as defined by the {@link PortletType} and the Wrapping Servlet
* information as defined by the{@link ServletDD}
*
*/
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java?rev=704743&r1=704742&r2=704743&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java Tue Oct 14 17:01:07 2008
@@ -432,7 +432,7 @@
public String getParameter(String name) {
ArgumentUtility.validateNotNull("parameterName", name);
- List<String> publicRenderParameterNames = portletWindow.getPortletEntity().getPortletDefinition().getPublicRenderParameter();
+ List<String> publicRenderParameterNames = portletWindow.getPortletEntity().getPortletDefinition().getSupportedPublicRenderParameters();
PortletURLProvider urlProvider = container.getRequiredContainerServices().getPortalCallbackService().getPortletURLProvider(getHttpServletRequest(), portletWindow);
String[] values = null;
if (publicRenderParameterNames != null){
@@ -457,7 +457,7 @@
public String[] getParameterValues(String name) {
ArgumentUtility.validateNotNull("parameterName", name);
- List<String> publicRenderParameterNames = portletWindow.getPortletEntity().getPortletDefinition().getPublicRenderParameter();
+ List<String> publicRenderParameterNames = portletWindow.getPortletEntity().getPortletDefinition().getSupportedPublicRenderParameters();
PortletURLProvider urlProvider = container.getRequiredContainerServices()
.getPortalCallbackService()
.getPortletURLProvider(getHttpServletRequest(), portletWindow);
@@ -481,7 +481,7 @@
public Map getParameterMap() {
Map<String, String[]>map = StringUtils.copyParameters(baseGetParameterMap());
- List<String> publicRenderParameterNames = portletWindow.getPortletEntity().getPortletDefinition().getPublicRenderParameter();
+ List<String> publicRenderParameterNames = portletWindow.getPortletEntity().getPortletDefinition().getSupportedPublicRenderParameters();
if (publicRenderParameterNames!=null){
PortletURLProvider urlProvider = container
.getRequiredContainerServices()
@@ -855,7 +855,7 @@
.getRequiredContainerServices()
.getPortalCallbackService()
.getPortletURLProvider(getHttpServletRequest(), portletWindow);
- List<String> publicRenderParameterNames = portletWindow.getPortletEntity().getPortletDefinition().getPublicRenderParameter();
+ List<String> publicRenderParameterNames = portletWindow.getPortletEntity().getPortletDefinition().getSupportedPublicRenderParameters();
String[] values = null;
if (publicRenderParameterNames != null){
for (String string : publicRenderParameterNames) {