[portal-commits] JBoss Portal SVN: r10284 - in branches/JBoss_Portal_Branch_2_7: server/src/main/org/jboss/portal/server/deployment/jboss and 9 other directories.

Friday, 14 March 2008

Author: chris.laprun(a)jboss.com
Date: 2008-03-14 21:55:13 -0400 (Fri, 14 Mar 2008)
New Revision: 10284

Added:
  
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/BasicPortalContext.java
Modified:
  
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java
  
branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/deployment/jboss/AbstractDeploymentFactory.java
   branches/JBoss_Portal_Branch_2_7/testsuite/build.xml
   branches/JBoss_Portal_Branch_2_7/testsuite/imports/server-config.xml
   branches/JBoss_Portal_Branch_2_7/wsrp/build.xml
  
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java
  
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/NeedPortletHandleTest.java
   branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPUtils.java
  
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupRequest.java
  
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java
  
branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml
Log:
- Fixed PortletAppDeploymentFactory (AbstractDeploymentFactory was causing an infinite
loop)
- Started working on WSRP tests
- More generification

Modified:
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java	2008-03-14
19:18:06 UTC (rev 10283)
+++
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java	2008-03-15
01:55:13 UTC (rev 10284)
@@ -133,9 +133,9 @@
       return matcher.matches();
    }
 
-   public Deployment newInstance(URL url, PortalWebApp pwa,
ManagedObjectRegistryEventListener listener, MBeanServer mbeanServer) throws
DeploymentException
+   public Deployment newInstance(URL url, PortalWebApp pwa, MBeanServer mbeanServer)
throws DeploymentException
    {
-      return new PortletAppDeployment(url, pwa, listener, mbeanServer, this);
+      return new PortletAppDeployment(url, pwa, bridgeToInvoker, mbeanServer, this);
    }
 
    public void start() throws Exception

Modified:
branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/deployment/jboss/AbstractDeploymentFactory.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/deployment/jboss/AbstractDeploymentFactory.java	2008-03-14
19:18:06 UTC (rev 10283)
+++
branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/deployment/jboss/AbstractDeploymentFactory.java	2008-03-15
01:55:13 UTC (rev 10284)
@@ -22,17 +22,12 @@
  ******************************************************************************/
 package org.jboss.portal.server.deployment.jboss;
 
-import org.jboss.deployment.DeploymentException;
 import org.jboss.logging.Logger;
 import org.jboss.portal.common.net.URLFilter;
 import org.jboss.portal.common.util.Tools;
-import org.jboss.portal.server.deployment.PortalWebApp;
-import org.jboss.portal.web.WebApp;
 
 import java.net.URL;
 
