[gatein-commits] gatein SVN: r77 - in components/pc/trunk: portal/src/assemble and 4 other directories.

Tuesday, 25 August 2009

Author: thomas.heute(a)jboss.com
Date: 2009-08-25 19:17:55 -0400 (Tue, 25 Aug 2009)
New Revision: 77

Modified:
   components/pc/trunk/build/pom.xml
   components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml
  
components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-portal-beans.xml
   components/pc/trunk/test/src/test/build.xml
  
components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml
  
components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml
Log:
Make the testsuite run better

Modified: components/pc/trunk/build/pom.xml
===================================================================

--- components/pc/trunk/build/pom.xml	2009-08-25 23:08:49 UTC (rev 76)
+++ components/pc/trunk/build/pom.xml	2009-08-25 23:17:55 UTC (rev 77)
@@ -40,7 +40,7 @@
      
<version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient>
       <version.jboss.microcontainer>2.0.2.GA</version.jboss.microcontainer>
       <version.jboss.reflect>2.0.2.GA</version.jboss.reflect>
-      <version.cargo>1.0-alpha-6</version.cargo>
+      <version.cargo>1.0.1-SNAPSHOT</version.cargo>
       <version.junit>3.8.2</version.junit>
       <version.ant>1.7.0</version.ant>
       <version.sun-jaxb>2.1.4</version.sun-jaxb>
@@ -53,16 +53,15 @@
    </properties>
 
    <repositories>
+  <repository>
+    <id>codehaus snapshot repository</id>
+    <url>http://snapshots.repository.codehaus.org/</url>
+    <releases>
+      <enabled>true</enabled>
+    </releases>
+  </repository>
+
       <repository>
-         <id>repository.jboss.org</id>
-         <name>JBoss Repository</name>
-         <layout>default</layout>
-         <url>http://repository.jboss.org/maven2/</url>
-         <snapshots>
-            <enabled>false</enabled>
-         </snapshots>
-      </repository>
-      <repository>
          <id>snapshots.jboss.org</id>
          <name>JBoss Snapshots Repository</name>
          <layout>default</layout>
@@ -87,6 +86,15 @@
          </snapshots>
       </repository>
       <repository>
+         <id>repository.jboss.org</id>
+         <name>JBoss Repository</name>
+         <layout>default</layout>
+         <url>http://repository.jboss.org/maven2/</url>
+         <snapshots>
+            <enabled>false</enabled>
+         </snapshots>
+      </repository>
+      <repository>
          <id>exo-int</id>
          <name>exoplatform.org internal repository</name>
          <url>http://maven2.exoplatform.org/rest/maven2</url>
@@ -130,7 +138,14 @@
    </build>
 
    <pluginRepositories>
-      <pluginRepository>
+  <pluginRepository>
+    <id>codehaus snapshot repository</id>
+    <url>http://snapshots.repository.codehaus.org/</url>
+    <releases>
+      <enabled>true</enabled>
+    </releases>
+  </pluginRepository>
+        <pluginRepository>
          <id>apache.org</id>
          <name>Maven Plugin Snapshots</name>
          <url>http://people.apache.org/repo/m2-snapshot-repository</url>

Modified: components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml	2009-08-25 23:08:49
UTC (rev 76)
+++ components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml	2009-08-25 23:17:55
UTC (rev 77)
@@ -49,6 +49,7 @@
             <include>apache-xerces:xercesImpl</include>
             <include>apache-xerces:resolver</include>
             <include>apache-xerces:xml-apis</include>
+            <include>apache-log4j:log4j</include>
 
             <include>apache-taglibs:jstl</include>
             <include>apache-taglibs:standard</include>
@@ -66,7 +67,7 @@
             <include>xpp3:xpp3</include>
             <include>commons-logging:commons-logging</include>
             <include>sun-jaxb:jaxb-api</include>
-
+            <include>org.jboss.logging:jboss-logging-spi</include>
          </includes>
       </dependencySet>
       <dependencySet>

Modified:
components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-portal-beans.xml
===================================================================
---
components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-portal-beans.xml	2009-08-25
23:08:49 UTC (rev 76)
+++
components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-portal-beans.xml	2009-08-25
23:17:55 UTC (rev 77)
@@ -21,7 +21,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<!--<deployment xmlns="urn:jboss:bean-deployer:2.0">-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
 <!---->
 <!--   <bean name="PortletApplicationDeployer"
