You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2008/08/05 17:31:52 UTC
svn commit: r682758 - in /cocoon/trunk/blocks/cocoon-portal:
cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/
cocoon-portal-impl/src/main/java/...
Author: cziegeler
Date: Tue Aug 5 08:31:50 2008
New Revision: 682758
URL: http://svn.apache.org/viewvc?rev=682758&view=rev
Log:
Somehow Eclipse did not commit this change :(
Modified:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/ReferenceFieldHandler.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/layout/renderer/aspect/impl/AbstractCompositeAspect.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/profile/impl/AbstractProfileManager.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/StaticProfileManager.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/AbstractPortalService.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultLayoutFactory.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultPortalManager.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/LayoutTypeDefinitionParser.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/acting/helpers/FullScreenMapping.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/source/LayoutSource.java
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/ReferenceFieldHandler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/ReferenceFieldHandler.java?rev=682758&r1=682757&r2=682758&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/ReferenceFieldHandler.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-converter-castor/src/main/java/org/apache/cocoon/portal/converter/castor/ReferenceFieldHandler.java Tue Aug 5 08:31:50 2008
@@ -19,12 +19,12 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.cocoon.portal.layout.renderer.Renderer;
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.om.Layout;
import org.apache.cocoon.portal.om.LayoutType;
+import org.apache.cocoon.portal.om.Renderer;
import org.apache.cocoon.portal.profile.PersistenceType;
import org.exolab.castor.mapping.AbstractFieldHandler;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/InternalEventReceiver.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/InternalEventReceiver.java?rev=682758&r1=682757&r2=682758&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/InternalEventReceiver.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/InternalEventReceiver.java Tue Aug 5 08:31:50 2008
@@ -39,7 +39,7 @@
import org.apache.cocoon.portal.om.LayoutFeatures;
import org.apache.cocoon.portal.om.LayoutInstance;
import org.apache.cocoon.portal.om.LayoutFeatures.RenderInfo;
-import org.apache.cocoon.portal.profile.ProfileManager;
+import org.apache.cocoon.portal.services.ProfileManager;
import org.apache.commons.jxpath.JXPathContext;
/**
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=682758&r1=682757&r2=682758&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 5 08:31:50 2008
@@ -19,13 +19,13 @@
import java.util.Iterator;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.layout.renderer.Renderer;
import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext;
import org.apache.cocoon.portal.om.CompositeLayout;
import org.apache.cocoon.portal.om.Item;
import org.apache.cocoon.portal.om.Layout;
import org.apache.cocoon.portal.om.LayoutException;
import org.apache.cocoon.portal.om.LayoutFeatures;
+import org.apache.cocoon.portal.om.Renderer;
import org.apache.cocoon.portal.om.LayoutFeatures.RenderInfo;
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/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=682758&r1=682757&r2=682758&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 5 08:31:50 2008
@@ -17,11 +17,11 @@
package org.apache.cocoon.portal.layout.renderer.impl;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.layout.renderer.Renderer;
import org.apache.cocoon.portal.layout.renderer.aspect.impl.support.RendererAspectChain;
import org.apache.cocoon.portal.layout.renderer.aspect.impl.support.RendererContextImpl;
import org.apache.cocoon.portal.om.Layout;
import org.apache.cocoon.portal.om.LayoutException;
+import org.apache.cocoon.portal.om.Renderer;
import org.apache.cocoon.portal.util.AbstractBean;
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/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=682758&r1=682757&r2=682758&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 5 08:31:50 2008
@@ -17,12 +17,12 @@
package org.apache.cocoon.portal.layout.renderer.impl;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.layout.renderer.Renderer;
import org.apache.cocoon.portal.om.Layout;
import org.apache.cocoon.portal.om.LayoutException;
import org.apache.cocoon.portal.om.LayoutFeatures;
import org.apache.cocoon.portal.om.LayoutInstance;
import org.apache.cocoon.portal.om.LinkLayout;
+import org.apache.cocoon.portal.om.Renderer;
import org.apache.cocoon.portal.util.AbstractBean;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -42,7 +42,7 @@
implements Renderer {
/**
- * @see org.apache.cocoon.portal.layout.renderer.Renderer#toSAX(org.apache.cocoon.portal.om.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
+ * @see org.apache.cocoon.portal.om.Renderer#toSAX(org.apache.cocoon.portal.om.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
*/
public void toSAX(Layout layout, PortalService service, ContentHandler handler)
throws SAXException, LayoutException {
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=682758&r1=682757&r2=682758&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 5 08:31:50 2008
@@ -34,7 +34,7 @@
import org.apache.cocoon.portal.om.Layout;
import org.apache.cocoon.portal.om.LayoutException;
import org.apache.cocoon.portal.om.PortalUser;
-import org.apache.cocoon.portal.profile.ProfileManager;
+import org.apache.cocoon.portal.services.ProfileManager;
import org.apache.cocoon.portal.services.aspects.AspectChain;
import org.apache.cocoon.portal.services.aspects.impl.support.ProfileManagerAspectContextImpl;
import org.apache.cocoon.portal.services.aspects.support.AspectChainImpl;
@@ -76,21 +76,21 @@
}
/**
- * @see org.apache.cocoon.portal.profile.ProfileManager#getProfileManagerAspectChain()
+ * @see org.apache.cocoon.portal.services.ProfileManager#getProfileManagerAspectChain()
*/
public AspectChain getProfileManagerAspectChain() {
return this.chain;
}
/**
- * @see org.apache.cocoon.portal.profile.ProfileManager#getCopletTypes()
+ * @see org.apache.cocoon.portal.services.ProfileManager#getCopletTypes()
*/
public Collection getCopletTypes() {
return this.copletTypesMap.values();
}
/**
- * @see org.apache.cocoon.portal.profile.ProfileManager#getCopletType(java.lang.String)
+ * @see org.apache.cocoon.portal.services.ProfileManager#getCopletType(java.lang.String)
*/
public CopletType getCopletType(String id) {
return (CopletType)this.copletTypesMap.get(id);
@@ -109,7 +109,7 @@
}
/**
- * @see org.apache.cocoon.portal.profile.ProfileManager#saveUserProfiles()
+ * @see org.apache.cocoon.portal.services.ProfileManager#saveUserProfiles()
*/
public void saveUserProfiles() {
// override in subclass
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/GroupBasedProfileManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/GroupBasedProfileManager.java?rev=682758&r1=682757&r2=682758&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/GroupBasedProfileManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/GroupBasedProfileManager.java Tue Aug 5 08:31:50 2008
@@ -136,7 +136,7 @@
}
/**
- * @see org.apache.cocoon.portal.profile.ProfileManager#getCopletInstance(java.lang.String)
+ * @see org.apache.cocoon.portal.services.ProfileManager#getCopletInstance(java.lang.String)
*/
public CopletInstance getCopletInstance(String copletID) {
final ProfileHolder profile = this.getUserProfile();
@@ -147,7 +147,7 @@
}
/**
- * @see org.apache.cocoon.portal.profile.ProfileManager#getCopletDefinition(java.lang.String)
+ * @see org.apache.cocoon.portal.services.ProfileManager#getCopletDefinition(java.lang.String)
*/
public CopletDefinition getCopletDefinition(String copletDataId) {
final ProfileHolder profile = this.getUserProfile();
@@ -158,7 +158,7 @@
}
/**
- * @see org.apache.cocoon.portal.profile.ProfileManager#getCopletInstances(org.apache.cocoon.portal.om.CopletDefinition)
+ * @see org.apache.cocoon.portal.services.ProfileManager#getCopletInstances(org.apache.cocoon.portal.om.CopletDefinition)
*/
public List getCopletInstances(CopletDefinition data) {
final ProfileHolder profile = this.getUserProfile();
@@ -233,7 +233,7 @@
}
/**
- * @see org.apache.cocoon.portal.profile.ProfileManager#getLayout(java.lang.String)
+ * @see org.apache.cocoon.portal.services.ProfileManager#getLayout(java.lang.String)
*/
public Layout getLayout(String layoutId) {
ProfileHolder profile = this.getUserProfile();
@@ -250,7 +250,7 @@
}
/**
- * @see org.apache.cocoon.portal.profile.ProfileManager#getCopletDefinitions()
+ * @see org.apache.cocoon.portal.services.ProfileManager#getCopletDefinitions()
*/
public Collection getCopletDefinitions() {
final ProfileHolder profile = this.getUserProfile();
@@ -261,7 +261,7 @@
}
/**
- * @see org.apache.cocoon.portal.profile.ProfileManager#getCopletInstances()
+ * @see org.apache.cocoon.portal.services.ProfileManager#getCopletInstances()
*/
public Collection getCopletInstances() {
final ProfileHolder profile = this.getUserProfile();
@@ -465,7 +465,7 @@
}
/**
- * @see org.apache.cocoon.portal.profile.ProfileManager#saveUserProfiles()
+ * @see org.apache.cocoon.portal.services.ProfileManager#saveUserProfiles()
*/
public void saveUserProfiles() {
this.saveCopletInstances();
@@ -505,7 +505,7 @@
}
/**
- * @see org.apache.cocoon.portal.profile.ProfileManager#getLayoutInstance(org.apache.cocoon.portal.om.Layout)
+ * @see org.apache.cocoon.portal.services.ProfileManager#getLayoutInstance(org.apache.cocoon.portal.om.Layout)
*/
public LayoutInstance getLayoutInstance(Layout layout) {
LayoutInstance result = null;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/StaticProfileManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/StaticProfileManager.java?rev=682758&r1=682757&r2=682758&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/StaticProfileManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/StaticProfileManager.java Tue Aug 5 08:31:50 2008
@@ -61,7 +61,7 @@
}
/**
- * @see org.apache.cocoon.portal.profile.ProfileManager#getLayout(java.lang.String)
+ * @see org.apache.cocoon.portal.services.ProfileManager#getLayout(java.lang.String)
*/
public Layout getLayout(String layoutID) {
try {
@@ -196,7 +196,7 @@
}
/**
- * @see org.apache.cocoon.portal.profile.ProfileManager#getCopletInstance(java.lang.String)
+ * @see org.apache.cocoon.portal.services.ProfileManager#getCopletInstance(java.lang.String)
*/
public CopletInstance getCopletInstance(String copletID) {
// TODO - we should store a map in the static profile manager
@@ -216,7 +216,7 @@
}
/**
- * @see org.apache.cocoon.portal.profile.ProfileManager#getCopletDefinition(java.lang.String)
+ * @see org.apache.cocoon.portal.services.ProfileManager#getCopletDefinition(java.lang.String)
*/
public CopletDefinition getCopletDefinition(String copletDataId) {
try {
@@ -239,7 +239,7 @@
}
/**
- * @see org.apache.cocoon.portal.profile.ProfileManager#getCopletInstances(org.apache.cocoon.portal.om.CopletDefinition)
+ * @see org.apache.cocoon.portal.services.ProfileManager#getCopletInstances(org.apache.cocoon.portal.om.CopletDefinition)
*/
public List getCopletInstances(CopletDefinition data) {
List coplets = new ArrayList();
@@ -258,7 +258,7 @@
}
/**
- * @see org.apache.cocoon.portal.profile.ProfileManager#getCopletDefinitions()
+ * @see org.apache.cocoon.portal.services.ProfileManager#getCopletDefinitions()
*/
public Collection getCopletDefinitions() {
try {
@@ -269,7 +269,7 @@
}
/**
- * @see org.apache.cocoon.portal.profile.ProfileManager#getCopletInstances()
+ * @see org.apache.cocoon.portal.services.ProfileManager#getCopletInstances()
*/
public Collection getCopletInstances() {
try {
@@ -280,7 +280,7 @@
}
/**
- * @see org.apache.cocoon.portal.profile.ProfileManager#getLayoutInstance(org.apache.cocoon.portal.om.Layout)
+ * @see org.apache.cocoon.portal.services.ProfileManager#getLayoutInstance(org.apache.cocoon.portal.om.Layout)
*/
public LayoutInstance getLayoutInstance(Layout layout) {
// TODO Auto-generated method stub
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/AbstractPortalService.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/AbstractPortalService.java?rev=682758&r1=682757&r2=682758&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/AbstractPortalService.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/AbstractPortalService.java Tue Aug 5 08:31:50 2008
@@ -27,11 +27,11 @@
import org.apache.cocoon.portal.RequestContext;
import org.apache.cocoon.portal.event.EventConverter;
import org.apache.cocoon.portal.event.EventManager;
-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.portal.services.PortalManager;
+import org.apache.cocoon.portal.services.ProfileManager;
import org.apache.cocoon.portal.services.UserService;
import org.apache.cocoon.portal.services.VariableResolver;
import org.apache.cocoon.portal.spi.RequestContextProvider;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/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?rev=682758&r1=682757&r2=682758&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/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 5 08:31:50 2008
@@ -34,9 +34,9 @@
import org.apache.cocoon.portal.om.LayoutException;
import org.apache.cocoon.portal.om.LayoutInstance;
import org.apache.cocoon.portal.om.LayoutType;
-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.ProfileManager;
import org.apache.cocoon.portal.util.AbstractBean;
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultPortalManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultPortalManager.java?rev=682758&r1=682757&r2=682758&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultPortalManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultPortalManager.java Tue Aug 5 08:31:50 2008
@@ -22,14 +22,14 @@
import org.apache.cocoon.portal.PortalException;
import org.apache.cocoon.portal.PortalRuntimeException;
-import org.apache.cocoon.portal.layout.renderer.Renderer;
import org.apache.cocoon.portal.om.CopletInstance;
import org.apache.cocoon.portal.om.CopletInstanceFeatures;
import org.apache.cocoon.portal.om.Layout;
import org.apache.cocoon.portal.om.LayoutException;
import org.apache.cocoon.portal.om.LayoutFeatures;
-import org.apache.cocoon.portal.profile.ProfileManager;
+import org.apache.cocoon.portal.om.Renderer;
import org.apache.cocoon.portal.services.PortalManager;
+import org.apache.cocoon.portal.services.ProfileManager;
import org.apache.cocoon.portal.services.aspects.AspectChain;
import org.apache.cocoon.portal.services.aspects.RequestProcessorAspect;
import org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/LayoutTypeDefinitionParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/LayoutTypeDefinitionParser.java?rev=682758&r1=682757&r2=682758&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/LayoutTypeDefinitionParser.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/LayoutTypeDefinitionParser.java Tue Aug 5 08:31:50 2008
@@ -16,8 +16,8 @@
*/
package org.apache.cocoon.portal.spring;
-import org.apache.cocoon.portal.layout.renderer.Renderer;
import org.apache.cocoon.portal.om.LayoutType;
+import org.apache.cocoon.portal.om.Renderer;
import org.apache.cocoon.spring.configurator.impl.AbstractElementParser;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.config.BeanDefinition;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/acting/helpers/FullScreenMapping.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/acting/helpers/FullScreenMapping.java?rev=682758&r1=682757&r2=682758&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/acting/helpers/FullScreenMapping.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/acting/helpers/FullScreenMapping.java Tue Aug 5 08:31:50 2008
@@ -20,7 +20,7 @@
import org.apache.cocoon.portal.event.Event;
import org.apache.cocoon.portal.event.coplet.CopletInstanceSizingEvent;
import org.apache.cocoon.portal.om.CopletInstance;
-import org.apache.cocoon.portal.profile.ProfileManager;
+import org.apache.cocoon.portal.services.ProfileManager;
/**
* Helper class for a full screen event.
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/source/LayoutSource.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/source/LayoutSource.java?rev=682758&r1=682757&r2=682758&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/source/LayoutSource.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/source/LayoutSource.java Tue Aug 5 08:31:50 2008
@@ -25,9 +25,9 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.CascadingIOException;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.layout.renderer.Renderer;
import org.apache.cocoon.portal.om.Layout;
import org.apache.cocoon.portal.om.LayoutException;
+import org.apache.cocoon.portal.om.Renderer;
import org.apache.cocoon.serialization.Serializer;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceNotFoundException;