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 2006/08/15 16:45:41 UTC
svn commit: r431606 [4/4] - in /cocoon/trunk/blocks/cocoon-portal:
cocoon-portal-impl/
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/
cocoon-...
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/TestProfileManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/TestProfileManager.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/TestProfileManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/TestProfileManager.java Tue Aug 15 07:45:27 2006
@@ -22,16 +22,15 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletDefinition;
-import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.event.Receiver;
import org.apache.cocoon.portal.event.user.UserEvent;
import org.apache.cocoon.portal.event.user.UserIsAccessingEvent;
-import org.apache.cocoon.portal.layout.CompositeLayout;
-import org.apache.cocoon.portal.layout.Item;
import org.apache.cocoon.portal.layout.LayoutException;
-import org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl;
-import org.apache.cocoon.portal.layout.impl.CopletLayout;
+import org.apache.cocoon.portal.om.CompositeLayout;
+import org.apache.cocoon.portal.om.CopletDefinition;
+import org.apache.cocoon.portal.om.CopletInstance;
+import org.apache.cocoon.portal.om.CopletLayout;
+import org.apache.cocoon.portal.om.Item;
import org.apache.cocoon.portal.profile.PortalUser;
import org.apache.cocoon.portal.profile.impl.GroupBasedProfileManager;
import org.apache.cocoon.portal.scratchpad.Profile;
@@ -79,7 +78,7 @@
profile.setCopletDefinitions( this.getGlobalDatas( info, profile, layoutKey) );
// create root layout
- CompositeLayout rootLayout = new CompositeLayoutImpl("root", "row");
+ CompositeLayout rootLayout = new CompositeLayout("root", "row");
// create coplet instances and layouts
final List instances = new ArrayList();
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java Tue Aug 15 07:45:27 2006
@@ -37,13 +37,13 @@
import org.apache.cocoon.portal.PortalManagerAspectPrepareContext;
import org.apache.cocoon.portal.PortalManagerAspectRenderContext;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletDefinitionFeatures;
-import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider;
import org.apache.cocoon.portal.coplet.adapter.DecorationAction;
import org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter;
import org.apache.cocoon.portal.event.Receiver;
import org.apache.cocoon.portal.event.coplet.CopletInstanceSizingEvent;
+import org.apache.cocoon.portal.om.CopletDefinitionFeatures;
+import org.apache.cocoon.portal.om.CopletInstance;
import org.apache.cocoon.portal.pluto.PortletActionProviderImpl;
import org.apache.cocoon.portal.pluto.PortletContainerEnvironmentImpl;
import org.apache.cocoon.portal.pluto.PortletURLProviderImpl;
@@ -124,7 +124,7 @@
}
/**
- * @see org.apache.cocoon.portal.coplet.adapter.CopletAdapter#login(org.apache.cocoon.portal.coplet.CopletInstance)
+ * @see org.apache.cocoon.portal.coplet.adapter.CopletAdapter#login(org.apache.cocoon.portal.om.CopletInstance)
*/
public void login(CopletInstance coplet) {
super.login(coplet);
@@ -173,7 +173,7 @@
}
/**
- * @see org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter#streamContent(org.apache.cocoon.portal.coplet.CopletInstance, org.xml.sax.ContentHandler)
+ * @see org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter#streamContent(org.apache.cocoon.portal.om.CopletInstance, org.xml.sax.ContentHandler)
*/
public void streamContent(CopletInstance coplet,
ContentHandler contentHandler)
@@ -216,7 +216,7 @@
}
/**
- * @see org.apache.cocoon.portal.coplet.adapter.CopletAdapter#logout(org.apache.cocoon.portal.coplet.CopletInstance)
+ * @see org.apache.cocoon.portal.coplet.adapter.CopletAdapter#logout(org.apache.cocoon.portal.om.CopletInstance)
*/
public void logout(CopletInstance coplet) {
super.logout(coplet);
@@ -508,7 +508,7 @@
}
/**
- * @see org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider#getTitle(org.apache.cocoon.portal.coplet.CopletInstance)
+ * @see org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider#getTitle(org.apache.cocoon.portal.om.CopletInstance)
*/
public String getTitle(CopletInstance copletInstanceData) {
String title = null;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java Tue Aug 15 07:45:27 2006
@@ -41,13 +41,13 @@
import org.apache.cocoon.components.thread.RunnableManager;
import org.apache.cocoon.portal.PortalComponentManager;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletDefinition;
-import org.apache.cocoon.portal.coplet.CopletType;
import org.apache.cocoon.portal.deployment.DeploymentEvent;
import org.apache.cocoon.portal.deployment.DeploymentException;
import org.apache.cocoon.portal.deployment.DeploymentStatus;
import org.apache.cocoon.portal.event.Receiver;
import org.apache.cocoon.portal.impl.AbstractComponent;
+import org.apache.cocoon.portal.om.CopletDefinition;
+import org.apache.cocoon.portal.om.CopletType;
import org.apache.cocoon.portal.pluto.deployment.Deployer;
import org.apache.cocoon.portal.pluto.deployment.WebApplicationRewriter;
import org.apache.commons.lang.StringUtils;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java Tue Aug 15 07:45:27 2006
@@ -19,7 +19,7 @@
import java.util.Locale;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstance;
+import org.apache.cocoon.portal.om.CopletInstance;
import org.apache.cocoon.portal.pluto.PortletPreferencesProvider;
import org.apache.pluto.PortletContainerServices;
import org.apache.pluto.om.common.Description;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityListImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityListImpl.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityListImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityListImpl.java Tue Aug 15 07:45:27 2006
@@ -19,7 +19,7 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.cocoon.portal.coplet.CopletInstance;
+import org.apache.cocoon.portal.om.CopletInstance;
import org.apache.cocoon.portal.pluto.om.common.ObjectIDImpl;
import org.apache.pluto.PortletContainerServices;
import org.apache.pluto.om.common.ObjectID;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java Tue Aug 15 07:45:27 2006
@@ -15,7 +15,7 @@
*/
package org.apache.cocoon.portal.pluto.om;
-import org.apache.cocoon.portal.coplet.CopletInstance;
+import org.apache.cocoon.portal.om.CopletInstance;
import org.apache.pluto.om.common.ObjectID;
import org.apache.pluto.om.entity.PortletEntity;
import org.apache.pluto.om.window.PortletWindow;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java Tue Aug 15 07:45:27 2006
@@ -25,7 +25,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
-import org.apache.cocoon.portal.coplet.CopletInstance;
+import org.apache.cocoon.portal.om.CopletInstance;
import org.apache.cocoon.portal.pluto.PortletURLProviderImpl;
import org.apache.cocoon.portal.pluto.om.PortletWindowImpl;
import org.apache.pluto.om.window.PortletWindow;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/AbstractBasketTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/AbstractBasketTransformer.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/AbstractBasketTransformer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/AbstractBasketTransformer.java Tue Aug 15 07:45:27 2006
@@ -44,8 +44,8 @@
/**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager) throws ServiceException {
- super.service(manager);
+ public void service(ServiceManager serviceManager) throws ServiceException {
+ super.service(serviceManager);
this.basketManager = (BasketManager) this.manager.lookup(BasketManager.ROLE);
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/AddToBasketAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/AddToBasketAspect.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/AddToBasketAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/AddToBasketAspect.java Tue Aug 15 07:45:27 2006
@@ -21,13 +21,14 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.portal.PortalException;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.coplets.basket.events.AddItemEvent;
import org.apache.cocoon.portal.event.Event;
-import org.apache.cocoon.portal.layout.Layout;
-import org.apache.cocoon.portal.layout.impl.CopletLayout;
+import org.apache.cocoon.portal.layout.LayoutException;
import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext;
import org.apache.cocoon.portal.layout.renderer.aspect.impl.AbstractAspect;
+import org.apache.cocoon.portal.om.CopletInstance;
+import org.apache.cocoon.portal.om.CopletLayout;
+import org.apache.cocoon.portal.om.Layout;
import org.apache.cocoon.xml.XMLUtils;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -49,8 +50,8 @@
/**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager) throws ServiceException {
- super.service(manager);
+ public void service(ServiceManager serviceManager) throws ServiceException {
+ super.service(serviceManager);
this.basketManager = (BasketManager)this.manager.lookup(BasketManager.ROLE);
}
@@ -66,17 +67,17 @@
}
/**
- * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
+ * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext, org.apache.cocoon.portal.om.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
*/
- public void toSAX(RendererAspectContext context,
+ public void toSAX(RendererAspectContext renderContext,
Layout layout,
PortalService service,
ContentHandler contenthandler)
- throws SAXException {
+ throws SAXException, LayoutException {
final CopletInstance cid = this.getCopletInstance(((CopletLayout)layout).getCopletInstanceId());
final ContentStore store;
final String elementName;
- if ( context.getAspectConfiguration().equals(Boolean.TRUE) ) {
+ if ( renderContext.getAspectConfiguration().equals(Boolean.TRUE) ) {
store = this.basketManager.getBasket();
elementName = "basket-add-content";
} else {
@@ -97,7 +98,7 @@
XMLUtils.createElement(contenthandler, elementName, service.getLinkService().getLinkURI(event));
}
- context.invokeNext( layout, service, contenthandler );
+ renderContext.invokeNext( layout, service, contenthandler );
}
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketContentGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketContentGenerator.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketContentGenerator.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketContentGenerator.java Tue Aug 15 07:45:27 2006
@@ -24,8 +24,8 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.generation.AbstractCopletGenerator;
+import org.apache.cocoon.portal.om.CopletInstance;
import org.apache.cocoon.xml.SaxBuffer;
import org.apache.cocoon.xml.XMLUtils;
import org.apache.excalibur.source.Source;
@@ -86,12 +86,12 @@
}
}
if ( !streamed ) {
- Source source = null;
+ Source src = null;
try {
- source = this.resolver.resolveURI(this.source);
- parser.parse(SourceUtil.getInputSource(source), this.xmlConsumer);
+ src = this.resolver.resolveURI(this.source);
+ parser.parse(SourceUtil.getInputSource(src), this.xmlConsumer);
} finally {
- this.resolver.release(source);
+ this.resolver.release(src);
}
}
} catch (ServiceException se) {
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketGenerator.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketGenerator.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketGenerator.java Tue Aug 15 07:45:27 2006
@@ -68,8 +68,8 @@
/**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager) throws ServiceException {
- super.service(manager);
+ public void service(ServiceManager serviceManager) throws ServiceException {
+ super.service(serviceManager);
this.basketManager = (BasketManager)this.manager.lookup(BasketManager.ROLE);
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java Tue Aug 15 07:45:27 2006
@@ -43,8 +43,6 @@
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.portal.PortalException;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletDefinition;
-import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.coplets.basket.events.AddItemEvent;
import org.apache.cocoon.portal.coplets.basket.events.CleanBriefcaseEvent;
import org.apache.cocoon.portal.coplets.basket.events.ContentStoreEvent;
@@ -56,7 +54,9 @@
import org.apache.cocoon.portal.coplets.basket.events.UploadItemEvent;
import org.apache.cocoon.portal.event.Receiver;
import org.apache.cocoon.portal.impl.AbstractComponent;
-import org.apache.cocoon.portal.layout.impl.CopletLayout;
+import org.apache.cocoon.portal.om.CopletDefinition;
+import org.apache.cocoon.portal.om.CopletInstance;
+import org.apache.cocoon.portal.om.CopletLayout;
import org.apache.cocoon.servlet.multipart.Part;
import org.apache.cocoon.servlet.multipart.PartOnDisk;
import org.apache.cocoon.util.ClassUtils;
@@ -125,8 +125,8 @@
/**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager) throws ServiceException {
- super.service(manager);
+ public void service(ServiceManager serviceManager) throws ServiceException {
+ super.service(serviceManager);
this.scheduler = (JobScheduler)this.manager.lookup(JobScheduler.ROLE);
final Settings settings = (Settings)this.manager.lookup(Settings.ROLE);
this.directory = settings.getWorkDirectory();
@@ -247,10 +247,10 @@
} catch (ServiceException se) {
this.getLogger().warn("Unable to get source resolver.", se);
} finally {
- if ( source != null ) {
+ if ( resolver != null ) {
resolver.release(source);
+ this.manager.release(resolver);
}
- this.manager.release(resolver);
}
} else {
@@ -272,7 +272,9 @@
}
}
}
- layout.setCopletInstanceId(cid.getId());
+ if ( cid != null ) {
+ layout.setCopletInstanceId(cid.getId());
+ }
} catch (PortalException pe) {
this.getLogger().warn("Unable to create new instance.", pe);
}
@@ -376,10 +378,10 @@
} catch (ServiceException se) {
this.getLogger().warn("Unable to get source resolver.", se);
} finally {
- if ( source != null ) {
+ if ( resolver != null ) {
resolver.release(source);
+ this.manager.release(resolver);
}
- this.manager.release(resolver);
}
} else if ( ci.getURL() == null ) {
// copy coplet attributes
@@ -528,10 +530,10 @@
*/
protected List loadBriefcases() {
if ( this.directory != null ) {
- File directory = new File(this.directory);
- if ( directory.exists()) {
+ File dir = new File(this.directory);
+ if ( dir.exists()) {
List briefcases = new ArrayList();
- File[] files = directory.listFiles();
+ File[] files = dir.listFiles();
for(int i=0; i<files.length;i++) {
String user = files[i].getName();
int pos = user.indexOf(".briefcase");
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java Tue Aug 15 07:45:27 2006
@@ -24,10 +24,10 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.coplets.basket.BasketManager.ActionInfo;
import org.apache.cocoon.portal.coplets.basket.events.AddItemEvent;
import org.apache.cocoon.portal.event.Event;
+import org.apache.cocoon.portal.om.CopletInstance;
import org.apache.cocoon.xml.AttributesImpl;
import org.apache.cocoon.xml.XMLUtils;
import org.xml.sax.Attributes;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/ContentItem.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/ContentItem.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/ContentItem.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/ContentItem.java Tue Aug 15 07:45:27 2006
@@ -17,7 +17,7 @@
import java.io.Serializable;
-import org.apache.cocoon.portal.coplet.CopletInstance;
+import org.apache.cocoon.portal.om.CopletInstance;
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/ContentStore.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/ContentStore.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/ContentStore.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/ContentStore.java Tue Aug 15 07:45:27 2006
@@ -105,12 +105,12 @@
/**
* Get an item with the id
*/
- public Object getItem(long id) {
+ public Object getItem(long itemId) {
Iterator i = this.items.iterator();
while (i.hasNext()) {
Object item = i.next();
if ( item instanceof AbstractItem ) {
- if (((AbstractItem)item).getId() == id ) {
+ if (((AbstractItem)item).getId() == itemId ) {
return item;
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/FolderTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/FolderTransformer.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/FolderTransformer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/FolderTransformer.java Tue Aug 15 07:45:27 2006
@@ -80,23 +80,23 @@
} else if ( UPLOAD_FORM_ELEMENT.equals(name) ) {
AttributesImpl ai = new AttributesImpl(attr);
PortalService service = null;
- String parameters;
+ String params;
try {
service = (PortalService)this.manager.lookup(PortalService.ROLE);
Event e = new UploadItemEvent(this.basketManager.getFolder(), this.uploadElements);
- parameters = service.getLinkService().getLinkURI(e);
- int pos = parameters.indexOf('?');
- ai.addCDATAAttribute("action", parameters.substring(0, pos));
- parameters = parameters.substring(pos+1);
+ params = service.getLinkService().getLinkURI(e);
+ int pos = params.indexOf('?');
+ ai.addCDATAAttribute("action", params.substring(0, pos));
+ params = params.substring(pos+1);
} catch (ServiceException se) {
throw new SAXException("Unable to lookup portal service.", se);
} finally {
this.manager.release(service);
}
this.startElement("", "form", "form", ai);
- if ( parameters != null && parameters.length() > 0 ) {
+ if ( params != null && params.length() > 0 ) {
// create hidden input fields
- RequestParameters pars = new RequestParameters(parameters);
+ RequestParameters pars = new RequestParameters(params);
Enumeration enumPars = pars.getParameterNames();
while ( enumPars.hasMoreElements() ) {
String pName = (String)enumPars.nextElement();
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/UserConfiguration.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/UserConfiguration.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/UserConfiguration.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/UserConfiguration.java Tue Aug 15 07:45:27 2006
@@ -21,7 +21,7 @@
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstance;
+import org.apache.cocoon.portal.om.CopletInstance;
import org.apache.cocoon.portal.profile.ProfileManager;
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/events/ShowItemEvent.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/events/ShowItemEvent.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/events/ShowItemEvent.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/events/ShowItemEvent.java Tue Aug 15 07:45:27 2006
@@ -16,7 +16,7 @@
package org.apache.cocoon.portal.coplets.basket.events;
import org.apache.cocoon.portal.coplets.basket.ContentStore;
-import org.apache.cocoon.portal.layout.Layout;
+import org.apache.cocoon.portal.om.Layout;
/**
* Show one item of a content store.
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/security/DBSecurityHandler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/security/DBSecurityHandler.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/security/DBSecurityHandler.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/security/DBSecurityHandler.java Tue Aug 15 07:45:27 2006
@@ -72,7 +72,7 @@
/**
* @see SecurityHandler#logout(Map, org.apache.cocoon.auth.User)
*/
- public void logout(Map context, org.apache.cocoon.auth.User user) {
+ public void logout(Map logoutContext, org.apache.cocoon.auth.User user) {
// nothing to do
}
}
Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/basket-sample.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/basket-sample.xconf?rev=431606&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/basket-sample.xconf (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/basket-sample.xconf Tue Aug 15 07:45:27 2006
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-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.
+-->
+<!--+
+ |
+ | @version $Id$
+ +-->
+<components>
+ <!--+
+ | THIS IS A SAMPLE PORTAL
+ |
+ | It demonstrates several features of the portal engine,
+ | so it's neither configured for *your* environment nor
+ | optimized for production. If you use the portal for your
+ | own projects make sure that you remove all unused stuff
+ | from the configuration and that you configure the remaining
+ | components properly. However, the best way is to start your
+ | portal project from scratch!
+ +-->
+ <!-- This is the basket manager -->
+ <component class="org.apache.cocoon.portal.coplets.basket.BasketManagerImpl"
+ role="org.apache.cocoon.portal.coplets.basket.BasketManager">
+ <!-- This is only a sample configuration, it doesn't really work -->
+ <parameter name="basket:action:print" value="cocoon://print-basket"/>
+ <parameter name="basket:action:email" value="cocoon://email-basket"/>
+ <parameter name="briefcase:action:print" value="cocoon://print-briefcase"/>
+ <parameter name="briefcase:action:email" value="cocoon://email-briefcase"/>
+ <parameter name="briefcase:action:calc" value="cocoon://calc-briefcase"/>
+ </component>
+
+ <!-- This is the special basket renderer -->
+ <component role="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/basket"
+ class="org.apache.cocoon.portal.coplets.basket.AddToBasketAspect"/>
+</components>
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/basket-sample.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/basket-sample.xconf
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf Tue Aug 15 07:45:27 2006
@@ -199,7 +199,6 @@
<aspect type="parameter">
<parameter name="tag-name" value="tab-layout"/>
</aspect>
- <aspect type="history"/>
<aspect type="tab-content">
<parameter name="root-tag" value="false"/>
<parameter name="store" value="session"/>
@@ -212,7 +211,6 @@
<aspect type="parameter">
<parameter name="tag-name" value="tab-layout"/>
</aspect>
- <aspect type="history"/>
<aspect type="tab-content">
<parameter name="root-tag" value="false"/>
<parameter name="store" value="session"/>
@@ -228,7 +226,6 @@
<aspect type="parameter">
<parameter name="tag-name" value="linktab-layout"/>
</aspect>
- <aspect type="history"/>
<aspect type="tab-content">
<parameter name="root-tag" value="false"/>
<parameter name="store" value="session"/>
@@ -247,7 +244,6 @@
<aspect type="window">
<parameter name="root-tag" value="false"/>
</aspect>
- <aspect type="history"/>
<aspect type="basket"/>
<aspect type="coplet-cinclude"/>
</aspects>
@@ -264,7 +260,6 @@
<aspect type="window">
<parameter name="root-tag" value="false"/>
</aspect>
- <aspect type="history"/>
<aspect type="basket"/>
<aspect type="coplet-cinclude"/>
</aspects>
@@ -280,7 +275,6 @@
<renderer name="nowindow"
class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
<aspects>
- <aspect type="history"/>
<aspect type="coplet-cinclude">
<parameter name="root-tag" value="false"/>
</aspect>
@@ -307,19 +301,19 @@
<portal-layout-factory>
<layouts>
<layout type="column"
- class="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl">
+ class="org.apache.cocoon.portal.layout.impl.CompositeLayout">
<renderers default="column">
<renderer name="column"/>
</renderers>
</layout>
<layout type="row"
- class="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl">
+ class="org.apache.cocoon.portal.layout.impl.CompositeLayout">
<renderers default="row">
<renderer name="row"/>
</renderers>
</layout>
<layout type="tab"
- class="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl"
+ class="org.apache.cocoon.portal.layout.impl.CompositeLayout"
item-class="org.apache.cocoon.portal.layout.NamedItem"
default-is-static="true">
<renderers default="tab">
@@ -327,14 +321,14 @@
</renderers>
</layout>
<layout type="rawtab"
- class="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl"
+ class="org.apache.cocoon.portal.layout.impl.CompositeLayout"
item-class="org.apache.cocoon.portal.layout.NamedItem">
<renderers default="rawtab">
<renderer name="rawtab"/>
</renderers>
</layout>
<layout type="linktab"
- class="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl"
+ class="org.apache.cocoon.portal.layout.impl.CompositeLayout"
item-class="org.apache.cocoon.portal.layout.NamedItem"
default-is-static="true">
<renderers default="linktab">
@@ -365,21 +359,6 @@
</layout>
</layouts>
</portal-layout-factory>
-
- <!-- This is the basket manager -->
- <component class="org.apache.cocoon.portal.coplets.basket.BasketManagerImpl"
- role="org.apache.cocoon.portal.coplets.basket.BasketManager">
- <!-- This is only a sample configuration, it doesn't really work -->
- <parameter name="basket:action:print" value="cocoon://print-basket"/>
- <parameter name="basket:action:email" value="cocoon://email-basket"/>
- <parameter name="briefcase:action:print" value="cocoon://print-briefcase"/>
- <parameter name="briefcase:action:email" value="cocoon://email-briefcase"/>
- <parameter name="briefcase:action:calc" value="cocoon://calc-briefcase"/>
- </component>
-
- <!-- This is the special basket renderer -->
- <component role="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/basket"
- class="org.apache.cocoon.portal.coplets.basket.AddToBasketAspect"/>
<wsrp-adapter>
<!-- This is the WSRP configuration containing the producers etc. -->
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/copletManagement/LayoutActions.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/copletManagement/LayoutActions.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/copletManagement/LayoutActions.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/copletManagement/LayoutActions.java Tue Aug 15 07:45:27 2006
@@ -25,15 +25,15 @@
import org.apache.cocoon.forms.formmodel.Widget;
import org.apache.cocoon.forms.formmodel.Repeater.RepeaterRow;
import org.apache.cocoon.portal.PortalException;
-import org.apache.cocoon.portal.coplet.CopletDefinition;
import org.apache.cocoon.portal.coplet.CopletFactory;
-import org.apache.cocoon.portal.coplet.CopletInstance;
-import org.apache.cocoon.portal.layout.CompositeLayout;
-import org.apache.cocoon.portal.layout.Item;
-import org.apache.cocoon.portal.layout.Layout;
import org.apache.cocoon.portal.layout.LayoutFactory;
-import org.apache.cocoon.portal.layout.NamedItem;
-import org.apache.cocoon.portal.layout.impl.CopletLayout;
+import org.apache.cocoon.portal.om.CompositeLayout;
+import org.apache.cocoon.portal.om.CopletDefinition;
+import org.apache.cocoon.portal.om.CopletInstance;
+import org.apache.cocoon.portal.om.CopletLayout;
+import org.apache.cocoon.portal.om.Item;
+import org.apache.cocoon.portal.om.Layout;
+import org.apache.cocoon.portal.om.NamedItem;
import org.apache.cocoon.portal.profile.ProfileManager;
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/helper/PortalObjects.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/helper/PortalObjects.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/helper/PortalObjects.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/helper/PortalObjects.java Tue Aug 15 07:45:27 2006
@@ -17,7 +17,7 @@
import org.apache.cocoon.portal.PortalComponentManager;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.layout.Layout;
+import org.apache.cocoon.portal.om.Layout;
import org.apache.cocoon.portal.profile.ProfileManager;
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java Tue Aug 15 07:45:27 2006
@@ -51,16 +51,16 @@
import org.apache.cocoon.portal.PortalManagerAspectPrepareContext;
import org.apache.cocoon.portal.PortalManagerAspectRenderContext;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletDefinition;
-import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider;
import org.apache.cocoon.portal.coplet.adapter.DecorationAction;
import org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter;
import org.apache.cocoon.portal.event.Event;
import org.apache.cocoon.portal.event.Receiver;
import org.apache.cocoon.portal.event.coplet.CopletInstanceSizingEvent;
-import org.apache.cocoon.portal.layout.Layout;
-import org.apache.cocoon.portal.layout.LayoutFeatures;
+import org.apache.cocoon.portal.om.CopletDefinition;
+import org.apache.cocoon.portal.om.CopletInstance;
+import org.apache.cocoon.portal.om.Layout;
+import org.apache.cocoon.portal.om.LayoutFeatures;
import org.apache.cocoon.portal.serialization.IncludingHTMLSerializer;
import org.apache.cocoon.portal.util.HtmlSaxParser;
import org.apache.cocoon.portal.wsrp.consumer.ConsumerEnvironmentImpl;
@@ -172,8 +172,8 @@
/**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager) throws ServiceException {
- super.service(manager);
+ public void service(ServiceManager serviceManager) throws ServiceException {
+ super.service(serviceManager);
this.userContextProvider = (UserContextProvider)this.manager.lookup(UserContextProvider.ROLE);
}
@@ -230,7 +230,7 @@
* and stores its into the copletInstanceData<br/>
* After that it initiates the <tt>getServiceDescription()</tt>-call<br/>
*
- * @see org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter#login(org.apache.cocoon.portal.coplet.CopletInstance)
+ * @see org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter#login(org.apache.cocoon.portal.om.CopletInstance)
*/
public void login(CopletInstance coplet) {
super.login(coplet);
@@ -320,7 +320,7 @@
* Checks the values of the <tt>portlet-key</tt> and the <tt>user</tt> for current portlet-instance<br/>
* After that all passed the <tt>getMarkup()</tt>-call will be initiated<br />
*
- * @see org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter#streamContent(org.apache.cocoon.portal.coplet.CopletInstance, org.xml.sax.ContentHandler)
+ * @see org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter#streamContent(org.apache.cocoon.portal.om.CopletInstance, org.xml.sax.ContentHandler)
*/
public void streamContent(CopletInstance coplet, ContentHandler contentHandler)
throws SAXException {
@@ -395,7 +395,7 @@
/**
* Releases all sessions (<tt>userSession, groupSession, portletSession</tt>)<br/>
*
- * @see org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter#logout(org.apache.cocoon.portal.coplet.CopletInstance)
+ * @see org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter#logout(org.apache.cocoon.portal.om.CopletInstance)
*/
public void logout(CopletInstance coplet) {
super.logout(coplet);
@@ -619,7 +619,7 @@
final Layout rootLayout = service.getProfileManager().getPortalLayout(null, null);
final Layout layout = LayoutFeatures.searchLayout(service, coplet.getId(), rootLayout);
- final Layout fullScreenLayout = LayoutFeatures.getFullScreenInfo(rootLayout);
+ final Layout fullScreenLayout = LayoutFeatures.getFullScreenInfo(service, rootLayout);
if ( fullScreenLayout != null
&& fullScreenLayout.equals( layout )
&& !windowState.equals(WindowStates._maximized) ) {
@@ -958,7 +958,7 @@
}
/**
- * @see org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider#getTitle(org.apache.cocoon.portal.coplet.CopletInstance)
+ * @see org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider#getTitle(org.apache.cocoon.portal.om.CopletInstance)
*/
public String getTitle(CopletInstance copletInstanceData) {
String title = null;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEvent.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEvent.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEvent.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEvent.java Tue Aug 15 07:45:27 2006
@@ -17,8 +17,8 @@
import java.util.Map;
-import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.event.CopletInstanceEvent;
+import org.apache.cocoon.portal.om.CopletInstance;
/**
* This event is fired for every wsrp action. <br/>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEventAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEventAspect.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEventAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEventAspect.java Tue Aug 15 07:45:27 2006
@@ -23,10 +23,10 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.event.Event;
import org.apache.cocoon.portal.event.aspect.EventAspect;
import org.apache.cocoon.portal.event.aspect.EventAspectContext;
+import org.apache.cocoon.portal.om.CopletInstance;
/**
* This event processes all wsrp related urls and fires {@link org.apache.cocoon.portal.wsrp.adapter.WSRPEvent}s.
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/ConsumerEnvironmentImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/ConsumerEnvironmentImpl.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/ConsumerEnvironmentImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/ConsumerEnvironmentImpl.java Tue Aug 15 07:45:27 2006
@@ -21,7 +21,7 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstance;
+import org.apache.cocoon.portal.om.CopletInstance;
import org.apache.cocoon.portal.wsrp.adapter.WSRPAdapter;
import org.apache.wsrp4j.consumer.PortletDriverRegistry;
import org.apache.wsrp4j.consumer.PortletRegistry;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java Tue Aug 15 07:45:27 2006
@@ -20,7 +20,7 @@
import java.util.Map;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstance;
+import org.apache.cocoon.portal.om.CopletInstance;
import org.apache.cocoon.portal.wsrp.adapter.WSRPAdapter;
import org.apache.cocoon.portal.wsrp.adapter.WSRPEventAspect;
import org.apache.wsrp4j.consumer.URLGenerator;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLTemplateComposerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLTemplateComposerImpl.java?rev=431606&r1=431605&r2=431606&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLTemplateComposerImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLTemplateComposerImpl.java Tue Aug 15 07:45:27 2006
@@ -15,7 +15,7 @@
*/
package org.apache.cocoon.portal.wsrp.consumer;
-import org.apache.cocoon.portal.coplet.CopletInstance;
+import org.apache.cocoon.portal.om.CopletInstance;
import org.apache.cocoon.portal.wsrp.adapter.WSRPAdapter;
import org.apache.wsrp4j.consumer.URLGenerator;
import org.apache.wsrp4j.consumer.URLTemplateComposer;