class="org.gatein.pc.mc.PortletApplicationDeployer">-->
 <!--      <alias>PortletApplicationRegistry</alias>-->
@@ -167,7 +167,7 @@
       <property name="next"><inject
bean="ContextDispatcherInterceptor"/></property>
    </bean>
    <bean name="ContextDispatcherInterceptor"
class="org.gatein.pc.aspects.portlet.ContextDispatcherInterceptor">
-      <property name="servletContainerFactory"><inject
bean="ServletContainerFactory"/></property>
+      <property name="servletContainer"><inject
bean="ServletContainer"/></property>
       <property name="next"><inject
bean="ProducerCacheInterceptor"/></property>
    </bean>
    <bean name="ProducerCacheInterceptor"
class="org.gatein.pc.aspects.portlet.ProducerCacheInterceptor">

Modified: components/pc/trunk/test/src/test/build.xml
===================================================================
--- components/pc/trunk/test/src/test/build.xml	2009-08-25 23:08:49 UTC (rev 76)
+++ components/pc/trunk/test/src/test/build.xml	2009-08-25 23:17:55 UTC (rev 77)
@@ -675,7 +675,7 @@
             <property name="cargo.servlet.port" value="8080"/>
             <property name="cargo.logging" value="high"/>
             <property name="cargo.rmi.port" value="1099"/>
-            <property name="cargo.jvmargs"
value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"/>
+            <!--<property name="cargo.jvmargs"
value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"/-->
             <deployable type="war"
file="${test.temp.lib}/jboss-5.1/portlet-test.war"/>
          </configuration>
       </cargo>
@@ -768,7 +768,7 @@
          <configuration>
             <property name="cargo.servlet.port" value="8080"/>
             <property name="cargo.logging" value="high"/>
-            <!--<property name="cargo.jvmargs" value="-Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9000"/>-->
+            <!--property name="cargo.jvmargs" value="-Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9000"/-->
             <deployable type="war"
file="${test.temp.lib}/manager.war"/>
             <deployable type="war"
file="${test.temp.lib}/tomcat-6.0/portlet-test.war"/>
          </configuration>