-import javax.management.MBeanServer;
-
 /**
  * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -172,14 +167,4 @@
    {
       setupURL = null;
    }
-   
-   public Deployment newInstance(URL url, PortalWebApp pwa, MBeanServer mbeanServer)
throws DeploymentException
-   {
-      return newInstance(url, pwa, null, mbeanServer);
-   }
-
-   public Deployment newInstance(URL url, PortalWebApp pwa, WebApp webApp, MBeanServer
mbeanServer) throws DeploymentException
-   {
-      return newInstance(url, pwa, null, mbeanServer);
-   }
 }

Modified: branches/JBoss_Portal_Branch_2_7/testsuite/build.xml
===================================================================

--- branches/JBoss_Portal_Branch_2_7/testsuite/build.xml	2008-03-14 19:18:06 UTC (rev
10283)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/build.xml	2008-03-15 01:55:13 UTC (rev
10284)
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+<?xml version="1.0"
encoding="UTF-8"?><!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   ~ JBoss, a division of Red Hat                                              ~
   ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
   ~ contributors as indicated by the @authors tag. See the                    ~
@@ -22,13 +21,9 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 
-<!DOCTYPE project [
-   <!ENTITY defaults   SYSTEM
"../tools/etc/buildfragments/defaults.ent">
-   <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
-   ]>
+<!DOCTYPE project [<!ENTITY defaults   SYSTEM
"../tools/etc/buildfragments/defaults.ent"><!ENTITY libraries  SYSTEM
"../thirdparty/libraries.ent">]>
 
-<project default="tests" name="JBoss Portal Testuite"
-         xmlns:server="http://jboss.org/ns/test/ant/server">
+<project default="tests" name="JBoss Portal Testuite"
xmlns:server="http://jboss.org/ns/test/ant/server">
 
    <import file="imports/server-config.xml"/>
 
@@ -40,8 +35,7 @@
    <dirname property="project.root" file="${basedir}"/>
    <property name="project.thirdparty"
value="${project.root}/thirdparty"/>
 
-   &defaults;
-   &libraries;
+   &defaults; &libraries;
 
    <path id="portal.task.classpath">
       <pathelement location="${project.tools}/lib/ant.jar"/>
@@ -50,14 +44,8 @@
    </path>
 
 
-   <taskdef
-      name="deploy"
-      classname="org.jboss.portal.common.ant.Deploy"
-      classpathref="portal.task.classpath"/>
-   <taskdef
-      name="undeploy"
-      classname="org.jboss.portal.common.ant.Undeploy"
-      classpathref="portal.task.classpath"/>
+   <taskdef name="deploy"
classname="org.jboss.portal.common.ant.Deploy"
classpathref="portal.task.classpath"/>
+   <taskdef name="undeploy"
classname="org.jboss.portal.common.ant.Undeploy"
classpathref="portal.task.classpath"/>
 
    <target name="init">
       <mkdir dir="${log.dir}"/>
@@ -88,8 +76,8 @@
    </target>
 
    <target name="run-tests">
-       <ant antfile="../${module}/build.xml" output="output.log"
dir="../${module}" target="package-tests"/>
-       <ant antfile="../${module}/build.xml" output="tests.log"
dir="../${module}" target="tests"/>
+      <ant antfile="../${module}/build.xml" output="output.log"
dir="../${module}" target="package-tests"/>
+      <ant antfile="../${module}/build.xml" output="tests.log"
dir="../${module}" target="tests"/>
    </target>
 
    <target name="test-module" depends="clean,init">
@@ -116,7 +104,7 @@
    <!-- executes all modules' tests -->
    <target name="tests" depends="init">
       <server:start name="default"/>
-   	<sequential>
+      <sequential>
          <antcall target="agent-deploy"/>
          <antcall target="internal-test-module">
             <param name="module" value="cms"/>
@@ -159,13 +147,12 @@
    </target>
 
    <target name="reports">
-         <junitreport todir="${reports.dir}">
-            <fileset dir="${reports.dir}">
-               <include name="TEST-*.xml"/>
-            </fileset>
-            <report format="frames"
-                    todir="${reports.dir}"/>
-         </junitreport>
+      <junitreport todir="${reports.dir}">
+         <fileset dir="${reports.dir}">
+            <include name="TEST-*.xml"/>
+         </fileset>
+         <report format="frames" todir="${reports.dir}"/>
+      </junitreport>
    </target>
 
    <target name="clean">
@@ -198,7 +185,7 @@
       </delete>
       <!-- remove testsuite output dir -->
       <delete includeEmptyDirs="true" quiet="true">
-          <fileset dir="output"/>
+         <fileset dir="output"/>
       </delete>
    </target>
 
@@ -213,8 +200,8 @@
    </target>
 
    <target name="help">
-		<echo message="To run individual module tests use the test-module target with
-Dmodule=the module you want to test,
+      <echo message="To run individual module tests use the test-module target
with -Dmodule=the module you want to test,
 		   e.g. ant -Dmodule=portlet test-module"/>
-	</target>
+   </target>
 
 </project>

Modified: branches/JBoss_Portal_Branch_2_7/testsuite/imports/server-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/imports/server-config.xml	2008-03-14
19:18:06 UTC (rev 10283)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/imports/server-config.xml	2008-03-15
01:55:13 UTC (rev 10284)
@@ -24,8 +24,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 
-<project name="server-config" default="help"
-         xmlns:server="http://jboss.org/ns/test/ant/server">
+<project name="server-config" default="help"
xmlns:server="http://jboss.org/ns/test/ant/server">
 
    <!-- PROPERTIES -->
    <property environment="env"/>
@@ -72,10 +71,10 @@
 
    <!-- Server Config Classpath, also used for JUnit formatting -->
    <path id="jboss.test.classpath">
-           <filelist dir="${project.tools}/lib">
-             <file name="jboss-test.jar"/>
-           </filelist>
-  </path>
+      <filelist dir="${project.tools}/lib">
+         <file name="jboss-test.jar"/>
+      </filelist>
+   </path>
 
    <taskdef name="config"
classname="org.jboss.ant.taskdefs.server.ConfigManagerTask"
             uri="http://jboss.org/ns/test/ant/server"
loaderref="server.loader">
@@ -92,18 +91,17 @@
       <classpath refid="server.taskdef.classpath"/>
    </taskdef>
 
-   <server:config javaHome="${env.JAVA_HOME}"
jbossHome="${jboss.dist}"
-                  udpGroup="${udpGroup}">
+   <server:config javaHome="${env.JAVA_HOME}"
jbossHome="${jboss.dist}" udpGroup="${udpGroup}">
       <server name="default" host="${node0}">
          <jvmarg value="${jpda.cmdline}"/>
          <jvmarg value="-Xmx128m"/>
          <sysproperty key="java.endorsed.dirs"
value="${jboss.dist}/lib/endorsed"/>
-      </server>      
+      </server>
    </server:config>
 
-<target name="help">
+   <target name="help">
       <echo message="The project fragment which defines the jboss server
configs"/>
    </target>
-    
-      
+
+
 </project>

Modified: branches/JBoss_Portal_Branch_2_7/wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/build.xml	2008-03-14 19:18:06 UTC (rev 10283)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/build.xml	2008-03-15 01:55:13 UTC (rev 10284)
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+<?xml version="1.0"
encoding="UTF-8"?><!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   ~ JBoss, a division of Red Hat                                              ~
   ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
   ~ contributors as indicated by the @authors tag. See the                    ~
@@ -22,44 +21,19 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 
-<!DOCTYPE project [
-   <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
-   <!ENTITY buildmagic SYSTEM
"../tools/etc/buildfragments/buildmagic.ent">
-   <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
-   <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
-   <!ENTITY defaults   SYSTEM
"../tools/etc/buildfragments/defaults.ent">
-   <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
-   ]>
+<!DOCTYPE project [<!ENTITY libraries  SYSTEM
"../thirdparty/libraries.ent"><!ENTITY buildmagic SYSTEM
"../tools/etc/buildfragments/buildmagic.ent"><!ENTITY tools      SYSTEM
"../tools/etc/buildfragments/tools.ent"><!ENTITY modules    SYSTEM
"../tools/etc/buildfragments/modules.ent"><!ENTITY defaults   SYSTEM
"../tools/etc/buildfragments/defaults.ent"><!ENTITY targets    SYSTEM
"../tools/etc/buildfragments/targets.ent">]>
 
 <!-- $Id$ -->
 
-<!--+======================================================================+-->
-<!--| JBoss Portal (The OpenSource Portal) Build File                      |-->
-<!--|                                                                      |-->
-<!--| Distributable under LGPL license.                                    |-->
-<!--| See terms of license at http://www.gnu.org.                          |-->
-<!--|                                                                      |-->
-<!--| This file has been designed to work with the 'tools' module and     
|-->
-<!--| Buildmagic extentions.                                               |-->
-<!--+======================================================================+-->
+<!--+======================================================================+--><!--|
JBoss Portal (The OpenSource Portal) Build File                      |--><!--|      
                                                               |--><!--|
Distributable under LGPL license.                                    |--><!--| See
terms of license at http://www.gnu.org.                          |--><!--|          
                                                           |--><!--| This file has
been designed to work with the 'tools' module and      |--><!--| Buildmagic
extentions.                                              
|--><!--+======================================================================+-->
 
 <project default="main" name="WSRP for JBoss Portal"
xmlns:server="http://jboss.org/ns/test/ant/server">
 
-   <!--| Include the common build elements.                                 |-->
-   <!--|                                                                    |-->
-   <!--| This defines several different targets, properties and paths.      |-->
-   <!--| It also sets up the basic extention tasks amoung other things.     |-->
-   <!--+====================================================================+-->
+   <!--| Include the common build elements.                                
|--><!--|                                                                   
|--><!--| This defines several different targets, properties and paths.     
|--><!--| It also sets up the basic extention tasks amoung other things.    
|--><!--+====================================================================+-->
 
-   &buildmagic;
-   &modules;
-   &defaults;
-   &tools;
-   &targets;
+   &buildmagic; &modules; &defaults; &tools; &targets;
 
-   <!-- ================================================================== -->
-   <!-- Initialization                                                     -->
-   <!-- ================================================================== -->
+   <!-- ==================================================================
--><!-- Initialization                                                    
--><!-- ================================================================== -->
 
    <!--
      | Initialize the build system.  Must depend on '_buildmagic:init'.
@@ -77,25 +51,14 @@
       <pathelement location="${project.tools}/lib/explode.jar"/>
       <pathelement
location="${project.tools}/lib/cargo-core-uberjar-0.8.jar"/>
    </path>
-   <taskdef
-      name="deploy"
-      classname="org.jboss.portal.common.ant.Deploy"
-      classpathref="portal.task.classpath"/>
-   <taskdef
-      name="undeploy"
-      classname="org.jboss.portal.common.ant.Undeploy"
-      classpathref="portal.task.classpath"/>
+   <taskdef name="deploy"
classname="org.jboss.portal.common.ant.Deploy"
classpathref="portal.task.classpath"/>
+   <taskdef name="undeploy"
classname="org.jboss.portal.common.ant.Undeploy"
classpathref="portal.task.classpath"/>
 
    <target name="init" depends="_buildmagic:init">
       <!-- Add module specific elements here -->
    </target>
 
-   <!--+====================================================================+-->
-   <!--| Configuration                                                      |-->
-   <!--|                                                                    |-->
-   <!--| This target is invoked by the Buildmagic initialization logic      |-->
-   <!--| and should contain module specific configuration elements.         |-->
-   <!--+====================================================================+-->
+  
<!--+====================================================================+--><!--|
Configuration                                                      |--><!--|        
                                                           |--><!--| This target is
invoked by the Buildmagic initialization logic      |--><!--| and should contain
module specific configuration elements.        
|--><!--+====================================================================+-->
 
    <target name="configure" unless="configure.disable">
 
@@ -108,8 +71,7 @@
       <!-- Lib directory for current JBoss configuration -->
       <property name="jboss.deploy.lib.dir"
value="${jboss.deploy.dir}/../lib"/>
 
-      <!-- Configure thirdparty libraries -->
-      &libraries;
+      <!-- Configure thirdparty libraries --> &libraries;
 
       <!-- Libraries required to compile -->
       <path id="library.classpath">
@@ -148,6 +110,7 @@
       <!-- Libraries required for tests -->
       <path id="tests.classpath">
          <path refid="library.classpath"/>
+         <path refid="jboss.portal/modules/portlet.classpath"/>
          <pathelement
location="${jboss.portal/modules/test.lib}/portal-test-jboss-lib.jar"/>
          <path refid="jboss.microcontainer.classpath"/>
          <pathelement path="${jboss.deploy.lib.dir}/log4j.jar"/>
@@ -174,9 +137,7 @@
          <path refid="jboss.portal-faces.classpath"/>
       </path>
 
-      <!--+=======================================+-->
-      <!--| Override any default properties here. |-->
-      <!--+=======================================+-->
+      <!--+=======================================+--><!--| Override any default
properties here. |--><!--+=======================================+-->
 
       <!-- Classes generated from WSDL are in a non-standard location so need to
override properties -->
       <property name="build.gen" value="${module.source}"/>
@@ -202,9 +163,7 @@
       <call target="configure-explode"/>
       <call target="configure-jbossaop"/>
 
-      <!--+=======================================+-->
-      <!--| Define module specific elements here. |-->
-      <!--+=======================================+-->
+      <!--+=======================================+--><!--| Define module
specific elements here. |--><!--+=======================================+-->
       <property name="javadoc.private" value="true"/>
       <property name="javadoc.protected" value="false"/>
 
@@ -223,10 +182,7 @@
          <path refid="trove.trove.classpath"/>
          <path refid="qdox.qdox.classpath"/>
       </path>
-      <taskdef
-         name="aopc"
-         classname="org.jboss.aop.ant.AopC"
-         classpathref="jbossaop.task.classpath"/>
+      <taskdef name="aopc" classname="org.jboss.aop.ant.AopC"
classpathref="jbossaop.task.classpath"/>
    </target>
 
    <target name="configure-explode">
@@ -234,21 +190,12 @@
          <pathelement location="${project.tools}/lib/explode.jar"/>
          <path refid="apache.ant.classpath"/>
       </path>
-      <taskdef name="explode"
-               classname="org.jboss.portal.common.ant.Explode"
-               classpathref="explode.task.classpath"/>
+      <taskdef name="explode"
classname="org.jboss.portal.common.ant.Explode"
classpathref="explode.task.classpath"/>
    </target>
 
-   <!--+====================================================================+-->
-   <!--| Compile                                                            |-->
-   <!--|                                                                    |-->
-   <!--| This target should depend on other compile-* targets for each      |-->
-   <!--| different type of compile that needs to be performed, short of     |-->
-   <!--| documentation compiles.                                            |-->
-   <!--+====================================================================+-->
+  
<!--+====================================================================+--><!--|
Compile                                                            |--><!--|        
                                                           |--><!--| This target
should depend on other compile-* targets for each      |--><!--| different type of
compile that needs to be performed, short of     |--><!--| documentation compiles.  
                                        
|--><!--+====================================================================+-->
 
-   <target name="compile"
-           description="Compile all source files."
+   <target name="compile" description="Compile all source files."
            depends="_default:compile-classes,_default:compile-etc">
       <!-- essentially accomplish _default:compile-resources that needs to be done
here to filter hibernate conf files -->
       <mkdir dir="${build.resources}"/>
@@ -285,13 +232,7 @@
       <property name="compile.disable" value="true"/>
    </target>
 
-   <!--+====================================================================+-->
-   <!--| Generate Output                                                    |-->
-   <!--|                                                                    |-->
-   <!--| Generates the target output for this module. Target output is      |-->
-   <!--| the output which is meant to be released or used by external       |-->
-   <!--| modules.                                                           |-->
-   <!--+====================================================================+-->
+  
<!--+====================================================================+--><!--|
Generate Output                                                    |--><!--|        
                                                           |--><!--| Generates the
target output for this module. Target output is      |--><!--| the output which is
meant to be released or used by external       |--><!--| modules.                   
                                      
|--><!--+====================================================================+-->
 
    <target name="output" description="Generate WSRP Service
archive." depends="compile">
       <mkdir dir="${build.lib}"/>
@@ -334,14 +275,10 @@
    </target>
 
    <target name="explode" depends="init">
-      <explode file="${build.lib}/portal-wsrp.sar"
-               todir="${build.lib}"
-               name="portal-wsrp-exploded.sar"/>
+      <explode file="${build.lib}/portal-wsrp.sar"
todir="${build.lib}" name="portal-wsrp-exploded.sar"/>
    </target>
 
-   <!-- ================================================================== -->
-   <!-- Cleaning                                                           -->
-   <!-- ================================================================== -->
+   <!-- ==================================================================
--><!-- Cleaning                                                          
--><!-- ================================================================== -->
 
    <!-- Clean up all build output -->
    <target name="clean" depends="_default:clean">
@@ -349,28 +286,20 @@
       <!-- Add module specific elements here. -->
    </target>
 
-   <!--+====================================================================+-->
-   <!--| Documents                                                          |-->
-   <!--|                                                                    |-->
-   <!--| Generate all documentation for this module.                        |-->
-   <!--+====================================================================+-->
+  
<!--+====================================================================+--><!--|
Documents                                                          |--><!--|        
                                                           |--><!--| Generate all
documentation for this module.                       
|--><!--+====================================================================+-->
 
    <target name="docs" depends="_default:docs">
       <!-- Add module specific elements here. -->
    </target>
 
-   <!-- ================================================================== -->
-   <!-- Misc.                                                              -->
-   <!-- ================================================================== -->
+   <!-- ==================================================================
--><!-- Misc.                                                             
--><!-- ================================================================== -->
 
    <target name="main" depends="most"/>
    <target name="all" depends="_default:all, explode"/>
    <target name="most" depends="_default:most"/>
    <target name="help" depends="_default:help"/>
 
-   <!-- ================================================================== -->
-   <!-- Deployment                                                         -->
-   <!-- ================================================================== -->
+   <!-- ==================================================================
--><!-- Deployment                                                        
--><!-- ================================================================== -->
 
    <!-- Deployment of test agent -->
    <target name="agent-deploy" depends="init">
@@ -418,9 +347,7 @@
       <undeploy file="${build.lib.test}/test-wsrp-consumer.sar"
config="default"/>
    </target>
 
-   <!-- ================================================================== -->
-   <!-- Tests                                                              -->
-   <!-- ================================================================== -->
+   <!-- ==================================================================
--><!-- Tests                                                             
--><!-- ================================================================== -->
 
    <target name="package-deployment-test" description="Generates the
deployment test artifacts" depends="compile">
       <jar jarfile="${build.lib.test}/test-deployment-lib.jar">
@@ -432,8 +359,8 @@
       </jar>
    </target>
 
-   <target name="package-producer-configuration-test"
-           description="Generates the producer configuration test artifacts"
depends="compile">
+   <target name="package-producer-configuration-test"
description="Generates the producer configuration test artifacts"
+           depends="compile">
       <jar
jarfile="${build.lib.test}/test-producer-configuration-lib.jar">
          <fileset
dir="${build.resources.test}/test-producer-configuration-lib-jar"/>
          <fileset dir="${source.resources}/portal-wsrp-sar/dtd"/>
@@ -572,6 +499,7 @@
          <fileset dir="${build.lib.test}"
includes="test-wsrp-producer-client.jar"/>
          <fileset dir="${jboss.portal-security.root}/lib"
includes="portal-security-lib.jar"/>
          <fileset dir="${jboss.portal-server.lib}"
includes="portal-server-test-framework-lib.jar"/>
+         <fileset dir="${jboss.portal-core.lib}"
includes="portal-core-lib.jar"/>
       </copy>
 
       <jar jarfile="${build.lib.test}/test-wsrp-producer.sar">
@@ -627,8 +555,7 @@
       <!-- Resourceportlet test portlet -->
       <package-test-portlet archiveName="resource"
portletName="Resource"/>
 
-      <!-- Multipart test portlet -->
-      <!--<package-test-portlet archiveName="multipart"
portletName="Multipart"/>-->
+      <!-- Multipart test portlet --><!--<package-test-portlet
archiveName="multipart" portletName="Multipart"/>-->
 
       <!-- Application scope test portlet -->
       <jar
jarfile="${build.lib.test}/test-applicationscope-portlet.war">
@@ -642,13 +569,10 @@
 
    <!-- Packages all the test related artifacts. Note that compilation should have
been already executed -->
    <target name="package-tests"
depends="package-protocolv1-consumer-test, package-deployment-test,
package-other-test,
-      package-protocolv1-producer-test, package-producer-configuration-test"
-           description="Packages all the test-related artifacts. Does NOT compile
classes so this should be done before
+      package-protocolv1-producer-test, package-producer-configuration-test"
description="Packages all the test-related artifacts. Does NOT compile classes so
this should be done before
            calling this task."/>
 
-   <!-- ================================================================== -->
-   <!-- Tests                                                              -->
-   <!-- ================================================================== -->
+   <!-- ==================================================================
--><!-- Tests                                                             
--><!-- ================================================================== -->
 
    <target name="clean-test">
       <!-- remove generated test xml files -->
@@ -684,26 +608,22 @@
    <target name="protocolv1-producer-test"
depends="deploy-producer-test">
       <execute-tests>
          <x-test>
-            <zest todir="${test.reports}"
-                  name="org.jboss.portal.test.framework.runner.HTTPTestRunner"
+            <zest todir="${test.reports}"
name="org.jboss.portal.test.framework.runner.HTTPTestRunner"
                  
outfile="TEST-org.jboss.portal.test.wsrp.v1.producer.ServiceDescription"
                  
id="org.jboss.portal.test.wsrp.v1.producer.ServiceDescription">
                <parameter name="archive"
value="test-wsrp-producer-servicedescription.sar"/>
             </zest>
-            <zest todir="${test.reports}"
-                  name="org.jboss.portal.test.framework.runner.HTTPTestRunner"
+            <zest todir="${test.reports}"
name="org.jboss.portal.test.framework.runner.HTTPTestRunner"
                   outfile="TEST-org.jboss.portal.test.wsrp.v1.producer.Markup"
                   id="org.jboss.portal.test.wsrp.v1.producer.Markup">
                <parameter name="archive"
value="test-wsrp-producer-markup.sar"/>
             </zest>
-            <zest todir="${test.reports}"
-                  name="org.jboss.portal.test.framework.runner.HTTPTestRunner"
+            <zest todir="${test.reports}"
name="org.jboss.portal.test.framework.runner.HTTPTestRunner"
                  
outfile="TEST-org.jboss.portal.test.wsrp.v1.producer.Registration"
                   id="org.jboss.portal.test.wsrp.v1.producer.Registration">
                <parameter name="archive"
value="test-wsrp-producer-registration.sar"/>
             </zest>
-            <zest todir="${test.reports}"
-                  name="org.jboss.portal.test.framework.runner.HTTPTestRunner"
+            <zest todir="${test.reports}"
name="org.jboss.portal.test.framework.runner.HTTPTestRunner"
                  
outfile="TEST-org.jboss.portal.test.wsrp.v1.producer.PortletManagement"
                  
id="org.jboss.portal.test.wsrp.v1.producer.PortletManagement">
                <parameter name="archive"
value="test-wsrp-producer-portletmanagement.sar"/>
@@ -736,20 +656,17 @@
    <target name="protocolv1-consumer-test"
depends="deploy-consumer-test">
       <execute-tests>
          <x-test>
-            <zest todir="${test.reports}"
-                  name="org.jboss.portal.test.framework.runner.HTTPTestRunner"
+            <zest todir="${test.reports}"
name="org.jboss.portal.test.framework.runner.HTTPTestRunner"
                  
outfile="TEST-org.jboss.portal.test.wsrp.v1.consumer.ServiceDescription"
                  
id="org.jboss.portal.test.wsrp.v1.consumer.ServiceDescription">
                <parameter name="archive"
value="test-wsrp-consumer-servicedescription.sar"/>
             </zest>
-            <zest todir="${test.reports}"
-                  name="org.jboss.portal.test.framework.runner.HTTPTestRunner"
+            <zest todir="${test.reports}"
name="org.jboss.portal.test.framework.runner.HTTPTestRunner"
                   outfile="TEST-org.jboss.portal.test.wsrp.v1.consumer.Markup"
                   id="org.jboss.portal.test.wsrp.v1.consumer.Markup">
                <parameter name="archive"
value="test-wsrp-consumer-markup.sar"/>
             </zest>
-            <zest todir="${test.reports}"
-                  name="org.jboss.portal.test.framework.runner.HTTPTestRunner"
+            <zest todir="${test.reports}"
name="org.jboss.portal.test.framework.runner.HTTPTestRunner"
                  
outfile="TEST-org.jboss.portal.test.wsrp.v1.consumer.PortletManagement"
                  
id="org.jboss.portal.test.wsrp.v1.consumer.PortletManagement">
                <parameter name="archive"
value="test-wsrp-consumer-portletmanagement.sar"/>

Added:
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/BasicPortalContext.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/BasicPortalContext.java	
                       (rev 0)
+++
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/BasicPortalContext.java	2008-03-15
01:55:13 UTC (rev 10284)
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2008, Your Corporation. All Rights Reserved.
+ */
+
+package org.jboss.portal.test.wsrp.framework.support;
+
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.spi.PortalContext;
+import org.jboss.portal.server.PortalConstants;
+import org.jboss.portal.wsrp.WSRPUtils;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
+ * @version $Revision$
+ */
+public class BasicPortalContext implements PortalContext
+{
+   public String getInfo()
+   {
+      return PortalConstants.VERSION.toString();
+   }
+
+   public Set<WindowState> getWindowStates()
+   {
+      return WSRPUtils.DEFAULT_JSR168_WINDOWSTATES;
+   }
+
+   public Set<Mode> getModes()
+   {
+      return WSRPUtils.DEFAULT_JSR168_MODES;
+   }
+
+   public Map<String, String> getProperties()
+   {
+      return Collections.emptyMap();
+   }
+}

Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java	2008-03-14
19:18:06 UTC (rev 10283)
+++
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java	2008-03-15
01:55:13 UTC (rev 10284)
@@ -37,6 +37,7 @@
 import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse;
 import org.jboss.portal.portlet.spi.WindowContext;
 import org.jboss.portal.test.wsrp.framework.support.BasicInstanceContext;
