[jboss-svn-commits] JBL Code SVN: r9499 - in labs/jbosslabs/trunk/portal-extensions: configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF and 7 other directories.

Wed Feb 14 13:43:21 EST 2007

Author: adamw
Date: 2007-02-14 13:43:21 -0500 (Wed, 14 Feb 2007)
New Revision: 9499

Added:
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/forge/
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/forge/redirect/
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/forge/redirect/RootRedirectFilter.java
Removed:
   labs/jbosslabs/trunk/portal-extensions/forge-root-redirect/
Modified:
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/forge-mapper.iml
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/maven.xml
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/
   labs/jbosslabs/trunk/portal-extensions/forge-primarynav/
   labs/jbosslabs/trunk/portal-extensions/maven.xml
Log:
Portal in root context

Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml
===================================================================

--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml	2007-02-14 18:02:28 UTC (rev 9498)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml	2007-02-14 18:43:21 UTC (rev 9499)
@@ -24,1116 +24,1134 @@
 
 <server>
 
-   <!-- Server configuration service -->
-   <mbean
-      code="org.jboss.portal.server.config.ServerConfigService"
-      name="portal:service=ServerConfig"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="ConfigLocation">conf/config.xml</attribute>
-   </mbean>
+    <!-- Server configuration service -->
+    <mbean
+            code="org.jboss.portal.server.config.ServerConfigService"
+            name="portal:service=ServerConfig"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <attribute name="ConfigLocation">conf/config.xml</attribute>
+    </mbean>
 
-   <mbean
-      code="org.jboss.portal.server.impl.xml.EntityResolverService"
-      name="portal:service=EntityResolver"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="DTDMapping">
-         <properties>
-            <entry key="-//JBoss Portal//DTD JBoss Portlet 2.6//EN">dtd/jboss-portlet_2_6.dtd</entry>
-            <entry key="-//JBoss Portal//DTD JBoss App 2.6//EN">dtd/jboss-app_2_6.dtd</entry>
-            <entry key="-//JBoss Portal//DTD Portal Object 2.6//EN">dtd/portal-object_2_6.dtd</entry>
-            <entry key="-//JBoss Portal//DTD Portlet Instances 2.6//EN">dtd/portlet-instances_2_6.dtd</entry>
-         </properties>
-      </attribute>
-   </mbean>
+    <mbean
+            code="org.jboss.portal.server.impl.xml.EntityResolverService"
+            name="portal:service=EntityResolver"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <attribute name="DTDMapping">
+            <properties>
+                <entry key="-//JBoss Portal//DTD JBoss Portlet 2.6//EN">dtd/jboss-portlet_2_6.dtd</entry>
+                <entry key="-//JBoss Portal//DTD JBoss App 2.6//EN">dtd/jboss-app_2_6.dtd</entry>
+                <entry key="-//JBoss Portal//DTD Portal Object 2.6//EN">dtd/portal-object_2_6.dtd</entry>
+                <entry key="-//JBoss Portal//DTD Portlet Instances 2.6//EN">dtd/portlet-instances_2_6.dtd</entry>
+            </properties>
+        </attribute>
+    </mbean>
 
-   <!-- Portal security services-->
-   <mbean
-      code="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl"
-      name="portal:service=AuthorizationDomainRegistry"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/> 
-   </mbean>
-   <mbean
-      code="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory"
-      name="portal:service=PortalAuthorizationManagerFactory"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="AuthorizationDomainRegistry"
-         proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.portlet.impl.security.JBossPortletSecurityService"
-      name="portal:service=PortletSecurityService"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-	   <depends
-         optional-attribute-name="PortalAuthorizationManagerFactory"
-         proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
-      <depends
-         optional-attribute-name="AuthorizationDomainRegistry"
-         proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
-   </mbean>
+    <!-- Portal security services-->
+    <mbean
+            code="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl"
+            name="portal:service=AuthorizationDomainRegistry"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory"
+            name="portal:service=PortalAuthorizationManagerFactory"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends
+                optional-attribute-name="AuthorizationDomainRegistry"
+                proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.portlet.impl.security.JBossPortletSecurityService"
+            name="portal:service=PortletSecurityService"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends
+                optional-attribute-name="PortalAuthorizationManagerFactory"
+                proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+        <depends
+                optional-attribute-name="AuthorizationDomainRegistry"
+                proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
+    </mbean>
 
-   <!-- Server stack -->
-   <mbean
-      code="org.jboss.portal.core.aspects.server.TransactionInterceptor"
-      name="portal:service=Interceptor,type=Server,name=Transaction"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.server.aspects.server.SessionInvalidatorInterceptor"
-      name="portal:service=Interceptor,type=Server,name=SessionInvalidator"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.aspects.server.UserInterceptor"
-      name="portal:service=Interceptor,type=Server,name=User"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends>portal:service=Module,type=IdentityServiceController</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.aspects.server.LocaleInterceptor"
-      name="portal:service=Interceptor,type=Server,name=Locale"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.server.aspects.server.ContentTypeInterceptor"
-      name="portal:service=Interceptor,type=Server,name=ContentType"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </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=Transaction</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Server,name=SessionInvalidator</depends-list-element>
-         <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>
-   </mbean>
+    <!-- Server stack -->
+    <mbean
+            code="org.jboss.portal.core.aspects.server.TransactionInterceptor"
+            name="portal:service=Interceptor,type=Server,name=Transaction"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.server.aspects.server.SessionInvalidatorInterceptor"
+            name="portal:service=Interceptor,type=Server,name=SessionInvalidator"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.aspects.server.UserInterceptor"
+            name="portal:service=Interceptor,type=Server,name=User"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends>portal:service=Module,type=IdentityServiceController</depends>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.aspects.server.LocaleInterceptor"
+            name="portal:service=Interceptor,type=Server,name=Locale"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.server.aspects.server.ContentTypeInterceptor"
+            name="portal:service=Interceptor,type=Server,name=ContentType"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </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=Transaction</depends-list-element>
+            <depends-list-element>portal:service=Interceptor,type=Server,name=SessionInvalidator</depends-list-element>
+            <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>
+    </mbean>
 
-   <!-- Command stack -->
-   <mbean
-      code="org.jboss.portal.core.aspects.controller.node.PortalNodeInterceptor"
-      name="portal:service=Interceptor,type=Command,name=PortalNode"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.aspects.controller.PolicyEnforcementInterceptor"
-      name="portal:service=Interceptor,type=Command,name=PolicyEnforcement"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.aspects.controller.PageCustomizerInterceptor"
-      name="portal:service=Interceptor,type=Command,name=PageCustomizer"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="PortalAuthorizationManagerFactory"
-         proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.controller.ajax.AjaxInterceptor"
-      name="portal:service=Interceptor,type=Command,name=Ajax"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.aspects.controller.node.EventBroadcasterInterceptor"
-      name="portal:service=Interceptor,type=Command,name=EventBroadcaster"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="ListenerRegistry"
-         proxy-type="attribute">portal:service=ListenerRegistry</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
-      name="portal:service=InterceptorStackFactory,type=Command"
-      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=Command,name=PortalNode</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Command,name=PolicyEnforcement</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Command,name=PageCustomizer</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Command,name=Ajax</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Command,name=EventBroadcaster</depends-list-element>
-      </depends-list>
-   </mbean>
+    <!-- Command stack -->
+    <mbean
+            code="org.jboss.portal.core.aspects.controller.node.PortalNodeInterceptor"
+            name="portal:service=Interceptor,type=Command,name=PortalNode"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.aspects.controller.PolicyEnforcementInterceptor"
+            name="portal:service=Interceptor,type=Command,name=PolicyEnforcement"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.aspects.controller.PageCustomizerInterceptor"
+            name="portal:service=Interceptor,type=Command,name=PageCustomizer"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends
+                optional-attribute-name="PortalAuthorizationManagerFactory"
+                proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.controller.ajax.AjaxInterceptor"
+            name="portal:service=Interceptor,type=Command,name=Ajax"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.aspects.controller.node.EventBroadcasterInterceptor"
+            name="portal:service=Interceptor,type=Command,name=EventBroadcaster"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends
+                optional-attribute-name="ListenerRegistry"
+                proxy-type="attribute">portal:service=ListenerRegistry</depends>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+            name="portal:service=InterceptorStackFactory,type=Command"
+            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=Command,name=PortalNode</depends-list-element>
+            <depends-list-element>portal:service=Interceptor,type=Command,name=PolicyEnforcement</depends-list-element>
+            <depends-list-element>portal:service=Interceptor,type=Command,name=PageCustomizer</depends-list-element>
+            <depends-list-element>portal:service=Interceptor,type=Command,name=Ajax</depends-list-element>
+            <depends-list-element>portal:service=Interceptor,type=Command,name=EventBroadcaster</depends-list-element>
+        </depends-list>
+    </mbean>
 