Modified:
components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml
===================================================================
---
components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml	2009-08-25
23:08:49 UTC (rev 76)
+++
components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml	2009-08-25
23:17:55 UTC (rev 77)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   ~ JBoss, a division of Red Hat                                              ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ Copyright 2008, 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.                                                  ~
@@ -22,55 +22,119 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
-<!--  
-   <bean name="TestDriverServer"
class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/>
+<!---->
+<!--   <bean name="PortletApplicationDeployer"
class="org.gatein.pc.mc.PortletApplicationDeployer">-->
+<!--      <alias>PortletApplicationRegistry</alias>-->
+<!--      <property name="servletContainer"><inject
bean="ServletContainer"/></property>-->
+<!--      <property name="containerPortletInvoker"><inject
bean="ContainerPortletInvoker"/></property>-->
+<!--   </bean>-->
+<!---->
+<!--    The ServletContainerFactory -->
+<!--   <bean name="ServletContainerFactory"
class="org.gatein.wci.impl.DefaultServletContainerFactory">-->
+<!--      <constructor
factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory"
factoryMethod="getInstance"/>-->
+<!--   </bean>-->
+<!---->
+<!--    The servlet container obtained from the ServletContainerFactory -->
+<!--   <bean name="ServletContainer"
class="org.gatein.wci.ServletContainer">-->
+<!--      <constructor factoryMethod="getServletContainer">-->
+<!--         <factory bean="ServletContainerFactory"/>-->
+<!--      </constructor>-->
+<!--   </bean>-->
+<!---->
+<!--    The producer persistence manager -->
+<!--   <bean name="ProducerPersistenceManager"
class="org.gatein.pc.impl.state.producer.PortletStatePersistenceManagerService"/>-->
+<!---->
+<!--    The producer state management policy -->
+<!--   <bean name="ProducerStateManagementPolicy"
class="org.gatein.pc.impl.state.StateManagementPolicyService">-->
+<!--      <property
name="persistLocally"><value>true</value></property>-->
+<!--   </bean>-->
+<!---->
+<!--    The producer state converter -->
+<!--   <bean name="ProducerStateConverter"
class="org.gatein.pc.impl.state.StateConverterV0"/>-->
+<!---->
+<!--    The consumer portlet invoker -->
+<!--   <bean name="ConsumerPortletInvoker"
class="org.gatein.pc.PortletInvokerInterceptor">-->
+<!--      <property name="next"><inject
bean="ConsumerCacheInterceptor"/></property>-->
+<!--   </bean>-->
+<!--   <bean name="ConsumerCacheInterceptor"
class="org.gatein.pc.aspects.portlet.ConsumerCacheInterceptor">-->
+<!--      <property name="next"><inject
bean="PortletCustomizationInterceptor"/></property>-->
+<!--   </bean>-->
+<!--   <bean name="PortletCustomizationInterceptor"
class="org.gatein.pc.aspects.portlet.PortletCustomizationInterceptor">-->
+<!--      <property name="next"><inject
bean="ProducerPortletInvoker"/></property>-->
+<!--   </bean>-->
+<!---->
+<!--    The producer portlet invoker -->
+<!--   <bean name="ProducerPortletInvoker"
class="org.gatein.pc.state.producer.ProducerPortletInvoker">-->
+<!--      <property name="next"><inject
bean="ContainerPortletInvoker"/></property>-->
+<!--      <property name="persistenceManager"><inject
bean="ProducerPersistenceManager"/></property>-->
+<!--      <property name="stateManagementPolicy"><inject
bean="ProducerStateManagementPolicy"/></property>-->
+<!--      <property name="stateConverter"><inject
bean="ProducerStateConverter"/></property>-->
+<!--   </bean>-->
+<!---->
+<!--    The portlet container invoker -->
+<!--   <bean name="ContainerPortletInvoker"
class="org.gatein.pc.container.ContainerPortletInvoker">-->
+<!--      <property name="next"><inject
bean="ValveInterceptor"/></property>-->
+<!--   </bean>-->
+<!---->
+<!--    Container stack -->
+<!--   <bean name="ValveInterceptor"
class="org.gatein.pc.aspects.portlet.ValveInterceptor">-->
+<!--      <property name="portletApplicationRegistry"><inject
bean="PortletApplicationRegistry"
state="Instantiated"/></property>-->
+<!--      <property name="next"><inject
bean="SecureTransportInterceptor"/></property>-->
+<!--   </bean>-->
+<!--   <bean name="SecureTransportInterceptor"
class="org.gatein.pc.aspects.portlet.SecureTransportInterceptor">-->
+<!--      <property name="next"><inject
bean="ContextDispatcherInterceptor"/></property>-->
+<!--   </bean>-->
+<!--   <bean name="ContextDispatcherInterceptor"
class="org.gatein.pc.aspects.portlet.ContextDispatcherInterceptor">-->
+<!--      <property name="servletContainerFactory"><inject
bean="ServletContainerFactory"/></property>-->
+<!--      <property name="next"><inject
bean="ProducerCacheInterceptor"/></property>-->
+<!--   </bean>-->
+<!--   <bean name="ProducerCacheInterceptor"
class="org.gatein.pc.aspects.portlet.ProducerCacheInterceptor">-->
+<!--      <property name="next"><inject
bean="CCPPInterceptor"/></property>-->
+<!--   </bean>-->
+<!--   <bean name="CCPPInterceptor"
class="org.gatein.pc.aspects.portlet.CCPPInterceptor">-->
+<!--      <property name="next"><inject
bean="RequestAttributeConversationInterceptor"/></property>-->
+<!--   </bean>-->
+<!--   <bean name="RequestAttributeConversationInterceptor"
class="org.gatein.pc.aspects.portlet.RequestAttributeConversationInterceptor">-->
+<!--      <property name="next"><inject
bean="EventPayloadInterceptor"/></property>-->
+<!--   </bean>-->
+<!--   <bean name="EventPayloadInterceptor"
class="org.gatein.pc.aspects.portlet.EventPayloadInterceptor">-->
+<!--      <property name="next"><inject
bean="PortletContainerDispatcher"/></property>-->
+<!--   </bean>-->
+<!--   <bean name="PortletContainerDispatcher"
class="org.gatein.pc.container.ContainerPortletDispatcher">-->
+<!--   </bean>-->
+<!---->
+<!--</deployment>-->
 
