[portal-commits] JBoss Portal SVN: r13799 - in modules/portlet/trunk: test/src/test/resources/portlet-tck-war/WEB-INF and 1 other directories.

Author: mwringe Date: 2009-09-01 11:05:32 -0400 (Tue, 01 Sep 2009) New Revision: 13799 Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml Log: Fix the remote tests. Update the server version test to consider SNAPSHOT releases. Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java 2009-08-28 21:06:23 UTC (rev 13798) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java 2009-09-01 15:05:32 UTC (rev 13799) @@ -47,7 +47,7 @@ { /** . */ - private static final String VERSION_REGEX = "JBossPortletContainer/[0-9]+\\.[0-9]+"; + private static final String VERSION_REGEX = "JBossPortletContainer/[0-9]+\\.[0-9]+(|\\.SNAPSHOT)"; /** . */ private static final Pattern VERSION_PATTERN = Pattern.compile(VERSION_REGEX, Pattern.CASE_INSENSITIVE); Modified: modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2009-08-28 21:06:23 UTC (rev 13798) +++ modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2009-09-01 15:05:32 UTC (rev 13799) @@ -36,7 +36,7 @@ <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.TestPortletApplicationDeployer"> <alias>PortletApplicationRegistry</alias> - <property name="servletContainer"><inject bean="ServletContainer"/></property> + <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> <property name="driver"><inject bean="TestDriverServer"/></property> <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property> </bean> Modified: modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2009-08-28 21:06:23 UTC (rev 13798) +++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2009-09-01 15:05:32 UTC (rev 13799) @@ -36,7 +36,7 @@ <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.TestPortletApplicationDeployer"> <alias>PortletApplicationRegistry</alias> - <property name="servletContainer"><inject bean="ServletContainer"/></property> + <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> <property name="driver"><inject bean="TestDriverServer"/></property> <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property> </bean>