Sun Oct 8 21:05:54 EDT 2006

Author: julien at jboss.com
Date: 2006-10-08 21:05:30 -0400 (Sun, 08 Oct 2006)
New Revision: 5366

Added:
   trunk/core/src/main/org/jboss/portal/core/controller/ajax/
   trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxController.java
   trunk/server/src/main/org/jboss/portal/server/RequestControllerDispatcher.java
Removed:
   trunk/server/src/main/org/jboss/portal/server/aspects/server/ControllerInterceptor.java
Modified:
   trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
   trunk/core/src/resources/portal-server-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test-sar/META-INF/jboss-service.xml
   trunk/portlet/src/resources/test-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml
   trunk/server/src/main/org/jboss/portal/server/servlet/PortalServlet.java
   trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml
   trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml
   trunk/server/src/resources/test/test-servlet-defaultservletmapping-war/WEB-INF/web.xml
   trunk/server/src/resources/test/test-servlet-pathmapping-war/WEB-INF/web.xml
   trunk/server/src/resources/test/test-servlet-rootpathmapping-war/WEB-INF/web.xml
   trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml
Log:
a few fixes in configuration

Added: trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxController.java
===================================================================

--- trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxController.java	2006-10-08 23:46:17 UTC (rev 5365)
+++ trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxController.java	2006-10-09 01:05:30 UTC (rev 5366)
@@ -0,0 +1,39 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.portal.core.controller.ajax;
+
+import org.jboss.portal.server.RequestController;
+import org.jboss.portal.server.ServerInvocation;
+import org.jboss.portal.server.ServerException;
+
+/**
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class AjaxController implements RequestController
+{
+
+   public void handle(ServerInvocation invocation) throws ServerException
+   {
+      System.out.println("ajax server invocation = " + invocation);
+   }
+}

Modified: trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml	2006-10-08 23:46:17 UTC (rev 5365)
+++ trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml	2006-10-09 01:05:30 UTC (rev 5366)
@@ -83,14 +83,6 @@
       <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.server.aspects.server.ControllerInterceptor"
-      name="portal:service=Interceptor,type=Server,name=Controller"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
-   </mbean>
-   <mbean
       code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
       name="portal:service=InterceptorStackFactory,type=Server"
       xmbean-dd=""
@@ -102,7 +94,6 @@
          <depends-list-element>portal:service=Interceptor,type=Server,name=User</depends-list-element>
          <depends-list-element>portal:service=Interceptor,type=Server,name=Locale</depends-list-element>
          <depends-list-element>portal:service=Interceptor,type=Server,name=ContentType</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Server,name=Controller</depends-list-element>
       </depends-list>
    </mbean>
 
@@ -719,7 +710,7 @@
    <!-- The core controller -->
    <mbean
       code="org.jboss.portal.core.controller.CoreController"
-      name="portal:controller=Request"
+      name="portal:controller=Core"
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
@@ -743,6 +734,15 @@
          proxy-type="attribute">portal:container=Instance</depends>
    </mbean>
 
+   <!-- The ajax controller -->
+   <mbean
+      code="org.jboss.portal.core.controller.ajax.AjaxController"
+      name="portal:controller=Ajax"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+   </mbean>
+
    <!-- -->
    <mbean
       code="org.jboss.portal.server.impl.ServerImpl"

Modified: trunk/core/src/resources/portal-server-war/WEB-INF/web.xml
===================================================================
--- trunk/core/src/resources/portal-server-war/WEB-INF/web.xml	2006-10-08 23:46:17 UTC (rev 5365)
+++ trunk/core/src/resources/portal-server-war/WEB-INF/web.xml	2006-10-09 01:05:30 UTC (rev 5366)
@@ -19,7 +19,7 @@
       </init-param>
       <init-param>
          <param-name>controllerName</param-name>
-         <param-value>portal:controller=Request</param-value>
+         <param-value>portal:controller=Core</param-value>
          <description>The request controller for the portal servlet</description>
       </init-param>
       <load-on-startup>0</load-on-startup>
@@ -40,7 +40,7 @@
       </init-param>
       <init-param>
          <param-name>controllerName</param-name>
-         <param-value>portal:controller=Request</param-value>
+         <param-value>portal:controller=Core</param-value>
          <description>The request controller for the portal servlet</description>
       </init-param>
       <load-on-startup>0</load-on-startup>
@@ -74,7 +74,7 @@
       <url-pattern>/authsec/*</url-pattern>
    </servlet-mapping>
 
-   <!-- Force the mapping of the index.jsp -->
+   <!-- Force the mapping of the index.jsp because of the default servlet replacement -->
    <servlet-mapping>
       <servlet-name>jsp</servlet-name>
       <url-pattern>/login.jsp</url-pattern>
@@ -162,4 +162,33 @@
    <security-role>
       <role-name>Authenticated</role-name>
    </security-role>
+
+   <!-- AJAX -->
+
+   <!-- The portal servlet for ajax requests -->
+   <servlet>
+      <servlet-name>PortalServletForAjax</servlet-name>
+      <servlet-class>org.jboss.portal.server.servlet.PortalServlet</servlet-class>
+      <init-param>
+         <param-name>asDefaultServlet</param-name>
+         <param-value>false</param-value>
+         <description>The servlet needs to know wether it is set as a default servlet or not</description>
+      </init-param>
+      <init-param>
+         <param-name>controllerName</param-name>
+         <param-value>portal:controller=Ajax</param-value>
+         <description>The request controller for the portal servlet</description>
+      </init-param>
+      <load-on-startup>0</load-on-startup>
+      <security-role-ref>
+        <role-name>Authenticated</role-name>
+        <role-link>Authenticated</role-link>
+      </security-role-ref>
+   </servlet>
+
+   <!-- Provide secure access to authenticated users -->
+   <servlet-mapping>
+      <servlet-name>PortalServletForAjax</servlet-name>
+      <url-pattern>/ajax/*</url-pattern>
+   </servlet-mapping>
 </web-app>

Modified: trunk/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml	2006-10-08 23:46:17 UTC (rev 5365)
+++ trunk/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml	2006-10-09 01:05:30 UTC (rev 5366)
@@ -11,21 +11,12 @@
 
    <!-- Server stack -->
    <mbean
-      code="org.jboss.portal.server.aspects.server.ControllerInterceptor"
-      name="portal:service=Interceptor,type=Server,name=Controller"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
-   </mbean>
-   <mbean
       code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
       name="portal:service=InterceptorStackFactory,type=Server"
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
       <depends-list optional-attribute-name="InterceptorNames">
-         <depends-list-element>portal:service=Interceptor,type=Server,name=Controller</depends-list-element>
       </depends-list>
    </mbean>
 

Modified: trunk/portlet/src/resources/test-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/portlet/src/resources/test-sar/META-INF/jboss-service.xml	2006-10-08 23:46:17 UTC (rev 5365)
+++ trunk/portlet/src/resources/test-sar/META-INF/jboss-service.xml	2006-10-09 01:05:30 UTC (rev 5366)
@@ -24,14 +24,6 @@
       <xmbean/>
    </mbean>
    <mbean
-      code="org.jboss.portal.server.aspects.server.ControllerInterceptor"
-      name="portal:service=Interceptor,type=Server,name=Controller"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request,redirect=true</depends>
-   </mbean>
-   <mbean
       code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
       name="portal:service=InterceptorStackFactory,type=Server"
       xmbean-dd=""
@@ -41,7 +33,6 @@
          <depends-list-element>portal:service=Interceptor,type=Server,name=User</depends-list-element>
          <depends-list-element>portal:service=Interceptor,type=Server,name=Locale</depends-list-element>
          <depends-list-element>portal:service=Interceptor,type=Server,name=ContentType</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Server,name=Controller</depends-list-element>
       </depends-list>
    </mbean>
 

Modified: trunk/portlet/src/resources/test-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test-war/WEB-INF/web.xml	2006-10-08 23:46:17 UTC (rev 5365)
+++ trunk/portlet/src/resources/test-war/WEB-INF/web.xml	2006-10-09 01:05:30 UTC (rev 5366)
@@ -15,6 +15,11 @@
          <param-value>false</param-value>
          <description>The servlet needs to know wether it is set as a default servlet or not</description>
       </init-param>
+      <init-param>
+         <param-name>controllerName</param-name>
+         <param-value>portal:controller=Request,redirect=true</param-value>
+         <description>The request controller for the portal servlet</description>
+      </init-param>
       <load-on-startup>0</load-on-startup>
       <security-role-ref>
         <role-name>Test</role-name>
@@ -31,6 +36,11 @@
          <param-value>false</param-value>
          <description>The servlet needs to know wether it is set as a default servlet or not</description>
       </init-param>
+      <init-param>
+         <param-name>controllerName</param-name>
+         <param-value>portal:controller=Request,redirect=false</param-value>
+         <description>The request controller for the portal servlet</description>
+      </init-param>
       <load-on-startup>0</load-on-startup>
       <security-role-ref>
         <role-name>Test</role-name>

Added: trunk/server/src/main/org/jboss/portal/server/RequestControllerDispatcher.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/RequestControllerDispatcher.java	2006-10-08 23:46:17 UTC (rev 5365)
+++ trunk/server/src/main/org/jboss/portal/server/RequestControllerDispatcher.java	2006-10-09 01:05:30 UTC (rev 5366)
@@ -0,0 +1,52 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.portal.server;
+
+import org.jboss.portal.common.invocation.InvocationHandler;
+import org.jboss.portal.common.invocation.Invocation;
+import org.jboss.portal.common.invocation.InvocationException;
+
+/**
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class RequestControllerDispatcher implements InvocationHandler
+{
+
+   /** . */
+   private final RequestController controller;
+
+   public RequestControllerDispatcher(RequestController controller)
+   {
+      if (controller == null)
+      {
+         throw new IllegalArgumentException();
+      }
+      this.controller = controller;
+   }
+
+   public void invoke(Invocation invocation) throws Exception, InvocationException
+   {
+      ServerInvocation serverInvocation = (ServerInvocation)invocation;
+      controller.handle(serverInvocation);
+   }
+}