-   <bean name="TestDriverServerExporter"
-        
class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
-      <constructor>
-         <parameter>socket://localhost:5400</parameter>
-         <parameter><inject
bean="TestDriverServer"/></parameter>
-        
<parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter>
-      </constructor>
-   </bean>
-
-   <bean name="PortletApplicationDeployer"
class="org.gatein.pc.test.TestPortletApplicationDeployer">
+   <bean name="PortletApplicationDeployer"
class="org.gatein.pc.mc.PortletApplicationDeployer">
       <alias>PortletApplicationRegistry</alias>
       <property name="servletContainer"><inject
bean="ServletContainer"/></property>
-      <property name="driver"><inject
bean="TestDriverServer"/></property>
       <property name="containerPortletInvoker"><inject
bean="ContainerPortletInvoker"/></property>
    </bean>
--->
+
    <!-- The ServletContainerFactory -->
-<!--
    <bean name="ServletContainerFactory"
class="org.gatein.wci.impl.DefaultServletContainerFactory">
       <constructor
factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory"
factoryMethod="getInstance"/>
    </bean>
--->
+
    <!-- The servlet container obtained from the ServletContainerFactory -->
-<!--
-     <bean name="ServletContainer"
class="org.gatein.wci.ServletContainer">
+   <bean name="ServletContainer"
class="org.gatein.wci.ServletContainer">
       <constructor factoryMethod="getServletContainer">
          <factory bean="ServletContainerFactory"/>
       </constructor>
    </bean>
--->
+
    <!-- The producer persistence manager -->
-<!--
    <bean name="ProducerPersistenceManager"
class="org.gatein.pc.impl.state.producer.PortletStatePersistenceManagerService"/>
--->
+
    <!-- The producer state management policy -->
-<!--
    <bean name="ProducerStateManagementPolicy"
class="org.gatein.pc.impl.state.StateManagementPolicyService">
       <property
name="persistLocally"><value>true</value></property>
    </bean>
--->
+
    <!-- The producer state converter -->
-<!--
    <bean name="ProducerStateConverter"
class="org.gatein.pc.impl.state.StateConverterV0"/>
--->
+
    <!-- The consumer portlet invoker -->
-<!--
    <bean name="ConsumerPortletInvoker"
class="org.gatein.pc.PortletInvokerInterceptor">
       <property name="next"><inject
bean="ConsumerCacheInterceptor"/></property>
    </bean>
@@ -80,22 +144,22 @@
    <bean name="PortletCustomizationInterceptor"
class="org.gatein.pc.aspects.portlet.PortletCustomizationInterceptor">
       <property name="next"><inject
bean="ProducerPortletInvoker"/></property>
    </bean>
--->
+
    <!-- The producer portlet invoker -->
-<!--   <bean name="ProducerPortletInvoker"
class="org.gatein.pc.state.producer.ProducerPortletInvoker">
+   <bean name="ProducerPortletInvoker"
class="org.gatein.pc.state.producer.ProducerPortletInvoker">
       <property name="next"><inject
bean="ContainerPortletInvoker"/></property>
       <property name="persistenceManager"><inject
bean="ProducerPersistenceManager"/></property>
       <property name="stateManagementPolicy"><inject
bean="ProducerStateManagementPolicy"/></property>
       <property name="stateConverter"><inject
bean="ProducerStateConverter"/></property>
    </bean>
--->
+
    <!-- The portlet container invoker -->
-<!--   <bean name="ContainerPortletInvoker"
class="org.gatein.pc.container.ContainerPortletInvoker">
+   <bean name="ContainerPortletInvoker"
class="org.gatein.pc.container.ContainerPortletInvoker">
       <property name="next"><inject
bean="ValveInterceptor"/></property>
    </bean>
--->
+
    <!-- Container stack -->
-<!--   <bean name="ValveInterceptor"
class="org.gatein.pc.aspects.portlet.ValveInterceptor">
+   <bean name="ValveInterceptor"
class="org.gatein.pc.aspects.portlet.ValveInterceptor">
       <property name="portletApplicationRegistry"><inject