-   <!-- Instance stack -->
-   <mbean
-      code="org.jboss.portal.core.model.instance.InstanceSecurityInterceptor"
-      name="portal:service=Interceptor,type=Portlet,name=InstanceSecurity"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor"
-      name="portal:service=Interceptor,type=Portlet,name=ConsumerCache"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.portlet.aspects.portlet.PortalSessionSynchronizationInterceptor"
-      name="portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
-      name="portal:service=InterceptorStackFactory,type=Instance"
-      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=Portlet,name=ConsumerCache</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Portlet,name=InstanceSecurity</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization</depends-list-element>
-      </depends-list>
-   </mbean>
+    <!-- Instance stack -->
+    <mbean
+            code="org.jboss.portal.core.model.instance.InstanceSecurityInterceptor"
+            name="portal:service=Interceptor,type=Portlet,name=InstanceSecurity"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor"
+            name="portal:service=Interceptor,type=Portlet,name=ConsumerCache"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.portlet.aspects.portlet.PortalSessionSynchronizationInterceptor"
+            name="portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+            name="portal:service=InterceptorStackFactory,type=Instance"
+            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=Portlet,name=ConsumerCache</depends-list-element>
+            <depends-list-element>portal:service=Interceptor,type=Portlet,name=InstanceSecurity</depends-list-element>
+            <depends-list-element>portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization</depends-list-element>
+        </depends-list>
+    </mbean>
 
-   <!-- Producer stack -->
-   <mbean
-      code="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor"
-      name="portal:service=Interceptor,type=Portlet,name=Valve"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.portlet.aspects.portlet.ContextTrackerInterceptor"
-      name="portal:service=Interceptor,type=Portlet,name=ContextTracker"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor"
-      name="portal:service=Interceptor,type=Portlet,name=SecureTransport"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor"
-      name="portal:service=Interceptor,type=Portlet,name=ContextDispatcher"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.portlet.aspects.portlet.PortletSessionSynchronizationInterceptor"
-      name="portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.bridge.BridgeInterceptor"
-      name="portal:service=Interceptor,type=Portlet,name=Bridge"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.portlet.aspects.portlet.WindowStatesInterceptor"
-      name="portal:service=Interceptor,type=Portlet,name=WindowStates"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.portlet.aspects.portlet.ModesInterceptor"
-      name="portal:service=Interceptor,type=Portlet,name=Modes"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor"
-      name="portal:service=Interceptor,type=Portlet,name=ProducerCache"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.aspects.portlet.TransactionInterceptor"
-      name="portal:service=Interceptor,type=Portlet,name=Transaction"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.aspects.portlet.HeaderInterceptor"
-      name="portal:service=Interceptor,type=Portlet,name=Header"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
-      name="portal:service=InterceptorStackFactory,type=Producer"
-      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=Portlet,name=Valve</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Portlet,name=SecureTransport</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextDispatcher</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextTracker</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Portlet,name=WindowStates</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Portlet,name=Bridge</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Portlet,name=Modes</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Portlet,name=ProducerCache</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Portlet,name=Header</depends-list-element>
-         <depends-list-element>portal:service=Interceptor,type=Portlet,name=Transaction</depends-list-element>
-      </depends-list>
-   </mbean>
+    <!-- Producer stack -->
+    <mbean
+            code="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor"
+            name="portal:service=Interceptor,type=Portlet,name=Valve"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.portlet.aspects.portlet.ContextTrackerInterceptor"
+            name="portal:service=Interceptor,type=Portlet,name=ContextTracker"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor"
+            name="portal:service=Interceptor,type=Portlet,name=SecureTransport"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor"
+            name="portal:service=Interceptor,type=Portlet,name=ContextDispatcher"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.portlet.aspects.portlet.PortletSessionSynchronizationInterceptor"
+            name="portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.bridge.BridgeInterceptor"
+            name="portal:service=Interceptor,type=Portlet,name=Bridge"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.portlet.aspects.portlet.WindowStatesInterceptor"
+            name="portal:service=Interceptor,type=Portlet,name=WindowStates"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.portlet.aspects.portlet.ModesInterceptor"
+            name="portal:service=Interceptor,type=Portlet,name=Modes"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor"
+            name="portal:service=Interceptor,type=Portlet,name=ProducerCache"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.aspects.portlet.TransactionInterceptor"
+            name="portal:service=Interceptor,type=Portlet,name=Transaction"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.aspects.portlet.HeaderInterceptor"
+            name="portal:service=Interceptor,type=Portlet,name=Header"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+            name="portal:service=InterceptorStackFactory,type=Producer"
+            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=Portlet,name=Valve</depends-list-element>
+            <depends-list-element>portal:service=Interceptor,type=Portlet,name=SecureTransport</depends-list-element>
+            <depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextDispatcher</depends-list-element>
+            <depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextTracker</depends-list-element>
+            <depends-list-element>portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization</depends-list-element>
+            <depends-list-element>portal:service=Interceptor,type=Portlet,name=WindowStates</depends-list-element>
+            <depends-list-element>portal:service=Interceptor,type=Portlet,name=Bridge</depends-list-element>
+            <depends-list-element>portal:service=Interceptor,type=Portlet,name=Modes</depends-list-element>
+            <depends-list-element>portal:service=Interceptor,type=Portlet,name=ProducerCache</depends-list-element>
+            <depends-list-element>portal:service=Interceptor,type=Portlet,name=Header</depends-list-element>
+            <depends-list-element>portal:service=Interceptor,type=Portlet,name=Transaction</depends-list-element>
+        </depends-list>
+    </mbean>
 
-   <!-- Theme and layout services -->
-   <mbean
-      code="org.jboss.portal.theme.impl.ThemeServiceImpl"
-      name="portal:service=ThemeService"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.theme.impl.LayoutServiceImpl"
-      name="portal:service=LayoutService"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.theme.impl.page.PageServiceImpl"
-      name="portal:service=PageService"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="LayoutService"
-         proxy-type="attribute">portal:service=LayoutService</depends>
-      <depends
-         optional-attribute-name="ThemeService"
-         proxy-type="attribute">portal:service=ThemeService</depends>
-   </mbean>
+    <!-- Theme and layout services -->
+    <mbean
+            code="org.jboss.portal.theme.impl.ThemeServiceImpl"
+            name="portal:service=ThemeService"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.theme.impl.LayoutServiceImpl"
+            name="portal:service=LayoutService"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.theme.impl.page.PageServiceImpl"
+            name="portal:service=PageService"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends
+                optional-attribute-name="LayoutService"
+                proxy-type="attribute">portal:service=LayoutService</depends>
+        <depends
+                optional-attribute-name="ThemeService"
+                proxy-type="attribute">portal:service=ThemeService</depends>
+    </mbean>
 
-   <!--
-      | Uncomment in clustered mode : replicated cache for hibernate
-      
-      <mbean
-      code="org.jboss.cache.TreeCache"
-      name="portal:service=TreeCache,type=hibernate">
-      <depends>jboss:service=Naming</depends>
-      <depends>jboss:service=TransactionManager</depends>
-      <attribute name="TransactionManagerLookupClass">org.jboss.cache.JBossTransactionManagerLookup</attribute>
-      <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-      <attribute name="CacheMode">REPL_SYNC</attribute>
-      <attribute name="ClusterName">portal.hibernate</attribute>
-      </mbean>
-      
-      <mbean
-      code="org.jboss.portal.jems.hibernate.JBossTreeCacheProvider"
-      name="portal:service=TreeCacheProvider,type=hibernate">
-      <depends optional-attribute-name="CacheName">portal:service=TreeCache,type=hibernate</depends>
-      </mbean>
-   
-   -->
+    <!--
+       | Uncomment in clustered mode : replicated cache for hibernate
 
