portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r706843 [2/2] - in /portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade: components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/factorybeans/ components/jetspeed-portal/src/main/java/org/apache/jetspeed/ components/jet...
Date Wed, 22 Oct 2008 01:34:12 GMT
Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedOptionalPlutoServices.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedOptionalPlutoServices.java?rev=706843&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedOptionalPlutoServices.java (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedOptionalPlutoServices.java Tue Oct 21 18:34:10 2008
@@ -0,0 +1,107 @@
+/*
+ * 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.jetspeed.container.services;
+
+import org.apache.pluto.NamespaceMapper;
+import org.apache.pluto.OptionalContainerServices;
+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;
+import org.apache.pluto.spi.optional.RequestAttributeService;
+import org.apache.pluto.spi.optional.UserInfoService;
+
+/**
+ * Service accessor for all Pluto *optional* container services
+ * 
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: $
+ */
+public class JetspeedOptionalPlutoServices implements OptionalContainerServices
+{
+    protected NamespaceMapper namespaceMapper;
+    protected PortalAdministrationService adminService;
+    protected PortletEnvironmentService environmentService;
+    protected PortletInfoService portletInfoService;    
+    protected UserInfoService userInfoService;
+    protected RequestAttributeService requestAttributeService;
+    protected PortletInvokerService invokerService;
+    protected PortletPreferencesService preferencesService;
+    protected PortletRegistryService registryService;
+    
+    public JetspeedOptionalPlutoServices(NamespaceMapper namespaceMapper, PortalAdministrationService adminService,
+            PortletEnvironmentService environmentService, PortletInfoService portletInfoService,
+            UserInfoService userInfoService, RequestAttributeService requestAttributeService,
+            PortletInvokerService invokerService)
+    {
+        this.namespaceMapper = namespaceMapper;
+        this.adminService = adminService;
+        this.environmentService = environmentService;
+        this.portletInfoService = portletInfoService;
+        this.userInfoService = userInfoService;
+        this.requestAttributeService = requestAttributeService;
+        this.invokerService = invokerService;
+    }
+    
+    public NamespaceMapper getNamespaceMapper()
+    {
+        return namespaceMapper;
+    }
+
+    public PortalAdministrationService getPortalAdministrationService()
+    {
+        return adminService;
+    }
+
+    public PortletEnvironmentService getPortletEnvironmentService()
+    {
+        return environmentService;
+    }
+
+    public PortletInfoService getPortletInfoService()
+    {
+        return portletInfoService;
+    }
+
+    public PortletInvokerService getPortletInvokerService()
+    {
+        return invokerService;
+    }
+
+    public PortletPreferencesService getPortletPreferencesService()
+    {
+        return preferencesService;
+    }
+
+    public PortletRegistryService getPortletRegistryService()
+    {
+        return registryService;
+    }
+
+    public RequestAttributeService getRequestAttributeService()
+    {
+        return this.requestAttributeService;
+    }
+
+    public UserInfoService getUserInfoService()
+    {
+        return userInfoService;
+    }
+
+}

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedPortalCallbackServices.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedPortalCallbackServices.java?rev=706843&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedPortalCallbackServices.java (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedPortalCallbackServices.java Tue Oct 21 18:34:10 2008
@@ -0,0 +1,161 @@
+/*
+ * 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.jetspeed.container.services;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.jetspeed.PortalReservedParameters;
+import org.apache.jetspeed.container.PortletEntity;
+import org.apache.jetspeed.container.providers.PortletURLProviderImpl;
+import org.apache.jetspeed.container.providers.ResourceURLProviderImpl;
+import org.apache.jetspeed.request.RequestContext;
+import org.apache.pluto.PortletWindow;
+import org.apache.pluto.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.spi.EventProvider;
+import org.apache.pluto.spi.FilterManager;
+import org.apache.pluto.spi.PortalCallbackService;
+import org.apache.pluto.spi.PortletURLListener;
+import org.apache.pluto.spi.PortletURLProvider;
+import org.apache.pluto.spi.RequestPropertyProvider;
+import org.apache.pluto.spi.ResourceURLProvider;
+
+/**
+ * Callback Service accessor for all Pluto *required* container providers
+ * (callbacks) TODO: 2.2 implement PropertyManager related functionality
+ * 
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: $
+ */
+public class JetspeedPortalCallbackServices implements PortalCallbackService
+{
+    RequestPropertyProvider propertyProvider;   
+    EventProvider eventProvider; 
+    FilterManager filterManager;
+    PortletURLListener urlListener;
+    
+    public JetspeedPortalCallbackServices(RequestPropertyProvider propertyProvider,
+            EventProvider eventProvider, FilterManager filterManager, PortletURLListener urlListener)
+    {
+        this.propertyProvider = propertyProvider;
+        this.eventProvider = eventProvider;
+        this.filterManager = filterManager;
+        this.urlListener = urlListener;
+    }
+
+    public PortletURLProvider getPortletURLProvider(HttpServletRequest request,
+            PortletWindow portletWindow)
+    {
+        RequestContext rc = (RequestContext) request
+                .getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
+        return new PortletURLProviderImpl(rc, portletWindow);
+    }
+
+    public ResourceURLProvider getResourceURLProvider(
+            HttpServletRequest request, PortletWindow portletWindow)
+    {
+        RequestContext rc = (RequestContext) request
+                .getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
+        return new ResourceURLProviderImpl(rc, portletWindow);
+    }
+
+    public RequestPropertyProvider getRequestPropertyProvider()
+    {
+        return propertyProvider;
+    }
+        
+
+    public EventProvider getEventProvider(HttpServletRequest request,
+            PortletWindow portletWindow)
+    {   
+        return eventProvider;
+    }
+
+    public EventProvider getEventProvider()
+    {
+        return eventProvider;
+    }
+
+    /**
+     * Returns the FilterManager, this is used to process the filter.
+     * 
+     * @return FilterManager
+     */
+    public FilterManager getFilterManager(
+            PortletApplicationDefinition portletAppDD, String portletName,
+            String lifeCycle)
+    {
+        return filterManager;
+    }
+
+    public PortletURLListener getPortletURLListener()
+    {
+        return urlListener;
+    }
+
+    /**
+     * Method invoked by the container when the portlet sets its title. This
+     * method binds the dynamic portlet title to the servlet request for later
+     * use.
+     */
+    public void setTitle(HttpServletRequest request,
+            PortletWindow portletWindow, String titleArg)
+    {
+        // TODO: 2.2 jetspeed uses a title service        
+        String title = null;
+        if (titleArg == null || titleArg.length() == 0)
+        {
+            title = getTitleFromPortletDefinition(portletWindow, request);
+        }
+        else
+        {
+            title = titleArg;
+        }
+        request.setAttribute(
+                PortalReservedParameters.OVERRIDE_PORTLET_TITLE_ATTR
+                        + "::window.id::" + portletWindow.getId(), title);        
+    }
+
+    protected final String getTitleFromPortletDefinition(PortletWindow window,
+            HttpServletRequest request)
+    {
+        String title = null;
+        RequestContext requestContext = (RequestContext) request
+                .getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
+        
+        org.apache.jetspeed.container.PortletWindow  jsWindow = (org.apache.jetspeed.container.PortletWindow)window;
+        PortletEntity entity = jsWindow.getPortletEntity();
+        if (entity != null && entity.getPortletDefinition() != null)
+        {
+            title = requestContext.getPreferedLanguage(
+                    entity.getPortletDefinition()).getTitle();
+        }
+
+        if (title == null && entity.getPortletDefinition() != null)
+        {
+            title = entity.getPortletDefinition().getPortletName();
+        }
+        else if (title == null)
+        {
+            title = "Invalid portlet entity " + entity.getId();
+        }
+        
+        return title;
+    }
+
+    
+}

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedRequiredPlutoServices.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedRequiredPlutoServices.java?rev=706843&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedRequiredPlutoServices.java (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedRequiredPlutoServices.java Tue Oct 21 18:34:10 2008
@@ -0,0 +1,68 @@
+/*
+ * 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.jetspeed.container.services;
+
+import javax.portlet.PortalContext;
+
+import org.apache.pluto.RequiredContainerServices;
+import org.apache.pluto.spi.CCPPProfileService;
+import org.apache.pluto.spi.ContainerInvocationService;
+import org.apache.pluto.spi.PortalCallbackService;
+
+/**
+ * Service accessor for all Pluto *required* container services and callbacks
+ * 
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: $
+ */
+public class JetspeedRequiredPlutoServices implements RequiredContainerServices
+{
+    private CCPPProfileService profileService;
+    private ContainerInvocationService invocationService;
+    private PortalCallbackService callbackService;
+    private PortalContext portalContext;
+    
+    public JetspeedRequiredPlutoServices(CCPPProfileService profileService, ContainerInvocationService invocationService,
+            PortalCallbackService callbackService, PortalContext portalContext)
+    {
+        this.profileService = profileService;
+        this.invocationService = invocationService;
+        this.callbackService = callbackService;
+        this.portalContext = portalContext;
+    }
+
+    public CCPPProfileService getCCPPProfileService()
+    {
+        return this.profileService;
+    }
+
+    public ContainerInvocationService getContainerInvocationService()
+    {
+        return this.invocationService;
+    }
+
+    public PortalCallbackService getPortalCallbackService()
+    {
+        return this.callbackService;
+    }
+
+    public PortalContext getPortalContext()
+    {
+        return this.portalContext;
+    }
+
+}

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedEngine.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedEngine.java?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedEngine.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/JetspeedEngine.java Tue Oct 21 18:34:10 2008
@@ -76,7 +76,10 @@
     public JetspeedEngine(PortalConfiguration configuration, String applicationRoot, ServletConfig config, ComponentManager componentManager )
     {
         this.componentManager = componentManager;
-        this.context = new JetspeedPortalContext(this, configuration, applicationRoot);
+        this.context = (PortalContext)componentManager.getComponent("PortalContext");
+        this.context.setEngine(this);
+        this.context.setConfiguration(configuration);
+        this.context.setApplicationRoot(applicationRoot);
         this.config = config;
         context.setApplicationRoot(applicationRoot);
         context.setConfiguration(configuration);           
@@ -86,7 +89,6 @@
         
         // Make these availble as beans to Spring
         componentManager.addComponent("Engine", this);
-        componentManager.addComponent("PortalContext", context);
         componentManager.addComponent("PortalConfiguration", configuration);
     }  
     

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactoryImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactoryImpl.java?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactoryImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactoryImpl.java Tue Oct 21 18:34:10 2008
@@ -21,6 +21,7 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.jetspeed.container.PortletWindow;
+import org.apache.jetspeed.container.namespace.JetspeedNamespaceMapper;
 
 /**
  * Factory implementation for creating HTTP Request Wrappers
@@ -31,7 +32,12 @@
 public class ServletRequestFactoryImpl
     implements ServletRequestFactory
 {    
+    private JetspeedNamespaceMapper namespaceMapper;
     
+    public ServletRequestFactoryImpl(JetspeedNamespaceMapper namespaceMapper)
+    {
+        this.namespaceMapper = namespaceMapper;
+    }
     public void init(javax.servlet.ServletConfig config, Map properties) 
     throws Exception
     {        
@@ -44,7 +50,7 @@
 
     protected HttpServletRequest createRequest(HttpServletRequest request, PortletWindow window)
     {
-        return new ServletRequestImpl(request, window);        
+        return new ServletRequestImpl(request, window, namespaceMapper);        
     }
     
     public HttpServletRequest getServletRequest(HttpServletRequest request, PortletWindow window)
@@ -53,7 +59,6 @@
         if (!(request instanceof ServletRequestImpl))
         {
             HttpServletRequest servletRequest = createRequest(request, window);
-
             return servletRequest;
         }
         else

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java Tue Oct 21 18:34:10 2008
@@ -41,17 +41,16 @@
 import org.apache.jetspeed.PortalReservedParameters;
 import org.apache.jetspeed.aggregator.CurrentWorkerContext;
 import org.apache.jetspeed.container.PortletDispatcherIncludeAware;
+import org.apache.jetspeed.container.PortletEntity;
+import org.apache.jetspeed.container.PortletWindow;
 import org.apache.jetspeed.container.namespace.JetspeedNamespaceMapper;
-import org.apache.jetspeed.container.namespace.JetspeedNamespaceMapperFactory;
 import org.apache.jetspeed.container.state.NavigationalState;
 import org.apache.jetspeed.om.common.GenericMetadata;
 import org.apache.jetspeed.om.common.LocalizedField;
 import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.request.JetspeedRequestContext;
 import org.apache.jetspeed.request.RequestContext;
-import org.apache.jetspeed.container.PortletEntity;
 import org.apache.pluto.om.portlet.PortletApplicationDefinition;
-import org.apache.jetspeed.container.PortletWindow;
 import org.apache.pluto.util.Enumerator;
 
 /**
@@ -90,14 +89,11 @@
     // this should be re-created when it is called for the first time or when some attributes are added/modified/removed.
     private Map cachedAttributes;
 
-    public ServletRequestImpl( HttpServletRequest servletRequest, PortletWindow window )
+    public ServletRequestImpl(HttpServletRequest servletRequest, PortletWindow window, JetspeedNamespaceMapper namespaceMapper)
     {
         super(servletRequest);
-        nameSpaceMapper = ((JetspeedNamespaceMapperFactory) Jetspeed.getComponentManager().getComponent(
-                org.apache.pluto.util.NamespaceMapper.class)).getJetspeedNamespaceMapper();
+        this.nameSpaceMapper = namespaceMapper;
         this.portletWindow = window;        
-        
-        
         String encoding = (String) servletRequest.getAttribute(PortalReservedParameters.PREFERED_CHARACTERENCODING_ATTRIBUTE);
         boolean decode = servletRequest.getAttribute(PortalReservedParameters.PARAMETER_ALREADY_DECODED_ATTRIBUTE) == null
                 && encoding != null;
@@ -500,7 +496,7 @@
 
                 if (null != portletAppDef)
                 {
-                    value = context.getUserInfoMap(portletAppDef.getId());
+                    value = context.getUserInfoMap(portletAppDef.getName());
                     if (log.isDebugEnabled() && (null != value))
                         log.debug(PortletRequest.USER_INFO + " map size: " + ((Map) value).size());
                 }

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletResponseFactoryImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletResponseFactoryImpl.java?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletResponseFactoryImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletResponseFactoryImpl.java Tue Oct 21 18:34:10 2008
@@ -43,8 +43,7 @@
     {
         if (!(response instanceof ServletResponseImpl))
         {
-            return new ServletResponseImpl(response);
-            
+            return new ServletResponseImpl(response);            
         }
         else
         {

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java Tue Oct 21 18:34:10 2008
@@ -35,12 +35,14 @@
 import org.apache.jetspeed.aggregator.ContentDispatcher;
 import org.apache.jetspeed.aggregator.ContentDispatcherCtrl;
 import org.apache.jetspeed.capabilities.CapabilityMap;
+import org.apache.jetspeed.container.PortletWindow;
 import org.apache.jetspeed.container.url.PortalURL;
 import org.apache.jetspeed.engine.servlet.ServletRequestFactory;
 import org.apache.jetspeed.engine.servlet.ServletResponseFactory;
 import org.apache.jetspeed.om.impl.LanguageImpl;
 import org.apache.jetspeed.om.page.ContentPage;
 import org.apache.jetspeed.om.page.ContentPageImpl;
+import org.apache.jetspeed.om.portlet.Language;
 import org.apache.jetspeed.pipeline.Pipeline;
 import org.apache.jetspeed.portalsite.PortalSiteRequestContext;
 import org.apache.jetspeed.portalsite.PortalSiteSessionContext;
@@ -49,9 +51,7 @@
 import org.apache.jetspeed.profiler.impl.ProfilerValveImpl;
 import org.apache.jetspeed.security.SubjectHelper;
 import org.apache.jetspeed.security.User;
-import org.apache.jetspeed.userinfo.UserInfoManager;
 import org.apache.pluto.om.portlet.PortletDefinition;
-import org.apache.jetspeed.container.PortletWindow;
 
 /**
  * Jetspeed Request Context is associated with each portal request. The request
@@ -65,6 +65,7 @@
 public class JetspeedRequestContext implements RequestContext
 {
     private static final String ACTION_ERROR_ATTR = "org.apache.jetspeed.action.error:";
+    private RequestContextComponent rcc;
     private HttpServletRequest request;
     private HttpServletResponse response;
     private ServletConfig config;
@@ -84,11 +85,9 @@
     private PortletWindow actionWindow;
     private String encoding;
     private String requestPath = null;
-    /** The user info manager. */
-    private UserInfoManager userInfoMgr;
     private Map requestsForWindows;
     private Map responsesForWindows;
-    private final Map objects;
+    private final Map<String, Object> objects;
     
     /**
      * Create a new Request Context
@@ -98,20 +97,18 @@
      * @param response
      * @param config
      */
-    public JetspeedRequestContext( HttpServletRequest request, HttpServletResponse response, ServletConfig config,
-            UserInfoManager userInfoMgr )
+    public JetspeedRequestContext(RequestContextComponent rcc, HttpServletRequest request, HttpServletResponse response, ServletConfig config)
     {
-        this(request, response, config, userInfoMgr, new HashMap());
+        this(rcc, request, response, config, new HashMap<String, Object>());
     }
 
-    public JetspeedRequestContext( HttpServletRequest request, HttpServletResponse response, ServletConfig config,
-            UserInfoManager userInfoMgr, Map objects)
+    public JetspeedRequestContext(RequestContextComponent rcc, HttpServletRequest request, HttpServletResponse response, ServletConfig config, Map<String, Object> objects)
     {
+        this.rcc = rcc;
         this.request = request;
         this.response = response;
         this.config = config;
         this.session = request.getSession();
-        this.userInfoMgr = userInfoMgr;
         this.requestsForWindows = new HashMap();
         this.responsesForWindows = new HashMap();
         this.objects = objects;
@@ -316,10 +313,9 @@
     public HttpServletRequest getRequestForWindow( PortletWindow window )
     {
         if (!requestsForWindows.containsKey(window.getId()))
-        {
-            ServletRequestFactory reqFac = (ServletRequestFactory) Jetspeed.getEngine().getFactory(
-                    javax.servlet.http.HttpServletRequest.class);
-            HttpServletRequest requestWrapper = reqFac.getServletRequest(request, window);
+        {            
+            ServletRequestFactory reqFactory = rcc.getServletRequestFactory(); 
+            HttpServletRequest requestWrapper = reqFactory.getServletRequest(request, window);
             requestsForWindows.put(window.getId(), requestWrapper);
             return requestWrapper;
         }
@@ -351,15 +347,11 @@
             }
             else
             {
-                ServletResponseFactory rspFac = (ServletResponseFactory) Jetspeed.getEngine().getFactory(
-                        HttpServletResponse.class);
-                wrappedResponse = rspFac.getServletResponse(this.response);
-
+                ServletResponseFactory rspFactory = rcc.getServletResponseFactory(); 
+                wrappedResponse = rspFactory.getServletResponse(this.response);
             }
-
             responsesForWindows.put(window.getId(), wrappedResponse);
             return wrappedResponse;
-
         }
         else
         {
@@ -504,12 +496,9 @@
         return url;
     }
 
-    /**
-     * @see org.apache.jetspeed.request.RequestContext#getUserInfoMap(org.apache.pluto.om.common.ObjectID)
-     */
-    public Map getUserInfoMap( ObjectID oid )
+    public Map<String, String> getUserInfoMap(String appName)
     {
-        return userInfoMgr.getUserInfoMap(oid, this);
+        return rcc.getUserInfoManager().getUserInfoMap(appName, this);
     }
 
     /**
@@ -674,7 +663,7 @@
         return null;
     }    
 
-    public Map getObjects()
+    public Map<String, Object> getObjects()
     {
         return objects;
     }

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContextComponent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContextComponent.java?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContextComponent.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContextComponent.java Tue Oct 21 18:34:10 2008
@@ -28,6 +28,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jetspeed.PortalReservedParameters;
 import org.apache.jetspeed.aggregator.CurrentWorkerContext;
+import org.apache.jetspeed.engine.servlet.ServletRequestFactory;
+import org.apache.jetspeed.engine.servlet.ServletResponseFactory;
 import org.apache.jetspeed.userinfo.UserInfoManager;
 
 /**
@@ -38,58 +40,32 @@
  */
 public class JetspeedRequestContextComponent implements RequestContextComponent
 {
-    private String contextClassName = null;
-    private Class contextClass = null;
-    /** The user info manager. */
+    ServletRequestFactory requestFactory;
+    ServletResponseFactory responseFactory;
     private UserInfoManager userInfoMgr;
     private ThreadLocal tlRequestContext = new ThreadLocal();
-    private Map requestContextObjects;
+    private Map<String, Object> requestContextObjects;
     
     private final static Log log = LogFactory.getLog(JetspeedRequestContextComponent.class);
 
-    public JetspeedRequestContextComponent(String contextClassName)
-    {
-        this.contextClassName = contextClassName;
-        this.requestContextObjects = new HashMap();
-    }
 
-    public JetspeedRequestContextComponent(String contextClassName, 
-                                           UserInfoManager userInfoMgr)
-    {
-        this.contextClassName = contextClassName;
-        this.userInfoMgr = userInfoMgr;
-        this.requestContextObjects = new HashMap();        
-    }
-
-    public JetspeedRequestContextComponent(String contextClassName, 
+    public JetspeedRequestContextComponent(ServletRequestFactory requestFactory, ServletResponseFactory responseFactory, 
             UserInfoManager userInfoMgr,
-            Map requestContextObjects)
+            Map<String, Object> requestContextObjects)
     {
-        this.contextClassName = contextClassName;
+        this.requestFactory = requestFactory;
+        this.responseFactory = responseFactory;
         this.userInfoMgr = userInfoMgr;
         this.requestContextObjects = requestContextObjects;        
     }
     
-    public RequestContext create(HttpServletRequest req, HttpServletResponse resp, ServletConfig config)
+    public RequestContext create(HttpServletRequest request, HttpServletResponse response, ServletConfig config)
     {
         RequestContext context = null;
 
         try
         {
-            if (null == contextClass)
-            {
-                contextClass = Class.forName(contextClassName);
-            }
-
-            Constructor constructor =
-                contextClass.getConstructor(
-                    new Class[] {
-                        HttpServletRequest.class,
-                        HttpServletResponse.class,
-                        ServletConfig.class,
-                        UserInfoManager.class,
-                        Map.class});
-            context = (RequestContext) constructor.newInstance(new Object[] { req, resp, config, userInfoMgr, requestContextObjects});
+            context = new JetspeedRequestContext(this, request, response, config, requestContextObjects);
                     
         }
         catch (Exception e)
@@ -142,4 +118,18 @@
         return rc;
     }
 
+    public ServletRequestFactory getServletRequestFactory()
+    {
+        return this.requestFactory;
+    }
+    
+    public ServletResponseFactory getServletResponseFactory()
+    {
+        return this.responseFactory;
+    }
+    
+    public UserInfoManager getUserInfoManager()
+    {
+        return this.userInfoMgr;
+    }
 }

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java Tue Oct 21 18:34:10 2008
@@ -28,6 +28,8 @@
 import org.apache.pluto.services.information.ResourceURLProvider;
 import org.apache.jetspeed.container.PortletWindow;
 import org.apache.pluto.services.information.PortletURLProvider;
+import org.apache.jetspeed.container.providers.PortletURLProviderImpl;
+import org.apache.jetspeed.container.providers.ResourceURLProviderImpl;
 import org.apache.jetspeed.container.state.MutableNavigationalState;
 import org.apache.jetspeed.container.state.NavigationalState;
 import org.apache.jetspeed.engine.core.PortletActionProviderImpl;
@@ -36,6 +38,7 @@
 import org.apache.jetspeed.Jetspeed;
 
 /**
+ * * TODO: 2.2 delete this, its removed from pluto
  * Provides dynamic information to Pluto Container:
  * 
  * 1.  getPortletURL

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java Tue Oct 21 18:34:10 2008
@@ -31,6 +31,7 @@
 import org.apache.jetspeed.aggregator.CurrentWorkerContext;
 
 /**
+ * * TODO: 2.2 delete this, its removed from pluto
  * Factory class for getting Information Provider access
  *
  * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/StaticInformationProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/StaticInformationProviderImpl.java?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/StaticInformationProviderImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/StaticInformationProviderImpl.java Tue Oct 21 18:34:10 2008
@@ -25,6 +25,7 @@
 import org.apache.pluto.services.information.StaticInformationProvider;
 
 /**
+ * TODO: 2.2 delete this, its removed from pluto
  * Provides static information to Pluto Container:
  * 
  * 1. PortletDefinition - given a unique registry id, 

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java Tue Oct 21 18:34:10 2008
@@ -28,6 +28,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.jetspeed.PortalReservedParameters;
 import org.apache.jetspeed.components.portletregistry.PortletRegistry;
 import org.apache.jetspeed.om.common.UserAttributeRef;
 import org.apache.jetspeed.om.portlet.PortletApplication;
@@ -37,7 +38,8 @@
 import org.apache.jetspeed.security.User;
 import org.apache.jetspeed.security.UserManager;
 import org.apache.jetspeed.userinfo.UserInfoManager;
-import org.apache.pluto.om.portlet.ObjectID;
+import org.apache.pluto.PortletContainerException;
+import org.apache.pluto.PortletWindow;
 
 /**
  * <p>
@@ -57,7 +59,7 @@
     // TODO Same caching issue as usual. We should look into JCS. That wil do
     // for now.
     /** Map used to cache user info maps for each mapped portlet application. */
-    private static Map userInfoMapCache;
+    private static Map<String, Map<String, String>> userInfoMapCache;
 
     /** The user manager */
     UserManager userMgr;
@@ -101,19 +103,15 @@
         initUserInfoMapCache();
     }
 
-    /**
-     * @see org.apache.jetspeed.userinfo.UserInfoManager#setUserInfoMap(org.apache.jetspeed.om.page.Fragment,
-     *      org.apache.jetspeed.request.RequestContext)
-     */
-    public Map getUserInfoMap(ObjectID oid, RequestContext context)
+    public Map<String, String> getUserInfoMap(String appName, RequestContext context)
     {
         if (log.isDebugEnabled())
             log.debug("Getting user info for portlet application: " + oid.toString());
 
         // Check if user info map is in cache.
-        if (userInfoMapCache.containsKey(oid))
+        if (userInfoMapCache.containsKey(appName))
         {
-            return (Map) userInfoMapCache.get(oid);
+            return userInfoMapCache.get(appName);
         }
         // Not in cache, map user info.
         Map<String, String> userInfo = getUserInformation(context);
@@ -123,7 +121,7 @@
             return null;
         }
 
-        PortletApplication pa = registry.getPortletApplication(oid);
+        PortletApplication pa = registry.getPortletApplication(appName);
         if (null == pa)
         {
             log.debug(PortletRequest.USER_INFO + " is set to null");
@@ -131,9 +129,7 @@
         }
         Collection userAttributes = pa.getUserAttributes();
         Collection userAttributeRefs = pa.getUserAttributeRefs();
-        Map userInfoMap = mapUserInfo(userInfo, userAttributes, userAttributeRefs);
-
-        return userInfoMap;
+        return mapUserInfo(userInfo, userAttributes, userAttributeRefs);
     }
 
     /**
@@ -231,4 +227,18 @@
         }
     }
 
+    /**
+     * For Pluto 2.0
+     */
+    public Map<String, String> getUserInfo(PortletRequest request, PortletWindow window) throws PortletContainerException
+    {
+        String remoteUser = request.getRemoteUser(); 
+        if ( remoteUser != null ) 
+        {
+            return Collections.EMPTY_MAP;
+        }
+        RequestContext requestContext=(RequestContext)request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
+        return this.getUserInfoMap(window.getPortletEntity().getPortletDefinition().getApplication().getName(), requestContext);        
+    }
+
 }
\ No newline at end of file

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.java?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.java Tue Oct 21 18:34:10 2008
@@ -64,7 +64,7 @@
     private JetspeedCache applicationNameCache = null;
     private JetspeedCache portletNameCache = null;
     private Map nameCache = new HashMap(); // work in progress (switch to JetspeedCache)
-    private List listeners = new ArrayList();
+    private List<RegistryEventListener> listeners = new ArrayList<RegistryEventListener>();
     
     // for testing purposes only: no need for the portletFactory then
     public PersistenceBrokerPortletRegistry(String repositoryPath)
@@ -293,7 +293,7 @@
         this.listeners.add(listener);
     }
 