bean="PortletApplicationRegistry"
state="Instantiated"/></property>
       <property name="next"><inject
bean="SecureTransportInterceptor"/></property>
    </bean>
@@ -103,7 +167,7 @@
       <property name="next"><inject
bean="ContextDispatcherInterceptor"/></property>
    </bean>
    <bean name="ContextDispatcherInterceptor"
class="org.gatein.pc.aspects.portlet.ContextDispatcherInterceptor">
-      <property name="servletContainerFactory"><inject
bean="ServletContainerFactory"/></property>
+      <property name="servletContainer"><inject
bean="ServletContainer"/></property>
       <property name="next"><inject
bean="ProducerCacheInterceptor"/></property>
    </bean>
    <bean name="ProducerCacheInterceptor"
class="org.gatein.pc.aspects.portlet.ProducerCacheInterceptor">
@@ -120,5 +184,5 @@
    </bean>
    <bean name="PortletContainerDispatcher"
class="org.gatein.pc.container.ContainerPortletDispatcher">
    </bean>
--->
+
 </deployment>

Modified:
components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml
===================================================================
---
components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml	2009-08-25
23:08:49 UTC (rev 76)
+++
components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml	2009-08-25
23:17:55 UTC (rev 77)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   ~ JBoss, a division of Red Hat                                              ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ Copyright 2008, 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.                                                  ~
@@ -22,55 +22,119 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
-<!--
-   <bean name="TestDriverServer"
class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/>
+<!---->
+<!--   <bean name="PortletApplicationDeployer"
class="org.gatein.pc.mc.PortletApplicationDeployer">-->
+<!--      <alias>PortletApplicationRegistry</alias>-->
+<!--      <property name="servletContainer"><inject
bean="ServletContainer"/></property>-->
+<!--      <property name="containerPortletInvoker"><inject
bean="ContainerPortletInvoker"/></property>-->
+<!--   </bean>-->
+<!---->
+<!--    The ServletContainerFactory -->
+<!--   <bean name="ServletContainerFactory"
class="org.gatein.wci.impl.DefaultServletContainerFactory">-->
+<!--      <constructor
factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory"
factoryMethod="getInstance"/>-->
+<!--   </bean>-->
+<!---->
+<!--    The servlet container obtained from the ServletContainerFactory -->
+<!--   <bean name="ServletContainer"
class="org.gatein.wci.ServletContainer">-->
+<!--      <constructor factoryMethod="getServletContainer">-->
+<!--         <factory bean="ServletContainerFactory"/>-->
+<!--      </constructor>-->
+<!--   </bean>-->
+<!---->
+<!--    The producer persistence manager -->
+<!--   <bean name="ProducerPersistenceManager"
class="org.gatein.pc.impl.state.producer.PortletStatePersistenceManagerService"/>-->
+<!---->
+<!--    The producer state management policy -->
+<!--   <bean name="ProducerStateManagementPolicy"
class="org.gatein.pc.impl.state.StateManagementPolicyService">-->
+<!--      <property
name="persistLocally"><value>true</value></property>-->
+<!--   </bean>-->
+<!---->
+<!--    The producer state converter -->
+<!--   <bean name="ProducerStateConverter"
class="org.gatein.pc.impl.state.StateConverterV0"/>-->
+<!---->
+<!--    The consumer portlet invoker -->
+<!--   <bean name="ConsumerPortletInvoker"
class="org.gatein.pc.PortletInvokerInterceptor">-->
+<!--      <property name="next"><inject
bean="ConsumerCacheInterceptor"/></property>-->
+<!--   </bean>-->
+<!--   <bean name="ConsumerCacheInterceptor"
class="org.gatein.pc.aspects.portlet.ConsumerCacheInterceptor">-->
+<!--      <property name="next"><inject
bean="PortletCustomizationInterceptor"/></property>-->
+<!--   </bean>-->
+<!--   <bean name="PortletCustomizationInterceptor"
class="org.gatein.pc.aspects.portlet.PortletCustomizationInterceptor">-->
+<!--      <property name="next"><inject
bean="ProducerPortletInvoker"/></property>-->
+<!--   </bean>-->
+<!---->
+<!--    The producer portlet invoker -->
+<!--   <bean name="ProducerPortletInvoker"
class="org.gatein.pc.state.producer.ProducerPortletInvoker">-->
+<!--      <property name="next"><inject
bean="ContainerPortletInvoker"/></property>-->
+<!--      <property name="persistenceManager"><inject
bean="ProducerPersistenceManager"/></property>-->
+<!--      <property name="stateManagementPolicy"><inject
bean="ProducerStateManagementPolicy"/></property>-->
+<!--      <property name="stateConverter"><inject
bean="ProducerStateConverter"/></property>-->
+<!--   </bean>-->
+<!---->
+<!--    The portlet container invoker -->
+<!--   <bean name="ContainerPortletInvoker"
class="org.gatein.pc.container.ContainerPortletInvoker">-->
+<!--      <property name="next"><inject
bean="ValveInterceptor"/></property>-->
+<!--   </bean>-->
+<!---->
+<!--    Container stack -->
+<!--   <bean name="ValveInterceptor"
class="org.gatein.pc.aspects.portlet.ValveInterceptor">-->
+<!--      <property name="portletApplicationRegistry"><inject
bean="PortletApplicationRegistry"
state="Instantiated"/></property>-->
+<!--      <property name="next"><inject
bean="SecureTransportInterceptor"/></property>-->
+<!--   </bean>-->
+<!--   <bean name="SecureTransportInterceptor"
class="org.gatein.pc.aspects.portlet.SecureTransportInterceptor">-->
+<!--      <property name="next"><inject
bean="ContextDispatcherInterceptor"/></property>-->
+<!--   </bean>-->
+<!--   <bean name="ContextDispatcherInterceptor"
class="org.gatein.pc.aspects.portlet.ContextDispatcherInterceptor">-->
+<!--      <property name="servletContainerFactory"><inject
bean="ServletContainerFactory"/></property>-->
+<!--      <property name="next"><inject
bean="ProducerCacheInterceptor"/></property>-->
+<!--   </bean>-->
+<!--   <bean name="ProducerCacheInterceptor"
class="org.gatein.pc.aspects.portlet.ProducerCacheInterceptor">-->
+<!--      <property name="next"><inject
bean="CCPPInterceptor"/></property>-->
+<!--   </bean>-->
+<!--   <bean name="CCPPInterceptor"
class="org.gatein.pc.aspects.portlet.CCPPInterceptor">-->
+<!--      <property name="next"><inject
bean="RequestAttributeConversationInterceptor"/></property>-->
+<!--   </bean>-->
+<!--   <bean name="RequestAttributeConversationInterceptor"
class="org.gatein.pc.aspects.portlet.RequestAttributeConversationInterceptor">-->
+<!--      <property name="next"><inject
bean="EventPayloadInterceptor"/></property>-->
+<!--   </bean>-->
+<!--   <bean name="EventPayloadInterceptor"
class="org.gatein.pc.aspects.portlet.EventPayloadInterceptor">-->
+<!--      <property name="next"><inject
bean="PortletContainerDispatcher"/></property>-->
+<!--   </bean>-->
+<!--   <bean name="PortletContainerDispatcher"
class="org.gatein.pc.container.ContainerPortletDispatcher">-->
+<!--   </bean>-->
+<!---->
+<!--</deployment>-->
 
