Author: cziegeler
Date: Tue May 19 12:40:50 2009
New Revision: 776295

URL: http://svn.apache.org/viewvc?rev=776295&view=rev
Log:
Adapt to Sling release and upcomming Pluto release

Added:
    
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/SlingPortletWindow.java
   (with props)
Modified:
    incubator/sling/whiteboard/portal/container/pom.xml
    
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/SlingPortletEntity.java
    
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/DefaultPortletContainer.java
    
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/EventProviderImpl.java
    
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/PortletRenderResponseContextImpl.java
    
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/PortletRequestContextImpl.java
    
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/PortletStateAwareResponseContextImpl.java
    
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/impl/PortletWindowImpl.java
    
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletInvokerService.java
    
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletPreferencesService.java
    
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/FilterManagerServiceImpl.java
    
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ui/UIServlet.java
    incubator/sling/whiteboard/rewriter/pom.xml

Modified: incubator/sling/whiteboard/portal/container/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/sling/whiteboard/portal/container/pom.xml?rev=776295&r1=776294&r2=776295&view=diff
==============================================================================
--- incubator/sling/whiteboard/portal/container/pom.xml (original)
+++ incubator/sling/whiteboard/portal/container/pom.xml Tue May 19 12:40:50 2009
@@ -165,19 +165,19 @@
         <dependency>
             <groupId>org.apache.portals.pluto</groupId>
             <artifactId>pluto-container-api</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.portals.pluto</groupId>
             <artifactId>pluto-container</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
+            <version>2.0.4-incubator</version>
             <scope>provided</scope>
         </dependency>
 
@@ -214,7 +214,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.jcr.resource</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
+            <version>2.0.4-incubator</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/SlingPortletEntity.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/SlingPortletEntity.java?rev=776295&r1=776294&r2=776295&view=diff
==============================================================================
--- 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/SlingPortletEntity.java
 (original)
+++ 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/SlingPortletEntity.java
 Tue May 19 12:40:50 2009
@@ -18,13 +18,11 @@
 
 import javax.portlet.Portlet;
 
-import org.apache.pluto.container.PortletEntity;
-
 
 /**
  * This object holds all relevant pieces of a portlet.
  */
