[gatein-commits] gatein SVN: r104 - in components/pc/trunk: pc/src/test/java/org/gatein/pc/support/spi and 3 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Aug 27 09:20:15 EDT 2009
Author: mwringe
Date: 2009-08-27 09:20:14 -0400 (Thu, 27 Aug 2009)
New Revision: 104
Modified:
components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/impl/ControllerRequestParameterMapFactory.java
components/pc/trunk/pc/src/test/java/org/gatein/pc/support/spi/PortletInvocationContextSupport.java
components/pc/trunk/test/pom.xml
components/pc/trunk/test/src/main/java/org/gatein/pc/test/ExoKernelIntegration.java
components/pc/trunk/test/src/test/build.xml
Log:
Update to get the tests mostly working again.
Modified: components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/impl/ControllerRequestParameterMapFactory.java
===================================================================
--- components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/impl/ControllerRequestParameterMapFactory.java 2009-08-27 12:05:01 UTC (rev 103)
+++ components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/impl/ControllerRequestParameterMapFactory.java 2009-08-27 13:20:14 UTC (rev 104)
@@ -59,6 +59,9 @@
Map<String, String> parameters = new HashMap<String, String>();
//
+ parameters.put(ControllerRequestParameterNames.WINDOW_ID, windowId);
+
+ //
String type;
if (containerURL instanceof ActionURL)
{
Modified: components/pc/trunk/pc/src/test/java/org/gatein/pc/support/spi/PortletInvocationContextSupport.java
===================================================================
--- components/pc/trunk/pc/src/test/java/org/gatein/pc/support/spi/PortletInvocationContextSupport.java 2009-08-27 12:05:01 UTC (rev 103)
+++ components/pc/trunk/pc/src/test/java/org/gatein/pc/support/spi/PortletInvocationContextSupport.java 2009-08-27 13:20:14 UTC (rev 104)
@@ -22,7 +22,6 @@
******************************************************************************/
package org.gatein.pc.support.spi;
-import org.gatein.common.invocation.AbstractInvocationContext;
import org.gatein.common.util.MarkupInfo;
import org.gatein.pc.api.ContainerURL;
import org.gatein.pc.api.URLFormat;
@@ -36,7 +35,7 @@
* @version $Revision: 5064 $
*/
@SuppressWarnings("unchecked")
-public class PortletInvocationContextSupport extends AbstractInvocationContext implements PortletInvocationContext
+public class PortletInvocationContextSupport implements PortletInvocationContext
{
public MarkupInfo getMarkupInfo()
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2009-08-27 12:05:01 UTC (rev 103)
+++ components/pc/trunk/test/pom.xml 2009-08-27 13:20:14 UTC (rev 104)
@@ -154,11 +154,11 @@
<type>war</type>
<scope>test</scope>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-wci</artifactId>
<type>jar</type>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>javax.ccpp</groupId>
<artifactId>ccpp</artifactId>
@@ -287,9 +287,8 @@
<property name="dependency.gatein-pc-pc.jar" value="${maven.dependency.org.gatein.pc.pc-pc.jar.path}"/>
<property name="dependency.gatein-pc-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
<property name="dependency.gatein-pc-mc.jar" value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
- <property name="dependency.gatein-pc-tests.test-jar" value="${maven.dependency.org.gatein.pc.pc-pc.tests.test-jar.path}"/>
-<!-- <property name="dependency.portal-portlet-tests.test-jar" value="${maven.dependency.org.gatein.pc.portlet-
-portlet.tests.jar.path}"/> -->
+ <property name="dependency.gatein-pc-tests.test-jar" value="${maven.dependency.org.gatein.pc.pc-pc.tests.jar.path}"/>
+<!-- <property name="dependency.portal-portlet-tests.test-jar" value="${maven.dependency.org.gatein.pc.portlet-portlet.tests.jar.path}"/> -->
<property name="dependency.gatein-pc-api.jar" value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
<property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
@@ -327,8 +326,7 @@
<!-- EXO -->
<property name="dependency.exo.kernel.container" value="${maven.dependency.org.exoplatform.kernel.exo.kernel.container.jar.path}"/>
<property name="dependency.exo.kernel.commons" value="${maven.dependency.org.exoplatform.kernel.exo.kernel.commons.jar.path}"/>
- <property name="dependency.exo.pc.component.common" value="${maven.dependency.org.exoplatform.portletcontainer.exo.pc
-.component.common.jar.path}"/>
+ <property name="dependency.exo.pc.component.common" value="${maven.dependency.org.exoplatform.portletcontainer.exo.pc.component.common.jar.path}"/>
<property name="dependency.picocontainer" value="${maven.dependency.picocontainer.picocontainer.jar.path}"/>
<property name="dependency.commons.logging" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
<property name="dependency.jibx" value="${maven.dependency.org.jibx.jibx-run.jar.path}"/>
Modified: components/pc/trunk/test/src/main/java/org/gatein/pc/test/ExoKernelIntegration.java
===================================================================
--- components/pc/trunk/test/src/main/java/org/gatein/pc/test/ExoKernelIntegration.java 2009-08-27 12:05:01 UTC (rev 103)
+++ components/pc/trunk/test/src/main/java/org/gatein/pc/test/ExoKernelIntegration.java 2009-08-27 13:20:14 UTC (rev 104)
@@ -38,6 +38,7 @@
import org.gatein.pc.container.ContainerPortletDispatcher;
import org.gatein.pc.container.ContainerPortletInvoker;
import org.gatein.pc.impl.state.MapStateConverter;
+import org.gatein.pc.impl.state.StateConverterV0;
import org.gatein.pc.impl.state.StateManagementPolicyService;
import org.gatein.pc.impl.state.producer.PortletStatePersistenceManagerService;
import org.gatein.pc.state.StateConverter;
@@ -76,10 +77,10 @@
// The producer state management policy
StateManagementPolicyService producerStateManagementPolicy = new StateManagementPolicyService();
- producerStateManagementPolicy.setPersistLocally(false);
+ producerStateManagementPolicy.setPersistLocally(true);//false);
// The producer state converter
- StateConverter producerStateConverter = new MapStateConverter();
+ StateConverter producerStateConverter = new StateConverterV0();//MapStateConverter();
// The portlet container invoker
ContainerPortletInvoker containerPortletInvoker = new ContainerPortletInvoker();
Modified: components/pc/trunk/test/src/test/build.xml
===================================================================
--- components/pc/trunk/test/src/test/build.xml 2009-08-27 12:05:01 UTC (rev 103)
+++ components/pc/trunk/test/src/test/build.xml 2009-08-27 13:20:14 UTC (rev 104)
@@ -550,6 +550,8 @@
<!-- Strip cargo manager war filename-->
<copy file="${dependency.cargo-manager.war}" tofile="${test.temp.lib}/manager.war"/>
+ <!-- unjar the war -->
+ <unzip src="${test.temp.lib}/manager.war" dest="${test.temp.lib}/manager"/>
</target>
@@ -771,6 +773,7 @@
<!--<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"/>
+ <file file="${test.temp.lib}/manager" todir="webapps/manager"/>
</configuration>
</cargo>
</target>
More information about the gatein-commits
mailing list