Author: mwringe Date: 2009-10-02 10:56:20 -0400 (Fri, 02 Oct 2009) New Revision: 234 Modified: components/pc/trunk/docs/user-guide/ components/pc/trunk/pom.xml components/pc/trunk/test/pom.xml components/pc/trunk/test/src/test/build.xml components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml components/pc/trunk/test/src/test/resources/test/servers.xml Log: Fix the issues that were preventing the JBoss AS 5 tests from running. Update the tests to use the more recent wci snapshot. Property changes on: components/pc/trunk/docs/user-guide ___________________________________________________________________ Name: svn:ignore + target Modified: components/pc/trunk/pom.xml =================================================================== --- components/pc/trunk/pom.xml 2009-10-02 07:52:02 UTC (rev 233) +++ components/pc/trunk/pom.xml 2009-10-02 14:56:20 UTC (rev 234) @@ -96,6 +96,11 @@ <artifactId>wci-wci</artifactId> <version>${version.gatein.wci}</version> </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat</artifactId> + <version>${version.gatein.wci}</version> + </dependency> </dependencies> </dependencyManagement> Modified: components/pc/trunk/test/pom.xml =================================================================== --- components/pc/trunk/test/pom.xml 2009-10-02 07:52:02 UTC (rev 233) +++ components/pc/trunk/test/pom.xml 2009-10-02 14:56:20 UTC (rev 234) @@ -21,6 +21,10 @@ <groupId>org.gatein.wci</groupId> <artifactId>wci-wci</artifactId> </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat</artifactId> + </dependency> <dependency> <groupId>org.gatein.pc</groupId> @@ -254,7 +258,8 @@ <property name="dependency.portal-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}"/> <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/> - <property name="dependency.portal-web-web.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/> + <property name="dependency.portal-wci-wci.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/> + <property name="dependency.portal-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat.jar.path}"/> <property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/> <property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/> Modified: components/pc/trunk/test/src/test/build.xml =================================================================== --- components/pc/trunk/test/src/test/build.xml 2009-10-02 07:52:02 UTC (rev 233) +++ components/pc/trunk/test/src/test/build.xml 2009-10-02 14:56:20 UTC (rev 234) @@ -76,7 +76,7 @@ </path> <path id="portal-web-shared"> - <pathelement path="${dependency.portal-web-web.jar}"/> + <pathelement path="${dependency.portal-wci-wci.jar}"/> </path> <path id="portal-portlet"> @@ -117,6 +117,7 @@ <path refid="portal-portlet-shared"/> <path refid="jboss-unit-shared"/> <path location="${dependency.ccpp.jar}"/> + <path location="${dependency.portal-wci-tomcat.jar}"/> </path> <path id="jboss-5.1"> @@ -133,6 +134,7 @@ <path refid="portal-portlet-shared"/> <path refid="jboss-unit-shared"/> <path location="${dependency.ccpp.jar}"/> + <path location="${dependency.portal-wci-tomcat.jar}"/> </path> <path id="tomcat-6.0"> @@ -161,6 +163,7 @@ <path location="${dependency.jaxb.jar}"/> <path location="${dependency.ccpp.jar}"/> <path location="${dependency.jboss-serialization.jar}"/> + <path location="${dependency.portal-wci-tomcat.jar}"/> </path> <path id="jetty-6.1"> @@ -796,7 +799,7 @@ </antcall> </target> - <target name="tests.jboss-5.1" if="JBOSS_5_1_HOME"> + <target name="tests.jboss-5.1" if="JBOSS_5_1_0_HOME"> <antcall target="tests.jboss-5.1.container-servlet"> <param name="test.id" value="JBoss-5_1-container-servlet"/> <param name="test.jboss-5.1.name" value="RemoteJBoss_5_1"/> Modified: components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml =================================================================== --- components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2009-10-02 07:52:02 UTC (rev 233) +++ components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2009-10-02 14:56:20 UTC (rev 234) @@ -35,7 +35,7 @@ </listener> <servlet> <servlet-name>ContainerServlet</servlet-name> - <servlet-class>org.gatein.wci.impl.tomcat.TC6ContainerServlet</servlet-class> + <servlet-class>org.gatein.wci.tomcat.TC6ContainerServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> <servlet> Modified: components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml =================================================================== --- components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml 2009-10-02 07:52:02 UTC (rev 233) +++ components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml 2009-10-02 14:56:20 UTC (rev 234) @@ -35,7 +35,7 @@ </listener> <servlet> <servlet-name>ContainerServlet</servlet-name> - <servlet-class>org.gatein.wci.impl.tomcat.TC6ContainerServlet</servlet-class> + <servlet-class>org.gatein.wci.tomcat.TC6ContainerServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> <servlet> Modified: components/pc/trunk/test/src/test/resources/test/servers.xml =================================================================== --- components/pc/trunk/test/src/test/resources/test/servers.xml 2009-10-02 07:52:02 UTC (rev 233) +++ components/pc/trunk/test/src/test/resources/test/servers.xml 2009-10-02 14:56:20 UTC (rev 234) @@ -116,7 +116,7 @@ </node> </server> <server> - <server-name>RemoteJBoss_5_0</server-name> + <server-name>RemoteJBoss_5_1</server-name> <node> <node-id>default</node-id> <service>