-public interface SlingPortletEntity extends PortletEntity {
+public interface SlingPortletEntity {
 
     SlingPortletConfig getPortletConfig();
 

Added: 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/SlingPortletWindow.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/SlingPortletWindow.java?rev=776295&view=auto
==============================================================================
--- 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/SlingPortletWindow.java
 (added)
+++ 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/SlingPortletWindow.java
 Tue May 19 12:40:50 2009
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.portal.container;
+
+import org.apache.pluto.container.PortletWindow;
+
+/**
+ * This is an extension of the {...@link PortletWindow} which
+ * stores additional information.
+ */
+public interface SlingPortletWindow extends PortletWindow {
+
+    SlingPortletEntity getPortletEntity();
+}
+
+

Propchange: 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/SlingPortletWindow.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/SlingPortletWindow.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/SlingPortletWindow.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/DefaultPortletContainer.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/DefaultPortletContainer.java?rev=776295&r1=776294&r2=776295&view=diff
==============================================================================
--- 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/DefaultPortletContainer.java
 (original)
+++ 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/DefaultPortletContainer.java
 Tue May 19 12:40:50 2009
@@ -34,7 +34,7 @@
 import org.apache.sling.portal.container.PortletRegistryService;
 import org.apache.sling.portal.container.PortletWindowManager;
 import org.apache.sling.portal.container.SlingPortletContainer;
-import org.apache.sling.portal.container.SlingPortletEntity;
+import org.apache.sling.portal.container.SlingPortletWindow;
 import 
org.apache.sling.portal.container.internal.services.DefaultContainerInfo;
 import org.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;
@@ -146,7 +146,7 @@
                                 final HttpServletRequest servletRequest,
                                 final HttpServletResponse servletResponse)
     throws PortletException, IOException, PortletContainerException {
-        if ( 
!((SlingPortletEntity)portletWindow.getPortletEntity()).isLoaded() ) {
+        if ( 
!((SlingPortletWindow)portletWindow).getPortletEntity().isLoaded() ) {
             this.doLoad(portletWindow, servletRequest, servletResponse);
         }
     }

Modified: 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/EventProviderImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/EventProviderImpl.java?rev=776295&r1=776294&r2=776295&view=diff
==============================================================================
--- 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/EventProviderImpl.java
 (original)
+++ 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/EventProviderImpl.java
 Tue May 19 12:40:50 2009
@@ -30,13 +30,10 @@
 import javax.xml.stream.FactoryConfigurationError;
 
 import org.apache.pluto.container.EventProvider;
-import org.apache.pluto.container.PortletContainerException;
 import org.apache.pluto.container.PortletWindow;
 import org.apache.pluto.container.om.portlet.EventDefinition;
 import org.apache.pluto.container.om.portlet.EventDefinitionReference;
 import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
-import org.apache.sling.portal.container.PortletRegistryService;
-import org.apache.sling.portal.container.SlingPortletEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,11 +42,9 @@
     private final Logger LOGGER = 
LoggerFactory.getLogger(this.getClass().getName());
 
     private PortletWindow portletWindow;
-    private PortletRegistryService portletRegistry;
 
-    public EventProviderImpl(PortletWindow portletWindow, 
PortletRegistryService portletRegistry) {
+    public EventProviderImpl(PortletWindow portletWindow) {
         this.portletWindow = portletWindow;
-        this.portletRegistry = portletRegistry;
     }
 
     @SuppressWarnings("unchecked")
@@ -100,18 +95,10 @@
 
     private boolean isDeclaredAsPublishingEvent(QName qname)
     {
-        List<? extends EventDefinitionReference> events = null;
-        try
-        {
-            events = 
portletRegistry.getPortletEntity(((SlingPortletEntity)portletWindow.getPortletEntity()).getPortletEntityId()).getPortletConfig().getPortletDefinition().getSupportedPublishingEvents();
-        }
-        catch (PortletContainerException e1)
-        {
-            e1.printStackTrace();
-        }
+        final List<? extends EventDefinitionReference> events = 
portletWindow.getPortletDefinition().getSupportedPublishingEvents();
         if (events != null)
         {
-            String defaultNamespace = 
portletWindow.getPortletEntity().getPortletDefinition().getApplication()
+            String defaultNamespace = 
portletWindow.getPortletDefinition().getApplication()
                                                    .getDefaultNamespace();
             for (EventDefinitionReference ref : events)
             {
@@ -131,7 +118,7 @@
 
     private boolean isValueInstanceOfDefinedClass(QName qname, Serializable 
value)
     {
-        PortletApplicationDefinition app = 
portletWindow.getPortletEntity().getPortletDefinition().getApplication();
+        PortletApplicationDefinition app = 
portletWindow.getPortletDefinition().getApplication();
         List<? extends EventDefinition> events = app.getEventDefinitions();
         if (events != null)
         {

Modified: 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/PortletRenderResponseContextImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/PortletRenderResponseContextImpl.java?rev=776295&r1=776294&r2=776295&view=diff
==============================================================================
--- 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/PortletRenderResponseContextImpl.java
 (original)
+++ 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/PortletRenderResponseContextImpl.java
 Tue May 19 12:40:50 2009
@@ -33,7 +33,7 @@
 import org.apache.pluto.container.om.portlet.PortletDefinition;
 import org.apache.pluto.container.om.portlet.Supports;
 import org.apache.sling.portal.container.SlingPortletContainer;
-import org.apache.sling.portal.container.SlingPortletEntity;
+import org.apache.sling.portal.container.SlingPortletWindow;
 import org.apache.sling.portal.container.internal.request.PortalURL;
 
 /**
@@ -61,7 +61,7 @@
                                             HttpServletResponse 
containerResponse,
                                             PortletWindow window) {
         super(container, containerRequest, containerResponse, window);
-        final PortletDefinition def = 
window.getPortletEntity().getPortletDefinition();
+        final PortletDefinition def = window.getPortletDefinition();
         DisplayName dn = def.getDisplayName(containerRequest.getLocale());
         if ( dn != null ) {
             this.title = dn.getDisplayName();
@@ -71,7 +71,7 @@
             } else if ( def.getPortletInfo().getShortTitle() != null ) {
                 this.title = def.getPortletInfo().getShortTitle();
             } else {
-                this.title = 
((SlingPortletEntity)window.getPortletEntity()).getPortletEntityId().getKey();
+                this.title = 
((SlingPortletWindow)window).getPortletEntity().getPortletEntityId().getKey();
             }
         }
     }
@@ -145,7 +145,7 @@
         Collection<PortletMode> modes = this.portletModes;
         if ( modes == null ) {
             modes = new ArrayList<PortletMode>();
-            final List<? extends Supports> supports = 
this.getPortletWindow().getPortletEntity().getPortletDefinition().getSupports();
+            final List<? extends Supports> supports = 
this.getPortletWindow().getPortletDefinition().getSupports();
             if ( supports != null ) {
                 for(final Supports s : supports) {
                     if ( s.getPortletModes() != null ) {

Modified: 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/PortletRequestContextImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/PortletRequestContextImpl.java?rev=776295&r1=776294&r2=776295&view=diff
==============================================================================
--- 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/PortletRequestContextImpl.java
 (original)
+++ 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/PortletRequestContextImpl.java
 Tue May 19 12:40:50 2009
@@ -103,7 +103,7 @@
 
     protected boolean isPublicRenderParameter(String name)
     {
-        List<String> publicRenderParameterNames = 
window.getPortletEntity().getPortletDefinition().getSupportedPublicRenderParameters();
+        List<String> publicRenderParameterNames = 
window.getPortletDefinition().getSupportedPublicRenderParameters();
         return publicRenderParameterNames.isEmpty() ? false : 
publicRenderParameterNames.contains(name);
     }
 

Modified: 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/PortletStateAwareResponseContextImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/PortletStateAwareResponseContextImpl.java?rev=776295&r1=776294&r2=776295&view=diff
==============================================================================
--- 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/PortletStateAwareResponseContextImpl.java
 (original)
+++ 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/PortletStateAwareResponseContextImpl.java
 Tue May 19 12:40:50 2009
@@ -128,6 +128,6 @@
 
     public EventProvider getEventProvider()
     {
-        return isClosed() ? null : new EventProviderImpl(getPortletWindow(), 
getSlingContainer().getPortletRegistryService());
+        return isClosed() ? null : new EventProviderImpl(getPortletWindow());
     }
 }

Modified: 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/impl/PortletWindowImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/impl/PortletWindowImpl.java?rev=776295&r1=776294&r2=776295&view=diff
==============================================================================
--- 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/impl/PortletWindowImpl.java
 (original)
+++ 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/impl/PortletWindowImpl.java
 Tue May 19 12:40:50 2009
@@ -19,15 +19,15 @@
 import javax.portlet.PortletMode;
 import javax.portlet.WindowState;
 
-import org.apache.pluto.container.PortletEntity;
-import org.apache.pluto.container.PortletWindow;
 import org.apache.pluto.container.PortletWindowID;
+import org.apache.pluto.container.om.portlet.PortletDefinition;
 import org.apache.sling.portal.container.SlingPortletEntity;
+import org.apache.sling.portal.container.SlingPortletWindow;
 
 /**
  * Implementation of <code>PortletWindow</code> interface.
  */
-public class PortletWindowImpl implements PortletWindow {
+public class PortletWindowImpl implements SlingPortletWindow {
 
     private final PortletMode portletMode;
     private final WindowState windowState;
@@ -69,9 +69,16 @@
     }
 
     /**
-     * @see org.apache.pluto.container.PortletWindow#getPortletEntity()
+     * @see 
org.apache.sling.portal.container.SlingPortletWindow#getPortletEntity()
      */
-    public PortletEntity getPortletEntity() {
+    public SlingPortletEntity getPortletEntity() {
         return this.entity;
     }
+
+    /**
+     * @see org.apache.pluto.container.PortletWindow#getPortletDefinition()
+     */
+    public PortletDefinition getPortletDefinition() {
+        return this.entity.getPortletConfig().getPortletDefinition();
+    }
 }
\ No newline at end of file

Modified: 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletInvokerService.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletInvokerService.java?rev=776295&r1=776294&r2=776295&view=diff
==============================================================================
--- 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletInvokerService.java
 (original)
+++ 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletInvokerService.java
 Tue May 19 12:40:50 2009
@@ -47,6 +47,7 @@
 import org.apache.sling.portal.container.SlingPortletConfig;
 import org.apache.sling.portal.container.SlingPortletContext;
 import org.apache.sling.portal.container.SlingPortletEntity;
+import org.apache.sling.portal.container.SlingPortletWindow;
 import org.apache.sling.portal.container.api.Container;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -156,7 +157,7 @@
                                 Integer               methodID)
     throws PortletException, IOException, PortletContainerException {
         final PortletWindow portletWindow = context.getPortletWindow();
-        final SlingPortletEntity portletEntity = 
(SlingPortletEntity)portletWindow.getPortletEntity();
+        final SlingPortletEntity portletEntity = 
((SlingPortletWindow)portletWindow).getPortletEntity();
         final PortletEntityId id = portletEntity.getPortletEntityId();
         logger.debug("Invoking portlet {}, method {}.", id, methodID);
 

Modified: 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletPreferencesService.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletPreferencesService.java?rev=776295&r1=776294&r2=776295&view=diff
==============================================================================
--- 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletPreferencesService.java
 (original)
+++ 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletPreferencesService.java
 Tue May 19 12:40:50 2009
@@ -44,7 +44,7 @@
 import org.apache.sling.portal.container.PortletEntityId;
 import org.apache.sling.portal.container.PortletRegistryService;
 import org.apache.sling.portal.container.SlingPortletContext;
-import org.apache.sling.portal.container.SlingPortletEntity;
+import org.apache.sling.portal.container.SlingPortletWindow;
 import org.apache.sling.portal.container.internal.util.PortalUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -121,11 +121,11 @@
     throws PortletContainerException {
         final Session userSession = PortalUtil.getUserSession(request);
 
-        final PortletEntityId entityId = 
((SlingPortletEntity)portletWindow.getPortletEntity()).getPortletEntityId();
+        final PortletEntityId entityId = 
((SlingPortletWindow)portletWindow).getPortletEntity().getPortletEntityId();
         Map<String, PortletPreference> preferences = 
this.defaultCache.get(entityId);
 
         if ( preferences == null ) {
-            final PortletDefinition portlet = 
portletWindow.getPortletEntity().getPortletDefinition();
+            final PortletDefinition portlet = 
portletWindow.getPortletDefinition();
             final Preferences prefs = portlet.getPortletPreferences();
             if (prefs != null && prefs.getPortletPreferences() != null) {
                 preferences = new 
HashMap<String,PortletPreference>(prefs.getPortletPreferences().size());

Modified: 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/FilterManagerServiceImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/FilterManagerServiceImpl.java?rev=776295&r1=776294&r2=776295&view=diff
==============================================================================
--- 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/FilterManagerServiceImpl.java
 (original)
+++ 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/FilterManagerServiceImpl.java
 Tue May 19 12:40:50 2009
@@ -70,8 +70,8 @@
      */
     public FilterManager getFilterManager(final PortletWindow portletWindow,
                                           final String lifeCycle) {
-        final PortletApplicationDefinition portletApp = 
portletWindow.getPortletEntity().getPortletDefinition().getApplication();
-        final String portletName = 
portletWindow.getPortletEntity().getPortletDefinition().getPortletName();
+        final PortletApplicationDefinition portletApp = 
portletWindow.getPortletDefinition().getApplication();
+        final String portletName = 
portletWindow.getPortletDefinition().getPortletName();
         final List<? extends FilterMapping> filterMappingList = 
portletApp.getFilterMappings();
         if (filterMappingList != null && filterMappingList.size() > 0 ) {
             final Map<String, PortletFilter> appFilters = 
filters.get(portletApp.getName());

Modified: 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ui/UIServlet.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ui/UIServlet.java?rev=776295&r1=776294&r2=776295&view=diff
==============================================================================
--- 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ui/UIServlet.java
 (original)
+++ 
incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ui/UIServlet.java
 Tue May 19 12:40:50 2009
@@ -68,7 +68,7 @@
                 w.key("value");
                 w.value(entity.getPortletEntityId().getKey());
                 w.key("text");
-                w.value(entity.getPortletDefinition().getPortletName());
+                
w.value(entity.getPortletConfig().getPortletDefinition().getPortletName());
                 w.endObject();
             }
             w.endArray();

Modified: incubator/sling/whiteboard/rewriter/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/sling/whiteboard/rewriter/pom.xml?rev=776295&r1=776294&r2=776295&view=diff
==============================================================================
--- incubator/sling/whiteboard/rewriter/pom.xml (original)
+++ incubator/sling/whiteboard/rewriter/pom.xml Tue May 19 12:40:50 2009
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
+            <version>2.0.4-incubator</version>
             <scope>provided</scope>
         </dependency>
         <dependency>


Reply via email to