cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r426912 [1/6] - in /cocoon/trunk/blocks/cocoon-portal: cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/ cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/ cocoon-portal-impl/src/main/java/org/apache/c...
Date Sun, 30 Jul 2006 18:41:50 GMT
Author: cziegeler
Date: Sun Jul 30 11:41:45 2006
New Revision: 426912

URL: http://svn.apache.org/viewvc?rev=426912&view=rev
Log:
Major refactoring: use better naming conventions

Added:
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDefinition.java   (with props)
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDefinitionFeatures.java
      - copied, changed from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDataFeatures.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstance.java
      - copied, changed from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstanceFeatures.java
      - copied, changed from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstanceDataFeatures.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletType.java   (with props)
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/CopletDefinitionEvent.java
      - copied, changed from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/CopletDataEvent.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/AbstractCopletDefinitionEvent.java
      - copied, changed from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/AbstractCopletDataEvent.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletDefinitionAddedEvent.java
      - copied, changed from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletDataAddedEvent.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/serialization/ReplacingOutputStream.java   (with props)
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletdefinition.xml
      - copied, changed from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletdata.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletinstance.xml
      - copied, changed from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletinstancedata.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/coplettype.xml
      - copied, changed from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletbasedata.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/update-profile.xsl   (with props)
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletdefinition/
      - copied from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletdata/
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/
      - copied from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/coplettype/
      - copied from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletbasedata/
Removed:
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletBaseData.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletData.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDataFeatures.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstanceDataFeatures.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/CopletDataEvent.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/AbstractCopletDataEvent.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletDataAddedEvent.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletbasedata.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletdata.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletinstancedata.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletbasedata/
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletdata/
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/
Modified:
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/AbstractPortalAction.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/CopletEventDescription.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/CopletMapping.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/FullScreenMapping.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/LayoutEventDescription.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/AbstractModule.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/LayoutModule.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/SkinModule.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletFactory.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/CopletAdapter.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/CopletDecorationProvider.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/DecorationAction.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/AbstractCopletAdapter.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/URICopletAdapter.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/impl/DefaultCopletFactory.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/deployment/impl/DefaultDeploymentManager.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/deployment/impl/DefaultDeploymentObject.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/CopletInstanceEvent.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/AbstractCopletInstanceEvent.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletInstanceDataAddedEvent.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletInstanceDataRemovedEvent.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletInstanceSizingEvent.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletJXPathEvent.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/ChangeCopletsJXPathEvent.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/CopletLinkEvent.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/EventAspectChain.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/InternalEventReceiver.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/layout/LayoutRemoveEvent.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/AbstractCopletGenerator.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/PortalGenerator.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/AbstractComponent.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultLinkService.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/LinkInfo.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelManager.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerAspectChain.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PreloadPortalManagerAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/Layout.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutDescription.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CIncludeCopletAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultCopletAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RemovableAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RendererAspectChain.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/persistence/castor/AttributesFieldHandler.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/persistence/castor/CastorSourceConverter.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/persistence/castor/ConfigurationFieldHandler.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/persistence/castor/ReferenceFieldHandler.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/ProfileLS.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/ProfileManager.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/AbstractProfileManager.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/DefaultProfileManagerAspectContext.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/GroupBasedProfileManager.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/MapProfileLS.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/ProfileManagerAspectChain.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/StaticProfileManager.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/reading/ProxyReader.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/scratchpad/Profile.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/scratchpad/ProfileImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/serialization/IncludingHTMLSerializer.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/source/CopletSource.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/source/CopletSourceFactory.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/AbstractCopletTransformer.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/CopletTransformer.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/EventLinkTransformer.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/LinkTransformer.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/NewEventLinkTransformer.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/layout.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletActionProviderImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletPreferencesProvider.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletPreferencesProviderImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLConverter.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/TestProfileManager.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityListImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/AddToBasketAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketContentGenerator.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/ContentItem.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/UserConfiguration.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/coplets/gallery/gallery.xsl
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/coplets/gallery/picture.xsl
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/coplets/gallery/sitemap.xmap
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletdefinition/portal.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal-user-anonymous.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal-user-cocoon.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal-user-test.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/coplettype/portal.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-anonymous.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-cocoon.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-test.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/copletManagement/LayoutActions.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEvent.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEventAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/ConsumerEnvironmentImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLTemplateComposerImpl.java

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/AbstractPortalAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/AbstractPortalAction.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/AbstractPortalAction.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/AbstractPortalAction.java Sun Jul 30 11:41:45 2006
@@ -47,8 +47,8 @@
     /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