Deleted: trunk/server/src/main/org/jboss/portal/server/aspects/server/ControllerInterceptor.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/aspects/server/ControllerInterceptor.java	2006-10-08 23:46:17 UTC (rev 5365)
+++ trunk/server/src/main/org/jboss/portal/server/aspects/server/ControllerInterceptor.java	2006-10-09 01:05:30 UTC (rev 5366)
@@ -1,57 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.portal.server.aspects.server;
-
-import org.jboss.portal.server.RequestController;
-import org.jboss.portal.server.ServerInterceptor;
-import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.common.invocation.InvocationException;
-
-/**
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public class ControllerInterceptor extends ServerInterceptor
-{
-
-   /** . */
-   private RequestController controller;
-
-   public RequestController getController()
-   {
-      return controller;
-   }
-
-   public void setController(RequestController controller)
-   {
-      this.controller = controller;
-   }
-
-   protected void invoke(ServerInvocation invocation) throws Exception, InvocationException
-   {
-      if (controller == null)
-      {
-         throw new InvocationException("No controller");
-      }
-      controller.handle(invocation);
-   }
-}

Modified: trunk/server/src/main/org/jboss/portal/server/servlet/PortalServlet.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/servlet/PortalServlet.java	2006-10-08 23:46:17 UTC (rev 5365)
+++ trunk/server/src/main/org/jboss/portal/server/servlet/PortalServlet.java	2006-10-09 01:05:30 UTC (rev 5366)
@@ -36,6 +36,8 @@
 import org.jboss.portal.server.ServerRequest;
 import org.jboss.portal.server.ServerResponse;
 import org.jboss.portal.server.ServerURL;
