portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r771327 - in /portals/jetspeed-2/portal/trunk: components/jetspeed-db-tools/ components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/ components/jetspeed-portal/src/test/java/JETSPEED-INF/spring/ components/jetspeed-...
Date Mon, 04 May 2009 15:02:24 GMT
Author: ate
Date: Mon May  4 15:02:23 2009
New Revision: 771327

URL: http://svn.apache.org/viewvc?rev=771327&view=rev
Log:
JS2-985: Upgrade to new pluto-container-api requirements as needed for PLUTO-557
See: http://issues.apache.org/jira/browse/JS2-985
- adding new Pluto RequestDispatcherService and handling: as it needs to be passed on to PortletContext its needed in PortletFactory
  as well as for the ServletContextProvider service
- dropping OM ApplicationDefinition ServletURLMapping state and corresponding (OJB) mapping and schema table definition

Added:
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/JETSPEED-INF/spring/RequestDispatcherService.xml   (with props)
Removed:
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/util/
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/ServletMappingURLPatternImpl.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/ServletMappingURLPattern.java
Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedPlutoServices.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/AbstractRequestContextTestCase.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/engine/AbstractEngineTest.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/engine/TestSpringEngine.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManagerServer.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContextImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedServletContextProviderImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/test/java/org/apache/jetspeed/factory/TestPortletFactory.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorServiceImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/registry-test.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml?rev=771327&r1=771326&r2=771327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml Mon May  4 15:02:23 2009
@@ -68,6 +68,11 @@
       <artifactId>jetspeed-commons</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.portals.bridges</groupId>
+      <artifactId>portals-bridges-common</artifactId>
+      <version>${org.apache.portals.bridges.common.version}</version>
+    </dependency>
+    <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>jetspeed-cm</artifactId>
       <exclusions>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedPlutoServices.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedPlutoServices.java?rev=771327&r1=771326&r2=771327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedPlutoServices.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/JetspeedPlutoServices.java Mon May  4 15:02:23 2009
@@ -35,6 +35,7 @@
 import org.apache.pluto.container.PortletRequestContextService;
 import org.apache.pluto.container.PortletURLListenerService;
 import org.apache.pluto.container.ContainerServices;
