Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 4356 invoked from network); 15 Aug 2006 15:59:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Aug 2006 15:59:25 -0000 Received: (qmail 22678 invoked by uid 500); 15 Aug 2006 15:59:25 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 22552 invoked by uid 500); 15 Aug 2006 15:59:24 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 22541 invoked by uid 99); 15 Aug 2006 15:59:24 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Aug 2006 08:59:24 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Aug 2006 08:59:21 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id F116D1A981A; Tue, 15 Aug 2006 08:59:00 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r431628 [1/2] - in /cocoon/trunk/blocks/cocoon-portal: cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/ cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/ cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/co... Date: Tue, 15 Aug 2006 15:58:45 -0000 To: cvs@cocoon.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060815155900.F116D1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: cziegeler Date: Tue Aug 15 08:58:41 2006 New Revision: 431628 URL: http://svn.apache.org/viewvc?rev=431628&view=rev Log: Refactor services into own package Create configuration directory for renderers Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/LayoutException.java - copied, changed from r431389, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/LayoutException.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/CopletFactory.java - copied, changed from r431606, 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/services/LayoutFactory.java - copied, changed from r431606, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/LayoutFactory.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/LinkService.java - copied, changed from r431389, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/LinkService.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultCopletFactory.java - copied, changed from r431606, 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/services/impl/DefaultLayoutFactory.java - copied, changed from r431606, 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/services/impl/DefaultLinkService.java (with props) cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/LayoutDescription.java - copied, changed from r431389, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/LayoutDescription.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/LinkInfo.java - copied, changed from r431389, 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/services/impl/PageLabelLinkService.java - copied, changed from r431606, 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-sample/src/main/resources/COB-INF/config/xconf/renderers/ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/renderers/borderless-window.xconf (with props) cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/renderers/column.xconf (with props) cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/renderers/decorated-frame.xconf (with props) cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/renderers/frame.xconf (with props) cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/renderers/link.xconf (with props) cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/renderers/linktab.xconf (with props) cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/renderers/nowindow.xconf (with props) cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/renderers/rawtab.xconf (with props) cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/renderers/row.xconf (with props) cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/renderers/tab.xconf (with props) cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/renderers/window.xconf (with props) Removed: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/LinkService.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/impl/DefaultCopletFactory.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/layout/LayoutException.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/LayoutFactory.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/impl/LayoutDescription.java Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalComponentManager.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/event/aspect/impl/RequestParameterEventAspect.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalComponentManager.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/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/layout/renderer/Renderer.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspect.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspectContext.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/DefaultRendererContext.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/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/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/layout/renderer/impl/DefaultLinkRenderer.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CompositeLayout.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletInstance.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletLayout.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/FrameLayout.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/Layout.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/LayoutFeatures.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/LinkLayout.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/reading/ProxyReader.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/source/LayoutSource.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/ProxyTransformer.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/portal.roles 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-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/BasketGenerator.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-tools-impl/src/main/java/org/apache/cocoon/portal/tools/copletManagement/LayoutActions.java Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/LayoutException.java (from r431389, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/LayoutException.java) URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/LayoutException.java?p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/LayoutException.java&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/LayoutException.java&r1=431389&r2=431628&rev=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/LayoutException.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/LayoutException.java Tue Aug 15 08:58:41 2006 @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.portal.layout; +package org.apache.cocoon.portal; -import org.apache.cocoon.portal.PortalException; /** * Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalComponentManager.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalComponentManager.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalComponentManager.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalComponentManager.java Tue Aug 15 08:58:41 2006 @@ -15,12 +15,13 @@ */ package org.apache.cocoon.portal; -import org.apache.cocoon.portal.coplet.CopletFactory; import org.apache.cocoon.portal.coplet.adapter.CopletAdapter; import org.apache.cocoon.portal.event.EventManager; -import org.apache.cocoon.portal.layout.LayoutFactory; import org.apache.cocoon.portal.layout.renderer.Renderer; import org.apache.cocoon.portal.profile.ProfileManager; +import org.apache.cocoon.portal.services.CopletFactory; +import org.apache.cocoon.portal.services.LayoutFactory; +import org.apache.cocoon.portal.services.LinkService; import org.apache.cocoon.processing.ProcessInfoProvider; /** 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=431628&r1=431627&r2=431628&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 Tue Aug 15 08:58:41 2006 @@ -22,11 +22,11 @@ import org.apache.cocoon.components.ContextHelper; import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.Request; -import org.apache.cocoon.portal.LinkService; import org.apache.cocoon.portal.PortalService; import org.apache.cocoon.portal.event.CopletInstanceEvent; import org.apache.cocoon.portal.event.impl.CopletLinkEvent; import org.apache.cocoon.portal.om.CopletInstance; +import org.apache.cocoon.portal.services.LinkService; import org.apache.cocoon.portal.transformation.ProxyTransformer; import org.apache.cocoon.util.NetUtils; import org.apache.cocoon.xml.XMLUtils; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java Tue Aug 15 08:58:41 2006 @@ -22,12 +22,12 @@ import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.Request; -import org.apache.cocoon.portal.LinkService; import org.apache.cocoon.portal.PortalService; import org.apache.cocoon.portal.event.Event; import org.apache.cocoon.portal.event.EventManager; import org.apache.cocoon.portal.event.aspect.EventAspect; import org.apache.cocoon.portal.event.aspect.EventAspectContext; +import org.apache.cocoon.portal.services.LinkService; /** * Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalComponentManager.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalComponentManager.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalComponentManager.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalComponentManager.java Tue Aug 15 08:58:41 2006 @@ -21,16 +21,16 @@ import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; -import org.apache.cocoon.portal.LinkService; import org.apache.cocoon.portal.PortalComponentManager; import org.apache.cocoon.portal.PortalManager; import org.apache.cocoon.portal.PortalRuntimeException; -import org.apache.cocoon.portal.coplet.CopletFactory; import org.apache.cocoon.portal.coplet.adapter.CopletAdapter; import org.apache.cocoon.portal.event.EventManager; -import org.apache.cocoon.portal.layout.LayoutFactory; import org.apache.cocoon.portal.layout.renderer.Renderer; import org.apache.cocoon.portal.profile.ProfileManager; +import org.apache.cocoon.portal.services.CopletFactory; +import org.apache.cocoon.portal.services.LayoutFactory; +import org.apache.cocoon.portal.services.LinkService; import org.apache.cocoon.processing.ProcessInfoProvider; /** Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelManager.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelManager.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelManager.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelManager.java Tue Aug 15 08:58:41 2006 @@ -33,10 +33,10 @@ import org.apache.cocoon.components.ContextHelper; import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.Request; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalRuntimeException; import org.apache.cocoon.portal.PortalService; import org.apache.cocoon.portal.event.layout.ChangeTabEvent; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.om.CompositeLayout; import org.apache.cocoon.portal.om.Item; import org.apache.cocoon.portal.om.Layout; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java Tue Aug 15 08:58:41 2006 @@ -26,13 +26,13 @@ import org.apache.cocoon.ajax.AjaxHelper; import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.Request; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalManager; import org.apache.cocoon.portal.PortalManagerAspect; import org.apache.cocoon.portal.PortalManagerAspectPrepareContext; import org.apache.cocoon.portal.PortalManagerAspectRenderContext; import org.apache.cocoon.portal.PortalService; import org.apache.cocoon.portal.event.EventManager; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.layout.renderer.Renderer; import org.apache.cocoon.portal.om.CopletInstance; import org.apache.cocoon.portal.om.CopletInstanceFeatures; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java Tue Aug 15 08:58:41 2006 @@ -39,16 +39,16 @@ import org.apache.cocoon.components.ContextHelper; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Session; -import org.apache.cocoon.portal.LinkService; import org.apache.cocoon.portal.PortalManager; import org.apache.cocoon.portal.PortalService; -import org.apache.cocoon.portal.coplet.CopletFactory; import org.apache.cocoon.portal.coplet.adapter.CopletAdapter; import org.apache.cocoon.portal.event.EventManager; -import org.apache.cocoon.portal.layout.LayoutFactory; import org.apache.cocoon.portal.layout.SkinDescription; import org.apache.cocoon.portal.layout.renderer.Renderer; import org.apache.cocoon.portal.profile.ProfileManager; +import org.apache.cocoon.portal.services.CopletFactory; +import org.apache.cocoon.portal.services.LayoutFactory; +import org.apache.cocoon.portal.services.LinkService; import org.apache.cocoon.processing.ProcessInfoProvider; import org.apache.excalibur.source.Source; import org.apache.excalibur.source.SourceResolver; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/Renderer.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/Renderer.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/Renderer.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/Renderer.java Tue Aug 15 08:58:41 2006 @@ -15,8 +15,8 @@ */ package org.apache.cocoon.portal.layout.renderer; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalService; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.om.Layout; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspect.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspect.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspect.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspect.java Tue Aug 15 08:58:41 2006 @@ -17,9 +17,9 @@ import java.util.Properties; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalException; import org.apache.cocoon.portal.PortalService; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.om.Layout; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspectContext.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspectContext.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspectContext.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspectContext.java Tue Aug 15 08:58:41 2006 @@ -15,8 +15,8 @@ */ package org.apache.cocoon.portal.layout.renderer.aspect; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalService; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.om.Layout; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java Tue Aug 15 08:58:41 2006 @@ -17,8 +17,8 @@ import java.util.Iterator; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalService; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.layout.renderer.Renderer; import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext; import org.apache.cocoon.portal.om.CompositeLayout; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CIncludeCopletAspect.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CIncludeCopletAspect.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CIncludeCopletAspect.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CIncludeCopletAspect.java Tue Aug 15 08:58:41 2006 @@ -17,9 +17,9 @@ import java.util.Properties; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalException; import org.apache.cocoon.portal.PortalService; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext; import org.apache.cocoon.portal.om.CopletInstance; import org.apache.cocoon.portal.om.CopletLayout; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java Tue Aug 15 08:58:41 2006 @@ -19,9 +19,9 @@ import java.util.Map; import java.util.Properties; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalException; import org.apache.cocoon.portal.PortalService; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext; import org.apache.cocoon.portal.om.Item; import org.apache.cocoon.portal.om.Layout; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultCopletAspect.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultCopletAspect.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultCopletAspect.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultCopletAspect.java Tue Aug 15 08:58:41 2006 @@ -15,9 +15,9 @@ */ package org.apache.cocoon.portal.layout.renderer.aspect.impl; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalService; import org.apache.cocoon.portal.coplet.adapter.CopletAdapter; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext; import org.apache.cocoon.portal.om.CopletInstance; import org.apache.cocoon.portal.om.CopletLayout; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultRendererContext.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultRendererContext.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultRendererContext.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultRendererContext.java Tue Aug 15 08:58:41 2006 @@ -17,8 +17,8 @@ import java.util.Iterator; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalService; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect; import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext; import org.apache.cocoon.portal.om.Layout; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java Tue Aug 15 08:58:41 2006 @@ -15,8 +15,8 @@ */ package org.apache.cocoon.portal.layout.renderer.aspect.impl; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalService; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext; import org.apache.cocoon.portal.om.FrameLayout; import org.apache.cocoon.portal.om.Layout; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java Tue Aug 15 08:58:41 2006 @@ -19,9 +19,9 @@ import java.util.Map; import java.util.Properties; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalException; import org.apache.cocoon.portal.PortalService; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext; import org.apache.cocoon.portal.om.Layout; import org.apache.cocoon.xml.AttributesImpl; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RemovableAspect.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RemovableAspect.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RemovableAspect.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RemovableAspect.java Tue Aug 15 08:58:41 2006 @@ -15,9 +15,9 @@ */ package org.apache.cocoon.portal.layout.renderer.aspect.impl; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalService; import org.apache.cocoon.portal.event.layout.RemoveLayoutEvent; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext; import org.apache.cocoon.portal.om.CopletDefinitionFeatures; import org.apache.cocoon.portal.om.CopletInstance; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java Tue Aug 15 08:58:41 2006 @@ -21,11 +21,11 @@ import java.util.ArrayList; import java.util.Properties; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalException; import org.apache.cocoon.portal.PortalService; import org.apache.cocoon.portal.event.layout.ChangeTabEvent; import org.apache.cocoon.portal.event.layout.LayoutInstanceChangeAttributeEvent; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext; import org.apache.cocoon.portal.om.CompositeLayout; import org.apache.cocoon.portal.om.Item; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java Tue Aug 15 08:58:41 2006 @@ -19,6 +19,7 @@ import java.util.List; import java.util.Properties; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalException; import org.apache.cocoon.portal.PortalService; import org.apache.cocoon.portal.coplet.adapter.CopletAdapter; @@ -27,7 +28,6 @@ import org.apache.cocoon.portal.event.Event; import org.apache.cocoon.portal.event.coplet.CopletInstanceSizingEvent; import org.apache.cocoon.portal.event.layout.RemoveLayoutEvent; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext; import org.apache.cocoon.portal.om.CopletDefinitionFeatures; import org.apache.cocoon.portal.om.CopletInstance; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java Tue Aug 15 08:58:41 2006 @@ -37,9 +37,9 @@ import org.apache.cocoon.components.ContextHelper; import org.apache.cocoon.components.treeprocessor.variables.VariableResolver; import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalException; import org.apache.cocoon.portal.PortalService; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext; import org.apache.cocoon.portal.om.Layout; import org.apache.cocoon.sitemap.PatternException; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java Tue Aug 15 08:58:41 2006 @@ -24,8 +24,8 @@ import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.Serviceable; import org.apache.avalon.framework.thread.ThreadSafe; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalService; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.layout.renderer.Renderer; import org.apache.cocoon.portal.om.Layout; import org.apache.cocoon.xml.IncludeXMLConsumer; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java Tue Aug 15 08:58:41 2006 @@ -24,8 +24,8 @@ import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.Serviceable; import org.apache.avalon.framework.thread.ThreadSafe; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalService; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.layout.renderer.Renderer; import org.apache.cocoon.portal.layout.renderer.aspect.impl.DefaultRendererContext; import org.apache.cocoon.portal.layout.renderer.aspect.impl.RendererAspectChain; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java Tue Aug 15 08:58:41 2006 @@ -15,8 +15,8 @@ */ package org.apache.cocoon.portal.layout.renderer.impl; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalService; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.om.Layout; import org.apache.cocoon.portal.om.LayoutFeatures; import org.apache.cocoon.portal.om.LayoutInstance; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CompositeLayout.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CompositeLayout.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CompositeLayout.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CompositeLayout.java Tue Aug 15 08:58:41 2006 @@ -19,7 +19,7 @@ import java.util.Iterator; import java.util.List; -import org.apache.cocoon.portal.layout.LayoutFactory; +import org.apache.cocoon.portal.services.LayoutFactory; /** * A composite layout is a layout that contains other layouts. Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletInstance.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletInstance.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletInstance.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletInstance.java Tue Aug 15 08:58:41 2006 @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.cocoon.portal.coplet.CopletFactory; +import org.apache.cocoon.portal.services.CopletFactory; import org.apache.cocoon.portal.util.PortalUtils; /** Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletLayout.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletLayout.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletLayout.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletLayout.java Tue Aug 15 08:58:41 2006 @@ -15,7 +15,7 @@ */ package org.apache.cocoon.portal.om; -import org.apache.cocoon.portal.layout.LayoutFactory; +import org.apache.cocoon.portal.services.LayoutFactory; /** * A coplet layout holds a coplet. Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/FrameLayout.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/FrameLayout.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/FrameLayout.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/FrameLayout.java Tue Aug 15 08:58:41 2006 @@ -15,7 +15,7 @@ */ package org.apache.cocoon.portal.om; -import org.apache.cocoon.portal.layout.LayoutFactory; +import org.apache.cocoon.portal.services.LayoutFactory; /** * A frame layout holds a source URI. The URI can be changed dynamically through Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/Layout.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/Layout.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/Layout.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/Layout.java Tue Aug 15 08:58:41 2006 @@ -18,7 +18,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import org.apache.cocoon.portal.layout.LayoutFactory; +import org.apache.cocoon.portal.services.LayoutFactory; import org.apache.cocoon.portal.util.PortalUtils; import org.apache.commons.collections.map.LinkedMap; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/LayoutFeatures.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/LayoutFeatures.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/LayoutFeatures.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/LayoutFeatures.java Tue Aug 15 08:58:41 2006 @@ -17,8 +17,8 @@ import java.util.Iterator; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalService; -import org.apache.cocoon.portal.layout.LayoutException; /** Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/LinkLayout.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/LinkLayout.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/LinkLayout.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/LinkLayout.java Tue Aug 15 08:58:41 2006 @@ -15,7 +15,7 @@ */ package org.apache.cocoon.portal.om; -import org.apache.cocoon.portal.layout.LayoutFactory; +import org.apache.cocoon.portal.services.LayoutFactory; /** * A link layout references another layout to be used instead. The reference Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/AbstractProfileManager.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/AbstractProfileManager.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/AbstractProfileManager.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/AbstractProfileManager.java Tue Aug 15 08:58:41 2006 @@ -25,6 +25,7 @@ import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.ServiceSelector; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalService; import org.apache.cocoon.portal.coplet.adapter.CopletAdapter; import org.apache.cocoon.portal.event.Receiver; @@ -32,7 +33,6 @@ import org.apache.cocoon.portal.event.user.UserEvent; import org.apache.cocoon.portal.event.user.UserWillLogoutEvent; import org.apache.cocoon.portal.impl.AbstractComponent; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.om.CompositeLayout; import org.apache.cocoon.portal.om.CopletInstance; import org.apache.cocoon.portal.om.CopletLayout; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/reading/ProxyReader.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/reading/ProxyReader.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/reading/ProxyReader.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/reading/ProxyReader.java Tue Aug 15 08:58:41 2006 @@ -31,9 +31,9 @@ import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Response; import org.apache.cocoon.environment.SourceResolver; -import org.apache.cocoon.portal.LinkService; import org.apache.cocoon.portal.PortalService; import org.apache.cocoon.portal.om.CopletInstance; +import org.apache.cocoon.portal.services.LinkService; import org.apache.cocoon.portal.transformation.ProxyTransformer; import org.apache.cocoon.reading.ServiceableReader; import org.apache.cocoon.util.NetUtils; Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/CopletFactory.java (from r431606, 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/services/CopletFactory.java?p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/CopletFactory.java&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletFactory.java&r1=431606&r2=431628&rev=431628&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/services/CopletFactory.java Tue Aug 15 08:58:41 2006 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.portal.coplet; +package org.apache.cocoon.portal.services; import org.apache.cocoon.portal.PortalException; import org.apache.cocoon.portal.om.CopletDefinition; Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/LayoutFactory.java (from r431606, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/LayoutFactory.java) URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/LayoutFactory.java?p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/LayoutFactory.java&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/LayoutFactory.java&r1=431606&r2=431628&rev=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/LayoutFactory.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/LayoutFactory.java Tue Aug 15 08:58:41 2006 @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.portal.layout; +package org.apache.cocoon.portal.services; import java.util.Collection; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.om.Item; import org.apache.cocoon.portal.om.Layout; import org.apache.cocoon.portal.om.LayoutInstance; Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/LinkService.java (from r431389, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/LinkService.java) URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/LinkService.java?p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/LinkService.java&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/LinkService.java&r1=431389&r2=431628&rev=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/LinkService.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/LinkService.java Tue Aug 15 08:58:41 2006 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.portal; +package org.apache.cocoon.portal.services; import java.util.List; Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultCopletFactory.java (from r431606, 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/services/impl/DefaultCopletFactory.java?p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultCopletFactory.java&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/impl/DefaultCopletFactory.java&r1=431606&r2=431628&rev=431628&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/services/impl/DefaultCopletFactory.java Tue Aug 15 08:58:41 2006 @@ -13,10 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.portal.coplet.impl; +package org.apache.cocoon.portal.services.impl; import org.apache.cocoon.portal.PortalException; -import org.apache.cocoon.portal.coplet.CopletFactory; import org.apache.cocoon.portal.coplet.adapter.CopletAdapter; import org.apache.cocoon.portal.event.coplet.CopletDefinitionAddedEvent; import org.apache.cocoon.portal.event.coplet.CopletInstanceAddedEvent; @@ -25,6 +24,7 @@ import org.apache.cocoon.portal.om.CopletDefinition; import org.apache.cocoon.portal.om.CopletInstance; import org.apache.cocoon.portal.om.CopletType; +import org.apache.cocoon.portal.services.CopletFactory; /** * This factory is for creating and managing coplet objects. @@ -38,7 +38,7 @@ protected static long idCounter = System.currentTimeMillis(); /** - * @see org.apache.cocoon.portal.coplet.CopletFactory#newInstance(org.apache.cocoon.portal.om.CopletDefinition) + * @see org.apache.cocoon.portal.services.CopletFactory#newInstance(org.apache.cocoon.portal.om.CopletDefinition) */ public CopletInstance newInstance(CopletDefinition copletData) throws PortalException { @@ -46,7 +46,7 @@ } /** - * @see org.apache.cocoon.portal.coplet.CopletFactory#newInstance(org.apache.cocoon.portal.om.CopletDefinition, String) + * @see org.apache.cocoon.portal.services.CopletFactory#newInstance(org.apache.cocoon.portal.om.CopletDefinition, String) */ public CopletInstance newInstance(CopletDefinition copletData, String key) throws PortalException { @@ -72,7 +72,7 @@ } /** - * @see org.apache.cocoon.portal.coplet.CopletFactory#remove(org.apache.cocoon.portal.om.CopletInstance) + * @see org.apache.cocoon.portal.services.CopletFactory#remove(org.apache.cocoon.portal.om.CopletInstance) */ public void remove(CopletInstance copletInstanceData) { if ( copletInstanceData != null ) { @@ -88,7 +88,7 @@ } /** - * @see org.apache.cocoon.portal.coplet.CopletFactory#newInstance(org.apache.cocoon.portal.om.CopletType, java.lang.String) + * @see org.apache.cocoon.portal.services.CopletFactory#newInstance(org.apache.cocoon.portal.om.CopletType, java.lang.String) */ public CopletDefinition newInstance(CopletType copletType, String key) throws PortalException { Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultLayoutFactory.java (from r431606, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java) URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultLayoutFactory.java?p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultLayoutFactory.java&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java&r1=431606&r2=431628&rev=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultLayoutFactory.java Tue Aug 15 08:58:41 2006 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.portal.layout.impl; +package org.apache.cocoon.portal.services.impl; import java.lang.reflect.Constructor; import java.util.Collection; @@ -24,17 +24,15 @@ import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalRuntimeException; import org.apache.cocoon.portal.PortalService; -import org.apache.cocoon.portal.coplet.CopletFactory; import org.apache.cocoon.portal.event.Receiver; import org.apache.cocoon.portal.event.layout.LayoutAddedEvent; import org.apache.cocoon.portal.event.layout.LayoutInstanceAddedEvent; import org.apache.cocoon.portal.event.layout.LayoutRemovedEvent; import org.apache.cocoon.portal.event.layout.RemoveLayoutEvent; import org.apache.cocoon.portal.impl.AbstractComponent; -import org.apache.cocoon.portal.layout.LayoutException; -import org.apache.cocoon.portal.layout.LayoutFactory; import org.apache.cocoon.portal.om.CompositeLayout; import org.apache.cocoon.portal.om.CopletInstance; import org.apache.cocoon.portal.om.CopletLayout; @@ -42,6 +40,8 @@ import org.apache.cocoon.portal.om.Layout; import org.apache.cocoon.portal.om.LayoutInstance; import org.apache.cocoon.portal.profile.ProfileManager; +import org.apache.cocoon.portal.services.CopletFactory; +import org.apache.cocoon.portal.services.LayoutFactory; import org.apache.cocoon.util.ClassUtils; /** @@ -174,7 +174,7 @@ } /** - * @see org.apache.cocoon.portal.layout.LayoutFactory#newInstance(java.lang.String) + * @see org.apache.cocoon.portal.services.LayoutFactory#newInstance(java.lang.String) */ public Layout newInstance(String layoutType) throws LayoutException { @@ -182,7 +182,7 @@ } /** - * @see org.apache.cocoon.portal.layout.LayoutFactory#newInstance(java.lang.String, java.lang.String) + * @see org.apache.cocoon.portal.services.LayoutFactory#newInstance(java.lang.String, java.lang.String) */ public Layout newInstance(String layoutType, String id) throws LayoutException { @@ -223,7 +223,7 @@ } /** - * @see org.apache.cocoon.portal.layout.LayoutFactory#remove(org.apache.cocoon.portal.om.Layout) + * @see org.apache.cocoon.portal.services.LayoutFactory#remove(org.apache.cocoon.portal.om.Layout) */ public void remove(Layout layout) { if ( layout != null ) { @@ -255,7 +255,7 @@ } /** - * @see org.apache.cocoon.portal.layout.LayoutFactory#getRendererName(org.apache.cocoon.portal.om.Layout) + * @see org.apache.cocoon.portal.services.LayoutFactory#getRendererName(org.apache.cocoon.portal.om.Layout) */ public String getRendererName(Layout layout) { if ( layout != null ) { @@ -269,14 +269,14 @@ } /** - * @see org.apache.cocoon.portal.layout.LayoutFactory#getLayoutTypes() + * @see org.apache.cocoon.portal.services.LayoutFactory#getLayoutTypes() */ public Collection getLayoutTypes() { return this.layouts.keySet(); } /** - * @see org.apache.cocoon.portal.layout.LayoutFactory#getRendererNames(java.lang.String) + * @see org.apache.cocoon.portal.services.LayoutFactory#getRendererNames(java.lang.String) */ public Collection getRendererNames(String type) { LayoutDescription desc = (LayoutDescription) this.layouts.get(type); @@ -287,7 +287,7 @@ } /** - * @see org.apache.cocoon.portal.layout.LayoutFactory#createItem(org.apache.cocoon.portal.om.Layout) + * @see org.apache.cocoon.portal.services.LayoutFactory#createItem(org.apache.cocoon.portal.om.Layout) */ public Item createItem(Layout layout) throws LayoutException { @@ -306,7 +306,7 @@ } /** - * @see org.apache.cocoon.portal.layout.LayoutFactory#newInstace(org.apache.cocoon.portal.om.Layout) + * @see org.apache.cocoon.portal.services.LayoutFactory#newInstace(org.apache.cocoon.portal.om.Layout) */ public LayoutInstance newInstace(Layout layout) { final LayoutInstance instance = new LayoutInstance(layout); Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultLinkService.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultLinkService.java?rev=431628&view=auto ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultLinkService.java (added) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultLinkService.java Tue Aug 15 08:58:41 2006 @@ -0,0 +1,407 @@ +/* + * 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.services.impl; + +import java.io.UnsupportedEncodingException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.StringTokenizer; + +import org.apache.avalon.framework.activity.Disposable; +import org.apache.avalon.framework.context.Context; +import org.apache.avalon.framework.context.ContextException; +import org.apache.avalon.framework.context.Contextualizable; +import org.apache.avalon.framework.logger.AbstractLogEnabled; +import org.apache.avalon.framework.parameters.ParameterException; +import org.apache.avalon.framework.parameters.Parameterizable; +import org.apache.avalon.framework.parameters.Parameters; +import org.apache.avalon.framework.service.ServiceException; +import org.apache.avalon.framework.service.ServiceManager; +import org.apache.avalon.framework.service.Serviceable; +import org.apache.avalon.framework.thread.ThreadSafe; +import org.apache.cocoon.components.ContextHelper; +import org.apache.cocoon.environment.Request; +import org.apache.cocoon.portal.event.ComparableEvent; +import org.apache.cocoon.portal.event.Event; +import org.apache.cocoon.portal.event.EventConverter; +import org.apache.cocoon.portal.services.LinkService; +import org.apache.cocoon.util.NetUtils; + +/** + * + * @version $Id$ + */ +public class DefaultLinkService + extends AbstractLogEnabled + implements LinkService, + ThreadSafe, + Serviceable, + Disposable, + Contextualizable, + Parameterizable { + + /** The converter used to convert an event into a request parameter. */ + protected EventConverter converter; + + /** The service manager. */ + protected ServiceManager manager; + + /** The cocoon context- */ + protected Context context; + + /** Default port used for http. */ + protected int defaultPort = 80; + + /** Default port used for https. */ + protected int defaultSecurePort = 443; + + /** List of internal parameters. */ + protected List internalParameters = new ArrayList(); + + /** List of matchers for internal parameters. */ + protected List internalParametersMatchers = new ArrayList(); + + /** + * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager) + */ + public void service(ServiceManager aManager) throws ServiceException { + this.manager = aManager; + this.converter = (EventConverter)this.manager.lookup(EventConverter.ROLE); + } + + /** + * @see org.apache.avalon.framework.parameters.Parameterizable#parameterize(org.apache.avalon.framework.parameters.Parameters) + */ + public void parameterize(Parameters params) throws ParameterException { + this.defaultPort = params.getParameterAsInteger("defaultPort", this.defaultPort); + this.defaultSecurePort = params.getParameterAsInteger("defaultSecurePort", this.defaultSecurePort); + final String internalParams = params.getParameter("internalParameters", "cocoon-*"); + final StringTokenizer st = new StringTokenizer(internalParams, ","); + while ( st.hasMoreTokens() ) { + final String parameter = st.nextToken(); + this.internalParameters.add(parameter); + if ( parameter.endsWith("*") ) { + this.internalParametersMatchers.add(new PrefixParameterMatcher(parameter)); + } else { + this.internalParametersMatchers.add(new ConstantParameterMatcher(parameter)); + } + } + } + + /** + * Return the current info for the request. + * @return A LinkInfo object. + */ + protected LinkInfo getInfo() { + final Request request = ContextHelper.getRequest( this.context ); + LinkInfo info = (LinkInfo)request.getAttribute(DefaultLinkService.class.getName()); + if ( info == null ) { + synchronized ( this ) { + info = (LinkInfo)request.getAttribute(DefaultLinkService.class.getName()); + if ( info == null ) { + info = new LinkInfo(request, this.defaultPort, this.defaultSecurePort); + request.setAttribute(DefaultLinkService.class.getName(), info); + } + } + } + return info; + } + + /** + * @see org.apache.cocoon.portal.services.LinkService#isSecure() + */ + public boolean isSecure() { + return ContextHelper.getRequest(this.context).isSecure(); + } + + /** + * @see org.apache.cocoon.portal.services.LinkService#encodeURL(String url) + */ + public String encodeURL(String url) { + return ContextHelper.getResponse(this.context).encodeURL(url); + } + + /** + * @see org.apache.cocoon.portal.services.LinkService#getLinkURI(org.apache.cocoon.portal.event.Event) + */ + public String getLinkURI(Event event) { + return this.getLinkURI(event, null); + } + + /** + * @see org.apache.cocoon.portal.services.LinkService#getLinkURI(org.apache.cocoon.portal.event.Event, Boolean) + */ + public String getLinkURI(Event event, Boolean secure) { + if (event == null) { + return this.getRefreshLinkURI(secure); + } + final LinkInfo info = this.getInfo(); + final StringBuffer buffer = new StringBuffer(info.getBase(secure)); + boolean hasParams = info.hasParameters(); + + // add comparable events + final boolean comparableEvent = event instanceof ComparableEvent; + Iterator iter = info.comparableEvents.iterator(); + while (iter.hasNext()) { + Object[] objects = (Object[]) iter.next(); + ComparableEvent current = (ComparableEvent) objects[0]; + if (!comparableEvent || !current.equalsEvent((ComparableEvent) event)) { + if (hasParams) { + buffer.append('&'); + } else { + buffer.append('?'); + } + try { + buffer.append((String) objects[1]).append('=').append(NetUtils.encode((String) objects[2], "utf-8")); + } catch (UnsupportedEncodingException uee) { + // ignore this as utf-8 is always supported + } + hasParams = true; + } + } + + // now add event + hasParams = this.addEvent(buffer, event, hasParams); + + return buffer.toString(); + } + + /** + * Add one event to the buffer + * @return Returns true, if the link contains a parameter + */ + protected boolean addEvent(StringBuffer buffer, Event event, boolean hasParams) { + if ( hasParams ) { + buffer.append('&'); + } else { + buffer.append('?'); + } + final String value = this.converter.encode(event); + try { + buffer.append(DEFAULT_REQUEST_EVENT_PARAMETER_NAME).append('=').append(NetUtils.encode(value, "utf-8")); + } catch (UnsupportedEncodingException uee) { + // ignore this as utf-8 is always supported + } + return true; + } + + /** + * @see org.apache.cocoon.portal.services.LinkService#getLinkURI(java.util.List) + */ + public String getLinkURI(List events) { + return this.getLinkURI(events, null); + } + + /** + * @see org.apache.cocoon.portal.services.LinkService#getLinkURI(java.util.List) + */ + public String getLinkURI(List events, Boolean secure) { + if (events == null || events.size() == 0) { + return this.getRefreshLinkURI(secure); + } + final LinkInfo info = this.getInfo(); + boolean hasParams = info.hasParameters(); + final StringBuffer buffer = new StringBuffer(info.getBase(secure)); + + // add comparable events + Iterator iter = info.comparableEvents.iterator(); + while (iter.hasNext()) { + Object[] objects = (Object[]) iter.next(); + ComparableEvent current = (ComparableEvent) objects[0]; + + Iterator eventIterator = events.iterator(); + boolean found = false; + while (!found && eventIterator.hasNext()) { + final Object inEvent = eventIterator.next(); + if (inEvent instanceof ComparableEvent + && current.equalsEvent((ComparableEvent) inEvent)) { + found = true; + } + } + if (!found) { + if (hasParams) { + buffer.append('&'); + } else { + buffer.append('?'); + } + try { + buffer.append((String) objects[1]).append('=').append(NetUtils.encode((String) objects[2], "utf-8")); + } catch (UnsupportedEncodingException uee) { + // ignore this as utf-8 is always supported + } + hasParams = true; + } + } + + // now add events + iter = events.iterator(); + while (iter.hasNext()) { + final Object current = iter.next(); + if (current instanceof Event) { + hasParams = this.addEvent(buffer, (Event) current, hasParams); + } else if ( current instanceof ParameterDescription ) { + if (hasParams) { + buffer.append('&'); + } else { + buffer.append('?'); + hasParams = true; + } + buffer.append(((ParameterDescription) current).parameters); + } + } + return buffer.toString(); + } + + /** + * @see org.apache.cocoon.portal.services.LinkService#addEventToLink(org.apache.cocoon.portal.event.Event) + */ + public void addEventToLink(Event event) { + if (event == null) { + return; + } + final String value = this.converter.encode(event); + final LinkInfo info = this.getInfo(); + if (event instanceof ComparableEvent) { + // search if we already have an event for this! + final Iterator iter = info.comparableEvents.iterator(); + boolean found = false; + while (!found && iter.hasNext()) { + Object[] objects = (Object[])iter.next(); + if (((ComparableEvent) objects[0]).equalsEvent((ComparableEvent) event)) { + found = true; + info.comparableEvents.remove(objects); + } + } + info.comparableEvents.add(new Object[]{event, DEFAULT_REQUEST_EVENT_PARAMETER_NAME, value}); + } else { + this.addParameterToLink(DEFAULT_REQUEST_EVENT_PARAMETER_NAME, value); + } + } + + /** + * @see org.apache.cocoon.portal.services.LinkService#addParameterToLink(java.lang.String, java.lang.String) + */ + public void addParameterToLink(String name, String value) { + final LinkInfo info = this.getInfo(); + info.addParameterToBase(name, value); + } + + /** + * @see org.apache.cocoon.portal.services.LinkService#addUniqueParameterToLink(java.lang.String, java.lang.String) + */ + public void addUniqueParameterToLink(String name, String value) { + final LinkInfo info = this.getInfo(); + info.deleteParameterFromBase(name); + this.addParameterToLink(name, value); + } + + /** + * @see org.apache.cocoon.portal.services.LinkService#getRefreshLinkURI() + */ + public String getRefreshLinkURI() { + return this.getRefreshLinkURI(null); + } + + /** + * @see org.apache.cocoon.portal.services.LinkService#getRefreshLinkURI(java.lang.Boolean) + */ + public String getRefreshLinkURI(Boolean secure) { + final LinkInfo info = this.getInfo(); + + final StringBuffer buffer = new StringBuffer(info.getBase(secure)); + + // add comparable events + Iterator iter = info.comparableEvents.iterator(); + boolean hasParams = info.hasParameters(); + while (iter.hasNext()) { + Object[] objects = (Object[])iter.next(); + if ( hasParams ) { + buffer.append('&'); + } else { + buffer.append('?'); + } + try { + buffer.append((String)objects[1]).append('=').append(NetUtils.encode((String)objects[2], "utf-8")); + } catch (UnsupportedEncodingException uee) { + // ignore this as utf-8 is always supported + } + hasParams = true; + } + return buffer.toString(); + } + + /** + * @see org.apache.avalon.framework.activity.Disposable#dispose() + */ + public void dispose() { + if (this.manager != null) { + this.manager.release( this.converter ); + this.converter = null; + this.manager = null; + } + } + + /** + * @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context) + */ + public void contextualize(Context aContext) throws ContextException { + this.context = aContext; + } + + /** + * @see org.apache.cocoon.portal.services.LinkService#getInternalParameterNames() + */ + public List getInternalParameterNames() { + return this.internalParameters; + } + + /** + * @see org.apache.cocoon.portal.services.LinkService#isInternalParameterName(java.lang.String) + */ + public boolean isInternalParameterName(String name) { + final Iterator i = this.internalParametersMatchers.iterator(); + while ( i.hasNext() ) { + final ParameterMatcher current = (ParameterMatcher)i.next(); + if ( current.match(name) ) { + return true; + } + } + return false; + } + + public static interface ParameterMatcher { + boolean match(String name); + } + public static final class ConstantParameterMatcher implements ParameterMatcher { + protected final String name; + public ConstantParameterMatcher(String value) { + this.name = value; + } + public boolean match(String matchingName) { + return this.name.equals(matchingName); + } + } + public static final class PrefixParameterMatcher implements ParameterMatcher { + protected final String prefix; + public PrefixParameterMatcher(String prefix) { + this.prefix = prefix.substring(0, prefix.length()-1); + } + public boolean match(String name) { + return name.startsWith(this.prefix); + } + } +} Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultLinkService.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultLinkService.java ------------------------------------------------------------------------------ svn:keywords = Id Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/LayoutDescription.java (from r431389, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/LayoutDescription.java) URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/LayoutDescription.java?p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/LayoutDescription.java&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/LayoutDescription.java&r1=431389&r2=431628&rev=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/LayoutDescription.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/LayoutDescription.java Tue Aug 15 08:58:41 2006 @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.portal.layout.impl; +package org.apache.cocoon.portal.services.impl; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.cocoon.portal.layout.LayoutFactory; +import org.apache.cocoon.portal.services.LayoutFactory; /** Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/LinkInfo.java (from r431389, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/LinkInfo.java) URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/LinkInfo.java?p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/LinkInfo.java&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/LinkInfo.java&r1=431389&r2=431628&rev=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/LinkInfo.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/LinkInfo.java Tue Aug 15 08:58:41 2006 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.portal.impl; +package org.apache.cocoon.portal.services.impl; import java.io.UnsupportedEncodingException; import java.util.ArrayList; Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/PageLabelLinkService.java (from r431606, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java) URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/PageLabelLinkService.java?p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/PageLabelLinkService.java&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java&r1=431606&r2=431628&rev=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/PageLabelLinkService.java Tue Aug 15 08:58:41 2006 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.portal.impl; +package org.apache.cocoon.portal.services.impl; import java.io.UnsupportedEncodingException; import java.util.Iterator; @@ -21,6 +21,7 @@ import org.apache.cocoon.portal.event.Event; import org.apache.cocoon.portal.event.layout.LayoutChangeParameterEvent; +import org.apache.cocoon.portal.impl.PageLabelManager; import org.apache.cocoon.portal.om.CompositeLayout; import org.apache.cocoon.portal.om.Item; import org.apache.cocoon.portal.om.NamedItem; Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/source/LayoutSource.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/source/LayoutSource.java?rev=431628&r1=431627&r2=431628&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/source/LayoutSource.java (original) +++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/source/LayoutSource.java Tue Aug 15 08:58:41 2006 @@ -26,8 +26,8 @@ import org.apache.avalon.framework.service.ServiceManager; import org.apache.cocoon.CascadingIOException; import org.apache.cocoon.components.ContextHelper; +import org.apache.cocoon.portal.LayoutException; import org.apache.cocoon.portal.PortalService; -import org.apache.cocoon.portal.layout.LayoutException; import org.apache.cocoon.portal.layout.renderer.Renderer; import org.apache.cocoon.portal.om.Layout; import org.apache.cocoon.serialization.Serializer;