-   <!-- Session factories -->
-   <mbean
-      code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
-      name="portal:service=Hibernate"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
-      <!-- Uncomment in clustered mode : hibernate depends on its tree cache service 
-         <depends>portal:service=TreeCacheProvider,type=hibernate</depends>
-       -->
-      <attribute name="DoChecking">true</attribute>
-      <attribute name="ConfigLocation">conf/hibernate/user/hibernate.cfg.xml</attribute>
-      <attribute name="SetupLocation">conf/hibernate/user/setup.txt</attribute>
-      <attribute name="JNDIName">java:/portal/IdentitySessionFactory</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
-      name="portal:service=Hibernate,type=Instance"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
-      <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
-      <!-- Uncomment in clustered mode : hibernate depends on its tree cache service 
-         <depends>portal:service=TreeCacheProvider,type=hibernate</depends>
-       -->
-      <attribute name="DoChecking">true</attribute>
-      <attribute name="ConfigLocation">conf/hibernate/instance/hibernate.cfg.xml</attribute>
-      <attribute name="JNDIName">java:/portal/InstanceSessionFactory</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
-      name="portal:service=Hibernate,type=PortalObject"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
-      <!-- Uncomment in clustered mode : hibernate depends on its tree cache service 
-         <depends>portal:service=TreeCacheProvider,type=hibernate</depends>
-       -->
-      <attribute name="DoChecking">true</attribute>
-      <attribute name="ConfigLocation">conf/hibernate/portal/hibernate.cfg.xml</attribute>
-      <attribute name="JNDIName">java:/portal/PortalObjectSessionFactory</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
-      name="portal:service=Hibernate,type=Portlet"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
-      <!-- Uncomment in clustered mode : hibernate depends on its tree cache service 
-         <depends>portal:service=TreeCacheProvider,type=hibernate</depends>
-       -->
-      <attribute name="DoChecking">true</attribute>
-      <attribute name="ConfigLocation">conf/hibernate/portlet/hibernate.cfg.xml</attribute>
-      <attribute name="JNDIName">java:/portal/PortletSessionFactory</attribute>
-   </mbean>
+       <mbean
+       code="org.jboss.cache.TreeCache"
+       name="portal:service=TreeCache,type=hibernate">
+       <depends>jboss:service=Naming</depends>
+       <depends>jboss:service=TransactionManager</depends>
+       <attribute name="TransactionManagerLookupClass">org.jboss.cache.JBossTransactionManagerLookup</attribute>
+       <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+       <attribute name="CacheMode">REPL_SYNC</attribute>
+       <attribute name="ClusterName">portal.hibernate</attribute>
+       </mbean>
 
-   <!--Identity-->
-   <mbean
-      code="org.jboss.portal.identity.IdentityServiceControllerImpl"
-      name="portal:service=Module,type=IdentityServiceController"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends>portal:service=Hibernate</depends>
-      <!--<depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>-->
-      <attribute name="JndiName">java:/portal/IdentityServiceController</attribute>
-      <attribute name="RegisterMBeans">true</attribute>
-      <attribute name="ConfigFile">conf/identity/identity-config.xml</attribute>
-      <attribute name="DefaultConfigFile">conf/identity/standardidentity-config.xml</attribute>
-   </mbean>
+       <mbean
+       code="org.jboss.portal.jems.hibernate.JBossTreeCacheProvider"
+       name="portal:service=TreeCacheProvider,type=hibernate">
+       <depends optional-attribute-name="CacheName">portal:service=TreeCache,type=hibernate</depends>
+       </mbean>
 
-   <mbean
-      code="org.jboss.portal.core.impl.mail.MailModuleImpl"
-      name="portal:service=Module,type=Mail"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends>jboss:service=Mail</depends>
-      <depends>portal:service=Module,type=IdentityServiceController</depends>
-      <attribute name="QueueCapacity">-1</attribute>
-      <attribute name="Gateway">localhost</attribute>
-      <attribute name="SmtpUser"></attribute>
-      <attribute name="SmtpPassword"></attribute>
-      <attribute name="JavaMailDebugEnabled">false</attribute>
-      <attribute name="SMTPConnectionTimeout">100000</attribute>
-      <attribute name="SMTPTimeout">10000</attribute>
-      <attribute name="JNDIName">java:portal/MailModule</attribute>
-   </mbean>
+    -->
 
-   <mbean
-      code="org.jboss.security.auth.login.DynamicLoginConfig"
-      name="portal:service=JAASLoginModule">
-      <depends optional-attribute-name="LoginConfigService">jboss.security:service=XMLLoginConfig</depends>
-      <depends optional-attribute-name="SecurityManagerService">jboss.security:service=JaasSecurityManager</depends>
-      <attribute name="AuthConfig">conf/login-config.xml</attribute>
-   </mbean>
+    <!-- Session factories -->
+    <mbean
+            code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+            name="portal:service=Hibernate"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
+        <!-- Uncomment in clustered mode : hibernate depends on its tree cache service
+          <depends>portal:service=TreeCacheProvider,type=hibernate</depends>
+        -->
+        <attribute name="DoChecking">true</attribute>
+        <attribute name="ConfigLocation">conf/hibernate/user/hibernate.cfg.xml</attribute>
+        <attribute name="SetupLocation">conf/hibernate/user/setup.txt</attribute>
+        <attribute name="JNDIName">java:/portal/IdentitySessionFactory</attribute>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+            name="portal:service=Hibernate,type=Instance"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
+        <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
+        <!-- Uncomment in clustered mode : hibernate depends on its tree cache service
+          <depends>portal:service=TreeCacheProvider,type=hibernate</depends>
+        -->
+        <attribute name="DoChecking">true</attribute>
+        <attribute name="ConfigLocation">conf/hibernate/instance/hibernate.cfg.xml</attribute>
+        <attribute name="JNDIName">java:/portal/InstanceSessionFactory</attribute>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+            name="portal:service=Hibernate,type=PortalObject"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
+        <!-- Uncomment in clustered mode : hibernate depends on its tree cache service
+          <depends>portal:service=TreeCacheProvider,type=hibernate</depends>
+        -->
+        <attribute name="DoChecking">true</attribute>
+        <attribute name="ConfigLocation">conf/hibernate/portal/hibernate.cfg.xml</attribute>
+        <attribute name="JNDIName">java:/portal/PortalObjectSessionFactory</attribute>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+            name="portal:service=Hibernate,type=Portlet"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
+        <!-- Uncomment in clustered mode : hibernate depends on its tree cache service
+          <depends>portal:service=TreeCacheProvider,type=hibernate</depends>
+        -->
+        <attribute name="DoChecking">true</attribute>
+        <attribute name="ConfigLocation">conf/hibernate/portlet/hibernate.cfg.xml</attribute>
+        <attribute name="JNDIName">java:/portal/PortletSessionFactory</attribute>
+    </mbean>
 
-   <!-- Registries -->
-   <mbean
-      code="org.jboss.portal.portlet.container.PortletApplicationRegistryImpl"
-      name="portal:service=WebAppRegistry"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
+    <!--Identity-->
+    <mbean
+            code="org.jboss.portal.identity.IdentityServiceControllerImpl"
+            name="portal:service=Module,type=IdentityServiceController"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends>portal:service=Hibernate</depends>
+        <!--<depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>-->
+        <attribute name="JndiName">java:/portal/IdentityServiceController</attribute>
+        <attribute name="RegisterMBeans">true</attribute>
+        <attribute name="ConfigFile">conf/identity/identity-config.xml</attribute>
+        <attribute name="DefaultConfigFile">conf/identity/standardidentity-config.xml</attribute>
+    </mbean>
 
-   <!-- Listener registry -->
-   <mbean
-      code="org.jboss.portal.core.event.PortalEventListenerRegistryImpl"
-      name="portal:service=ListenerRegistry"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
+    <mbean
+            code="org.jboss.portal.core.impl.mail.MailModuleImpl"
+            name="portal:service=Module,type=Mail"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends>jboss:service=Mail</depends>
+        <depends>portal:service=Module,type=IdentityServiceController</depends>
+        <attribute name="QueueCapacity">-1</attribute>
+        <attribute name="Gateway">localhost</attribute>
+        <attribute name="SmtpUser"></attribute>
+        <attribute name="SmtpPassword"></attribute>
+        <attribute name="JavaMailDebugEnabled">false</attribute>
+        <attribute name="SMTPConnectionTimeout">100000</attribute>
+        <attribute name="SMTPTimeout">10000</attribute>
+        <attribute name="JNDIName">java:portal/MailModule</attribute>
+    </mbean>
 
-   <!-- The different containers -->
-   <mbean
-      code="org.jboss.portal.core.impl.model.instance.PersistentInstanceContainer"
-      name="portal:container=Instance"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends>portal:service=Hibernate,type=Instance</depends>
-      <depends
-         optional-attribute-name="StackFactory"
-         proxy-type="attribute">portal:service=InterceptorStackFactory,type=Instance</depends>
-      <depends
-         optional-attribute-name="PortletInvoker"
-         proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
-      <depends
-         optional-attribute-name="PortalAuthorizationManagerFactory"
-         proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
-      <depends
-         optional-attribute-name="AuthorizationDomainRegistry"
-         proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
-      <attribute name="SessionFactoryJNDIName">java:/portal/InstanceSessionFactory</attribute>
-      <attribute name="CacheNaturalId">true</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer"
-      name="portal:container=PortalObject"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends>portal:service=Hibernate,type=PortalObject</depends>
-	   <depends
-         optional-attribute-name="PortalAuthorizationManagerFactory"
-         proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
-      <depends
-         optional-attribute-name="AuthorizationDomainRegistry"
-         proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
-      <depends
-         optional-attribute-name="InstanceContainer"
-         proxy-type="attribute">portal:container=Instance</depends>
-      <attribute name="SessionFactoryJNDIName">java:/portal/PortalObjectSessionFactory</attribute>
-      <attribute name="CacheNaturalId">true</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.impl.model.content.portlet.PortletContentHandler"
-      name="portal:service=ContentHandler,type=portlet"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="Registry"
-         proxy-type="attribute">portal:container=PortalObject</depends>
-      <depends
-         optional-attribute-name="InstanceContainer"
-         proxy-type="attribute">portal:container=Instance</depends>
-      <attribute name="ContentType">portlet</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.impl.model.content.cms.CMSContentHandler"
-      name="portal:service=ContentHandler,type=cms"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="Registry"
-         proxy-type="attribute">portal:container=PortalObject</depends>
-      <attribute name="ContentType">cms</attribute>
-   </mbean>
+    <mbean
+            code="org.jboss.security.auth.login.DynamicLoginConfig"
+            name="portal:service=JAASLoginModule">
+        <depends optional-attribute-name="LoginConfigService">jboss.security:service=XMLLoginConfig</depends>
+        <depends optional-attribute-name="SecurityManagerService">jboss.security:service=JaasSecurityManager</depends>
+        <attribute name="AuthConfig">conf/login-config.xml</attribute>
+    </mbean>
 