+import org.apache.pluto.container.RequestDispatcherService;
 import org.apache.pluto.container.UserInfoService;
 
 /**
@@ -55,6 +56,7 @@
     protected UserInfoService userInfoService;
     protected PortletInvokerService invokerService;
     protected PortletPreferencesService preferencesService;
+    private RequestDispatcherService rdService;
     private CCPPProfileService profileService = new DummyCCPPProfileServiceImpl();
 
     public JetspeedPlutoServices(PortalContext portalContext, 
@@ -66,7 +68,8 @@
                                  PortletEnvironmentService environmentService,
                                  UserInfoService userInfoService,
                                  PortletInvokerService invokerService, 
-                                 PortletPreferencesService preferencesService)
+                                 PortletPreferencesService preferencesService,
+                                 RequestDispatcherService rdService)
     {
         this.portalContext = portalContext;
         this.eventCoordinationService = eventCoordinationService;
@@ -78,6 +81,7 @@
         this.userInfoService = userInfoService;
         this.invokerService = invokerService;
         this.preferencesService = preferencesService;
+        this.rdService = rdService;
     }
 
     public PortalContext getPortalContext()
@@ -135,6 +139,11 @@
         return userInfoService;
     }
     
+    public RequestDispatcherService getRequestDispatcherService()
+    {
+        return rdService;
+    }
+    
     class DummyCCPPProfileServiceImpl implements CCPPProfileService 
     {
 

Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/JETSPEED-INF/spring/RequestDispatcherService.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/JETSPEED-INF/spring/RequestDispatcherService.xml?rev=771327&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/JETSPEED-INF/spring/RequestDispatcherService.xml (added)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/JETSPEED-INF/spring/RequestDispatcherService.xml Mon May  4 15:02:23 2009
@@ -0,0 +1,27 @@
+<?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">
+    
+    <bean id="org.apache.pluto.services.RequestDispatcherService"
+          class="org.apache.pluto.container.impl.RequestDispatcherServiceImpl">
+      <meta key="j2:cat" value="default or registry" />          
+    </bean>
+    
+</beans>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/JETSPEED-INF/spring/RequestDispatcherService.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/JETSPEED-INF/spring/RequestDispatcherService.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/JETSPEED-INF/spring/RequestDispatcherService.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/AbstractRequestContextTestCase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/AbstractRequestContextTestCase.java?rev=771327&r1=771326&r2=771327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/AbstractRequestContextTestCase.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/AbstractRequestContextTestCase.java Mon May  4 15:02:23 2009
@@ -21,17 +21,28 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.jetspeed.components.util.RegistrySupportedTestCase;
+import org.apache.jetspeed.components.portletregistry.PortletRegistry;
+import org.apache.jetspeed.components.util.TransactionCacheEnabledSpringTestCase;
 
-public class AbstractRequestContextTestCase extends RegistrySupportedTestCase
+public class AbstractRequestContextTestCase extends TransactionCacheEnabledSpringTestCase
 {
+    protected PortletRegistry portletRegistry;
 
+    protected void setUp() throws Exception
+    {       
+        super.setUp();
+        portletRegistry = (PortletRegistry) scm.getComponent("portletRegistry");
+    }   
+    
     protected String[] getConfigurations()
     {
-//        File webapp = new File("../../src/webapp");
-//        System.setProperty(JetspeedEngineConstants.APPLICATION_ROOT_KEY, webapp.getAbsolutePath());        
         String[] confs = super.getConfigurations();
-        List confList = new ArrayList(Arrays.asList(confs));
+        List<String> confList = new ArrayList<String>(Arrays.asList(confs));
+        confList.add("jetspeed-base.xml");
+        confList.add("jetspeed-properties.xml");
+        confList.add("page-manager.xml");
+        confList.add("registry.xml");
+        confList.add("JETSPEED-INF/spring/RequestDispatcherService.xml");        
         confList.add("rc2.xml");
         confList.add("static-bean-references.xml");
         confList.add("security-managers.xml");
@@ -41,11 +52,11 @@
         confList.add("security-spi-atn.xml");
         confList.add("security-atz.xml");
         confList.add("JETSPEED-INF/spring/JetspeedPrincipalManagerProviderOverride.xml");        
-        return (String[]) confList.toArray(new String[confList.size()]);
+        return confList.toArray(new String[confList.size()]);
     }
 
     protected String getBeanDefinitionFilterCategories()
     {
-        return super.getBeanDefinitionFilterCategories()+",security,dbSecurity";
+        return super.getBeanDefinitionFilterCategories()+",xmlPageManager,security,dbSecurity";
     }
 }
\ No newline at end of file

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/engine/AbstractEngineTest.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/engine/AbstractEngineTest.java?rev=771327&r1=771326&r2=771327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/engine/AbstractEngineTest.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/engine/AbstractEngineTest.java Mon May  4 15:02:23 2009
@@ -41,52 +41,14 @@
         super();
     }
 
-    /**
-     * @param arg0
-     */
-    public AbstractEngineTest(String arg0)
-    {
-        super(arg0);
-    }
 
     protected Engine engine;
 
     protected Object[] keysToCheck;
 
     private SpringEngineHelper engineHelper;
-
-    public void testEngine() throws Exception
-    {
-        assertNotNull(engine.getComponentManager());
-        assertNotNull(engine.getComponentManager().getRootContainer());
-        if (keysToCheck != null)
-        {
-            verifyComponents(keysToCheck);
-        }
-    }
-
-    protected void setUp() throws Exception
-    {
-       HashMap context = new HashMap();
-       engineHelper = new SpringEngineHelper(context);
-       engineHelper.setUp(getBaseDir());
-       engine = (Engine) context.get(SpringEngineHelper.ENGINE_ATTR);
-    }
-
-    protected void tearDown() throws Exception
-    {
-        engineHelper.tearDown();
-        super.tearDown();        
-    }
-
-    protected void verifyComponents(Object[] keys)
-    {
-        ComponentManagement cm = engine.getComponentManager();
-        for (int i = 0; i < keys.length; i++)
-        {
-            assertNotNull("Could not get component insatance " + keys[i], cm.getComponent(keys[i]));
-            System.out.println("Load componenet " + cm.getComponent(keys[i]).getClass() + " for key " + keys[i]);
-        }
-    }
+    
+    private boolean setup;
+    
 
 }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/engine/TestSpringEngine.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/engine/TestSpringEngine.java?rev=771327&r1=771326&r2=771327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/engine/TestSpringEngine.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/engine/TestSpringEngine.java Mon May  4 15:02:23 2009
@@ -22,6 +22,8 @@
  */
 package org.apache.jetspeed.engine;
 
+import java.util.HashMap;
+
 import javax.servlet.ServletConfig;
 
 import junit.framework.Test;
@@ -31,6 +33,7 @@
 import org.apache.jetspeed.aggregator.PortletAggregator;
 import org.apache.jetspeed.aggregator.PortletRenderer;
 import org.apache.jetspeed.capabilities.Capabilities;
+import org.apache.jetspeed.components.ComponentManagement;
 import org.apache.jetspeed.components.portletregistry.PortletRegistry;
 import org.apache.jetspeed.page.PageManager;
 import org.apache.jetspeed.profiler.Profiler;