-    public void removeRegistryEventListner(RegistryEventListener listener)
+    public void removeRegistryEventListener(RegistryEventListener listener)
     {
         this.listeners.remove(listener);
     }

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/PortalContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/PortalContext.java?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/PortalContext.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/PortalContext.java Tue Oct 21 18:34:10 2008
@@ -31,6 +31,7 @@
 public interface PortalContext extends javax.portlet.PortalContext
 {
     public Engine getEngine();
+    public void setEngine(Engine engine);
 
     public PortalConfiguration getConfiguration();
     public void setConfiguration(PortalConfiguration configuration);

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletregistry/PortletRegistry.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletregistry/PortletRegistry.java?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletregistry/PortletRegistry.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletregistry/PortletRegistry.java Tue Oct 21 18:34:10 2008
@@ -117,5 +117,5 @@
 	
     void addRegistryListener(RegistryEventListener listener);
     
-    void removeRegistryEventListner(RegistryEventListener listener);
+    void removeRegistryEventListener(RegistryEventListener listener);
 }

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/engine/Engine.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/engine/Engine.java?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/engine/Engine.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/engine/Engine.java Tue Oct 21 18:34:10 2008
@@ -23,8 +23,6 @@
 import org.apache.jetspeed.exception.JetspeedException;
 import org.apache.jetspeed.pipeline.Pipeline;
 import org.apache.jetspeed.request.RequestContext;