-   <!-- Customization manager -->
-   <mbean
-      code="org.jboss.portal.core.impl.model.CustomizationManagerService"
-      name="portal:service=CustomizationManager"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-	   <depends
-         optional-attribute-name="PortalAuthorizationManagerFactory"
-         proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
-      <depends
-         optional-attribute-name="InstanceContainer"
-         proxy-type="attribute">portal:container=Instance</depends>
-      <depends
-         optional-attribute-name="PortalObjectContainer"
-         proxy-type="attribute">portal:container=PortalObject</depends>
-      <depends>portal:service=Module,type=IdentityServiceController</depends>
-      <attribute name="DashboardContextId">dashboard</attribute>
-   </mbean>
+    <!-- Registries -->
+    <mbean
+            code="org.jboss.portal.portlet.container.PortletApplicationRegistryImpl"
+            name="portal:service=WebAppRegistry"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
 
-   <!-- Command factories -->
-   <mbean
-      code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService"
-      name="portal:commandFactory=Delegating"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.model.portal.DefaultPortalCommandFactory"
-      name="portal:commandFactory=DefaultPortal"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="NextFactory"
-         proxy-type="attribute">portal:commandFactory=Delegating</depends>
-      <depends
-         optional-attribute-name="Container"
-         proxy-type="attribute">portal:container=PortalObject</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
-      name="portal:commandFactory=PortalObject"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="Container"
-         proxy-type="attribute">portal:container=PortalObject</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
-      name="portal:commandFactory=Delegate,path=portal"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Path">/portal</attribute>
-      <depends
-         optional-attribute-name="DelegatingFactory"
-         proxy-type="attribute">portal:commandFactory=Delegating</depends>
-      <depends
-         optional-attribute-name="DelegateFactory"
-         proxy-type="attribute">portal:commandFactory=PortalObject</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.controller.command.mapper.SimpleCommandFactory"
-      name="portal:commandFactory=SignOut"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="CommandClassName">org.jboss.portal.core.controller.command.SignOutCommand</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
-      name="portal:commandFactory=Delegate,path=signout"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Path">/signout</attribute>
-      <depends
-         optional-attribute-name="DelegatingFactory"
-         proxy-type="attribute">portal:commandFactory=Delegating</depends>
-      <depends
-         optional-attribute-name="DelegateFactory"
-         proxy-type="attribute">portal:commandFactory=SignOut</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.model.portal.DashboardCommandFactory"
-      name="portal:commandFactory=Dashboard"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
-      name="portal:commandFactory=Delegate,path=dashboard"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Path">/dashboard</attribute>
-      <depends
-         optional-attribute-name="DelegatingFactory"
-         proxy-type="attribute">portal:commandFactory=Delegating</depends>
-      <depends
-         optional-attribute-name="DelegateFactory"
-         proxy-type="attribute">portal:commandFactory=Dashboard</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.model.instance.InstanceCommandFactory"
-      name="portal:commandFactory=Configurator"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="InstanceId">ConfiguratorPortletInstance</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
-      name="portal:commandFactory=Delegate,path=configure"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Path">/configure</attribute>
-      <depends
-         optional-attribute-name="DelegatingFactory"
-         proxy-type="attribute">portal:commandFactory=Delegating</depends>
-      <depends
-         optional-attribute-name="DelegateFactory"
-         proxy-type="attribute">portal:commandFactory=Configurator</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
-      name="portal:commandFactory=Delegate,path=test"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Path">/test</attribute>
-      <depends
-         optional-attribute-name="DelegatingFactory"
-         proxy-type="attribute">portal:commandFactory=Delegating</depends>
-      <depends
-         optional-attribute-name="DelegateFactory"
-         proxy-type="attribute">portal:commandFactory=Test</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.model.instance.InstanceCommandFactory"
-      name="portal:commandFactory=Test"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="InstanceId">TestPortletInstance</attribute>
-   </mbean>
+    <!-- Listener registry -->
+    <mbean
+            code="org.jboss.portal.core.event.PortalEventListenerRegistryImpl"
+            name="portal:service=ListenerRegistry"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
 
-   <!-- URL factories -->
-   <mbean
-      code="org.jboss.portal.core.controller.command.mapper.DelegatingURLFactoryService"
-      name="portal:urlFactory=Delegating"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
-      name="portal:urlFactory=PortalObject"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Path">/portal</attribute>
-      <depends
-         optional-attribute-name="Factory"
-         proxy-type="attribute">portal:urlFactory=Delegating</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.controller.command.mapper.SimpleURLFactory"
-      name="portal:urlFactory=SignOut"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Path">/signout</attribute>
-      <attribute name="ClassNames">org.jboss.portal.core.controller.command.SignOutCommand</attribute>
-      <depends
-         optional-attribute-name="Factory"
-         proxy-type="attribute">portal:urlFactory=Delegating</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.controller.command.mapper.SimpleURLFactory"
-      name="portal:urlFactory=Dashboard"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Path">/dashboard</attribute>
-      <attribute name="ClassNames">org.jboss.portal.core.model.portal.command.ViewDashboardCommand</attribute>
-      <depends
-         optional-attribute-name="Factory"
-         proxy-type="attribute">portal:urlFactory=Delegating</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.model.instance.InstanceURLFactory"
-      name="portal:urlFactory=Configurator"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="InstanceId">ConfiguratorPortletInstance</attribute>
-      <attribute name="Path">/configure</attribute>
-      <depends
-         optional-attribute-name="Factory"
-         proxy-type="attribute">portal:urlFactory=Delegating</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.model.instance.InstanceURLFactory"
-      name="portal:urlFactory=Test"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="InstanceId">TestPortletInstance</attribute>
-      <attribute name="Path">/test</attribute>
-      <depends
-         optional-attribute-name="Factory"
-         proxy-type="attribute">portal:urlFactory=Delegating</depends>
-   </mbean>
+    <!-- The different containers -->
+    <mbean
+            code="org.jboss.portal.core.impl.model.instance.PersistentInstanceContainer"
+            name="portal:container=Instance"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends>portal:service=Hibernate,type=Instance</depends>
+        <depends
+                optional-attribute-name="StackFactory"
+                proxy-type="attribute">portal:service=InterceptorStackFactory,type=Instance</depends>
+        <depends
+                optional-attribute-name="PortletInvoker"
+                proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
+        <depends
+                optional-attribute-name="PortalAuthorizationManagerFactory"
+                proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+        <depends
+                optional-attribute-name="AuthorizationDomainRegistry"
+                proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
+        <attribute name="SessionFactoryJNDIName">java:/portal/InstanceSessionFactory</attribute>
+        <attribute name="CacheNaturalId">true</attribute>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer"
+            name="portal:container=PortalObject"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends>portal:service=Hibernate,type=PortalObject</depends>
+        <depends
+                optional-attribute-name="PortalAuthorizationManagerFactory"
+                proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+        <depends
+                optional-attribute-name="AuthorizationDomainRegistry"
+                proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
+        <depends
+                optional-attribute-name="InstanceContainer"
+                proxy-type="attribute">portal:container=Instance</depends>
+        <attribute name="SessionFactoryJNDIName">java:/portal/PortalObjectSessionFactory</attribute>
+        <attribute name="CacheNaturalId">true</attribute>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.impl.model.content.portlet.PortletContentHandler"
+            name="portal:service=ContentHandler,type=portlet"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends
+                optional-attribute-name="Registry"
+                proxy-type="attribute">portal:container=PortalObject</depends>
+        <depends
+                optional-attribute-name="InstanceContainer"
+                proxy-type="attribute">portal:container=Instance</depends>
+        <attribute name="ContentType">portlet</attribute>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.impl.model.content.cms.CMSContentHandler"
+            name="portal:service=ContentHandler,type=cms"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends
+                optional-attribute-name="Registry"
+                proxy-type="attribute">portal:container=PortalObject</depends>
+        <attribute name="ContentType">cms</attribute>
+    </mbean>
 