@@ -40,6 +43,8 @@
 import org.apache.jetspeed.security.RoleManager;
 import org.apache.jetspeed.security.UserManager;
 import org.apache.jetspeed.security.impl.RdbmsPolicy;
+import org.apache.jetspeed.test.JetspeedTestCase;
+import org.apache.jetspeed.testhelpers.SpringEngineHelper;
 import org.apache.jetspeed.userinfo.UserInfoManager;
 
 /**
@@ -54,26 +59,29 @@
  * @version $Id$
  *  
  */
-public class TestSpringEngine extends AbstractEngineTest
+public class TestSpringEngine extends JetspeedTestCase
 {
-    public TestSpringEngine()
-    {        
-        keysToCheck = new Object[] {"IdGenerator", "DecorationLocator", "TemplateLocator", "IdGenerator", "PageFileCache", PageManager.class, 
-                                     PortletRegistry.class, "PortalServices",
-                                     Profiler.class, Capabilities.class, UserManager.class,
-                                     GroupManager.class, RoleManager.class, PermissionManager.class, RdbmsPolicy.class,
-                                     UserInfoManager.class, RequestContextComponent.class, 
-                                     PortletRenderer.class, PageAggregator.class, PortletAggregator.class, "PAM",
-                                     "deploymentManager", "portletFactory", ServletConfig.class, 
-                                      "NavigationalStateCodec", "PortalURL", "NavigationalStateComponent"};
-    }
+    private Engine engine;
+    private SpringEngineHelper engineHelper;
     
-    public static Test suite()
+    
+    protected void setUp() throws Exception
     {
-        // All methods starting with "test" will be executed in the test suite.
-        return new TestSuite(TestSpringEngine.class);
+        super.setUp();
+       HashMap context = new HashMap();
+       engineHelper = new SpringEngineHelper(context);
+       engineHelper.setUp(getBaseDir());
+       engine = (Engine) context.get(SpringEngineHelper.ENGINE_ATTR);
     }
 
+    protected void tearDown() throws Exception
+    {
+        engineHelper.tearDown();
+        super.tearDown();        
+    }
 
+    public void testSomeEngine() throws Exception
+    {
+    }
 
 }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManagerServer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManagerServer.java?rev=771327&r1=771326&r2=771327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManagerServer.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManagerServer.java Mon May  4 15:02:23 2009
@@ -79,6 +79,7 @@
         configurationsList.add("jetspeed-properties.xml");
         configurationsList.add("page-manager.xml");
         configurationsList.add("registry.xml");
+        configurationsList.add("JETSPEED-INF/spring/RequestDispatcherService.xml");
         configurationsList.add("rc2.xml");
         configurationsList.add("deployment.xml");
         if (TestPortletApplicationManager.TEST_USE_VERSIONED_PAM)

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/pom.xml?rev=771327&r1=771326&r2=771327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/pom.xml Mon May  4 15:02:23 2009
@@ -51,6 +51,12 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.portals.bridges</groupId>
+      <artifactId>portals-bridges-common</artifactId>
+      <version>${org.apache.portals.bridges.common.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContextImpl.java?rev=771327&r1=771326&r2=771327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContextImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContextImpl.java Mon May  4 15:02:23 2009
@@ -26,6 +26,7 @@
 import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.jetspeed.services.JetspeedPortletServices;
 import org.apache.jetspeed.services.PortletServices;
+import org.apache.pluto.container.RequestDispatcherService;
 import org.apache.pluto.container.impl.PortletContextImpl;
 import org.apache.portals.bridges.common.ServletContextProvider;
 
@@ -38,10 +39,18 @@
 public class JetspeedPortletContextImpl extends PortletContextImpl implements JetspeedPortletContext
 {
     private static final String CONTAINER_SUPPORTED_RUNTIME_OPTION = "container.supported.runtimeOption";
+
+    private ServletContextProvider servletContextProvider;
     
-    public JetspeedPortletContextImpl(ServletContext servletContext, PortletApplication application, ContainerInfo containerInfo, PortalConfiguration configuration)
-    {
-        super(servletContext, application, containerInfo, Arrays.asList(configuration.getStringArray(CONTAINER_SUPPORTED_RUNTIME_OPTION)));
+    public JetspeedPortletContextImpl(ServletContext servletContext, 
+                                      PortletApplication application, 
+                                      ContainerInfo containerInfo, 
+                                      PortalConfiguration configuration,
+                                      RequestDispatcherService rdService,
+                                      ServletContextProvider servletContextProvider)
+    {        
+        super(servletContext, application, containerInfo, Arrays.asList(configuration.getStringArray(CONTAINER_SUPPORTED_RUNTIME_OPTION)), rdService);
+        this.servletContextProvider = servletContextProvider;
     }
 
     public java.lang.Object getAttribute(java.lang.String name)
@@ -88,6 +97,6 @@
     
     public ServletContextProvider getServletContextProvider()
     {
-        return JetspeedServletContextProviderImpl.getInstance();
+        return servletContextProvider;
     }
 }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedServletContextProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedServletContextProviderImpl.java?rev=771327&r1=771326&r2=771327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedServletContextProviderImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedServletContextProviderImpl.java Mon May  4 15:02:23 2009
@@ -30,16 +30,15 @@
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
 
 import org.apache.jetspeed.Jetspeed;
 import org.apache.jetspeed.PortalReservedParameters;
 import org.apache.jetspeed.container.JetspeedPortletContext;
 import org.apache.jetspeed.container.PortletWindow;
 import org.apache.pluto.container.PortletRequestContext;
+import org.apache.pluto.container.RequestDispatcherService;
 
-import org.apache.pluto.container.impl.HttpServletPortletRequestWrapper;
-import org.apache.pluto.container.impl.HttpServletPortletResponseWrapper;
-import org.apache.pluto.container.impl.RequestDispatcherPathInfoImpl;
 import org.apache.portals.bridges.common.ServletContextProvider;
 
 /**
@@ -52,7 +51,7 @@
     private static final String SERVLET_REQUEST = ServletContextProvider.class.getName()+".request";
     private static final String SERVLET_RESPONSE = ServletContextProvider.class.getName()+".response";
     
-    private static ServletContextProvider instance = new JetspeedServletContextProviderImpl();
+    private RequestDispatcherService requestDispatcherService;
     
     private static class ServletContextProxy implements InvocationHandler
     {
@@ -122,14 +121,13 @@
         }        
     }
     
-    private static class HttpServletPortletResourceResponseWrapper extends HttpServletPortletResponseWrapper
+    private static class HttpServletPortletResourceResponseWrapper extends HttpServletResponseWrapper
     {
         private HttpServletResponse response;
         
-        public HttpServletPortletResourceResponseWrapper(HttpServletResponse response, PortletRequest portletRequest,
-                                                         PortletResponse portletResponse, boolean included)
+        public HttpServletPortletResourceResponseWrapper(HttpServletResponse response)
         {
-            super(response, portletRequest, portletResponse, included);
+            super(response);
             this.response = response;
         }
 
@@ -140,14 +138,9 @@
         }
     }
     
-    private JetspeedServletContextProviderImpl()
+    public JetspeedServletContextProviderImpl(RequestDispatcherService requestDispatcherService)
     {
-        
-    }
-    
-    public static ServletContextProvider getInstance()
-    {
-        return instance;
+        this.requestDispatcherService = requestDispatcherService;
     }
     
     public ServletContext getServletContext(GenericPortlet portlet)
@@ -165,20 +158,17 @@
 
     public HttpServletRequest getHttpServletRequest(GenericPortlet portlet, PortletRequest request)
     {        
-        PortletWindow window = Jetspeed.getCurrentRequestContext().getCurrentPortletWindow();        
+        PortletWindow window = Jetspeed.getCurrentRequestContext().getCurrentPortletWindow();
         HttpServletRequest req = (HttpServletRequest)window.getAttribute(SERVLET_REQUEST);
         if (req == null)
         {
             PortletRequestContext rc = window.getPortletRequestContext();
-            req = new HttpServletPortletRequestWrapper(rc.getServletRequest(),
-                                                       rc.getServletContext(),
-                                                       null,
-                                                       request,
-                                                       new RequestDispatcherPathInfoImpl((String)request.getAttribute("javax.servlet.include.context_path"), 
-                                                                                         (String)request.getAttribute("javax.servlet.include.servlet_path"), 
-                                                                                         (String)request.getAttribute("javax.servlet.include.path_info"), 
-                                                                                         (String)request.getAttribute("javax.servlet.include.query_string")), 
-                                                       true);
+            req = requestDispatcherService.getRequestWrapper(rc.getServletContext(),
+                                                             rc.getServletRequest(),
+                                                             request,
+                                                             null,
+                                                             true,
+                                                             false);
             req.setAttribute(ContainerConstants.PORTLET_CONFIG, rc.getPortletConfig());
             req.setAttribute(ContainerConstants.PORTLET_REQUEST, window.getPortletRequest());
             req.setAttribute(ContainerConstants.PORTLET_RESPONSE, window.getPortletResponse());
@@ -194,19 +184,15 @@
         if (res == null)
         {
             boolean included = window.getAttribute(PortalReservedParameters.PORTLET_CONTAINER_INVOKER_USE_FORWARD) == null;
+            PortletRequestContext rc = window.getPortletRequestContext();
+            res = requestDispatcherService.getResponseWraper(rc.getServletContext(),
+                                                             rc.getServletResponse(),
+                                                             window.getPortletRequest(),
+                                                             response,
+                                                             included);
             if (PortletWindow.Action.RENDER == window.getAction() && !included)
             {
-                res = new HttpServletPortletResourceResponseWrapper(window.getPortletRequestContext().getServletResponse(),
-                                                                    window.getPortletRequest(),
-                                                                    response,
-                                                                    included);
-            }
-            else
-            {
-                res = new HttpServletPortletResponseWrapper(window.getPortletRequestContext().getServletResponse(),
-                                                            window.getPortletRequest(),
-                                                            response,
-                                                            included);
+                res = new HttpServletPortletResourceResponseWrapper(res);
             }
             window.setAttribute(SERVLET_RESPONSE, res);
         }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java?rev=771327&r1=771326&r2=771327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java Mon May  4 15:02:23 2009
@@ -41,11 +41,14 @@
 import org.apache.jetspeed.container.JetspeedPortletConfigImpl;
 import org.apache.jetspeed.container.JetspeedPortletContext;
 import org.apache.jetspeed.container.JetspeedPortletContextImpl;
+import org.apache.jetspeed.container.JetspeedServletContextProviderImpl;
 import org.apache.jetspeed.om.portlet.Filter;
 import org.apache.jetspeed.om.portlet.Language;
 import org.apache.jetspeed.om.portlet.Listener;
 import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.jetspeed.om.portlet.PortletDefinition;
+import org.apache.pluto.container.RequestDispatcherService;
+import org.apache.portals.bridges.common.ServletContextProvider;
 
 /**
  * <p>
@@ -71,6 +74,8 @@
     private Map<String, Map<String, Map<Locale, ResourceBundle>>> portletsResourceBundleCache;
     private final Map<String, ClassLoader> classLoaderMap;
     private PortalContext portalContext;
+    private RequestDispatcherService rdService;
+    private ServletContextProvider servletContextProvider;   
 
     /**
      * Flag whether this factory will create proxy instances for actual portlet
@@ -92,13 +97,14 @@
 
     private String customConfigModePortletUniqueName;
 
-    public JetspeedPortletFactory()
+    public JetspeedPortletFactory(RequestDispatcherService rdService)
     {
-        this(false, false);
+        this(rdService, false, false);
     }
     
-    public JetspeedPortletFactory(boolean autoSwitchConfigMode, boolean autoSwitchEditDefaultsModeToEditMode)
+    public JetspeedPortletFactory(RequestDispatcherService rdService, boolean autoSwitchConfigMode, boolean autoSwitchEditDefaultsModeToEditMode)
     {
+        this.rdService = rdService;
         this.portletCache = Collections.synchronizedMap(new HashMap<String, Map<String, PortletInstance>>());
         this.validatorCache = Collections.synchronizedMap(new HashMap<String, Map<String, PreferencesValidator>>());
         this.classLoaderMap = Collections.synchronizedMap(new HashMap<String, ClassLoader>());
@@ -109,6 +115,7 @@
         this.autoSwitchConfigMode = autoSwitchConfigMode;
         this.autoSwitchEditDefaultsModeToEditMode = autoSwitchEditDefaultsModeToEditMode;
         this.portletProxyUsed = (this.autoSwitchConfigMode || this.autoSwitchEditDefaultsModeToEditMode);
+        this.servletContextProvider = new JetspeedServletContextProviderImpl(rdService);
     }
     
     protected ResourceBundle loadResourceBundle( Locale locale, String bundleName, ClassLoader cl )
@@ -471,7 +478,13 @@
                     throw new UnavailableException(msg);
                 }
                 
-                JetspeedPortletContext portletContext = new JetspeedPortletContextImpl(servletContext, pa, ContainerInfo.getInfo(), portalContext.getConfiguration());                    
+                JetspeedPortletContext portletContext = new JetspeedPortletContextImpl(servletContext, 
+                                                                                       pa, 
+                                                                                       ContainerInfo.getInfo(), 
+                                                                                       portalContext.getConfiguration(),
+                                                                                       rdService,
+                                                                                       servletContextProvider
+                                                                                       );
                 JetspeedPortletConfig portletConfig = new JetspeedPortletConfigImpl(this, portletContext, pd); 
                 
                 try

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/test/java/org/apache/jetspeed/factory/TestPortletFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/test/java/org/apache/jetspeed/factory/TestPortletFactory.java?rev=771327&r1=771326&r2=771327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/test/java/org/apache/jetspeed/factory/TestPortletFactory.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/test/java/org/apache/jetspeed/factory/TestPortletFactory.java Mon May  4 15:02:23 2009
@@ -40,6 +40,7 @@
 import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.util.DelegatingObjectProxy;
+import org.apache.pluto.container.impl.RequestDispatcherServiceImpl;
 import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
 
 import com.mockrunner.mock.web.MockServletContext;
@@ -51,7 +52,7 @@
     @Override
     public void setUp() throws Exception
     {
-        this.portletFactory = new JetspeedPortletFactory(true, true);
+        this.portletFactory = new JetspeedPortletFactory(new RequestDispatcherServiceImpl(), true, true);
         PortalConfiguration configuration = (PortalConfiguration) DelegatingObjectProxy.createProxy(new Class [] { PortalConfiguration.class },
                                                                                                     new MockPortalConfiguration());
         PortalContext portalContext = (PortalContext) DelegatingObjectProxy.createProxy(new Class [] { PortalContext.class },

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java?rev=771327&r1=771326&r2=771327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/java/org/apache/jetspeed/profiler/TestProfiler.java Mon May  4 15:02:23 2009
@@ -42,8 +42,12 @@
 import org.apache.jetspeed.request.RequestContext;
 import org.apache.jetspeed.security.JetspeedSubjectFactory;
 import org.apache.jetspeed.security.PrincipalsSet;
+import org.apache.jetspeed.security.SecurityDomain;
 import org.apache.jetspeed.security.impl.RoleImpl;
+import org.apache.jetspeed.security.impl.SecurityDomainImpl;
 import org.apache.jetspeed.security.impl.UserImpl;
+import org.apache.jetspeed.security.spi.SecurityDomainAccessManager;
+import org.apache.jetspeed.security.spi.SecurityDomainStorageManager;
 import org.apache.jetspeed.serializer.JetspeedSerializer;
 
 /**
@@ -56,6 +60,8 @@
 {
     private Profiler profiler = null;
     private ProfileResolvers resolvers = null;
+    protected SecurityDomainStorageManager domainStorageManager;
+    protected SecurityDomainAccessManager domainAccessManager;
     
     protected static final Properties TEST_PROPS = new Properties();
 
@@ -116,6 +122,26 @@
     protected void setUp() throws Exception
     {
         super.setUp();
+        
+        // Need to ensure required Security Domains are setup.
+        domainStorageManager = (SecurityDomainStorageManager) scm.getComponent(SecurityDomainStorageManager.class.getName());
+        domainAccessManager = (SecurityDomainAccessManager) scm.getComponent("org.apache.jetspeed.security.spi.SecurityDomainAccessManager");
+
+        SecurityDomain domain = domainAccessManager.getDomainByName(SecurityDomain.SYSTEM_NAME); 
+        if (domain == null){
+            
+            SecurityDomainImpl newDomain = new SecurityDomainImpl();
+            newDomain.setName(SecurityDomain.SYSTEM_NAME);
+            domainStorageManager.addDomain(newDomain);
+        } 
+        domain = domainAccessManager.getDomainByName(SecurityDomain.DEFAULT_NAME); 
+        if (domain == null){
+            
+            SecurityDomainImpl newDomain = new SecurityDomainImpl();
+            newDomain.setName(SecurityDomain.DEFAULT_NAME);
+            domainStorageManager.addDomain(newDomain);
+        }
+        
         this.profiler = (Profiler) scm.getComponent("profiler");
         JetspeedProfilerImpl profilerImpl = (JetspeedProfilerImpl)scm.getComponent("profilerImpl");
         assertNotNull("profiler not found ", profiler);
@@ -559,7 +585,7 @@
     protected String[] getConfigurations()
     {
         return new String[] { "profiler.xml", "transaction.xml", "serializer.xml", "security-providers.xml", "cache-test.xml", "capabilities.xml", "registry.xml", "search.xml", "jetspeed-spring.xml",
-                "security-managers.xml", "security-spi.xml", "security-spi-atn.xml", "security-atz.xml", "static-bean-references.xml", "JETSPEED-INF/spring/JetspeedPrincipalManagerProviderOverride.xml",
+                "security-managers.xml", "security-spi.xml", "security-spi-atn.xml", "security-atz.xml", "static-bean-references.xml", "pluto-services.xml", "JETSPEED-INF/spring/JetspeedPrincipalManagerProviderOverride.xml",
                 "JETSPEED-INF/spring/JetspeedPreferencesOverride.xml"};
     }
 

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml?rev=771327&r1=771326&r2=771327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml Mon May  4 15:02:23 2009
@@ -357,16 +357,6 @@
       </collection-descriptor>
       
    <collection-descriptor
-         name="servletMappingURLPatternList"
-         element-class-ref="org.apache.jetspeed.om.portlet.impl.ServletMappingURLPatternImpl"
-          auto-delete="true"
-          auto-update = "true"
-          auto-retrieve = "true"
-      >
-         <inverse-foreignkey field-ref="applicationId"/>
-      </collection-descriptor>
-
-   <collection-descriptor
          name="localeEncodingMappingList"
          element-class-ref="org.apache.jetspeed.om.portlet.impl.LocaleEncodingMappingImpl"
           auto-delete="true"
@@ -2229,38 +2219,6 @@
     </class-descriptor>
 
 <!--
-   - S E R V L E T  M A P P I N G  U R L P A T T E R N
- -->
-   <class-descriptor
-      class="org.apache.jetspeed.om.portlet.impl.ServletMappingURLPatternImpl"
-      table="SERVLET_MAPPING_URLPATTERN"
-   >
-
-      <field-descriptor
-         name="id"
-         column="ID"
-         jdbc-type="BIGINT"
-         primarykey="true"
-         autoincrement="true"
-         access="anonymous"
-      />
-
-      <field-descriptor
-         name="applicationId"
-         column="APPLICATION_ID"
-         jdbc-type="BIGINT"
-         access="anonymous"
-      />
-
-      <field-descriptor
-         name="urlPattern"
-         column="VALUE"
-         jdbc-type="VARCHAR"
-      />
-
-    </class-descriptor>
-
-<!--
    - L O C A L E   E N C O D I N G   M A P P I N G
  -->
    <class-descriptor

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorServiceImpl.java?rev=771327&r1=771326&r2=771327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorServiceImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorServiceImpl.java Mon May  4 15:02:23 2009
@@ -307,27 +307,6 @@
             }
         }
         
-        // retrieve servlet-mapping url patterns
-        nodes = (NodeList)xpath.evaluate("/"+prefix+"web-app/"+prefix+"servlet-mapping", document, XPathConstants.NODESET);
-        if (nodes != null)
-        {
-            String urlPattern;
-            
-            for (int i = 0, nsize = nodes.getLength(); i < nsize; i++)
-            {
-                element = (Element)nodes.item(i);
-                children = element.getElementsByTagName("url-pattern");
-                if (children != null && children.getLength() != 0)
-                {
-                    urlPattern = children.item(0).getTextContent().trim();
-                    if (urlPattern.length() > 0)
-                    {
-                        pa.addServletMappingURLPattern(urlPattern);
-                    }
-                }
-            }
-        }
-        
         // retrieve locale-encoding-mapping
         nodes = (NodeList)xpath.evaluate("/"+prefix+"web-app/"+prefix+"locale-encoding-mapping-list/"+prefix+"locale-encoding-mapping", document, XPathConstants.NODESET);
         if (nodes != null)

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java?rev=771327&r1=771326&r2=771327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java Mon May  4 15:02:23 2009
@@ -22,11 +22,9 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
 
 import javax.portlet.PortletMode;
 import javax.portlet.WindowState;
@@ -52,7 +50,6 @@
 import org.apache.jetspeed.om.portlet.PublicRenderParameter;
 import org.apache.jetspeed.om.portlet.SecurityConstraint;
 import org.apache.jetspeed.om.portlet.SecurityRole;
-import org.apache.jetspeed.om.portlet.ServletMappingURLPattern;
 import org.apache.jetspeed.om.portlet.UserAttribute;
 import org.apache.jetspeed.om.portlet.UserAttributeRef;
 import org.apache.jetspeed.util.JetspeedLocale;
@@ -112,7 +109,6 @@
     private List<UserAttributeRef> userAttributeRefs;
     private List<JetspeedServiceReference> services = new ArrayList<JetspeedServiceReference>();
 
-    private List<ServletMappingURLPattern> servletMappingURLPatternList;
     private List<LocaleEncodingMapping> localeEncodingMappingList;
     
     private transient Map<PortletMode,PortletMode> supportedCustomModes;
@@ -121,7 +117,6 @@
     private transient Map<WindowState,WindowState> mappedCustomStates;    
     private transient List<PortletMode> supportedPortletModes;
     private transient List<WindowState> supportedWindowStates;
-    private transient Set<String> servletMappingURLPatterns;
     private transient Map<Locale, String> localeEncodingMappings;
     
     private transient String localContextPath;
@@ -889,36 +884,6 @@
         return cro;
     }
     
-    public Set<String> getServletMappingURLPatterns()
-    {
-        if (servletMappingURLPatterns == null)
-        {
-            if (servletMappingURLPatternList == null)
-            {
-                servletMappingURLPatterns = Collections.emptySet();
-            }
-            else
-            {
-                Set<String> patterns = new HashSet<String>();
-                for (ServletMappingURLPattern pat : servletMappingURLPatternList)
-                {
-                    patterns.add(pat.getURLPattern());
-                }
-                servletMappingURLPatterns = Collections.unmodifiableSet(patterns);
-            }
-        }                        
-        return servletMappingURLPatterns;
-    }
-    
-    public void addServletMappingURLPattern(String servletMappingURLPattern)
-    {
-        if (servletMappingURLPatternList == null)
-        {
-            servletMappingURLPatternList = new ArrayList<ServletMappingURLPattern>();
-        }
-        servletMappingURLPatternList.add(new ServletMappingURLPatternImpl(servletMappingURLPattern));
-    }
-    
     public Map<Locale, String> getLocaleEncodingMappings()
     {
         if (localeEncodingMappings == null)

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/registry-test.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/registry-test.xml?rev=771327&r1=771326&r2=771327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/registry-test.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/registry-test.xml Mon May  4 15:02:23 2009
@@ -20,7 +20,11 @@
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
     
     <!-- Portlet Factory -->
-    <bean id="portletFactory" class="org.apache.jetspeed.factory.JetspeedPortletFactory"></bean>
+    <bean id="portletFactory" class="org.apache.jetspeed.factory.JetspeedPortletFactory">
+        <constructor-arg>
+            <bean class="org.apache.pluto.container.impl.RequestDispatcherServiceImpl"/>
+        </constructor-arg>
+    </bean>
 
     <!-- Portlet Registry DAO-->
     <bean id="portletRegistryImpl" class="org.apache.jetspeed.components.portletregistry.PersistenceBrokerPortletRegistry" init-method="init">

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml?rev=771327&r1=771326&r2=771327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml Mon May  4 15:02:23 2009
@@ -439,15 +439,6 @@
     </table> 
 	              
    <!--                    
-       SERVLET MAPPING URLPATTERN
-    -->                                                                     
-    <table name="SERVLET_MAPPING_URLPATTERN">                                            
-        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
-        <column name="APPLICATION_ID" required="true" type="INTEGER"/>
-        <column name="VALUE" required="true" size="255" type="VARCHAR"/>
-    </table> 
-    
-   <!--                    
        LOCALE ENCODING MAPPING
     -->                                                                     
     <table name="LOCALE_ENCODING_MAPPING">                                            

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml?rev=771327&r1=771326&r2=771327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml Mon May  4 15:02:23 2009
@@ -37,6 +37,7 @@
       <constructor-arg><ref bean="org.apache.pluto.services.UserInfoService"/></constructor-arg>            
       <constructor-arg><ref bean="org.apache.pluto.services.PortletInvokerService"/></constructor-arg>            
       <constructor-arg><ref bean="org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider"/></constructor-arg>
+      <constructor-arg><ref bean="org.apache.pluto.services.RequestDispatcherService"/></constructor-arg>
     </bean>
     
     <bean id='org.apache.jetspeed.events.PortletEventQueue'
@@ -93,4 +94,15 @@
         <constructor-arg index="2"><ref bean="portletFactory" /></constructor-arg>
     </bean>
 
+    <bean id="org.apache.pluto.services.RequestDispatcherService"
+          class="org.apache.pluto.container.impl.RequestDispatcherServiceImpl">
+      <meta key="j2:cat" value="default or registry" />
+      <!-- Pluto HttpServletPortletRequestWrapper.DispatchDetection:
+           - 0: CHECK_STATE (default)
+           - 1: CHECK_REQUEST_WRAPPER_STACK
+           - 2: EVALUATE
+      -->
+      <constructor-arg><value>0</value></constructor-arg>          
+    </bean>
+
 </beans>
\ No newline at end of file

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml?rev=771327&r1=771326&r2=771327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml Mon May  4 15:02:23 2009
@@ -21,14 +21,17 @@
   <!-- Portlet Factory -->
   <bean id="portletFactory" class="org.apache.jetspeed.factory.JetspeedPortletFactory">
     <meta key="j2:cat" value="default or registry" />
+    <constructor-arg index="0">
+      <ref bean="org.apache.pluto.services.RequestDispatcherService"/>
+    </constructor-arg>
     <!-- If the following constructor-arg is set to true, 
       proxy instances will switch config mode to built-in custom config mode portlet. -->
-    <constructor-arg index="0">
+    <constructor-arg index="1">
       <value>${supported.portletmode.autoswitch.config}</value>
     </constructor-arg>
     <!-- If the following constructor-arg is set to true, 
       proxy instances will switch edit_defaults mode to edit mode automatically for portlets not supporting edit_defaults mode. -->
-    <constructor-arg index="1">
+    <constructor-arg index="2">
       <value>${supported.portletmode.autoswitch.edit_defaults}</value>
     </constructor-arg>
     <!-- Surrogate portlet for config modes. -->



---------------------------------------------------------------------
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