-import org.apache.pluto.services.PortletContainerEnvironment;
-import org.apache.pluto.services.factory.FactoryManagerService;
 
 
 /**
@@ -33,7 +31,7 @@
  * @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
  * @version $Id: Engine.java 187178 2004-08-02 19:00:15Z weaver $
  */
-public interface Engine extends JetspeedEngineConstants, FactoryManagerService, PortletContainerEnvironment 
+public interface Engine extends JetspeedEngineConstants 
 {
     /**
      * Initializes the engine with a commons configuration, starting all early initable services.

Copied: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactory.java (from r706807, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactory.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactory.java?p2=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactory.java&p1=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactory.java&r1=706807&r2=706843&rev=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactory.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactory.java Tue Oct 21 18:34:10 2008
@@ -17,7 +17,6 @@
 package org.apache.jetspeed.engine.servlet;
 
 import javax.servlet.http.HttpServletRequest;
-import org.apache.pluto.factory.Factory;
 import org.apache.jetspeed.container.PortletWindow;
 
 /**
@@ -26,7 +25,7 @@
  * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
  * @version $Id$
  */
-public interface ServletRequestFactory extends Factory
+public interface ServletRequestFactory 
 {
     public HttpServletRequest getServletRequest(HttpServletRequest request, PortletWindow window);
 }

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactory.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.3

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactory.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactory.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/engine/servlet/ServletResponseFactory.java (from r706807, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletResponseFactory.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/engine/servlet/ServletResponseFactory.java?p2=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/engine/servlet/ServletResponseFactory.java&p1=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletResponseFactory.java&r1=706807&r2=706843&rev=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletResponseFactory.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/engine/servlet/ServletResponseFactory.java Tue Oct 21 18:34:10 2008
@@ -17,7 +17,6 @@
 package org.apache.jetspeed.engine.servlet;
 
 import javax.servlet.http.HttpServletResponse;
-import org.apache.pluto.factory.Factory;
 
 /**
  * Factory interface for creating HTTP Request Wrappers
@@ -25,7 +24,7 @@
  * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
  * @version $Id$
  */
-public interface ServletResponseFactory extends Factory
+public interface ServletResponseFactory 
 {
     public HttpServletResponse getServletResponse(HttpServletResponse response);
 }

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/engine/servlet/ServletResponseFactory.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.2

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/engine/servlet/ServletResponseFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/engine/servlet/ServletResponseFactory.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/engine/servlet/ServletResponseFactory.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContext.java?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContext.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContext.java Tue Oct 21 18:34:10 2008
@@ -382,7 +382,7 @@
      * @param appName The portlet application name.
      * @return The PortletRequest.USER_INFO map.
      */
-    Map getUserInfoMap(String appName);
+    Map<String, String> getUserInfoMap(String appName);
     
     /**
      * 
@@ -445,6 +445,6 @@
      * @return a Map of request context objects
      * @since 2.1.2
      */
-    Map getObjects();
+    Map<String, Object> getObjects();
 }
 

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContextComponent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContextComponent.java?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContextComponent.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContextComponent.java Tue Oct 21 18:34:10 2008
@@ -20,6 +20,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.jetspeed.engine.servlet.ServletRequestFactory;
+import org.apache.jetspeed.engine.servlet.ServletResponseFactory;
+import org.apache.jetspeed.userinfo.UserInfoManager;
+
 
 /**
  * RequestContextComponent
@@ -56,4 +60,9 @@
     RequestContext getRequestContext(HttpServletRequest request);    
     RequestContext getRequestContext();    
     
+    
+    ServletRequestFactory getServletRequestFactory();
+    ServletResponseFactory getServletResponseFactory();
+    UserInfoManager getUserInfoManager();
+    
 }

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/userinfo/UserInfoManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/userinfo/UserInfoManager.java?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/userinfo/UserInfoManager.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/userinfo/UserInfoManager.java Tue Oct 21 18:34:10 2008
@@ -19,6 +19,7 @@
 import java.util.Map;
 
 import org.apache.jetspeed.request.RequestContext;
+import org.apache.pluto.spi.optional.UserInfoService;
 
 /**
  * <p>The {@link UserInfoManager} retrieve the Map that will be set as a 
@@ -47,7 +48,7 @@
  * 
  * @author <a href="mailto:dlestrat@apache.org">David Le Strat</a>
  */
-public interface UserInfoManager
+public interface UserInfoManager extends UserInfoService
 {
     
     /**

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/ContainerConstants.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/ContainerConstants.java?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/ContainerConstants.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/ContainerConstants.java Tue Oct 21 18:34:10 2008
@@ -35,4 +35,8 @@
     public final static Integer METHOD_RENDER = new Integer(1);
     public final static Integer METHOD_ACTION = new Integer(3);
     public final static Integer METHOD_NOOP = new Integer(5);
+    public final static Integer METHOD_RESOURCE = new Integer(6);
+    public final static Integer METHOD_EVENT = new Integer(7);
+    public final static Integer METHOD_ADMIN = new Integer(8);
+    
 }

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml Tue Oct 21 18:34:10 2008
@@ -54,4 +54,42 @@
     <!-- Uncomment this to HARD CODE your portal URL -->
     <!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg>  -->
   </bean>
+
+  <!-- Desktop Pluto Portlet Container -->
+  <bean id="DesktopPluto" class="org.apache.jetspeed.container.DesktopPortletContainerImpl">
+    <meta key="j2:cat" value="default" />
+    <constructor-arg index='0'><value>${portal.name}</value></constructor-arg>
+    <constructor-arg index='1'><ref bean="org.apache.pluto.services.RequiredPlutoServices"/></constructor-arg>
+    <constructor-arg index='2'><ref bean="org.apache.pluto.services.OptionalPlutoServices"/></constructor-arg>	    
+    <constructor-arg index='3'><value>/desktop</value></constructor-arg>
+    <constructor-arg index='4'><value>/action</value></constructor-arg>
+    <constructor-arg index='5'><value>/portlet</value></constructor-arg>
+  </bean>
+
+  <!-- Jetspeed 2's wrapper around Desktop Pluto container -->
+  <!-- settings for this bean will start the underlying pluto portlet container -->
+  <bean id="org.apache.pluto.DesktopPortletContainer"
+    class="org.apache.jetspeed.container.JetspeedPortletContainerWrapper" init-method="init"
+    destroy-method="destroy">
+    <meta key="j2:cat" value="default" />
+    <constructor-arg>
+      <ref bean="DesktopPluto" />
+    </constructor-arg>
+    <constructor-arg>
+      <value>${portal.name}Desktop</value>
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="ServletConfig" />
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="Engine" />
+    </constructor-arg>
+    <property name="requestFactory">
+      <ref bean="ServletRequestFactory" />
+    </property>
+    <property name="responseFactory">
+      <ref bean="ServletResponseFactory" />
+    </property>
+  </bean>
+
 </beans>

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml Tue Oct 21 18:34:10 2008
@@ -25,11 +25,6 @@
     </constructor-arg>
   </bean>
 
-  <!-- ServletConfig -->
-  <bean id="javax.servlet.ServletConfig" name="ServletConfig"
-    class="org.apache.jetspeed.components.factorybeans.ServletConfigFactoryBean">
-    <meta key="j2:cat" value="default" />
-  </bean>
 
   <!-- Template Locators -->
   <bean id="TemplateLocator" class="org.apache.jetspeed.locator.JetspeedTemplateLocator" init-method="start"
@@ -76,15 +71,10 @@
   <bean id="org.apache.jetspeed.request.RequestContextComponent"
     class="org.apache.jetspeed.request.JetspeedRequestContextComponent">
     <meta key="j2:cat" value="default,registry" />
-    <constructor-arg index='0'>
-      <value>org.apache.jetspeed.request.JetspeedRequestContext</value>
-    </constructor-arg>
-    <constructor-arg index='1'>
-      <ref bean="org.apache.jetspeed.userinfo.UserInfoManager" />
-    </constructor-arg>
-    <constructor-arg index='2'>
-      <ref bean="RequestContextObjects" />
-    </constructor-arg>
+    <constructor-arg index='0'><ref bean="ServletRequestFactory" /></constructor-arg>
+    <constructor-arg index='1'><ref bean="ServletResponseFactory" /></constructor-arg>
+    <constructor-arg index='2'><ref bean="org.apache.jetspeed.userinfo.UserInfoManager" /></constructor-arg>
+    <constructor-arg index='3'><ref bean="RequestContextObjects" /></constructor-arg>
   </bean>
 
   <bean class="org.apache.jetspeed.components.factorybeans.NullReferenceFactoryBean">
@@ -116,30 +106,17 @@
   </bean>
 
   <!-- Pluto Portlet Container -->
-  <bean id="Pluto" class="org.apache.pluto.PortletContainerImpl">
+  <bean id="Pluto" class="org.apache.pluto.core.PortletContainerImpl">
     <meta key="j2:cat" value="default" />
-  </bean>
-
-  <!-- Desktop Pluto Portlet Container -->
-  <bean id="DesktopPluto" class="org.apache.jetspeed.container.DesktopPortletContainerImpl">
-    <meta key="j2:cat" value="default" />
-
-    <constructor-arg index='0'>
-      <value>/desktop</value>
-    </constructor-arg>
-    <constructor-arg index='1'>
-      <value>/action</value>
-    </constructor-arg>
-    <constructor-arg index='2'>
-      <value>/portlet</value>
-    </constructor-arg>
-
+    <constructor-arg><value>${portal.name}</value></constructor-arg>
+    <constructor-arg><ref bean="org.apache.pluto.services.RequiredPlutoServices"/></constructor-arg>
+    <constructor-arg><ref bean="org.apache.pluto.services.OptionalPlutoServices"/></constructor-arg>	    
   </bean>
 
   <!-- Jetspeed 2's wrapper around Pluto -->
   <!-- settings for this bean will start the underlying pluto portlet container -->
   <bean id="org.apache.pluto.PortletContainer" class="org.apache.jetspeed.container.JetspeedPortletContainerWrapper"
-    init-method="start" destroy-method="shutdown">
+    init-method="init" destroy-method="destroy">
     <meta key="j2:cat" value="default" />
     <constructor-arg>
       <ref bean="Pluto" />
@@ -147,38 +124,6 @@
     <constructor-arg>
       <value>${portal.name}</value>
     </constructor-arg>
-    <constructor-arg>
-      <ref bean="ServletConfig" />
-    </constructor-arg>
-    <constructor-arg>
-      <ref bean="Engine" />
-    </constructor-arg>
-    <property name="requestFactory">
-      <ref bean="ServletRequestFactory" />
-    </property>
-    <property name="responseFactory">
-      <ref bean="ServletResponseFactory" />
-    </property>
-  </bean>
-
-  <!-- Jetspeed 2's wrapper around Desktop Pluto container -->
-  <!-- settings for this bean will start the underlying pluto portlet container -->
-  <bean id="org.apache.pluto.DesktopPortletContainer"
-    class="org.apache.jetspeed.container.JetspeedPortletContainerWrapper" init-method="start"
-    destroy-method="shutdown">
-    <meta key="j2:cat" value="default" />
-    <constructor-arg>
-      <ref bean="DesktopPluto" />
-    </constructor-arg>
-    <constructor-arg>
-      <value>${portal.name}Desktop</value>
-    </constructor-arg>
-    <constructor-arg>
-      <ref bean="ServletConfig" />
-    </constructor-arg>
-    <constructor-arg>
-      <ref bean="Engine" />
-    </constructor-arg>
     <property name="requestFactory">
       <ref bean="ServletRequestFactory" />
     </property>

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml?rev=706843&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml Tue Oct 21 18:34:10 2008
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+    <!-- ========================================== -->
+    <!-- Declare Pluto Service Accessors, top level -->
+    <!-- ========================================== -->
+	
+    <bean id="org.apache.pluto.services.PlutoContainerServices"
+          class="org.apache.pluto.core.PlutoContainerServices">
+      <meta key="j2:cat" value="default" />
+      <constructor-arg><ref bean="org.apache.pluto.services.RequiredPlutoServices"/></constructor-arg>
+      <constructor-arg><ref bean="org.apache.pluto.services.OptionalPlutoServices"/></constructor-arg>
+    </bean>
+
+	<bean id="org.apache.pluto.services.PlutoServices"
+	      class="org.apache.pluto.services.PlutoServices">
+      <meta key="j2:cat" value="default" />
+      <constructor-arg><ref bean="org.apache.pluto.services.PlutoContainerServices"/></constructor-arg>          	      
+	</bean>  
+
+    <!-- ====================================================== -->
+    <!-- Declare Pluto Service Accessors, Required              -->
+    <!-- ====================================================== -->
+
+    <bean id="org.apache.pluto.services.RequiredContainerServices"
+          class="org.apache.jetspeed.container.services.JetspeedRequiredPlutoServices">
+      <meta key="j2:cat" value="default" />          
+      <constructor-arg><ref bean="org.apache.pluto.services.CCPPProfileService"/></constructor-arg>
+      <constructor-arg><ref bean="org.apache.pluto.services.ContainerInvocationService"/></constructor-arg>
+      <constructor-arg><ref bean="org.apache.pluto.services.ContainerCallbackProviders"/></constructor-arg>
+      <constructor-arg><ref bean="org.apache.pluto.services.PortalContext"/></constructor-arg>
+    </bean>
+    
+    <bean id="CCPPProfileService"
+    	  class="org.apache.pluto.core.DummyCCPPProfileServiceImpl">
+      <meta key="j2:cat" value="default" />    	  
+    </bean>
+
+	<bean id='ContainerInvocationService'
+	      class='org.apache.pluto.core.ContainerInvocationServiceImpl'>
+      <meta key="j2:cat" value="default" />	      
+	</bean>
+
+    <bean id="org.apache.pluto.services.PortalContext" name="PortalContext"
+          class="org.apache.jetspeed.JetspeedPortalContext">
+      <meta key="j2:cat" value="default" />          
+    </bean>
+	
+
+    <!-- ====================================================== -->
+    <!-- Pluto Container Callbacks                              -->
+    <!-- ====================================================== -->
+
+
+    <bean id="org.apache.pluto.services.ContainerCallbackProviders"
+          class="org.apache.jetspeed.container.services.JetspeedPortalCallbackServices">
+      <meta key="j2:cat" value="default" />          
+<!--   <constructor-arg><ref bean="org.apache.pluto.services.PortletURLProviderImpl"/></constructor-arg> (currently doing a 'new')
+       <constructor-arg><ref bean="org.apache.pluto.services.ResourceURLProviderImpl"/></constructor-arg> (currently doing a 'new')
+-->
+		<constructor-arg><ref bean="org.apache.pluto.services.RequestPropertyProvider"/></constructor-arg>
+		<constructor-arg><ref bean="org.apache.pluto.services.EventProvider"/></constructor-arg>
+		<constructor-arg><ref bean="org.apache.pluto.services.FilterManager"/></constructor-arg>
+		<constructor-arg><ref bean="org.apache.pluto.services.PortletURLListener"/></constructor-arg>
+    </bean>
+
+
+	<bean id='org.apache.pluto.services.RequestPropertyProvider'
+		  class="org.apache.jetspeed.container.providers.RequestPropertyProviderImpl">
+      <meta key="j2:cat" value="default" />		  
+	</bean>
+	
+	<bean id='org.apache.pluto.services.EventProvider'
+	      class='org.apache.jetspeed.container.providers.EventProviderImpl'>
+      <meta key="j2:cat" value="default" />
+	</bean>
+
+	<bean id='org.apache.pluto.services.FilterManager'
+	      class='org.apache.jetspeed.container.providers.FilterManagerImpl'>
+      <meta key="j2:cat" value="default" />	      
+	</bean>
+
+	<bean id='org.apache.pluto.services.PortletURLListener'
+	      class='org.apache.jetspeed.container.providers.PortletURLListenerImpl'>
+      <meta key="j2:cat" value="default" />	      
+	</bean>
+	
+    <!-- ====================================================== -->
+    <!-- Declare Pluto Service Accessors, Optional              -->
+    <!-- ====================================================== -->
+
+    <bean id="org.apache.pluto.services.OptionalContainerServices"
+          class="org.apache.jetspeed.container.services.JetspeedOptionalPlutoServices">
+      <meta key="j2:cat" value="default" />          
+      <constructor-arg><ref bean="org.apache.pluto.services.NamespaceMapper"/></constructor-arg>
+      <constructor-arg><ref bean="org.apache.pluto.services.PortalAdministrationService"/></constructor-arg>
+      <constructor-arg><ref bean="org.apache.pluto.services.PortletEnvironmentService"/></constructor-arg>
+      <constructor-arg><ref bean="org.apache.pluto.services.PortletInfoService"/></constructor-arg>
+      <constructor-arg><ref bean="org.apache.pluto.services.UserInfoService"/></constructor-arg>            
+      <constructor-arg><ref bean="org.apache.pluto.services.RequestAttributeService"/></constructor-arg>
+      <constructor-arg><ref bean="org.apache.pluto.services.PortletInvokerService"/></constructor-arg>            
+	<!--  TODO: preferences, registry -->
+    </bean>
+    
+    <bean id="org.apache.pluto.services.NamespaceMapper"
+          class="org.apache.jetspeed.container.namespace.JetspeedNamespaceMapperImpl">
+      <meta key="j2:cat" value="default" />          
+	  <constructor-arg index="0"><value>js_</value></constructor-arg>
+    </bean>
+
+    <bean id="org.apache.pluto.services.PortalAdministrationService"
+          class="org.apache.pluto.core.DefaultPortalAdministrationService">
+      <meta key="j2:cat" value="default" />          
+    </bean>
+
+    <bean id="org.apache.pluto.services.PortletEnvironmentService"
+          class="org.apache.pluto.core.DefaultPortletEnvironmentService">
+      <meta key="j2:cat" value="default" />          
+    </bean>
+
+    <bean id="org.apache.pluto.services.PortletInfoService"
+          class="org.apache.pluto.core.DefaultPortletInfoService">
+      <meta key="j2:cat" value="default" />          
+    </bean>
+
+    <bean id="org.apache.pluto.services.RequestAttributeService"
+          class="org.apache.pluto.core.RequestAttributeService">
+      <meta key="j2:cat" value="default" />          
+      <constructor-arg><ref bean="org.apache.pluto.services.NamespaceMapper"/></constructor-arg>
+      <constructor-arg><ref bean="org.apache.pluto.services.UserInfoService"/></constructor-arg>                      
+    </bean>
+
+    <bean id="org.apache.pluto.services.PortletInvokerService"
+          class="org.apache.jetspeed.container.invoker.JetspeedPortletInvokerService">          
+	    <meta key="j2:cat" value="default" />
+	    <constructor-arg index="0"><ref bean="javax.servlet.ServletConfig" /></constructor-arg>
+	    <constructor-arg index="1"><ref bean="org.apache.pluto.services.PortalContext" /></constructor-arg>
+	    <constructor-arg index="2"><ref bean="portletFactory" /></constructor-arg>         
+        <constructor-arg index="3"><ref bean="PortletRequestResponseUnwrapper"/></constructor-arg>
+    </bean>
+
+
+
+
+    
+</beans>
\ No newline at end of file

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/servlet-api.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/servlet-api.xml?rev=706843&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/servlet-api.xml (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/servlet-api.xml Tue Oct 21 18:34:10 2008
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+  <!-- ServletConfig -->
+  <bean id="javax.servlet.ServletConfig" name="ServletConfig"
+    class="org.apache.jetspeed.components.factorybeans.ServletConfigFactoryBean">
+    <meta key="j2:cat" value="default" />
+  </bean>
+
+  <bean id="ServletRequestFactory" name="javax.servlet.http.HttpServletRequest"
+    class="org.apache.jetspeed.engine.servlet.ServletRequestFactoryImpl">
+    <meta key="j2:cat" value="default" />
+    <constructor-arg><ref bean="org.apache.pluto.services.NamespaceMapper"/></constructor-arg>   
+  </bean>
+
+  <bean id="ServletResponseFactory" name="javax.servlet.http.HttpServletResponse"
+    class="org.apache.jetspeed.engine.servlet.ServletResponseFactoryImpl">
+    <meta key="j2:cat" value="default" />
+  </bean>
+  
+  <!--  
+    PortletRequestResponseUnwrapper finds servlet request or servlet response from portlet request or portlet response by unwrapping.
+    Third-party module can provide an implementation to decorate the real request or response object of a servlet container.
+    For example, the real request object of a servlet container can be decorated because it is not thread-safe under Jetspeed parallel rendering mode.
+  -->
+  <bean id="PortletRequestResponseUnwrapper"
+    class="org.apache.jetspeed.container.invoker.DefaultPortletRequestResponseUnwrapper">
+    <meta key="j2:cat" value="default" />
+  </bean>
+  
+  
+</beans>
\ No newline at end of file

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/userinfo.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/userinfo.xml?rev=706843&r1=706842&r2=706843&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/userinfo.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/userinfo.xml Tue Oct 21 18:34:10 2008
@@ -20,6 +20,7 @@
 
   <!-- Single Source User Info -->
   <bean id="org.apache.jetspeed.userinfo.UserInfoManager"
+        name="org.apache.pluto.services.UserInfoService"
     class="org.apache.jetspeed.userinfo.impl.UserInfoManagerImpl">
     <meta key="j2:cat" value="default" />
     <constructor-arg index="0">



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message