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 2007/03/08 18:40:50 UTC
svn commit: r516115 - in
/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto:
ContainerServicesImpl.java PortalContextImpl.java PortalStartup.java
PortletAdapter.java
Author: cziegeler
Date: Thu Mar 8 09:40:44 2007
New Revision: 516115
URL: http://svn.apache.org/viewvc?view=rev&rev=516115
Log:
Remove dependency to avalon
Modified:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/ContainerServicesImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/PortalContextImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/PortalStartup.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/PortletAdapter.java
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/ContainerServicesImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/ContainerServicesImpl.java?view=diff&rev=516115&r1=516114&r2=516115
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/ContainerServicesImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/ContainerServicesImpl.java Thu Mar 8 09:40:44 2007
@@ -18,7 +18,7 @@
import javax.portlet.PortalContext;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.cocoon.portal.util.AbstractBean;
import org.apache.pluto.OptionalContainerServices;
import org.apache.pluto.RequiredContainerServices;
import org.apache.pluto.spi.PortalCallbackService;
@@ -35,7 +35,7 @@
*
*/
public class ContainerServicesImpl
- extends AbstractLogEnabled
+ extends AbstractBean
implements RequiredContainerServices, OptionalContainerServices {
protected PortalContext portalContext = new PortalContextImpl();
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/PortalContextImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/PortalContextImpl.java?view=diff&rev=516115&r1=516114&r2=516115
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/PortalContextImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/PortalContextImpl.java Thu Mar 8 09:40:44 2007
@@ -21,24 +21,27 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import javax.portlet.PortalContext;
import javax.portlet.PortletMode;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.cocoon.Constants;
+import org.apache.cocoon.portal.util.AbstractBean;
+import org.apache.cocoon.spring.configurator.ResourceUtils;
import org.apache.commons.collections.iterators.IteratorEnumeration;
/**
- *
+ *
* @version $Id$
*
*/
public class PortalContextImpl
- extends AbstractLogEnabled
+ extends AbstractBean
implements PortalContext {
- protected String versionInfo = "Apache Cocoon/" + Constants.VERSION;
+ protected static final String IDENTIFIER = "Apache Cocoon Portal/";
+
+ protected final String versionInfo;
protected final Map properties = new HashMap();
@@ -47,6 +50,12 @@
protected final List windowStates = new ArrayList();
public PortalContextImpl() {
+ final Properties pomProps = ResourceUtils.getPOMProperties("org.apache.cocoon", "cocoon-portal-portlet-impl");
+ if ( pomProps != null ) {
+ this.versionInfo = IDENTIFIER + pomProps.getProperty("version");
+ } else {
+ this.versionInfo = IDENTIFIER + "unknown";
+ }
this.portletModes.add(new PortletMode("view"));
this.portletModes.add(new PortletMode("edit"));
this.portletModes.add(new PortletMode("help"));
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/PortalStartup.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/PortalStartup.java?view=diff&rev=516115&r1=516114&r2=516115
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/PortalStartup.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/PortalStartup.java Thu Mar 8 09:40:44 2007
@@ -16,18 +16,19 @@
*/
package org.apache.cocoon.portal.pluto;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import javax.servlet.ServletContext;
+
+import org.apache.cocoon.portal.util.AbstractBean;
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.PortletContainerFactory;
import org.springframework.web.context.ServletContextAware;
-import javax.servlet.ServletContext;
-
/**
* @version $Id$
*/
-public class PortalStartup extends AbstractLogEnabled
+public class PortalStartup
+ extends AbstractBean
implements ServletContextAware {
protected ServletContext servletContext;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/PortletAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/PortletAdapter.java?view=diff&rev=516115&r1=516114&r2=516115
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/PortletAdapter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/PortletAdapter.java Thu Mar 8 09:40:44 2007
@@ -24,9 +24,6 @@
import javax.portlet.WindowState;
import javax.servlet.http.HttpServletResponse;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.avalon.framework.parameters.Parameterizable;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.portal.Constants;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider;
@@ -50,7 +47,7 @@
*/
public class PortletAdapter
extends AbstractCopletAdapter
- implements RequestProcessorAspect, ResponseProcessorAspect, CopletDecorationProvider, Receiver, Parameterizable {
+ implements RequestProcessorAspect, ResponseProcessorAspect, CopletDecorationProvider, Receiver {
/** Name of the temporary coplet instance attribute holding the portlet window. */
public static final String PORTLET_WINDOW_ATTRIBUTE_NAME = PortletAdapter.class.getName() + "/window";
@@ -70,21 +67,11 @@
/** Name of attribute in the coplet definition storing the portlet identifier. */
public static final String PORTLET_ATTRIBUTE_NAME = "portlet";
- /** The configuration. */
- protected Parameters parameters;
-
/** Is full-screen enabled? */
protected boolean enableFullScreen;
/** Is maximized enabled? */
protected boolean enableMaximized;
-
- /**
- * @see org.apache.avalon.framework.parameters.Parameterizable#parameterize(org.apache.avalon.framework.parameters.Parameters)
- */
- public void parameterize(Parameters params) throws ParameterException {
- this.parameters = params;
- }
/**
* @see org.apache.cocoon.portal.coplet.adapter.CopletAdapter#login(org.apache.cocoon.portal.coplet.CopletInstance)