-    public void service(ServiceManager manager) throws ServiceException {
-        super.service(manager);
+    public void service(ServiceManager aManager) throws ServiceException {
+        super.service(aManager);
         this.portalService = (PortalService) this.manager.lookup(PortalService.ROLE);
     }
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/CopletEventDescription.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/CopletEventDescription.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/CopletEventDescription.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/CopletEventDescription.java Sun Jul 30 11:41:45 2006
@@ -30,7 +30,7 @@
     /**
      * @see org.apache.cocoon.portal.acting.helpers.Mapping#getEvent(org.apache.cocoon.portal.PortalService, java.lang.Object)
      */
-    public Event getEvent(PortalService service, Object data) {
-        return super.getEvent(service, (data == null ? this.data : data));
+    public Event getEvent(PortalService service, Object eventData) {
+        return super.getEvent(service, (eventData == null ? this.data : eventData));
     }
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/CopletMapping.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/CopletMapping.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/CopletMapping.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/CopletMapping.java Sun Jul 30 11:41:45 2006
@@ -16,7 +16,7 @@
 package org.apache.cocoon.portal.acting.helpers;
 
 import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
 import org.apache.cocoon.portal.event.Event;
 import org.apache.cocoon.portal.event.coplet.CopletJXPathEvent;
 
@@ -34,7 +34,7 @@
      * @see org.apache.cocoon.portal.acting.helpers.Mapping#getEvent(org.apache.cocoon.portal.PortalService, java.lang.Object)
      */
     public Event getEvent(PortalService service, Object data) {
-        CopletInstanceData cid = service.getProfileManager().getCopletInstanceData(this.copletId);
+        CopletInstance cid = service.getProfileManager().getCopletInstanceData(this.copletId);
         Event e = new CopletJXPathEvent(cid, this.path, data);
         return e;
     }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/FullScreenMapping.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/FullScreenMapping.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/FullScreenMapping.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/FullScreenMapping.java Sun Jul 30 11:41:45 2006
@@ -16,7 +16,7 @@
 package org.apache.cocoon.portal.acting.helpers;
 
 import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
 import org.apache.cocoon.portal.event.Event;
 import org.apache.cocoon.portal.event.coplet.CopletInstanceSizingEvent;
 import org.apache.cocoon.portal.profile.ProfileManager;
@@ -36,10 +36,10 @@
      */
     public Event getEvent(PortalService service, Object data) {
         final ProfileManager manager = service.getProfileManager();
-        final CopletInstanceData cid = manager.getCopletInstanceData(this.copletId);
+        final CopletInstance cid = manager.getCopletInstanceData(this.copletId);
         //final Layout layout = manager.getPortalLayout(null, layoutId) ;
         
-        Event e = new CopletInstanceSizingEvent(cid, CopletInstanceData.SIZE_FULLSCREEN);
+        Event e = new CopletInstanceSizingEvent(cid, CopletInstance.SIZE_FULLSCREEN);
         return e;
     }
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/LayoutEventDescription.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/LayoutEventDescription.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/LayoutEventDescription.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/LayoutEventDescription.java Sun Jul 30 11:41:45 2006
@@ -30,7 +30,7 @@
     /**
      * @see org.apache.cocoon.portal.acting.helpers.Mapping#getEvent(org.apache.cocoon.portal.PortalService, java.lang.Object)
      */
-    public Event getEvent(PortalService service, Object data) {
-        return super.getEvent(service, (data == null ? this.data : data));
+    public Event getEvent(PortalService service, Object eventData) {
+        return super.getEvent(service, (eventData == null ? this.data : eventData));
     }
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/AbstractModule.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/AbstractModule.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/AbstractModule.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/AbstractModule.java Sun Jul 30 11:41:45 2006
@@ -44,8 +44,8 @@
     /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
-    public void service(ServiceManager manager) throws ServiceException {
-        this.manager = manager;
+    public void service(ServiceManager aManager) throws ServiceException {
+        this.manager = aManager;
         this.portalService = (PortalService)this.manager.lookup(PortalService.ROLE);
     }
 

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/LayoutModule.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/LayoutModule.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/LayoutModule.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/LayoutModule.java Sun Jul 30 11:41:45 2006
@@ -36,21 +36,22 @@
      */
     public Object getAttribute(String name, Configuration modeConf, Map objectModel) 
     throws ConfigurationException {
-        int pos = name.indexOf('/');
+        String key = name;
+        int pos = key.indexOf('/');
         String path;
         if ( pos == -1 ) {
             path = null;
         } else {
-            path = name.substring(pos + 1);
-            name = name.substring(0, pos);
+            path = key.substring(pos + 1);
+            key = key.substring(0, pos);
         }
         // is the layout key specified?
-        pos = name.indexOf(':');
+        pos = key.indexOf(':');
         String layoutKey = null;
-        String layoutId = name;
+        String layoutId = key;
         if ( pos != -1 ) {
-            layoutKey = name.substring(0, pos);
-            layoutId = name.substring(pos + 1);
+            layoutKey = key.substring(0, pos);
+            layoutId = key.substring(pos + 1);
         }
 
         // get the layout

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/SkinModule.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/SkinModule.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/SkinModule.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/SkinModule.java Sun Jul 30 11:41:45 2006
@@ -52,6 +52,7 @@
 	 */
 	public Object getAttribute(String name, Configuration modeConf, Map objectModel) 
     throws ConfigurationException {
+        String key = name;
         // lazy init
         if ( this.globalModule == null ) {
             synchronized ( this ) {
@@ -67,10 +68,10 @@
 
         String skinName = null;
         // if the attribute already contains a ':', the name is prefixed with the skin name
-        int pos = name.indexOf(':');
+        int pos = key.indexOf(':');
         if ( pos != -1 ) {
-            skinName = name.substring(0, pos);
-            name = name.substring(pos+1);
+            skinName = key.substring(0, pos);
+            key = key.substring(pos+1);
         } else {
             // get the current skin
             // the skin is stored as a parameter on the root layout
@@ -99,14 +100,14 @@
             }
         }
         if ( desc != null ) {
-            if ( "skin".equals(name) ) {
+            if ( "skin".equals(key) ) {
                 return skinName;
-            } else if ( "skin.basepath".equals(name) ) {
+            } else if ( "skin.basepath".equals(key) ) {
                 return desc.getBasePath();
-            } else if ( "skin.thumbnailpath".equals(name) ) {
+            } else if ( "skin.thumbnailpath".equals(key) ) {
                 return desc.getThumbnailPath();
-            } else if ( name.startsWith("skin.thumbnailuri.") ) {
-                String selectedSkinName = name.substring(name.lastIndexOf(".")+ 1, name.length());
+            } else if ( key.startsWith("skin.thumbnailuri.") ) {
+                String selectedSkinName = key.substring(key.lastIndexOf(".")+ 1, key.length());
                 for(Iterator it = portalService.getSkinDescriptions().iterator(); it.hasNext();) {
                     SkinDescription selected = (SkinDescription) it.next();
                     if(selected.getName().equals(selectedSkinName)) {

Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDefinition.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDefinition.java?rev=426912&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDefinition.java (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDefinition.java Sun Jul 30 11:41:45 2006
@@ -0,0 +1,207 @@
+/*
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
+ * Licensed 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.cocoon.portal.coplet;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import org.apache.cocoon.portal.util.PortalUtils;
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * A coplet definition describes an available coplet. A coplet definition can be seen
+ * as a class. A user can create one or more instances of the coplet
+ * ({@link CopletInstance}s).
+ *
+ * @version $Id$
+ */
+public class CopletDefinition implements Serializable {
+
+    /** The unique identifier. */
+    protected final String id;
+
+    protected String title;
+
+    protected CopletType copletType;
+
+    protected final Map attributes = new HashMap();
+
+    protected String allowedRoles;
+
+    protected transient List allowedRolesList;
+
+    /**
+     * Constructor to instantiate a new coplet data object.
+     * @param id The unique id of the object.
+     * @see PortalUtils#testId(String)
+     */
+    public CopletDefinition(String id) {
+        final String idErrorMsg = PortalUtils.testId(id);
+        if ( idErrorMsg != null ) {
+            throw new IllegalArgumentException(idErrorMsg);
+        }
+        this.id = id;
+    }
+
+    /**
+     * Return the unique identifier of this object.
+     * @return The unique identifier.
+     */
+    public String getId() {
+        return this.id;
+    }
+
+    /**
+     * Returns the title.
+     * @return String
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * Sets the title.
+     * @param title The title to set
+     */
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    /**
+     * Returns the type of the coplet.
+     * @return CopletType
+     */
+    public CopletType getCopletType() {
+        return this.copletType;
+    }
+
+    /**
+     * Sets the type of the coplet.
+     * @param copletType The coplet type to set
+     */
+    public void setCopletType(CopletType copletType) {
+        this.copletType = copletType;
+    }
+
+    public Object removeAttribute(String key) {
+        return this.attributes.remove(key);
+    }
+
+    public Object getAttribute(String key) {
+        return this.attributes.get(key);
+    }
+
+    public void setAttribute(String key, Object value) {
+        this.attributes.put(key, value);
+    }
+
+    public Map getAttributes() {
+    	return this.attributes;
+    }
+
+    /**
+     * @return Returns the allowed roles.
+     */
+    public String getAllowedRoles() {
+        return this.allowedRoles;
+    }
+
+    /**
+     * @param roles The allowed roles to set.
+     */
+    public void setAllowedRoles(String roles) {
+        this.allowedRoles = roles;
+        this.allowedRolesList = null;
+    }
+
+    /**
+     * Return the list of roles that are allowed to access this coplet
+     * @return A list of roles or null if everyone is allowed.
+     */
+    public List getAllowedRolesList() {
+        if ( StringUtils.isBlank(this.allowedRoles) ) {
+            return null;
+        }
+        if ( this.allowedRolesList == null ) {
+            this.allowedRolesList = new ArrayList();
+            final StringTokenizer tokenizer = new StringTokenizer(this.allowedRoles, ",");
+            while ( tokenizer.hasMoreElements() ) {
+                String token = (String)tokenizer.nextElement();
+                this.allowedRolesList.add(token);
+            }
+            if ( this.allowedRolesList.size() == 0 ) {
+                this.allowedRoles = null;
+                this.allowedRolesList = null;
+            }
+        }
+        return this.allowedRolesList;
+    }
+
+    public void addToAllowedRoles(String role) {
+        List l = this.getAllowedRolesList();
+        if ( l == null ) {
+            l = new ArrayList();
+            l.add(role);
+        } else {
+            if ( !l.contains(role) ) {
+                l.add(role);
+            }
+        }
+        this.buildRolesString(l);
+    }
+
+    public void removeFromAllowedRoles(String role) {
+        List l = this.getAllowedRolesList();
+        if ( l != null && l.contains(role) ) {
+            l.remove(role);
+            if ( l.size() == 0 ) {
+                this.allowedRoles = null;
+                this.allowedRolesList = null;
+            } else {
+                this.buildRolesString(l);
+            }
+        }
+    }
+
+    protected void buildRolesString(List fromList) {
+        this.allowedRolesList = fromList;
+        StringBuffer buffer = new StringBuffer();
+        boolean first = true;
+        Iterator i = fromList.iterator();
+        while ( i.hasNext() ) {
+            String role = (String)i.next();
+            if ( !first ) {
+                buffer.append(',');
+            }
+            first = false;
+            buffer.append(role);
+        }
+        this.allowedRoles = buffer.toString();
+    }
+
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString() {
+        return "CopletDefinition (" + this.hashCode() +
+               "), id=" + this.getId() + ", coplet-type=" + (this.getCopletType() == null ? "null" : this.getCopletType().getId());
+    }
+}

Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDefinition.java
------------------------------------------------------------------------------
    svn:keywords = Id

Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDefinitionFeatures.java (from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDataFeatures.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDefinitionFeatures.java?p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDefinitionFeatures.java&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDataFeatures.java&r1=426594&r2=426912&rev=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDataFeatures.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDefinitionFeatures.java Sun Jul 30 11:41:45 2006
@@ -23,7 +23,7 @@
  *
  * @version $Id$
  */
-public final class CopletDataFeatures {
+public final class CopletDefinitionFeatures {
 
     /** This is the name of the coplet data attribute containing a boolean value
      * indicating if the user is allowed to resize the coplet. (default is true) */
@@ -43,10 +43,10 @@
      * meaning the portal handles the state and renders only the title). */
     public static final String ATTRIBUTE_HANDLE_SIZING = "handle-sizing";
 
-    public static Object getAttributeValue(CopletData data, String key, Object defaultValue) {
+    public static Object getAttributeValue(CopletDefinition data, String key, Object defaultValue) {
         Object value = data.getAttribute(key);
         if ( value == null ) {
-            value = data.getCopletBaseData().getCopletConfig(key);
+            value = data.getCopletType().getCopletConfig(key);
             if ( value == null ) {
                 value = defaultValue;
             }
@@ -57,7 +57,7 @@
     /**
      * Is this coplet sizable?
      */
-    public static boolean isSizable(CopletData data) {
+    public static boolean isSizable(CopletDefinition data) {
         Boolean sizable = (Boolean)getAttributeValue(data, ATTRIBUTE_SIZABLE, Boolean.TRUE);
         return sizable.booleanValue();
     }
@@ -65,7 +65,7 @@
     /**
      * Is this coplet mandatory?
      */
-    public static boolean isMandatory(CopletData data) {
+    public static boolean isMandatory(CopletDefinition data) {
         Boolean mandatory = (Boolean)getAttributeValue(data, ATTRIBUTE_MANDATORY, Boolean.FALSE);
         return mandatory.booleanValue();
     }
@@ -73,7 +73,7 @@
     /**
      * Does this coplet support the full screen mode?
      */
-    public static boolean supportsFullScreenMode(CopletData data) {
+    public static boolean supportsFullScreenMode(CopletDefinition data) {
         Boolean supportsMode = (Boolean)getAttributeValue(data, ATTRIBUTE_FULLSCREEN, Boolean.TRUE);
         return supportsMode.booleanValue();
     }
@@ -81,16 +81,16 @@
     /**
      * Does this coplet handles sizing by itself?
      */
-    public static boolean handlesSizing(CopletData data) {
+    public static boolean handlesSizing(CopletDefinition data) {
         Boolean handlesSizing = (Boolean)getAttributeValue(data, ATTRIBUTE_HANDLE_SIZING, Boolean.FALSE);
         return handlesSizing.booleanValue();
     }
 
-    public static void setSizable(CopletData data, boolean value) {
+    public static void setSizable(CopletDefinition data, boolean value) {
         data.setAttribute(ATTRIBUTE_SIZABLE, BooleanUtils.toBooleanObject(value));
     }
 
-    public static void setMandatory(CopletData data, boolean value) {
+    public static void setMandatory(CopletDefinition data, boolean value) {
         data.setAttribute(ATTRIBUTE_MANDATORY, BooleanUtils.toBooleanObject(value));
     }
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletFactory.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletFactory.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletFactory.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletFactory.java Sun Jul 30 11:41:45 2006
@@ -30,26 +30,26 @@
      * Create a new coplet instance.
      * This is also registered at the profile manager.
      */
-    CopletInstanceData newInstance(CopletData copletData)
+    CopletInstance newInstance(CopletDefinition copletDef)
     throws PortalException;
 
     /** 
      * Create a new coplet instance.
      * This is also registered at the profile manager.
      */
-    CopletInstanceData newInstance(CopletData copletData,
-                                   String id)
+    CopletInstance newInstance(CopletDefinition copletDef,
+                                   String           id)
     throws PortalException;
 
     /**
      * Remove the coplet instance data.
      * This is also unregistered at the profile manager.
      */
-    void remove(CopletInstanceData copletInstanceData);
+    void remove(CopletInstance copletInstanceData);
 
     /**
      * Create a new coplet data instance.
      */
-    CopletData newInstance(CopletBaseData copletBaseData, String id)
+    CopletDefinition newInstance(CopletType copletType, String id)
     throws PortalException;
 }

Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstance.java (from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstance.java?p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstance.java&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java&r1=426594&r2=426912&rev=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstance.java Sun Jul 30 11:41:45 2006
@@ -43,7 +43,7 @@
  *
  * @version $Id$
  */
-public final class CopletInstanceData implements Serializable {
+public final class CopletInstance implements Serializable {
 
     public final static int SIZE_MINIMIZED  = 0;
     public final static int SIZE_NORMAL     = 1;
@@ -52,8 +52,8 @@
 
     protected final String id;
 
-    /** The corresponding {@link CopletData}. */
-	protected CopletData copletData;
+    /** The corresponding {@link CopletDefinition}. */
+	protected CopletDefinition copletDefinition;
 
     /** Persisted attributes. */
     protected Map attributes = new HashMap();
@@ -74,7 +74,7 @@
      * @param id The unique id of the object.
      * @see PortalUtils#testId(String)
 	 */
-	public CopletInstanceData(String id) {
+	public CopletInstance(String id) {
         final String idErrorMsg = PortalUtils.testId(id);
         if ( idErrorMsg != null ) {
             throw new IllegalArgumentException(idErrorMsg);
@@ -91,18 +91,18 @@
     }
 
 	/**
-	 * @return CopletData
+	 * @return CopletDefinition
 	 */
-	public CopletData getCopletData() {
-		return copletData;
+	public CopletDefinition getCopletDefinition() {
+		return this.copletDefinition;
 	}
 
 	/**
-	 * Sets the copletData.
-	 * @param copletData The copletData to set
+	 * Sets the coplet definition..
+	 * @param copletDef The copletDef to set
 	 */
-	public void setCopletData(CopletData copletData) {
-		this.copletData = copletData;
+	public void setCopletDefinition(CopletDefinition copletDef) {
+		this.copletDefinition = copletDef;
 	}
 
     public Object getAttribute(String key) {
@@ -141,7 +141,7 @@
         if (this.title != null) {
             return this.title;
         }
-        return this.getCopletData().getTitle();
+        return this.getCopletDefinition().getTitle();
     }
 
     public String getInstanceTitle() {
@@ -156,18 +156,18 @@
      * @see java.lang.Object#clone()
      */
     protected Object clone() throws CloneNotSupportedException {
-        CopletInstanceData clone = new CopletInstanceData(this.id);
+        CopletInstance clone = new CopletInstance(this.id);
 
-        clone.copletData = this.copletData;
+        clone.copletDefinition = this.copletDefinition;
         clone.attributes = new HashMap(this.attributes);
         clone.temporaryAttributes = new HashMap(this.temporaryAttributes);
 
         return clone;
     }
 
-    public CopletInstanceData copy() {
+    public CopletInstance copy() {
         try {
-            return (CopletInstanceData)this.clone();
+            return (CopletInstance)this.clone();
         } catch (CloneNotSupportedException cnse) {
             // ignore
             return null;
@@ -195,7 +195,7 @@
      * @see java.lang.Object#toString()
      */
     public String toString() {
-        return "CopletInstanceData (" + this.hashCode() +
-               "), id=" + this.getId() + ", coplet-data=" + (this.getCopletData() == null ? "null" : this.getCopletData().getId());
+        return "CopletInstance (" + this.hashCode() +
+               "), id=" + this.getId() + ", coplet-definition=" + (this.getCopletDefinition() == null ? "null" : this.getCopletDefinition().getId());
     }
 }

Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstanceFeatures.java (from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstanceDataFeatures.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstanceFeatures.java?p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstanceFeatures.java&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstanceDataFeatures.java&r1=426594&r2=426912&rev=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstanceDataFeatures.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstanceFeatures.java Sun Jul 30 11:41:45 2006
@@ -35,9 +35,9 @@
  *
  * @version $Id$
  */
-public final class CopletInstanceDataFeatures {
+public final class CopletInstanceFeatures {
 
-    protected static final String CHANGED_COPLETS_ATTRIBUTE_NAME = CopletInstanceDataFeatures.class.getName() + "/ChangedCoplets";
+    protected static final String CHANGED_COPLETS_ATTRIBUTE_NAME = CopletInstanceFeatures.class.getName() + "/ChangedCoplets";
 
     /**
      * Tests if this is a sizing event for a coplet instance.
@@ -103,7 +103,7 @@
     }
 
     public static void addChangedCopletInstanceData(PortalService service,
-                                                    CopletInstanceData cid) {
+                                                    CopletInstance cid) {
         List list = (List)service.getTemporaryAttribute(CHANGED_COPLETS_ATTRIBUTE_NAME);
         if ( list == null ) {
             list = new ArrayList();
@@ -116,10 +116,10 @@
 
     public static String sizeToString(int value) {
         switch (value) {
-            case CopletInstanceData.SIZE_NORMAL : return "normal";
-            case CopletInstanceData.SIZE_FULLSCREEN : return "fullscreen";
-            case CopletInstanceData.SIZE_MAXIMIZED : return "maximized";
-            case CopletInstanceData.SIZE_MINIMIZED : return "minimized";
+            case CopletInstance.SIZE_NORMAL : return "normal";
+            case CopletInstance.SIZE_FULLSCREEN : return "fullscreen";
+            case CopletInstance.SIZE_MAXIMIZED : return "maximized";
+            case CopletInstance.SIZE_MINIMIZED : return "minimized";
             default:
                 return "";
         }

Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletType.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletType.java?rev=426912&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletType.java (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletType.java Sun Jul 30 11:41:45 2006
@@ -0,0 +1,88 @@
+/*
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
+ * Licensed 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.cocoon.portal.coplet;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.cocoon.portal.util.PortalUtils;
+
+/**
+ * A coplet base data defines a coplet type, like a pipeline based coplet,
+ * a JSR 168 portlet or a WSRP portlet. For each type exists a coplet base
+ * data with some configuration.
+ * Based on the coplet base data, coplets are created ({@link CopletData}.
+ *
+ * @version $Id$
+ */
+public class CopletType implements Serializable { 
+
+	private final Map copletConfig = new HashMap();
+
+	private final String id;
+
+	private String copletAdapterName;
+
+    /**
+     * Create a new coplet base data object. 
+     * @param id The unique id of the object.
+     * @see PortalUtils#testId(String)
+     */
+    public CopletType(String id) {
+        final String idErrorMsg = PortalUtils.testId(id);
+        if ( idErrorMsg != null ) {
+            throw new IllegalArgumentException(idErrorMsg);
+        }
+        this.id = id;
+    }
+
+	public String getId() {
+		return id;
+	}
+
+	public String getCopletAdapterName() {
+		return this.copletAdapterName;
+	}
+
+	public Object getCopletConfig(String key) {
+		return this.copletConfig.get(key);
+	}
+
+	public void setCopletConfig(String key, Object value) {
+		this.copletConfig.put(key, value);
+	}
+
+    public Object removeCopletConfig(String key) {
+        return this.copletConfig.remove(key);
+    }
+
+	public Map getCopletConfig() {
+		return this.copletConfig;
+	}
+
+	public void setCopletAdapterName(String name) {
+		this.copletAdapterName = name;
+	}
+
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString() {
+        return "CopletType (" + this.hashCode() +
+               "), id=" + this.getId() + ", coplet-adapter=" + this.getCopletAdapterName();
+    }
+}

Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletType.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/CopletAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/CopletAdapter.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/CopletAdapter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/CopletAdapter.java Sun Jul 30 11:41:45 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.cocoon.portal.coplet.adapter;
 
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 
@@ -61,7 +61,7 @@
      * For each coplet, this method is only invoked once.
      * @param coplet The coplet
      */
-    void init(CopletInstanceData coplet);
+    void init(CopletInstance coplet);
 
     /**
      * Destroy the coplet.
@@ -69,12 +69,12 @@
      * For each coplet, this method is only invoked once.
      * @param coplet
      */
-    void destroy(CopletInstanceData coplet);
+    void destroy(CopletInstance coplet);
 
     /**
      * Stream the content of the coplet.
      */
-    void toSAX(CopletInstanceData coplet, ContentHandler contentHandler)
+    void toSAX(CopletInstance coplet, ContentHandler contentHandler)
     throws SAXException;
 
     /**
@@ -82,12 +82,12 @@
      * This method is invoked when a user logs in for each coplet instance
      * of the user.
      */
-    void login(CopletInstanceData coplet);
+    void login(CopletInstance coplet);
 
     /**
      * User logs out from a coplet.
      * This method is invoked when a user logs out for each coplet instance
      * of this user.
      */
-    void logout(CopletInstanceData coplet);
+    void logout(CopletInstance coplet);
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/CopletDecorationProvider.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/CopletDecorationProvider.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/CopletDecorationProvider.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/CopletDecorationProvider.java Sun Jul 30 11:41:45 2006
@@ -17,24 +17,24 @@
 
 import java.util.List;
 
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
 
 /**
  * @version $Id$
  */
 public interface CopletDecorationProvider extends CopletAdapter {
 
-    String getTitle(CopletInstanceData coplet);
+    String getTitle(CopletInstance coplet);
 
     /**
      * Returns a list of {@link DecorationAction}.
      * @return List of possible window states, might be empty.
      */
-    List getPossibleWindowStates(CopletInstanceData coplet);
+    List getPossibleWindowStates(CopletInstance coplet);
 
     /**
      * Returns a list of {@link DecorationAction}.
      * @return List of possible coplet modes, might be empty.
      */
-    List getPossibleCopletModes(CopletInstanceData coplet);
+    List getPossibleCopletModes(CopletInstance coplet);
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/DecorationAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/DecorationAction.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/DecorationAction.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/DecorationAction.java Sun Jul 30 11:41:45 2006
@@ -21,8 +21,8 @@
 public final class DecorationAction {
 
     public static final String WINDOW_STATE_NORMAL = "normal-uri";
-    public static final String WINDOW_STATE_MINIMIZED = "minimized-uri";
-    public static final String WINDOW_STATE_MAXIMIZED = "maximized-uri";
+    public static final String WINDOW_STATE_MINIMIZED = "minimize-uri";
+    public static final String WINDOW_STATE_MAXIMIZED = "maximize-uri";
     public static final String WINDOW_STATE_FULLSCREEN = "fullscreen-uri";
 
     protected String name;

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/AbstractCopletAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/AbstractCopletAdapter.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/AbstractCopletAdapter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/AbstractCopletAdapter.java Sun Jul 30 11:41:45 2006
@@ -32,9 +32,9 @@
 import org.apache.cocoon.components.thread.RunnableManager;
 import org.apache.cocoon.environment.CocoonRunnable;
 import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletData;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
-import org.apache.cocoon.portal.coplet.CopletInstanceDataFeatures;
+import org.apache.cocoon.portal.coplet.CopletDefinition;
+import org.apache.cocoon.portal.coplet.CopletInstance;
+import org.apache.cocoon.portal.coplet.CopletInstanceFeatures;
 import org.apache.cocoon.portal.coplet.adapter.CopletAdapter;
 import org.apache.cocoon.portal.event.CopletInstanceEvent;
 import org.apache.cocoon.portal.event.Receiver;
@@ -172,8 +172,8 @@
     /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
-    public void service(ServiceManager manager) throws ServiceException {
-        super.service(manager);
+    public void service(ServiceManager aManager) throws ServiceException {
+        super.service(aManager);
         this.cache = (Cache)this.manager.lookup(Cache.ROLE);
         this.runnableManager = (RunnableManager)this.manager.lookup( RunnableManager.ROLE );
     }
@@ -196,11 +196,11 @@
      * First the coplet data is queried and if it doesn't provide an
      * attribute with the given name, the coplet base data is used.
      */
-    protected Object getConfiguration(CopletInstanceData coplet, String key) {
-        CopletData copletData = coplet.getCopletData();
+    protected Object getConfiguration(CopletInstance coplet, String key) {
+        CopletDefinition copletData = coplet.getCopletDefinition();
         Object data = copletData.getAttribute( key );
         if ( data == null) {
-            data = copletData.getCopletBaseData().getCopletConfig().get( key );
+            data = copletData.getCopletType().getCopletConfig().get( key );
         }
         return data;
     }
@@ -211,7 +211,7 @@
      * attribute with the given name, the coplet base data is used.
      * If no value is found the default value is returned.
      */
-    protected Object getConfiguration(CopletInstanceData coplet,
+    protected Object getConfiguration(CopletInstance coplet,
                                       String key,
                                       Object defaultValue) {
         Object data = this.getConfiguration(coplet, key);
@@ -224,19 +224,19 @@
     /**
      * Implement this and not toSAX().
      */
-    public abstract void streamContent(CopletInstanceData coplet, 
+    public abstract void streamContent(CopletInstance coplet, 
                                        ContentHandler contentHandler)
     throws SAXException; 
 
     /**
      * This method streams the content of a coplet instance data.
      * It handles buffering and timeout setting and calls
-     * {@link #streamContent(CopletInstanceData, ContentHandler)}
+     * {@link #streamContent(CopletInstance, ContentHandler)}
      * for creating the content.
      *
-     * @see org.apache.cocoon.portal.coplet.adapter.CopletAdapter#toSAX(org.apache.cocoon.portal.coplet.CopletInstanceData, org.xml.sax.ContentHandler)
+     * @see org.apache.cocoon.portal.coplet.adapter.CopletAdapter#toSAX(org.apache.cocoon.portal.coplet.CopletInstance, org.xml.sax.ContentHandler)
      */
-    public void toSAX(CopletInstanceData coplet, ContentHandler contentHandler)
+    public void toSAX(CopletInstance coplet, ContentHandler contentHandler)
     throws SAXException {
         final long startTime = System.currentTimeMillis();
         Boolean bool = (Boolean) this.getConfiguration( coplet, CONFIGURATION_BUFFERING );
@@ -271,10 +271,10 @@
                 }
             } catch (Exception exception ) {
                 error = exception;
-                this.getLogger().warn("Unable to get content of coplet: " + coplet.getId(), exception);
+                this.getLogger().error("Unable to get content of coplet: " + coplet.getId(), exception);
             } catch (Throwable t ) {
                 error = new ProcessingException("Unable to get content of coplet: " + coplet.getId(), t);
-                this.getLogger().warn("Unable to get content of coplet: " + coplet.getId(), t);                
+                this.getLogger().error("Unable to get content of coplet: " + coplet.getId(), t);                
             }
 
             if ( read ) {
@@ -294,7 +294,7 @@
         }
         if ( this.getLogger().isInfoEnabled() ) {
             final long msecs = System.currentTimeMillis() - startTime;
-            this.getLogger().info("Streamed coplet " + coplet.getCopletData().getId() +
+            this.getLogger().info("Streamed coplet " + coplet.getCopletDefinition().getId() +
                                   " (instance " + coplet.getId() + ") in " + msecs + "ms.");
         }
     }
@@ -302,7 +302,7 @@
     /**
      * This method does the caching (if enabled).
      */
-    public void streamContentAndCache( final CopletInstanceData coplet,
+    public void streamContentAndCache( final CopletInstance coplet,
                                        final ContentHandler contentHandler)
     throws SAXException {
         // Is caching enabled?
@@ -368,25 +368,25 @@
     }
 
     /**
-     * @see org.apache.cocoon.portal.coplet.adapter.CopletAdapter#init(org.apache.cocoon.portal.coplet.CopletInstanceData)
+     * @see org.apache.cocoon.portal.coplet.adapter.CopletAdapter#init(org.apache.cocoon.portal.coplet.CopletInstance)
      */
-    public void init(CopletInstanceData coplet) {
+    public void init(CopletInstance coplet) {
         // nothing to do here, can be overwritten in subclasses
     }
 
     /**
-     * @see org.apache.cocoon.portal.coplet.adapter.CopletAdapter#destroy(org.apache.cocoon.portal.coplet.CopletInstanceData)
+     * @see org.apache.cocoon.portal.coplet.adapter.CopletAdapter#destroy(org.apache.cocoon.portal.coplet.CopletInstance)
      */
-    public void destroy(CopletInstanceData coplet) {
+    public void destroy(CopletInstance coplet) {
         // nothing to do here, can be overwritten in subclasses
     }
 
     /**
-     * @see org.apache.cocoon.portal.coplet.adapter.CopletAdapter#login(org.apache.cocoon.portal.coplet.CopletInstanceData)
+     * @see org.apache.cocoon.portal.coplet.adapter.CopletAdapter#login(org.apache.cocoon.portal.coplet.CopletInstance)
      */
-    public void login(CopletInstanceData coplet) {
+    public void login(CopletInstance coplet) {
         // copy temporary attributes from the coplet data
-        Iterator iter = coplet.getCopletData().getAttributes().entrySet().iterator();
+        Iterator iter = coplet.getCopletDefinition().getAttributes().entrySet().iterator();
         while ( iter.hasNext() ) {
             Map.Entry entry = (Map.Entry)iter.next();
             if ( entry.getKey().toString().startsWith("temporary:") ) {
@@ -397,9 +397,9 @@
     }
 
     /**
-     * @see org.apache.cocoon.portal.coplet.adapter.CopletAdapter#logout(org.apache.cocoon.portal.coplet.CopletInstanceData)
+     * @see org.apache.cocoon.portal.coplet.adapter.CopletAdapter#logout(org.apache.cocoon.portal.coplet.CopletInstance)
      */
-    public void logout(CopletInstanceData coplet) {
+    public void logout(CopletInstance coplet) {
         // nothing to do here, can be overwritten in subclasses
     }
 
@@ -411,7 +411,7 @@
      * @return True if the error content has been rendered, otherwise false
      * @throws SAXException
      */
-    protected boolean renderErrorContent(CopletInstanceData coplet, 
+    protected boolean renderErrorContent(CopletInstance coplet, 
                                          ContentHandler     handler,
                                          Exception          error)
     throws SAXException {
@@ -422,19 +422,19 @@
      * @see org.apache.cocoon.portal.event.Receiver
      */
     public void inform(CopletInstanceEvent event, PortalService service) {
-        final CopletInstanceData coplet = event.getTarget();
+        final CopletInstance coplet = event.getTarget();
 
         // do we ignore SizingEvents
         boolean ignoreSizing = ((Boolean)this.getConfiguration(coplet, CONFIGURATION_IGNORE_SIZING_EVENTS, Boolean.TRUE)).booleanValue();
 
-        if ( !ignoreSizing || !CopletInstanceDataFeatures.isSizingEvent(event)) {
+        if ( !ignoreSizing || !CopletInstanceFeatures.isSizingEvent(event)) {
             boolean cleanupCache = true;
             boolean ignoreSimpleSizing = ((Boolean)this.getConfiguration(coplet, CONFIGURATION_IGNORE_SIMPLE_SIZING_EVENTS, Boolean.FALSE)).booleanValue();
-            if ( ignoreSimpleSizing && CopletInstanceDataFeatures.isSizingEvent(event) ) {
-                int newSize = CopletInstanceDataFeatures.getSize(event);
+            if ( ignoreSimpleSizing && CopletInstanceFeatures.isSizingEvent(event) ) {
+                int newSize = CopletInstanceFeatures.getSize(event);
                 int oldSize = coplet.getSize();
-                if (  (oldSize == CopletInstanceData.SIZE_NORMAL || oldSize == CopletInstanceData.SIZE_MINIMIZED )
-                   && (newSize == CopletInstanceData.SIZE_NORMAL || newSize == CopletInstanceData.SIZE_MINIMIZED )) {
+                if (  (oldSize == CopletInstance.SIZE_NORMAL || oldSize == CopletInstance.SIZE_MINIMIZED )
+                   && (newSize == CopletInstance.SIZE_NORMAL || newSize == CopletInstance.SIZE_MINIMIZED )) {
                     cleanupCache = false;
                 }
             }
@@ -457,15 +457,15 @@
     /**
      * Build the key for the global cache.
      */
-    protected String getCacheKey(CopletInstanceData coplet) {
+    protected String getCacheKey(CopletInstance coplet) {
         final Boolean useAttributes = (Boolean)this.getConfiguration(coplet,
                                                             CONFIGURATION_CACHE_GLOBAL_USE_ATTRIBUTES,
                                                             Boolean.FALSE);
         if ( !useAttributes.booleanValue() ) {
-            return "coplet:" + coplet.getCopletData().getId();
+            return "coplet:" + coplet.getCopletDefinition().getId();
         }
         final StringBuffer buffer = new StringBuffer("coplet:");
-        buffer.append(coplet.getCopletData().getId());
+        buffer.append(coplet.getCopletDefinition().getId());
         boolean hasParams = false;
         // first add attributes:
         // sort the keys
@@ -522,12 +522,12 @@
 
     private final AbstractCopletAdapter adapter;
     private final ContentHandler        handler;
-    private final CopletInstanceData    coplet;
+    private final CopletInstance    coplet;
     private final CountDown             finished;
     Exception exception;
 
     public LoaderThread(AbstractCopletAdapter adapter, 
-                         CopletInstanceData coplet,
+                         CopletInstance coplet,
                          ContentHandler handler) {
         this.adapter = adapter;
         this.coplet  = coplet;

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java Sun Jul 30 11:41:45 2006
@@ -24,7 +24,7 @@
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.portal.LinkService;
 import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
 import org.apache.cocoon.portal.event.CopletInstanceEvent;
 import org.apache.cocoon.portal.event.impl.CopletLinkEvent;
 import org.apache.cocoon.portal.transformation.ProxyTransformer;
@@ -43,9 +43,9 @@
 public class ApplicationCopletAdapter extends URICopletAdapter {
 
     /**
-     * @see org.apache.cocoon.portal.coplet.adapter.impl.URICopletAdapter#streamContent(org.apache.cocoon.portal.coplet.CopletInstanceData, java.lang.String, org.xml.sax.ContentHandler)
+     * @see org.apache.cocoon.portal.coplet.adapter.impl.URICopletAdapter#streamContent(org.apache.cocoon.portal.coplet.CopletInstance, java.lang.String, org.xml.sax.ContentHandler)
      */
-    public void streamContent(final CopletInstanceData coplet,
+    public void streamContent(final CopletInstance coplet,
                               final String uri,
                               final ContentHandler contentHandler)
     throws SAXException {
@@ -71,7 +71,7 @@
 
         if ( e instanceof CopletLinkEvent ) {
             CopletLinkEvent event = (CopletLinkEvent) e;
-            CopletInstanceData coplet = event.getTarget();
+            CopletInstance coplet = event.getTarget();
 
             // this is a normal link event, so save the url in the instance data
             // for ProxyTransformer
@@ -120,7 +120,7 @@
      * @return True if the error content has been rendered, otherwise false
      * @throws SAXException
      */
-    protected boolean renderErrorContent(CopletInstanceData coplet,
+    protected boolean renderErrorContent(CopletInstance coplet,
                                          ContentHandler handler)
     throws SAXException {
         handler.startDocument();

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/URICopletAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/URICopletAdapter.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/URICopletAdapter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/URICopletAdapter.java Sun Jul 30 11:41:45 2006
@@ -29,8 +29,8 @@
 import org.apache.cocoon.components.source.SourceUtil;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.portal.Constants;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
-import org.apache.cocoon.portal.coplet.CopletInstanceDataFeatures;
+import org.apache.cocoon.portal.coplet.CopletInstance;
+import org.apache.cocoon.portal.coplet.CopletInstanceFeatures;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceResolver;
 import org.xml.sax.ContentHandler;
@@ -50,24 +50,24 @@
     /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
-    public void service(ServiceManager manager) throws ServiceException {
-        super.service( manager );
+    public void service(ServiceManager aManager) throws ServiceException {
+        super.service( aManager );
         this.resolver = (SourceResolver)this.manager.lookup(SourceResolver.ROLE);
     }
 
     /**
-     * @see org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter#streamContent(org.apache.cocoon.portal.coplet.CopletInstanceData, org.xml.sax.ContentHandler)
+     * @see org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter#streamContent(org.apache.cocoon.portal.coplet.CopletInstance, org.xml.sax.ContentHandler)
      */
-    public void streamContent(CopletInstanceData coplet, ContentHandler contentHandler)
+    public void streamContent(CopletInstance coplet, ContentHandler contentHandler)
     throws SAXException {
-        final String uri = (String)coplet.getCopletData().getAttribute("uri");
+        final String uri = (String)coplet.getCopletDefinition().getAttribute("uri");
         if ( uri == null ) {
-            throw new SAXException("No URI for coplet data "+coplet.getCopletData().getId()+" found.");
+            throw new SAXException("No URI for coplet data "+coplet.getCopletDefinition().getId()+" found.");
         }
         this.streamContent( coplet, uri, contentHandler);
     }
 
-    protected void streamContent(final CopletInstanceData coplet, 
+    protected void streamContent(final CopletInstance coplet, 
                                  final String uri,
                                  final ContentHandler contentHandler)
     throws SAXException {
@@ -79,7 +79,7 @@
                 String sourceUri = uri;
 
                 if ( handlePars.booleanValue() ) {
-                    List list = CopletInstanceDataFeatures.getChangedCopletInstanceDataObjects(this.portalService);
+                    List list = CopletInstanceFeatures.getChangedCopletInstanceDataObjects(this.portalService);
                     if ( list.contains( coplet )) {
                         // add parameters
                         if ( uri.startsWith("cocoon:raw:") ) {
@@ -130,7 +130,7 @@
      * @return True if the error content has been rendered, otherwise false
      * @throws SAXException
      */
-    protected boolean renderErrorContent(CopletInstanceData coplet, 
+    protected boolean renderErrorContent(CopletInstance coplet, 
                                          ContentHandler     handler,
                                          Exception          error)
     throws SAXException {

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/impl/DefaultCopletFactory.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/impl/DefaultCopletFactory.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/impl/DefaultCopletFactory.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/impl/DefaultCopletFactory.java Sun Jul 30 11:41:45 2006
@@ -16,12 +16,12 @@
 package org.apache.cocoon.portal.coplet.impl;
 
 import org.apache.cocoon.portal.PortalException;
-import org.apache.cocoon.portal.coplet.CopletBaseData;
-import org.apache.cocoon.portal.coplet.CopletData;
+import org.apache.cocoon.portal.coplet.CopletDefinition;
 import org.apache.cocoon.portal.coplet.CopletFactory;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
+import org.apache.cocoon.portal.coplet.CopletType;
 import org.apache.cocoon.portal.coplet.adapter.CopletAdapter;
-import org.apache.cocoon.portal.event.coplet.CopletDataAddedEvent;
+import org.apache.cocoon.portal.event.coplet.CopletDefinitionAddedEvent;
 import org.apache.cocoon.portal.event.coplet.CopletInstanceDataAddedEvent;
 import org.apache.cocoon.portal.event.coplet.CopletInstanceDataRemovedEvent;
 import org.apache.cocoon.portal.impl.AbstractComponent;
@@ -38,29 +38,30 @@
     protected static long idCounter = System.currentTimeMillis();
 
     /**
-     * @see org.apache.cocoon.portal.coplet.CopletFactory#newInstance(org.apache.cocoon.portal.coplet.CopletData)
+     * @see org.apache.cocoon.portal.coplet.CopletFactory#newInstance(org.apache.cocoon.portal.coplet.CopletDefinition)
      */
-    public CopletInstanceData newInstance(CopletData copletData)
+    public CopletInstance newInstance(CopletDefinition copletData)
     throws PortalException {
         return this.newInstance(copletData, null);
     }
 
     /**
-     * @see org.apache.cocoon.portal.coplet.CopletFactory#newInstance(org.apache.cocoon.portal.coplet.CopletData, String)
+     * @see org.apache.cocoon.portal.coplet.CopletFactory#newInstance(org.apache.cocoon.portal.coplet.CopletDefinition, String)
      */
-    public CopletInstanceData newInstance(CopletData copletData, String id)
+    public CopletInstance newInstance(CopletDefinition copletData, String key)
     throws PortalException {
+        String id = key;
         if (id == null ) {
             synchronized (this) {
                 id = copletData.getId() + '-' + idCounter;
                 idCounter += 1;
             }
         }
-        CopletInstanceData instance = new CopletInstanceData(id);
-        instance.setCopletData(copletData);
+        CopletInstance instance = new CopletInstance(id);
+        instance.setCopletDefinition(copletData);
 
         // now lookup the adapter
-        final String adapterName = copletData.getCopletBaseData().getCopletAdapterName();
+        final String adapterName = copletData.getCopletType().getCopletAdapterName();
         final CopletAdapter adapter = this.portalService.getCopletAdapter(adapterName);
         adapter.init( instance );
         adapter.login( instance );
@@ -71,12 +72,12 @@
     }
 
     /**
-     * @see org.apache.cocoon.portal.coplet.CopletFactory#remove(org.apache.cocoon.portal.coplet.CopletInstanceData)
+     * @see org.apache.cocoon.portal.coplet.CopletFactory#remove(org.apache.cocoon.portal.coplet.CopletInstance)
      */
-    public void remove(CopletInstanceData copletInstanceData) {
+    public void remove(CopletInstance copletInstanceData) {
         if ( copletInstanceData != null ) {
             // now lookup the adapter
-            final String adapterName = copletInstanceData.getCopletData().getCopletBaseData().getCopletAdapterName();
+            final String adapterName = copletInstanceData.getCopletDefinition().getCopletType().getCopletAdapterName();
             final CopletAdapter adapter = this.portalService.getCopletAdapter(adapterName);
             adapter.logout( copletInstanceData );
             adapter.destroy( copletInstanceData );
@@ -87,21 +88,22 @@
     }
 
     /**
-     * @see org.apache.cocoon.portal.coplet.CopletFactory#newInstance(org.apache.cocoon.portal.coplet.CopletBaseData, java.lang.String)
+     * @see org.apache.cocoon.portal.coplet.CopletFactory#newInstance(org.apache.cocoon.portal.coplet.CopletType, java.lang.String)
      */
-    public CopletData newInstance(CopletBaseData copletBaseData, String id)
+    public CopletDefinition newInstance(CopletType copletType, String key)
     throws PortalException {
+        String id = key;
         if (id == null ) {
             synchronized (this) {
-                id = copletBaseData.getId() + '_' + idCounter;
+                id = copletType.getId() + '_' + idCounter;
                 idCounter += 1;
             }
         }
-        final CopletData instance = new CopletData(id);
-        instance.setCopletBaseData(copletBaseData);
+        final CopletDefinition instance = new CopletDefinition(id);
+        instance.setCopletType(copletType);
 
         // send an event
-        this.portalService.getEventManager().send(new CopletDataAddedEvent(instance));
+        this.portalService.getEventManager().send(new CopletDefinitionAddedEvent(instance));
 
         return instance;
     }



Mime
View raw message