-   <bean name="TestDriverServerExporter"
-        
class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
-      <constructor>
-         <parameter>socket://localhost:5400</parameter>
-         <parameter><inject
bean="TestDriverServer"/></parameter>
-        
<parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter>
-      </constructor>
-   </bean>
-
-   <bean name="PortletApplicationDeployer"
class="org.gatein.pc.test.TestPortletApplicationDeployer">
+   <bean name="PortletApplicationDeployer"
class="org.gatein.pc.mc.PortletApplicationDeployer">
       <alias>PortletApplicationRegistry</alias>
       <property name="servletContainer"><inject
bean="ServletContainer"/></property>
-      <property name="driver"><inject
bean="TestDriverServer"/></property>
       <property name="containerPortletInvoker"><inject
bean="ContainerPortletInvoker"/></property>
    </bean>
--->
+
    <!-- The ServletContainerFactory -->
-<!--
    <bean name="ServletContainerFactory"
class="org.gatein.wci.impl.DefaultServletContainerFactory">
       <constructor
factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory"
factoryMethod="getInstance"/>
    </bean>
--->
+
    <!-- The servlet container obtained from the ServletContainerFactory -->
-<!--
    <bean name="ServletContainer"
class="org.gatein.wci.ServletContainer">
       <constructor factoryMethod="getServletContainer">
          <factory bean="ServletContainerFactory"/>
       </constructor>
    </bean>