+import org.jboss.portal.test.wsrp.framework.support.BasicPortalContext;
 import org.jboss.portal.test.wsrp.framework.support.BasicSecurityContext;
 import org.jboss.portal.test.wsrp.framework.support.BasicUserContext;
 import org.jboss.portal.test.wsrp.framework.support.TestPortletInvocationContext;
@@ -216,7 +217,10 @@
       render.setTarget(PortletContext.createPortletContext(portletHandle));
       render.setMode(mode);
       render.setWindowState(state);
-      render.setNavigationalState(new OpaqueStateString(navigationalState));
+      if (navigationalState != null)
+      {
+         render.setNavigationalState(new OpaqueStateString(navigationalState));
+      }
 
       render.setInstanceContext(new BasicInstanceContext(portletHandle));
       render.setSecurityContext(new BasicSecurityContext());
@@ -228,6 +232,7 @@
             return "windowcontext";
          }
       });
+      render.setPortalContext(new BasicPortalContext());
       return render;
    }
 

Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/NeedPortletHandleTest.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/NeedPortletHandleTest.java	2008-03-14
19:18:06 UTC (rev 10283)
+++
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/NeedPortletHandleTest.java	2008-03-15
01:55:13 UTC (rev 10284)
@@ -115,23 +115,29 @@
          GetServiceDescription getServiceDescription =
WSRPTypeFactory.createGetServiceDescription();
          ServiceDescription serviceDescription =
serviceDescriptionService.getServiceDescription(getServiceDescription);
          PortletDescription[] offered = serviceDescription.getOfferedPortlets();
-         for (int i = 0; i < offered.length; i++)
+         if (offered != null)
          {
-            PortletDescription portletDescription = offered[i];
-            String handle = portletDescription.getPortletHandle();
-            String warName = handle.substring(1, handle.indexOf('.')) +
".war";
-            if (warName.equals(archiveName))
+            for (PortletDescription portletDescription : offered)
             {
-               List<String> handles = war2Handles.get(warName);
-               if (handles == null)
+               String handle = portletDescription.getPortletHandle();
+               String warName = handle.substring(1, handle.indexOf('.')) +
".war";
+               if (warName.equals(archiveName))
                {
-                  handles = new ArrayList<String>(3);
-                  war2Handles.put(warName, handles);
+                  List<String> handles = war2Handles.get(warName);
+                  if (handles == null)
+                  {
+                     handles = new ArrayList<String>(3);
+                     war2Handles.put(warName, handles);
+                  }
+
+                  handles.add(handle);
                }
-
-               handles.add(handle);
             }
          }
+         else
+         {
+            throw new IllegalArgumentException(archiveName + " didn't contain
any portlets...");
+         }
       }
    }
 

Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPUtils.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPUtils.java	2008-03-14
19:18:06 UTC (rev 10283)
+++
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPUtils.java	2008-03-15
01:55:13 UTC (rev 10284)
@@ -44,10 +44,12 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
@@ -56,16 +58,19 @@
  */
 public class WSRPUtils
 {
-   private final static Map JSR168_WSRP_WINDOW_STATES = new HashMap(7);
-   private final static Map WSRP_JSR168_WINDOW_STATES = new HashMap(7);
-   private final static Map JSR168_WSRP_MODES = new HashMap(7);
-   private final static Map WSRP_JSR168_MODES = new HashMap(7);
+   private final static Map<String, String> JSR168_WSRP_WINDOW_STATES = new
HashMap<String, String>(7);
+   private final static Map<String, WindowState> WSRP_JSR168_WINDOW_STATES = new
HashMap<String, WindowState>(7);
+   private final static Map<String, String> JSR168_WSRP_MODES = new
HashMap<String, String>(7);
+   private final static Map<String, Mode> WSRP_JSR168_MODES = new
HashMap<String, Mode>(7);
    private static final String SET_OF_LOCALES = "set of Locales";
    private static final String MODE = "Mode";
    private static final String WSRP_MODE_NAME = "wsrp portlet name";
    private static final String WSRP_WINDOW_STATE_NAME = "wsrp window state
name";
    private static final String WINDOW_STATE = "WindowState";
 
+   public static final Set<Mode> DEFAULT_JSR168_MODES;
+   public static final Set<WindowState> DEFAULT_JSR168_WINDOWSTATES;
+
    static
    {
       JSR168_WSRP_WINDOW_STATES.put(WindowState.MAXIMIZED.toString(),
WSRPConstants.MAXIMIZED_WINDOW_STATE);
@@ -83,6 +88,9 @@
       WSRP_JSR168_MODES.put(WSRPConstants.EDIT_MODE, Mode.EDIT);
       WSRP_JSR168_MODES.put(WSRPConstants.HELP_MODE, Mode.HELP);
       WSRP_JSR168_MODES.put(WSRPConstants.VIEW_MODE, Mode.VIEW);
+
+      DEFAULT_JSR168_MODES = new HashSet<Mode>(WSRP_JSR168_MODES.values());
+      DEFAULT_JSR168_WINDOWSTATES = new
HashSet<WindowState>(WSRP_JSR168_WINDOW_STATES.values());
    }
 
    private WSRPUtils()
@@ -92,7 +100,7 @@
    public static WindowState getJSR168WindowStateFromWSRPName(String
wsrpWindowStateName)
    {
       ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(wsrpWindowStateName,
WSRP_WINDOW_STATE_NAME, null);
-      WindowState windowState =
(WindowState)WSRP_JSR168_WINDOW_STATES.get(wsrpWindowStateName);
+      WindowState windowState = WSRP_JSR168_WINDOW_STATES.get(wsrpWindowStateName);
       return (windowState == null) ? WindowState.create(wsrpWindowStateName) :
windowState;
    }
 
@@ -105,7 +113,7 @@
 
       // todo: how should we deal with solo?
       ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(jsr168WindowStateName,
WSRP_WINDOW_STATE_NAME, null);
-      String wsrpName = (String)JSR168_WSRP_WINDOW_STATES.get(jsr168WindowStateName);
+      String wsrpName = JSR168_WSRP_WINDOW_STATES.get(jsr168WindowStateName);
       return (wsrpName == null) ? jsr168WindowStateName : wsrpName;
    }
 
@@ -118,7 +126,7 @@
    public static Mode getJSR168PortletModeFromWSRPName(String wsrpPortletModeName)
    {
       ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(wsrpPortletModeName,
WSRP_MODE_NAME, null);
-      Mode mode = (Mode)WSRP_JSR168_MODES.get(wsrpPortletModeName);
+      Mode mode = WSRP_JSR168_MODES.get(wsrpPortletModeName);
       return (mode == null) ? Mode.create(wsrpPortletModeName) : mode;
    }
 
@@ -131,7 +139,7 @@
 
       // todo: how should we deal with preview?
       ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(jsr168PortletModeName,
WSRP_MODE_NAME, null);
-      String wsrpName = (String)JSR168_WSRP_MODES.get(jsr168PortletModeName);
+      String wsrpName = JSR168_WSRP_MODES.get(jsr168PortletModeName);
       return (wsrpName == null) ? jsr168PortletModeName : wsrpName;
    }
 
@@ -475,9 +483,8 @@
          if (formParams != null)
          {
             sb.append("\n\tForm params:\n");
-            for (int i = 0; i < formParams.length; i++)
+            for (NamedString formParam : formParams)
             {
-               NamedString formParam = formParams[i];
               
sb.append("\t\t").append(formParam.getName()).append("='").append(formParam.getValue()).append("'\n");
             }
          }

Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupRequest.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupRequest.java	2008-03-14
19:18:06 UTC (rev 10283)
+++
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupRequest.java	2008-03-15
01:55:13 UTC (rev 10284)
@@ -23,6 +23,8 @@
 
 package org.jboss.portal.wsrp.producer;
 
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
 import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.wsrp.WSRPUtils;
 import org.jboss.portal.wsrp.core.MarkupType;
@@ -103,11 +105,11 @@
       return portlet;
    }
 
-   public Set getSupportedModes()
+   public Set<Mode> getSupportedModes()
    {
       String[] modes = markupType.getModes();
       int length = modes.length;
-      Set result = new HashSet(length);
+      Set<Mode> result = new HashSet<Mode>(length);
       for (int i = 0; i < length; i++)
       {
          result.add(WSRPUtils.getJSR168PortletModeFromWSRPName(modes[i]));
@@ -115,11 +117,11 @@
       return result;
    }
 
-   public Set getSupportedWindowStates()
+   public Set<WindowState> getSupportedWindowStates()
    {
       String[] states = markupType.getWindowStates();
       int length = states.length;
-      Set result = new HashSet(length);
+      Set<WindowState> result = new HashSet<WindowState>(length);
       for (int i = 0; i < length; i++)
       {
          result.add(WSRPUtils.getJSR168WindowStateFromWSRPName(states[i]));

Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java	2008-03-14
19:18:06 UTC (rev 10283)
+++
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java	2008-03-15
01:55:13 UTC (rev 10284)
@@ -23,6 +23,8 @@
 
 package org.jboss.portal.wsrp.producer;
 
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
 import org.jboss.portal.common.util.MarkupInfo;
 import org.jboss.portal.common.util.MediaType;
 import org.jboss.portal.common.util.Tools;
@@ -360,15 +362,14 @@
             return PortalConstants.VERSION.toString();
          }
 
-         public Set getWindowStates()
+         public Set<WindowState> getWindowStates()
          {
             String[] validNewWindowStates = params.getValidNewWindowStates();
             if (validNewWindowStates != null)
             {
-               Set states = new HashSet(validNewWindowStates.length);
-               for (int i = 0; i < validNewWindowStates.length; i++)
+               Set<WindowState> states = new
HashSet<WindowState>(validNewWindowStates.length);
+               for (String state : validNewWindowStates)
                {
-                  String state = validNewWindowStates[i];
                   states.add(WSRPUtils.getJSR168WindowStateFromWSRPName(state));
                }
                return states;
@@ -376,15 +377,14 @@
             return markupRequest.getSupportedWindowStates();
          }
 
-         public Set getModes()
+         public Set<Mode> getModes()
          {
             String[] validNewModes = params.getValidNewModes();
             if (validNewModes != null)
             {
-               Set modes = new HashSet(validNewModes.length);
-               for (int i = 0; i < validNewModes.length; i++)
+               Set<Mode> modes = new HashSet<Mode>(validNewModes.length);
+               for (String mode : validNewModes)
                {
-                  String mode = validNewModes[i];
                   modes.add(WSRPUtils.getJSR168PortletModeFromWSRPName(mode));
                }
                return modes;
@@ -392,9 +392,9 @@
             return markupRequest.getSupportedModes();
          }
 
-         public Map getProperties()
+         public Map<String, String> getProperties()
          {
-            return Collections.EMPTY_MAP;
+            return Collections.emptyMap();
          }
       };
    }

Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml	2008-03-14
19:18:06 UTC (rev 10283)
+++
branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml	2008-03-15
01:55:13 UTC (rev 10284)
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+<?xml version="1.0"
encoding="UTF-8"?><!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   ~ JBoss, a division of Red Hat                                              ~
   ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
   ~ contributors as indicated by the @authors tag. See the                    ~
@@ -25,139 +24,99 @@
 <server>
 
    <!--  -->
-   <mbean
-     
code="org.jboss.portal.test.framework.driver.remote.RemoteTestDriverServer"
-      name="portal.test:service=TestDriverServer"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+   <mbean
code="org.jboss.portal.test.framework.driver.remote.RemoteTestDriverServer"
+          name="portal.test:service=TestDriverServer" xmbean-dd=""
+         
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
       <depends optional-attribute-name="Agent"
proxy-type="attribute">portal.test:service=Agent</depends>
    </mbean>
 
-   <!-- Webapp registry -->
-   <mbean
-     
code="org.jboss.portal.portlet.impl.container.PortletApplicationRegistryImpl"
-      name="portal:service=WebAppRegistry"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+   <mbean
code="org.jboss.portal.core.impl.portlet.info.CoreInfoBuilderFactory"
+          name="portal:service=InfoBuilderFactory,type=Core"
xmbean-dd=""
+         
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
    </mbean>
 
    <!-- Portlet deployment factory -->
-   <mbean
-     
code="org.jboss.portal.portlet.deployment.jboss.PortletAppDeploymentFactory"
-      name="portal:deploymentFactory=PortletApp"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+   <mbean
code="org.jboss.portal.portlet.deployment.jboss.PortletAppDeploymentFactory"
+          name="portal:deploymentFactory=PortletApp" 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="WebAppRegistry"
proxy-type="attribute">portal:service=WebAppRegistry</depends>
-      <depends
-         optional-attribute-name="Config"
proxy-type="attribute">portal:service=ServerConfig</depends>
+      <depends optional-attribute-name="Deployer"
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+      <depends optional-attribute-name="CoreInfoBuilderFactory"
proxy-type="attribute">
+         portal:service=InfoBuilderFactory,type=Core
+      </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>
    </mbean>
 
    <!-- Portlet container stack -->
-   <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">
+   <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/>
-      <depends
-         optional-attribute-name="ServletContainerFactory"
-        
proxy-type="attribute">portal:service=ServletContainerFactory</depends>
+      <depends optional-attribute-name="ServletContainerFactory"
proxy-type="attribute">
+         portal:service=ServletContainerFactory
+      </depends>
    </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">
+   <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.portlet.aspects.portlet.ModesInterceptor"
-      name="portal:service=Interceptor,type=Portlet,name=Modes"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+   <mbean
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+          name="portal:service=InterceptorStackFactory,type=Container"
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.server.impl.invocation.JBossInterceptorStackFactory"
-      name="portal:service=InterceptorStackFactory,type=Container"
-      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=ContextDispatcher</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=Modes</depends-list-element>
         
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ProducerCache</depends-list-element>
       </depends-list>
    </mbean>
 
    <!-- The producer portlet invoker -->
-   <mbean
-     
code="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"
-      name="portal:service=PersistenceManager,type=Producer"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+   <mbean
code="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"
+          name="portal:service=PersistenceManager,type=Producer"
xmbean-dd=""
+         
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
    </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">
+   <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">
+   <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.portlet.state.producer.ProducerPortletInvoker"
-      name="portal:service=PortletInvoker,type=Stateful"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+   <mbean
code="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker"
+          name="portal:service=PortletInvoker,type=Stateful"
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>
+      <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>
 
    <!-- 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">
+   <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=Container</depends>
-      <depends
-         optional-attribute-name="Registry"
-        
proxy-type="attribute">portal:service=WebAppRegistry</depends>
+      <depends optional-attribute-name="StackFactory"
proxy-type="attribute">
+         portal:service=InterceptorStackFactory,type=Container
+      </depends>
+      <!--<depends optional-attribute-name="Registry"
proxy-type="attribute">portal:service=WebAppRegistry</depends>-->
    </mbean>
 
    <!-- Registration manager -->
@@ -165,7 +124,9 @@
           name="portal.wsrp:service=RegistrationManager"
xmbean-dd=""
          
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
-      <depends optional-attribute-name="PersistenceManager"
proxy-type="attribute">portal.wsrp:service=PersistenceManager</depends>
+      <depends optional-attribute-name="PersistenceManager"
proxy-type="attribute">
+         portal.wsrp:service=PersistenceManager
+      </depends>
    </mbean>
 
    <!-- Producer configuration service -->
@@ -180,17 +141,18 @@
    </mbean>
 
    <!-- WSRP Producer implementation -->
-   <mbean
-      code="org.jboss.portal.wsrp.producer.WSRPProducerImpl"
-      name="portal.wsrp:service=WSRPProducer"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+   <mbean code="org.jboss.portal.wsrp.producer.WSRPProducerImpl"
name="portal.wsrp:service=WSRPProducer" xmbean-dd=""
+         
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
-      <depends optional-attribute-name="Invoker"
-              
proxy-type="attribute">portal:service=PortletInvoker,type=Stateful</depends>
+      <depends optional-attribute-name="Invoker"
proxy-type="attribute">portal:service=PortletInvoker,type=Stateful
+      </depends>
       <attribute name="RemotableByDefault">true</attribute>
-      <depends optional-attribute-name="RegistrationManager"
proxy-type="attribute">portal.wsrp:service=RegistrationManager</depends>
-      <depends optional-attribute-name="ProducerConfigurationService"
proxy-type="attribute">portal.wsrp:service=ProducerConfiguration</depends>
+      <depends optional-attribute-name="RegistrationManager"
proxy-type="attribute">
+         portal.wsrp:service=RegistrationManager
+      </depends>
+      <depends optional-attribute-name="ProducerConfigurationService"
proxy-type="attribute">
+         portal.wsrp:service=ProducerConfiguration
+      </depends>
    </mbean>
 
    <!-- Persistence manager for registrations -->
@@ -201,11 +163,8 @@
    </mbean>
 
    <!-- Hack to get access to req/resp -->
-   <mbean
-      code="org.jboss.portal.wsrp.servlet.ServletAccessService"
-      name="portal.wsrp:service=ServletAccess"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+   <mbean code="org.jboss.portal.wsrp.servlet.ServletAccessService"
name="portal.wsrp:service=ServletAccess"
+          xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
    </mbean>
 </server>


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

[portal-commits] JBoss Portal SVN: r10284 - in branches/JBoss_Portal_Branch_2_7: server/src/main/org/jboss/portal/server/deployment/jboss and 9 other directories.