-   <!-- The federating portlet invoker -->
-   <mbean
-      code="org.jboss.portal.federation.impl.FederatingPortletInvokerService"
-      name="portal:service=PortletInvoker,type=Federating"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
+    <!-- Customization manager -->
+    <mbean
+            code="org.jboss.portal.core.impl.model.CustomizationManagerService"
+            name="portal:service=CustomizationManager"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends
+                optional-attribute-name="PortalAuthorizationManagerFactory"
+                proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+        <depends
+                optional-attribute-name="InstanceContainer"
+                proxy-type="attribute">portal:container=Instance</depends>
+        <depends
+                optional-attribute-name="PortalObjectContainer"
+                proxy-type="attribute">portal:container=PortalObject</depends>
+        <depends>portal:service=Module,type=IdentityServiceController</depends>
+        <attribute name="DashboardContextId">dashboard</attribute>
+    </mbean>
 
-   <!-- The portlet container invoker -->
-   <mbean
-      code="org.jboss.portal.portlet.container.PortletContainerInvoker"
-      name="portal:service=PortletInvoker,type=Container"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="StackFactory"
-         proxy-type="attribute">portal:service=InterceptorStackFactory,type=Producer</depends>
-      <depends
-         optional-attribute-name="Registry"
-         proxy-type="attribute">portal:service=WebAppRegistry</depends>
-   </mbean>
+    <!-- Command factories -->
+    <mbean
+            code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService"
+            name="portal:commandFactory=Delegating"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <!--<depends
+                optional-attribute-name="NextFactory"
+                proxy-type="attribute">portal:commandFactory=Labs</depends>-->
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.model.portal.DefaultPortalCommandFactory"
+            name="portal:commandFactory=DefaultPortal"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends
+                optional-attribute-name="NextFactory"
+                proxy-type="attribute">portal:commandFactory=Delegating</depends>
+        <depends
+                optional-attribute-name="Container"
+                proxy-type="attribute">portal:container=PortalObject</depends>
+    </mbean>
 
-   <!-- The producer portlet invoker -->
-   <mbean
-      code="org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager"
-      name="portal:service=PersistenceManager,type=Producer"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends>portal:service=Hibernate,type=Portlet</depends>
-      <attribute name="SessionFactoryJNDIName">java:/portal/PortletSessionFactory</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.portlet.impl.state.StateManagementPolicyService"
-      name="portal:service=StateManagementPolicy,type=Producer"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="PersistLocally">true</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.portlet.impl.state.StateConverterV0"
-      name="portal:service=StateConverter,type=Producer"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.impl.portlet.state.ProducerPortletInvoker"
-      name="portal:service=PortletInvoker,type=Producer"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="PortletInvoker"
-         proxy-type="attribute">portal:service=PortletInvoker,type=Container</depends>
-      <depends
-         optional-attribute-name="PersistenceManager"
-         proxy-type="attribute">portal:service=PersistenceManager,type=Producer</depends>
-      <depends
-         optional-attribute-name="StateManagementPolicy"
-         proxy-type="attribute">portal:service=StateManagementPolicy,type=Producer</depends>
-      <depends
-         optional-attribute-name="StateConverter"
-         proxy-type="attribute">portal:service=StateConverter,type=Producer</depends>
-   </mbean>
+    <!--<mbean
+            code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+            name="portal:commandFactory=Delegate,path=portal"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends
+                optional-attribute-name="DelegatingFactory"
+                proxy-type="attribute">portal:commandFactory=Delegating</depends>
+        <depends
+                optional-attribute-name="DelegateFactory"
+                proxy-type="attribute">portal:commandFactory=PortalObject</depends>
+    </mbean>-->
 
-   <!-- Register the state portlet invoker on the federating portlet invoker -->
-   <mbean
-      code="org.jboss.portal.federation.impl.PortletInvokerRegistrationService"
-      name="portal:service=PortletInvokerRegistration,id=local"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Id">local</attribute>
-      <depends
-         optional-attribute-name="PortletInvoker"
-         proxy-type="attribute">portal:service=PortletInvoker,type=Producer</depends>
-      <depends
-         optional-attribute-name="FederatingPortletInvoker"
-         proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
-   </mbean>
+    <mbean
+       code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
+       name="portal:commandFactory=PortalObject"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <depends
+          optional-attribute-name="Container"
+          proxy-type="attribute">portal:container=PortalObject</depends>
+    </mbean>
+    <mbean
+       code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+       name="portal:commandFactory=Delegate,path=portal"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <attribute name="Path">/portal</attribute>
+       <depends
+          optional-attribute-name="DelegatingFactory"
+          proxy-type="attribute">portal:commandFactory=Delegating</depends>
+       <depends
+          optional-attribute-name="DelegateFactory"
+          proxy-type="attribute">portal:commandFactory=PortalObject</depends>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.controller.command.mapper.SimpleCommandFactory"
+            name="portal:commandFactory=SignOut"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <attribute name="CommandClassName">org.jboss.portal.core.controller.command.SignOutCommand</attribute>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+            name="portal:commandFactory=Delegate,path=signout"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <attribute name="Path">/signout</attribute>
+        <depends
+                optional-attribute-name="DelegatingFactory"
+                proxy-type="attribute">portal:commandFactory=Delegating</depends>
+        <depends
+                optional-attribute-name="DelegateFactory"
+                proxy-type="attribute">portal:commandFactory=SignOut</depends>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.model.portal.DashboardCommandFactory"
+            name="portal:commandFactory=Dashboard"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+            name="portal:commandFactory=Delegate,path=dashboard"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <attribute name="Path">/dashboard</attribute>
+        <depends
+                optional-attribute-name="DelegatingFactory"
+                proxy-type="attribute">portal:commandFactory=Delegating</depends>
+        <depends
+                optional-attribute-name="DelegateFactory"
+                proxy-type="attribute">portal:commandFactory=Dashboard</depends>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.model.instance.InstanceCommandFactory"
+            name="portal:commandFactory=Configurator"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <attribute name="InstanceId">ConfiguratorPortletInstance</attribute>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+            name="portal:commandFactory=Delegate,path=configure"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <attribute name="Path">/configure</attribute>
+        <depends
+                optional-attribute-name="DelegatingFactory"
+                proxy-type="attribute">portal:commandFactory=Delegating</depends>
+        <depends
+                optional-attribute-name="DelegateFactory"
+                proxy-type="attribute">portal:commandFactory=Configurator</depends>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+            name="portal:commandFactory=Delegate,path=test"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <attribute name="Path">/test</attribute>
+        <depends
+                optional-attribute-name="DelegatingFactory"
+                proxy-type="attribute">portal:commandFactory=Delegating</depends>
+        <depends
+                optional-attribute-name="DelegateFactory"
+                proxy-type="attribute">portal:commandFactory=Test</depends>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.model.instance.InstanceCommandFactory"
+            name="portal:commandFactory=Test"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <attribute name="InstanceId">TestPortletInstance</attribute>
+    </mbean>
 
-   <!-- The core controller -->
-   <mbean
-      code="org.jboss.portal.core.controller.classic.ClassicController"
-      name="portal:controller=Core"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="PageService"
-         proxy-type="attribute">portal:service=PageService</depends>
-      <depends
-         optional-attribute-name="CommandFactory"
-         proxy-type="attribute">portal:commandFactory=DefaultPortal</depends>
-      <depends
-         optional-attribute-name="URLFactory"
-         proxy-type="attribute">portal:urlFactory=Delegating</depends>
-      <depends
-         optional-attribute-name="StackFactory"
-         proxy-type="attribute">portal:service=InterceptorStackFactory,type=Command</depends>
-      <depends
-         optional-attribute-name="PortalObjectContainer"
-         proxy-type="attribute">portal:container=PortalObject</depends>
-      <depends
-         optional-attribute-name="InstanceContainer"
-         proxy-type="attribute">portal:container=Instance</depends>
-      <depends
-         optional-attribute-name="PortalAuthorizationManagerFactory"
-         proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
-      <depends
-         optional-attribute-name="CustomizationManager"
-         proxy-type="attribute">portal:service=CustomizationManager</depends>
-   </mbean>
+    <!-- URL factories -->
+    <mbean
+            code="org.jboss.portal.core.controller.command.mapper.DelegatingURLFactoryService"
+            name="portal:urlFactory=Delegating"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
+            name="portal:urlFactory=PortalObject"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <attribute name="Path">/portal</attribute>
+        <depends
+                optional-attribute-name="Factory"
+                proxy-type="attribute">portal:urlFactory=Delegating</depends>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.controller.command.mapper.SimpleURLFactory"
+            name="portal:urlFactory=SignOut"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <attribute name="Path">/signout</attribute>
+        <attribute name="ClassNames">org.jboss.portal.core.controller.command.SignOutCommand</attribute>
+        <depends
+                optional-attribute-name="Factory"
+                proxy-type="attribute">portal:urlFactory=Delegating</depends>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.controller.command.mapper.SimpleURLFactory"
+            name="portal:urlFactory=Dashboard"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <attribute name="Path">/dashboard</attribute>
+        <attribute name="ClassNames">org.jboss.portal.core.model.portal.command.ViewDashboardCommand</attribute>
+        <depends
+                optional-attribute-name="Factory"
+                proxy-type="attribute">portal:urlFactory=Delegating</depends>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.model.instance.InstanceURLFactory"
+            name="portal:urlFactory=Configurator"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <attribute name="InstanceId">ConfiguratorPortletInstance</attribute>
+        <attribute name="Path">/configure</attribute>
+        <depends
+                optional-attribute-name="Factory"
+                proxy-type="attribute">portal:urlFactory=Delegating</depends>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.model.instance.InstanceURLFactory"
+            name="portal:urlFactory=Test"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <attribute name="InstanceId">TestPortletInstance</attribute>
+        <attribute name="Path">/test</attribute>
+        <depends
+                optional-attribute-name="Factory"
+                proxy-type="attribute">portal:urlFactory=Delegating</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/>
-      <depends
-         optional-attribute-name="PageService"
-         proxy-type="attribute">portal:service=PageService</depends>
-      <depends
-         optional-attribute-name="CommandFactory"
-         proxy-type="attribute">portal:commandFactory=DefaultPortal</depends>
-      <depends
-         optional-attribute-name="URLFactory"
-         proxy-type="attribute">portal:urlFactory=Delegating</depends>
-      <depends
-         optional-attribute-name="StackFactory"
-         proxy-type="attribute">portal:service=InterceptorStackFactory,type=Command</depends>
-      <depends
-         optional-attribute-name="PortalObjectContainer"
-         proxy-type="attribute">portal:container=PortalObject</depends>
-      <depends
-         optional-attribute-name="InstanceContainer"
-         proxy-type="attribute">portal:container=Instance</depends>
-      <depends
-         optional-attribute-name="PortalAuthorizationManagerFactory"
-         proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
-      <depends
-         optional-attribute-name="CustomizationManager"
-         proxy-type="attribute">portal:service=CustomizationManager</depends>
-   </mbean>
+    <!-- The federating portlet invoker -->
+    <mbean
+            code="org.jboss.portal.federation.impl.FederatingPortletInvokerService"
+            name="portal:service=PortletInvoker,type=Federating"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
 
-   <!-- -->
-   <mbean
-      code="org.jboss.portal.server.impl.ServerImpl"
-      name="portal:service=Server"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="Config"
-         proxy-type="attribute">portal:service=ServerConfig</depends>
-   </mbean>
+    <!-- The portlet container invoker -->
+    <mbean
+            code="org.jboss.portal.portlet.container.PortletContainerInvoker"
+            name="portal:service=PortletInvoker,type=Container"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends
+                optional-attribute-name="StackFactory"
+                proxy-type="attribute">portal:service=InterceptorStackFactory,type=Producer</depends>
+        <depends
+                optional-attribute-name="Registry"
+                proxy-type="attribute">portal:service=WebAppRegistry</depends>
+    </mbean>
 
-   <!-- -->
-   <mbean
-      code="org.jboss.portal.server.deployment.jboss.ServerDeployer"
-      name="portal:deployer=PortalWebApp">
-      <depends>jboss.system:service=MainDeployer</depends>
-      <depends>portal:container=PortalObject</depends>
-      <depends>portal:container=Instance</depends>
-      <depends
-         optional-attribute-name="PortalServer"
-         proxy-type="attribute">portal:service=Server</depends>
-   </mbean>
+    <!-- The producer portlet invoker -->
+    <mbean
+            code="org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager"
+            name="portal:service=PersistenceManager,type=Producer"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends>portal:service=Hibernate,type=Portlet</depends>
+        <attribute name="SessionFactoryJNDIName">java:/portal/PortletSessionFactory</attribute>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.portlet.impl.state.StateManagementPolicyService"
+            name="portal:service=StateManagementPolicy,type=Producer"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <attribute name="PersistLocally">true</attribute>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.portlet.impl.state.StateConverterV0"
+            name="portal:service=StateConverter,type=Producer"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.impl.portlet.state.ProducerPortletInvoker"
+            name="portal:service=PortletInvoker,type=Producer"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends
+                optional-attribute-name="PortletInvoker"
+                proxy-type="attribute">portal:service=PortletInvoker,type=Container</depends>
+        <depends
+                optional-attribute-name="PersistenceManager"
+                proxy-type="attribute">portal:service=PersistenceManager,type=Producer</depends>
+        <depends
+                optional-attribute-name="StateManagementPolicy"
+                proxy-type="attribute">portal:service=StateManagementPolicy,type=Producer</depends>
+        <depends
+                optional-attribute-name="StateConverter"
+                proxy-type="attribute">portal:service=StateConverter,type=Producer</depends>
+    </mbean>
 
-   <!-- Portal object deployment factory -->
-   <!--
-      | Uncomment in cluster mode : have the deployment of objects run as a clustered singleton
-      
-      <mbean
-      code="org.jboss.portal.jems.as.system.LifecycleInvoker"
-      name="portal:service=Controller,target=ObjectDeploymentFactory"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends>jboss.ha:service=HASingletonDeployer,type=Barrier</depends>
-      <depends>jboss:service=${jboss.partition.name:DefaultPartition}</depends>
-      <depends>portal:container=PortalObject</depends>
-      <attribute name="Target">portal:deploymentFactory=Object</attribute>
-      <attribute name="OnStart">registerFactory</attribute>
-      <attribute name="OnStop">unregisterFactory</attribute>
-      </mbean>
-   
-   -->
-   <mbean
-      code="org.jboss.portal.core.deployment.jboss.ObjectDeploymentFactory"
-      name="portal:deploymentFactory=Object"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="Deployer"
-         proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends
-         optional-attribute-name="PortalObjectContainer"
-         proxy-type="attribute">portal:container=PortalObject</depends>
-      <depends
-         optional-attribute-name="ContentHandlerRegistry"
-         proxy-type="attribute">portal:container=PortalObject</depends>
-      <depends
-         optional-attribute-name="PortalObjectEntityResolver"
-         proxy-type="attribute">portal:service=EntityResolver</depends>
-      <attribute name="SetupLocation">conf/data/default-object.xml</attribute>
-      <!-- Set to false in clustered mode, otherwise set to true -->
-      <attribute name="RegistrationControlledByService">true</attribute>
-   </mbean>
+    <!-- Register the state portlet invoker on the federating portlet invoker -->
+    <mbean
+            code="org.jboss.portal.federation.impl.PortletInvokerRegistrationService"
+            name="portal:service=PortletInvokerRegistration,id=local"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <attribute name="Id">local</attribute>
+        <depends
+                optional-attribute-name="PortletInvoker"
+                proxy-type="attribute">portal:service=PortletInvoker,type=Producer</depends>
+        <depends
+                optional-attribute-name="FederatingPortletInvoker"
+                proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
+    </mbean>
 
-   <!--  -->
-   <!--
-      | Uncomment in cluster mode : have the creation of instances run as a clustered singleton
-      
-      <mbean
-      code="org.jboss.portal.jems.as.system.LifecycleInvoker"
-      name="portal:service=Controller,target=PortletAppDeploymentFactory"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends>jboss.ha:service=HASingletonDeployer,type=Barrier</depends>
-      <depends>jboss:service=${jboss.partition.name:DefaultPartition}</depends>
-      <depends>portal:container=PortalObject</depends>
-      <attribute name="Target">portal:deploymentFactory=PortletApp</attribute>
-      <attribute name="OnStart">enableCreateInstances</attribute>
-      <attribute name="OnStop">disableCreateInstances</attribute>
-      </mbean>
-   
-   -->
-   <mbean
-      code="org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory"
-      name="portal:deploymentFactory=PortletApp"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <!-- 
-      <depends>jboss.ha:service=HASingletonDeployer</depends>
-       -->
-      <depends>portal:service=PortletInvokerRegistration,id=local</depends>
-      <depends
-         optional-attribute-name="Deployer"
-         proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends
-         optional-attribute-name="WebAppRegistry"
-         proxy-type="attribute">portal:service=WebAppRegistry</depends>
-      <depends
-         optional-attribute-name="Config"
-         proxy-type="attribute">portal:service=ServerConfig</depends>
-      <depends
-         optional-attribute-name="PortletSecurityService"
-         proxy-type="attribute">portal:service=PortletSecurityService</depends>
-      <depends
-         optional-attribute-name="InstanceContainer"
-         proxy-type="attribute">portal:container=Instance</depends>
-      <depends
-         optional-attribute-name="JBossPortletEntityResolver"
-         proxy-type="attribute">portal:service=EntityResolver</depends>
-      <depends
-         optional-attribute-name="PortalObjectEntityResolver"
-         proxy-type="attribute">portal:service=EntityResolver</depends>
-      <depends
-         optional-attribute-name="PortletInstancesEntityResolver"
-         proxy-type="attribute">portal:service=EntityResolver</depends>
-      <attribute name="StandardJBossApplicationMetaDataLocation">conf/standardjboss-portlet.xml</attribute>
-      <attribute name="APIFactoryClassName">org.jboss.portlet.JBossAPIFactory</attribute>
-      <!-- Set to false in clustered mode, otherwise set to true -->
-      <attribute name="CreateInstances">true</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.theme.deployment.jboss.LayoutDeploymentFactory"
-      name="portal:deploymentFactory=Layout"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="Deployer"
-         proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends
-         optional-attribute-name="LayoutService"
-         proxy-type="attribute">portal:service=LayoutService</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.theme.deployment.jboss.LayoutFeaturesDeploymentFactory"
-      name="portal:deploymentFactory=LayoutFeatures"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="Deployer"
-         proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends
-         optional-attribute-name="LayoutService"
-         proxy-type="attribute">portal:service=LayoutService</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.theme.deployment.jboss.ThemeDeploymentFactory"
-      name="portal:deploymentFactory=Theme"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="Deployer"
-         proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends
-         optional-attribute-name="ThemeService"
-         proxy-type="attribute">portal:service=ThemeService</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.server.deployment.WebAppAdapter"
-      name="portal:deployer=Adapter"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
-      <depends
-         optional-attribute-name="Deployer"
-         proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends
-         optional-attribute-name="JBossAppEntityResolver"
-         proxy-type="attribute">portal:service=EntityResolver</depends>
-   </mbean>
+    <!-- The core controller -->
+    <mbean
+            code="org.jboss.portal.core.controller.classic.ClassicController"
+            name="portal:controller=Core"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends
+                optional-attribute-name="PageService"
+                proxy-type="attribute">portal:service=PageService</depends>
+        <depends
+                optional-attribute-name="CommandFactory"
+                proxy-type="attribute">portal:commandFactory=DefaultPortal</depends>
+        <depends
+                optional-attribute-name="URLFactory"
+                proxy-type="attribute">portal:urlFactory=Delegating</depends>
+        <depends
+                optional-attribute-name="StackFactory"
+                proxy-type="attribute">portal:service=InterceptorStackFactory,type=Command</depends>
+        <depends
+                optional-attribute-name="PortalObjectContainer"
+                proxy-type="attribute">portal:container=PortalObject</depends>
+        <depends
+                optional-attribute-name="InstanceContainer"
+                proxy-type="attribute">portal:container=Instance</depends>
+        <depends
+                optional-attribute-name="PortalAuthorizationManagerFactory"
+                proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+        <depends
+                optional-attribute-name="CustomizationManager"
+                proxy-type="attribute">portal:service=CustomizationManager</depends>
+    </mbean>
 
-   <mbean
-      code="org.jboss.portal.core.portlet.dashboard.ContentEditorRegistryService"
-      name="portal:registry=ContentEditor"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.portlet.dashboard.PortletContentEditor"
-      name="portal:service=ContentEditor,type=portlet"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends
-         optional-attribute-name="Registry"
-         proxy-type="attribute">portal:registry=ContentEditor</depends>
-      <depends
-         optional-attribute-name="InstanceContainer"
-         proxy-type="attribute">portal:container=Instance</depends>
-      <attribute name="ContentType">portlet</attribute>
-   </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/>
+        <depends
+                optional-attribute-name="PageService"
+                proxy-type="attribute">portal:service=PageService</depends>
+        <depends
+                optional-attribute-name="CommandFactory"
+                proxy-type="attribute">portal:commandFactory=DefaultPortal</depends>
+        <depends
+                optional-attribute-name="URLFactory"
+                proxy-type="attribute">portal:urlFactory=Delegating</depends>
+        <depends
+                optional-attribute-name="StackFactory"
+                proxy-type="attribute">portal:service=InterceptorStackFactory,type=Command</depends>
+        <depends
+                optional-attribute-name="PortalObjectContainer"
+                proxy-type="attribute">portal:container=PortalObject</depends>
+        <depends
+                optional-attribute-name="InstanceContainer"
+                proxy-type="attribute">portal:container=Instance</depends>
+        <depends
+                optional-attribute-name="PortalAuthorizationManagerFactory"
+                proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+        <depends
+                optional-attribute-name="CustomizationManager"
+                proxy-type="attribute">portal:service=CustomizationManager</depends>
+    </mbean>
+
+    <!-- -->
+    <mbean
+            code="org.jboss.portal.server.impl.ServerImpl"
+            name="portal:service=Server"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends
+                optional-attribute-name="Config"
+                proxy-type="attribute">portal:service=ServerConfig</depends>
+    </mbean>
+
+    <!-- -->
+    <mbean
+            code="org.jboss.portal.server.deployment.jboss.ServerDeployer"
+            name="portal:deployer=PortalWebApp">
+        <depends>jboss.system:service=MainDeployer</depends>
+        <depends>portal:container=PortalObject</depends>
+        <depends>portal:container=Instance</depends>
+        <depends
+                optional-attribute-name="PortalServer"
+                proxy-type="attribute">portal:service=Server</depends>
+    </mbean>
+
+    <!-- Portal object deployment factory -->
+    <!--
+       | Uncomment in cluster mode : have the deployment of objects run as a clustered singleton
+
+       <mbean
+       code="org.jboss.portal.jems.as.system.LifecycleInvoker"
+       name="portal:service=Controller,target=ObjectDeploymentFactory"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <depends>jboss.ha:service=HASingletonDeployer,type=Barrier</depends>
+       <depends>jboss:service=${jboss.partition.name:DefaultPartition}</depends>
+       <depends>portal:container=PortalObject</depends>
+       <attribute name="Target">portal:deploymentFactory=Object</attribute>
+       <attribute name="OnStart">registerFactory</attribute>
+       <attribute name="OnStop">unregisterFactory</attribute>
+       </mbean>
+
+    -->
+    <mbean
+            code="org.jboss.portal.core.deployment.jboss.ObjectDeploymentFactory"
+            name="portal:deploymentFactory=Object"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends
+                optional-attribute-name="Deployer"
+                proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+        <depends
+                optional-attribute-name="PortalObjectContainer"
+                proxy-type="attribute">portal:container=PortalObject</depends>
+        <depends
+                optional-attribute-name="ContentHandlerRegistry"
+                proxy-type="attribute">portal:container=PortalObject</depends>
+        <depends
+                optional-attribute-name="PortalObjectEntityResolver"
+                proxy-type="attribute">portal:service=EntityResolver</depends>
+        <attribute name="SetupLocation">conf/data/default-object.xml</attribute>
+        <!-- Set to false in clustered mode, otherwise set to true -->
+        <attribute name="RegistrationControlledByService">true</attribute>
+    </mbean>
+
+    <!--  -->
+    <!--
+       | Uncomment in cluster mode : have the creation of instances run as a clustered singleton
+
+       <mbean
+       code="org.jboss.portal.jems.as.system.LifecycleInvoker"
+       name="portal:service=Controller,target=PortletAppDeploymentFactory"
+       xmbean-dd=""
+       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <depends>jboss.ha:service=HASingletonDeployer,type=Barrier</depends>
+       <depends>jboss:service=${jboss.partition.name:DefaultPartition}</depends>
+       <depends>portal:container=PortalObject</depends>
+       <attribute name="Target">portal:deploymentFactory=PortletApp</attribute>
+       <attribute name="OnStart">enableCreateInstances</attribute>
+       <attribute name="OnStop">disableCreateInstances</attribute>
+       </mbean>
+
+    -->
+    <mbean
+            code="org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory"
+            name="portal:deploymentFactory=PortletApp"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <!--
+       <depends>jboss.ha:service=HASingletonDeployer</depends>
+        -->
+        <depends>portal:service=PortletInvokerRegistration,id=local</depends>
+        <depends
+                optional-attribute-name="Deployer"
+                proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+        <depends
+                optional-attribute-name="WebAppRegistry"
+                proxy-type="attribute">portal:service=WebAppRegistry</depends>
+        <depends
+                optional-attribute-name="Config"
+                proxy-type="attribute">portal:service=ServerConfig</depends>
+        <depends
+                optional-attribute-name="PortletSecurityService"
+                proxy-type="attribute">portal:service=PortletSecurityService</depends>
+        <depends
+                optional-attribute-name="InstanceContainer"
+                proxy-type="attribute">portal:container=Instance</depends>
+        <depends
+                optional-attribute-name="JBossPortletEntityResolver"
+                proxy-type="attribute">portal:service=EntityResolver</depends>
+        <depends
+                optional-attribute-name="PortalObjectEntityResolver"
+                proxy-type="attribute">portal:service=EntityResolver</depends>
+        <depends
+                optional-attribute-name="PortletInstancesEntityResolver"
+                proxy-type="attribute">portal:service=EntityResolver</depends>
+        <attribute name="StandardJBossApplicationMetaDataLocation">conf/standardjboss-portlet.xml</attribute>
+        <attribute name="APIFactoryClassName">org.jboss.portlet.JBossAPIFactory</attribute>
+        <!-- Set to false in clustered mode, otherwise set to true -->
+        <attribute name="CreateInstances">true</attribute>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.theme.deployment.jboss.LayoutDeploymentFactory"
+            name="portal:deploymentFactory=Layout"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends
+                optional-attribute-name="Deployer"
+                proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+        <depends
+                optional-attribute-name="LayoutService"
+                proxy-type="attribute">portal:service=LayoutService</depends>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.theme.deployment.jboss.LayoutFeaturesDeploymentFactory"
+            name="portal:deploymentFactory=LayoutFeatures"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends
+                optional-attribute-name="Deployer"
+                proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+        <depends
+                optional-attribute-name="LayoutService"
+                proxy-type="attribute">portal:service=LayoutService</depends>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.theme.deployment.jboss.ThemeDeploymentFactory"
+            name="portal:deploymentFactory=Theme"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends
+                optional-attribute-name="Deployer"
+                proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+        <depends
+                optional-attribute-name="ThemeService"
+                proxy-type="attribute">portal:service=ThemeService</depends>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.server.deployment.WebAppAdapter"
+            name="portal:deployer=Adapter"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends
+                optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
+        <depends
+                optional-attribute-name="Deployer"
+                proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+        <depends
+                optional-attribute-name="JBossAppEntityResolver"
+                proxy-type="attribute">portal:service=EntityResolver</depends>
+    </mbean>
+
+    <mbean
+            code="org.jboss.portal.core.portlet.dashboard.ContentEditorRegistryService"
+            name="portal:registry=ContentEditor"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+    </mbean>
+    <mbean
+            code="org.jboss.portal.core.portlet.dashboard.PortletContentEditor"
+            name="portal:service=ContentEditor,type=portlet"
+            xmbean-dd=""
+            xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+        <xmbean/>
+        <depends
+                optional-attribute-name="Registry"
+                proxy-type="attribute">portal:registry=ContentEditor</depends>
+        <depends
+                optional-attribute-name="InstanceContainer"
+                proxy-type="attribute">portal:container=Instance</depends>
+        <attribute name="ContentType">portlet</attribute>
+    </mbean>
 </server>