--->
+
    <!-- The producer persistence manager -->
-<!--
    <bean name="ProducerPersistenceManager"
class="org.gatein.pc.impl.state.producer.PortletStatePersistenceManagerService"/>
--->
+
    <!-- The producer state management policy -->
-<!--
    <bean name="ProducerStateManagementPolicy"
class="org.gatein.pc.impl.state.StateManagementPolicyService">
       <property
name="persistLocally"><value>true</value></property>
    </bean>
--->
+
    <!-- The producer state converter -->
-<!--
    <bean name="ProducerStateConverter"
class="org.gatein.pc.impl.state.StateConverterV0"/>
--->
+
    <!-- The consumer portlet invoker -->
-<!--
    <bean name="ConsumerPortletInvoker"
class="org.gatein.pc.PortletInvokerInterceptor">
       <property name="next"><inject
bean="ConsumerCacheInterceptor"/></property>
    </bean>
@@ -80,22 +144,22 @@
    <bean name="PortletCustomizationInterceptor"
class="org.gatein.pc.aspects.portlet.PortletCustomizationInterceptor">
       <property name="next"><inject
bean="ProducerPortletInvoker"/></property>
    </bean>
--->
+
    <!-- The producer portlet invoker -->
-<!--   <bean name="ProducerPortletInvoker"
class="org.gatein.pc.state.producer.ProducerPortletInvoker">
+   <bean name="ProducerPortletInvoker"
class="org.gatein.pc.state.producer.ProducerPortletInvoker">
       <property name="next"><inject
bean="ContainerPortletInvoker"/></property>
       <property name="persistenceManager"><inject
bean="ProducerPersistenceManager"/></property>
       <property name="stateManagementPolicy"><inject
bean="ProducerStateManagementPolicy"/></property>
       <property name="stateConverter"><inject
bean="ProducerStateConverter"/></property>
    </bean>
--->
+
    <!-- The portlet container invoker -->
-<!--   <bean name="ContainerPortletInvoker"
class="org.gatein.pc.container.ContainerPortletInvoker">
+   <bean name="ContainerPortletInvoker"
class="org.gatein.pc.container.ContainerPortletInvoker">
       <property name="next"><inject
bean="ValveInterceptor"/></property>
    </bean>
--->
+
    <!-- Container stack -->
-<!--   <bean name="ValveInterceptor"
class="org.gatein.pc.aspects.portlet.ValveInterceptor">
+   <bean name="ValveInterceptor"
class="org.gatein.pc.aspects.portlet.ValveInterceptor">
       <property name="portletApplicationRegistry"><inject
bean="PortletApplicationRegistry"
state="Instantiated"/></property>
       <property name="next"><inject
bean="SecureTransportInterceptor"/></property>
    </bean>
@@ -103,7 +167,7 @@
       <property name="next"><inject
bean="ContextDispatcherInterceptor"/></property>
    </bean>
    <bean name="ContextDispatcherInterceptor"
class="org.gatein.pc.aspects.portlet.ContextDispatcherInterceptor">
-      <property name="servletContainerFactory"><inject
bean="ServletContainerFactory"/></property>
+      <property name="servletContainer"><inject
bean="ServletContainer"/></property>
       <property name="next"><inject
bean="ProducerCacheInterceptor"/></property>
    </bean>
    <bean name="ProducerCacheInterceptor"
class="org.gatein.pc.aspects.portlet.ProducerCacheInterceptor">
@@ -120,5 +184,5 @@
    </bean>
    <bean name="PortletContainerDispatcher"
class="org.gatein.pc.container.ContainerPortletDispatcher">
    </bean>
--->
+
 </deployment>


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

[gatein-commits] gatein SVN: r77 - in components/pc/trunk: portal/src/assemble and 4 other directories.