+import org.jboss.portal.server.RequestControllerDispatcher;
+import org.jboss.portal.server.RequestController;
 import org.jboss.portal.server.impl.ServerInvocationContextImpl;
 import org.jboss.portal.server.request.URLContext;
 import org.jboss.portal.server.request.URLFormat;
@@ -95,10 +97,17 @@
    /** Are we or not the default servlet ? */
    private boolean asDefaultServlet;
 
+   /** The controller for this servlet. */
+   private RequestController controller;
+
+   /** The controller name. */
+   private String controllerName;
+
    /** Configure the as default servlet. */
    public void init() throws ServletException
    {
       asDefaultServlet = getAsDefaultServletInitValue();
+      controllerName = getServletConfig().getInitParameter("controllerName");
    }
 
    /**
@@ -115,8 +124,9 @@
          }
          catch (Exception e)
          {
-            log.error("Cannot get portal server", e);
-            throw new IllegalStateException("Cannot get portal server");
+            String msg = "Cannot get portal server";
+            log.error(msg, e);
+            throw new IllegalStateException(msg);
          }
       }
       return server;
@@ -133,13 +143,33 @@
          }
          catch (Exception e)
          {
-            log.error("Cannot get interceptor stack", e);
-            throw new IllegalStateException("Cannot get interceptor stack");
+            String msg = "Cannot get interceptor stack";
+            log.error(msg, e);
+            throw new IllegalStateException(msg);
          }
       }
       return interceptorStack;
    }
 
+   protected final RequestController getController()
+   {
+      if (controller == null)
+      {
+         try
+         {
+            MBeanServer mbeanServer = MBeanServerLocator.locateJBoss();
+            controller = (RequestController)MBeanProxy.get(RequestController.class, new ObjectName(controllerName), mbeanServer);
+         }
+         catch (Exception e)
+         {
+            String msg = "Cannot get controller " + controllerName;
+            log.error(msg, e);
+            throw new IllegalStateException(msg);
+         }
+      }
+      return controller;
+   }
+
    private String retrieveMediaType(String contentType)
    {
       String mediaType = contentType;
@@ -294,6 +324,10 @@
             }
             else
             {
+               if (bodyParameterMap.isEmpty())
+               {
+                  bodyParameterMap = new HashMap();
+               }
                bodyParameterMap.put(paramName, paramValues);
             }
          }
@@ -334,6 +368,10 @@
       invocation.setResponse(response);
 
       //
+      RequestController controller = getController();
+      invocation.setHandler(new RequestControllerDispatcher(controller));
+
+      //
       try
       {
          InterceptorStackFactory stack = getInterceptorStackFactory();

Modified: trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml	2006-10-08 23:46:17 UTC (rev 5365)
+++ trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml	2006-10-09 01:05:30 UTC (rev 5366)
@@ -23,21 +23,12 @@
 
    <!-- Server stack -->
    <mbean
-      code="org.jboss.portal.server.aspects.server.ControllerInterceptor"
-      name="portal:service=Interceptor,type=Controller"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
-   </mbean>
-   <mbean
       code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
       name="portal:service=InterceptorStackFactory,type=Server"
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
       <depends-list optional-attribute-name="InterceptorNames">
-         <depends-list-element>portal:service=Interceptor,type=Controller</depends-list-element>
       </depends-list>
    </mbean>
 

Modified: trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml	2006-10-08 23:46:17 UTC (rev 5365)
+++ trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml	2006-10-09 01:05:30 UTC (rev 5366)
@@ -22,21 +22,12 @@
 
    <!-- Server stack -->
    <mbean
-      code="org.jboss.portal.server.aspects.server.ControllerInterceptor"
-      name="portal:service=Interceptor,type=Controller"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
-   </mbean>
-   <mbean
       code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
       name="portal:service=InterceptorStackFactory,type=Server"
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
       <depends-list optional-attribute-name="InterceptorNames">
-         <depends-list-element>portal:service=Interceptor,type=Controller</depends-list-element>
       </depends-list>
    </mbean>
 

Modified: trunk/server/src/resources/test/test-servlet-defaultservletmapping-war/WEB-INF/web.xml
===================================================================
--- trunk/server/src/resources/test/test-servlet-defaultservletmapping-war/WEB-INF/web.xml	2006-10-08 23:46:17 UTC (rev 5365)
+++ trunk/server/src/resources/test/test-servlet-defaultservletmapping-war/WEB-INF/web.xml	2006-10-09 01:05:30 UTC (rev 5366)
@@ -12,6 +12,11 @@
          <param-value>true</param-value>
          <description>The servlet needs to know wether it is set as a default servlet or not</description>
       </init-param>
+      <init-param>
+         <param-name>controllerName</param-name>
+         <param-value>portal:controller=Request</param-value>
+         <description>The request controller for the portal servlet</description>
+      </init-param>
       <load-on-startup>0</load-on-startup>
    </servlet>
    <servlet-mapping>

Modified: trunk/server/src/resources/test/test-servlet-pathmapping-war/WEB-INF/web.xml
===================================================================
--- trunk/server/src/resources/test/test-servlet-pathmapping-war/WEB-INF/web.xml	2006-10-08 23:46:17 UTC (rev 5365)
+++ trunk/server/src/resources/test/test-servlet-pathmapping-war/WEB-INF/web.xml	2006-10-09 01:05:30 UTC (rev 5366)
@@ -12,6 +12,11 @@
          <param-value>false</param-value>
          <description>The servlet needs to know wether it is set as a default servlet or not</description>
       </init-param>
+      <init-param>
+         <param-name>controllerName</param-name>
+         <param-value>portal:controller=Request</param-value>
+         <description>The request controller for the portal servlet</description>
+      </init-param>
       <load-on-startup>0</load-on-startup>
    </servlet>
    <servlet-mapping>

Modified: trunk/server/src/resources/test/test-servlet-rootpathmapping-war/WEB-INF/web.xml
===================================================================
--- trunk/server/src/resources/test/test-servlet-rootpathmapping-war/WEB-INF/web.xml	2006-10-08 23:46:17 UTC (rev 5365)
+++ trunk/server/src/resources/test/test-servlet-rootpathmapping-war/WEB-INF/web.xml	2006-10-09 01:05:30 UTC (rev 5366)
@@ -12,6 +12,11 @@
          <param-value>false</param-value>
          <description>The servlet needs to know wether it is set as a default servlet or not</description>
       </init-param>
+      <init-param>
+         <param-name>controllerName</param-name>
+         <param-value>portal:controller=Request</param-value>
+         <description>The request controller for the portal servlet</description>
+      </init-param>
       <load-on-startup>0</load-on-startup>
    </servlet>
    <servlet-mapping>

Modified: trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml	2006-10-08 23:46:17 UTC (rev 5365)
+++ trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml	2006-10-09 01:05:30 UTC (rev 5366)
@@ -24,21 +24,12 @@
 
    <!-- Server stack -->
    <mbean
-      code="org.jboss.portal.server.aspects.server.ControllerInterceptor"
-      name="portal:service=Interceptor,type=Controller"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends optional-attribute-name="Controller" proxy-type="attribute">portal:controller=Request</depends>
-   </mbean>
-   <mbean
       code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
       name="portal:service=InterceptorStackFactory,type=Server"
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
       <depends-list optional-attribute-name="InterceptorNames">
-         <depends-list-element>portal:service=Interceptor,type=Controller</depends-list-element>
       </depends-list>
    </mbean>
 


