cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r515637 - in /cocoon/trunk/blocks/cocoon-portal: ./ cocoon-portal-portlet-newimpl/ cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/
Date Wed, 07 Mar 2007 16:36:59 GMT
Author: cziegeler
Date: Wed Mar  7 08:36:56 2007
New Revision: 515637

URL: http://svn.apache.org/viewvc?view=rev&rev=515637
Log:
Activate new portlet implementation based on pluto 1.1.0

Modified:
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/pom.xml
    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/PortalStartup.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/src/main/java/org/apache/cocoon/portal/pluto/PortletAdapter.java
    cocoon/trunk/blocks/cocoon-portal/pom.xml

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/pom.xml?view=diff&rev=515637&r1=515636&r2=515637
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-newimpl/pom.xml Wed Mar  7 08:36:56
2007
@@ -28,46 +28,20 @@
     <version>1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>cocoon-portal-portlet-impl</artifactId>
+  <artifactId>cocoon-portal-portlet-newimpl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Portal Block Portlet Implementation</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-core</artifactId>
-      <version>2.2.0-RC1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-portal-impl</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-portal-bridges-impl</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>castor</groupId>
-      <artifactId>castor</artifactId>
-      <version>1.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>xerces</groupId>
-          <artifactId>xerces</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
       <groupId>org.apache.pluto</groupId>
       <artifactId>pluto-container</artifactId>
-      <version>1.1.0-beta1</version>
+      <version>1.1.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

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=515637&r1=515636&r2=515637
==============================================================================
--- 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
Wed Mar  7 08:36:56 2007
@@ -21,14 +21,16 @@
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.pluto.OptionalContainerServices;
 import org.apache.pluto.RequiredContainerServices;
-import org.apache.pluto.internal.InternalPortletWindow;
 import org.apache.pluto.spi.PortalCallbackService;
+import org.apache.pluto.spi.optional.PortalAdministrationService;
 import org.apache.pluto.spi.optional.PortletEnvironmentService;
+import org.apache.pluto.spi.optional.PortletInfoService;
 import org.apache.pluto.spi.optional.PortletInvokerService;
 import org.apache.pluto.spi.optional.PortletPreferencesService;
+import org.apache.pluto.spi.optional.PortletRegistryService;
 
 /**
- * 
+ *
  * @version $Id$
  *
  */
@@ -54,27 +56,34 @@
         return this.portalContext;
     }
 
-    /**
-     * @see org.apache.pluto.OptionalContainerServices#getPortletEnvironmentService()
-     */
+    public PortalAdministrationService getPortalAdministrationService() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
     public PortletEnvironmentService getPortletEnvironmentService() {
         // TODO Auto-generated method stub
         return null;
     }
 
-    /**
-     * @see org.apache.pluto.OptionalContainerServices#getPortletInvokerService(org.apache.pluto.internal.InternalPortletWindow)
-     */
-    public PortletInvokerService getPortletInvokerService(InternalPortletWindow arg0) {
+    public PortletInfoService getPortletInfoService() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public PortletInvokerService getPortletInvokerService() {
         // TODO Auto-generated method stub
         return null;
     }
 
-    /**
-     * @see org.apache.pluto.OptionalContainerServices#getPortletPreferencesService()
-     */
     public PortletPreferencesService getPortletPreferencesService() {
         // TODO Auto-generated method stub
         return null;
     }
+
+    public PortletRegistryService getPortletRegistryService() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
 }

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=515637&r1=515636&r2=515637
==============================================================================
--- 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
Wed Mar  7 08:36:56 2007
@@ -88,7 +88,7 @@
             if (this.getLogger().isDebugEnabled()) {
                 this.getLogger().debug("Initializing portlet container...");
             }
-            container.init(servletContext);
+            container.init(this.servletContext);
 
             // Save portlet container to the servlet context scope.
             this.servletContext.setAttribute(CONTAINER_KEY, container);
@@ -101,7 +101,7 @@
             		+ ex.getMessage(), ex);
         }
     }
-    
+
     /**
      * Destroyes the portlet container and removes it from servlet context.
      * @param servletContext  the servlet context.

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=515637&r1=515636&r2=515637
==============================================================================
--- 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
Wed Mar  7 08:36:56 2007
@@ -27,7 +27,6 @@
 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.ProcessingException;
 import org.apache.cocoon.portal.Constants;
 import org.apache.cocoon.portal.PortalService;
 import org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider;
@@ -36,9 +35,10 @@
 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.services.aspects.PortalManagerAspect;
-import org.apache.cocoon.portal.services.aspects.PortalManagerAspectPrepareContext;
-import org.apache.cocoon.portal.services.aspects.PortalManagerAspectRenderContext;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspect;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext;
+import org.apache.cocoon.portal.services.aspects.ResponseProcessorAspect;
+import org.apache.cocoon.portal.services.aspects.ResponseProcessorAspectContext;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 
@@ -48,9 +48,9 @@
  *
  * @version $Id$
  */
-public class PortletAdapter 
+public class PortletAdapter
     extends AbstractCopletAdapter
-    implements PortalManagerAspect, CopletDecorationProvider, Receiver, Parameterizable {
+    implements RequestProcessorAspect, ResponseProcessorAspect, CopletDecorationProvider,
Receiver, Parameterizable {
 
     /** Name of the temporary coplet instance attribute holding the portlet window. */
     public static final String PORTLET_WINDOW_ATTRIBUTE_NAME = PortletAdapter.class.getName()
+ "/window";
@@ -161,18 +161,19 @@
     }
 
     /**
-     * @see org.apache.cocoon.portal.services.aspects.PortalManagerAspect#prepare(org.apache.cocoon.portal.services.aspects.PortalManagerAspectPrepareContext)
+     * @see org.apache.cocoon.portal.services.aspects.RequestProcessorAspect#process(org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext)
      */
-    public void prepare(PortalManagerAspectPrepareContext aspectContext)
-    throws ProcessingException {
+    public void process(RequestProcessorAspectContext aspectContext) {
         // process the events
         aspectContext.invokeNext();
     }
 
     /**
-     * @see org.apache.cocoon.portal.services.aspects.PortalManagerAspect#render(org.apache.cocoon.portal.services.aspects.PortalManagerAspectRenderContext,
org.xml.sax.ContentHandler, java.util.Properties)
+     * @see org.apache.cocoon.portal.services.aspects.ResponseProcessorAspect#render(org.apache.cocoon.portal.services.aspects.ResponseProcessorAspectContext,
org.xml.sax.ContentHandler, java.util.Properties)
      */
-    public void render(PortalManagerAspectRenderContext aspectContext, ContentHandler ch,
Properties properties)
+    public void render(ResponseProcessorAspectContext aspectContext,
+                       ContentHandler ch,
+                       Properties properties)
     throws SAXException {
         final Map objectModel = this.portalService.getProcessInfoProvider().getObjectModel();
 

Modified: cocoon/trunk/blocks/cocoon-portal/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/pom.xml?view=diff&rev=515637&r1=515636&r2=515637
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/pom.xml Wed Mar  7 08:36:56 2007
@@ -38,6 +38,7 @@
     <module>cocoon-portal-auth-impl</module>
     <module>cocoon-portal-impl</module>
     <module>cocoon-portal-portlet-impl</module>
+    <module>cocoon-portal-portlet-newimpl</module>
     <module>cocoon-portal-wsrp-impl</module>
     <module>cocoon-portal-bridges-impl</module>
     <module>cocoon-portal-sitemap</module>



Mime
View raw message