Added: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml	2007-02-14 18:43:21 UTC (rev 9499)
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, 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.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<jboss-web>
+   <security-domain>java:jaas/portal</security-domain>
+   <context-root />
+   <replication-config>
+      <replication-trigger>SET</replication-trigger>
+   </replication-config>
+   <resource-ref>
+      <res-ref-name>jdbc/PortalDS</res-ref-name>
+      <jndi-name>java:PortalDS</jndi-name>
+   </resource-ref>
+</jboss-web>

Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2007-02-14 18:02:28 UTC (rev 9498)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2007-02-14 18:43:21 UTC (rev 9499)
@@ -81,7 +81,17 @@
 		<servlet-name>ShowLoginPage</servlet-name>
 		<url-pattern>/logout</url-pattern>
 	</servlet-mapping>
-   
+
+    <filter>
+      <filter-name>redirectFilter</filter-name>
+      <filter-class>org.jboss.forge.redirect.RootRedirectFilter</filter-class>
+   </filter>
+
+   <filter-mapping>
+      <filter-name>redirectFilter</filter-name>
+      <url-pattern>/*</url-pattern>
+   </filter-mapping>
+
    <filter>
       <filter-name>titleAndTimestampFilter</filter-name>
       <filter-class>org.jboss.forge.portal.TitleChangeFilter</filter-class>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/forge-mapper.iml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/forge-mapper.iml	2007-02-14 18:02:28 UTC (rev 9498)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/forge-mapper.iml	2007-02-14 18:43:21 UTC (rev 9499)
@@ -6,6 +6,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/java-portal" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/maven.xml	2007-02-14 18:02:28 UTC (rev 9498)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/maven.xml	2007-02-14 18:43:21 UTC (rev 9499)
@@ -5,25 +5,25 @@
  -->
 <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
     <goal name="prj-install">
-	
+
     </goal>
 
     <goal name="build">
-	    <attainGoal name="jar" />
+        <attainGoal name="jar" />
     </goal>
-    
+
     <goal name="clean">
         <attainGoal name="prj-clean" />
     </goal>
-    
+
     <goal name="deploy">
-	<ant:copy
-	    todir="${forge.jar.dest}" 
-	    file="target/forge-mapper.jar"
-	    overwrite="true" />
+        <ant:copy
+                todir="${forge.jar.dest}"
+                file="target/forge-mapper.jar"
+                overwrite="true" />
     </goal>
-    
+
     <goal name="all">
-	<attainGoal name="prj-all" />
+        <attainGoal name="prj-all" />
     </goal>
 </project>


Property changes on: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src
___________________________________________________________________
Name: svn:ignore
   + java-portal


Copied: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/forge/redirect/RootRedirectFilter.java (from rev 9494, labs/jbosslabs/trunk/portal-extensions/forge-root-redirect/src/java/org/jboss/forge/redirect/RootRedirectFilter.java)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/forge/redirect/RootRedirectFilter.java	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/forge/redirect/RootRedirectFilter.java	2007-02-14 18:43:21 UTC (rev 9499)
@@ -0,0 +1,102 @@
+/*
+ * 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.forge.redirect;
+
+import java.io.IOException;
+import java.util.Map;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author Adam Warski (adamw at aster.pl)
+ * @author Tomasz Szymanski (tomasz.szymanski at jboss.com)
+ */
+public class RootRedirectFilter implements Filter {
+	private final static String WRONG_REQ_RESP = "Error accessing the requested resource.";
+
+	private static String bbRedirect = "http://www.jboss.com/index.html?module=";
+	
+	private static String blogRedirect = "http://www.jboss.com";
+
+	private static final String BB_REDIRECT = "bbRedirect";
+	
+	private static final String BLOG_REDIRECT = "blogRedirect";
+
+	public void init(FilterConfig conf) {
+		if (conf.getInitParameter(BB_REDIRECT) != null) {
+			bbRedirect = conf.getInitParameter(BB_REDIRECT);
+		}
+		if (conf.getInitParameter(BLOG_REDIRECT) != null) {
+			blogRedirect = conf.getInitParameter(BLOG_REDIRECT);
+		}
+	}
+
+	public void doFilter(ServletRequest request, ServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
+		if ((request instanceof HttpServletRequest)
+				&& (response instanceof HttpServletResponse)) {
+			HttpServletRequest httpRequest = (HttpServletRequest) request;
+			HttpServletResponse httpResponse = (HttpServletResponse) response;
+
+			String requestURI = httpRequest.getRequestURI();
+
+			// send response to forums or downloads
+			if (requestURI.equals("/index.html")
+					&& httpRequest.getParameter("module") != null
+					&& (httpRequest.getParameter("module").equals("bb") || httpRequest
+							.getParameter("module").equals("downloads"))) {
+
+				String redirectToForum = bbRedirect
+						+ httpRequest.getParameter("module");
+
+				Map parameterMap = httpRequest.getParameterMap();
+
+				for (Object key : parameterMap.keySet()) {
+					if (!key.equals("module")) {
+						redirectToForum += "&" + key + "="
+								+ httpRequest.getParameter((String) key);
+					}
+				}
+
+				httpResponse.sendRedirect(redirectToForum);
+				return;
+
+			}
+			else if (requestURI.startsWith("/jbossBlog")){
+				String redirectToBlog = blogRedirect + requestURI;
+				
+				httpResponse.sendRedirect(redirectToBlog);
+				return;
+			}
+
+		    chain.doFilter(request, response);
+		} else {
+			response.setContentType("text/html");
+			response.getWriter().write(WRONG_REQ_RESP);
+		}
+	}
+
+	public void destroy() {
+	}
+}


Property changes on: labs/jbosslabs/trunk/portal-extensions/forge-primarynav
___________________________________________________________________
Name: svn:ignore
   + target


Modified: labs/jbosslabs/trunk/portal-extensions/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/maven.xml	2007-02-14 18:02:28 UTC (rev 9498)
+++ labs/jbosslabs/trunk/portal-extensions/maven.xml	2007-02-14 18:43:21 UTC (rev 9499)
@@ -268,6 +268,7 @@
         <ant:delete file="${local.deploy.dir}/forge-freezone.sar" />
         <ant:delete file="${local.deploy.dir}/forge-ads-portlet.sar" />
         <ant:delete file="${local.deploy.dir}/forge-podcast-1.0.sar" />
+        <ant:delete file="${local.deploy.dir}/forge-root-redirect-1.0.sar" />
 
         <ant:delete dir="${forge.jar.dest}" />
 


