Author: mwringe Date: 2012-01-18 14:28:13 -0500 (Wed, 18 Jan 2012) New Revision: 8302 Removed: components/wci/trunk/test/src/ Modified: components/wci/trunk/test/core/src/main/java/org/gatein/wci/container/ServletContainerContextImpl.java components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/native/server-beans.xml components/wci/trunk/test/pom.xml components/wci/trunk/test/portlets/pom.xml components/wci/trunk/test/servers/jboss51/pom.xml components/wci/trunk/test/servers/jboss6/pom.xml components/wci/trunk/test/servers/jetty6/pom.xml components/wci/trunk/test/servers/src/common/resources/common.xml components/wci/trunk/test/servers/tomcat6/pom.xml components/wci/trunk/test/servers/tomcat7/pom.xml Log: GTNPC-76: Updating tests, removing old test directory which has not been used for a while (tests were transfered over to other directories a while ago) Modified: components/wci/trunk/test/core/src/main/java/org/gatein/wci/container/ServletContainerContextImpl.java =================================================================== --- components/wci/trunk/test/core/src/main/java/org/gatein/wci/container/ServletContainerContextImpl.java 2012-01-18 19:19:09 UTC (rev 8301) +++ components/wci/trunk/test/core/src/main/java/org/gatein/wci/container/ServletContainerContextImpl.java 2012-01-18 19:28:13 UTC (rev 8302) @@ -24,6 +24,7 @@ import org.gatein.wci.security.Credentials; import org.gatein.wci.spi.ServletContainerContext; +import org.gatein.wci.spi.WebAppContext; import org.gatein.wci.RequestDispatchCallback; import javax.servlet.ServletContext; @@ -80,4 +81,18 @@ { return "Impl"; } + + @Override + public void registerWebApp(WebAppContext webappContext, String dispatchPath) + { + // FIXME registerWebApp + + } + + @Override + public void unregisterWebApp(ServletContext servletContext) + { + // FIXME unregisterWebApp + + } } Modified: components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/native/server-beans.xml =================================================================== --- components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/native/server-beans.xml 2012-01-18 19:19:09 UTC (rev 8301) +++ components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/native/server-beans.xml 2012-01-18 19:28:13 UTC (rev 8302) @@ -93,4 +93,13 @@ </uninstall> </bean> + <bean name="SPINativeSkipTestCase" class="org.gatein.wci.spi.SPINativeSkipTestCase"> + <install bean="TestSuite" method="mount"> + <parameter><this/></parameter> + </install> + <uninstall bean="TestSuite" method="unmount"> + <parameter><this/></parameter> + </uninstall> + </bean> + </deployment> Modified: components/wci/trunk/test/pom.xml =================================================================== --- components/wci/trunk/test/pom.xml 2012-01-18 19:19:09 UTC (rev 8301) +++ components/wci/trunk/test/pom.xml 2012-01-18 19:28:13 UTC (rev 8302) @@ -32,6 +32,18 @@ </dependency> <dependency> <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-native-skipped-portlet</artifactId> + <type>war</type> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId> + <type>war</type> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> <artifactId>wci-test-gatein-portlet</artifactId> <type>war</type> <version>${project.version}</version> Modified: components/wci/trunk/test/portlets/pom.xml =================================================================== --- components/wci/trunk/test/portlets/pom.xml 2012-01-18 19:19:09 UTC (rev 8301) +++ components/wci/trunk/test/portlets/pom.xml 2012-01-18 19:28:13 UTC (rev 8302) @@ -13,5 +13,7 @@ <module>exo-portlet</module> <module>gatein-portlet</module> <module>native-portlet</module> + <module>native-skipped-portlet</module> + <module>native-skipped-with-gateinservlet-portlet</module> </modules> </project> Modified: components/wci/trunk/test/servers/jboss51/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/pom.xml 2012-01-18 19:19:09 UTC (rev 8301) +++ components/wci/trunk/test/servers/jboss51/pom.xml 2012-01-18 19:28:13 UTC (rev 8302) @@ -38,6 +38,18 @@ </dependency> <dependency> <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-native-skipped-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> <artifactId>wci-test-gatein-portlet</artifactId> <scope>test</scope> <type>war</type> @@ -375,6 +387,8 @@ <property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" /> <property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" /> + <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}"/> + <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}"/> <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" /> <!-- location of common.xml shared between the different server's build.xml --> Modified: components/wci/trunk/test/servers/jboss6/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/pom.xml 2012-01-18 19:19:09 UTC (rev 8301) +++ components/wci/trunk/test/servers/jboss6/pom.xml 2012-01-18 19:28:13 UTC (rev 8302) @@ -34,15 +34,33 @@ <groupId>org.gatein.wci</groupId> <artifactId>wci-test-core</artifactId> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-native-skipped-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> <artifactId>wci-test-native-portlet</artifactId> <scope>test</scope> <type>war</type> </dependency> <dependency> <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-native-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> <artifactId>wci-test-gatein-portlet</artifactId> <scope>test</scope> <type>war</type> @@ -397,6 +415,8 @@ <property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" /> <property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" /> + <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}"/> + <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}"/> <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" /> <!-- location of common.xml shared between the different server's build.xml --> Modified: components/wci/trunk/test/servers/jetty6/pom.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/pom.xml 2012-01-18 19:19:09 UTC (rev 8301) +++ components/wci/trunk/test/servers/jetty6/pom.xml 2012-01-18 19:28:13 UTC (rev 8302) @@ -38,6 +38,18 @@ </dependency> <dependency> <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-native-skipped-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> <artifactId>wci-test-gatein-portlet</artifactId> <scope>test</scope> <type>war</type> @@ -392,6 +404,9 @@ <property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" /> <property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" /> <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" /> + <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}"/> + <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}"/> + <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" /> <!-- location of common.xml shared between the different server's build.xml --> <property name="common.xml.file" value="${test.common.xml}" /> Modified: components/wci/trunk/test/servers/src/common/resources/common.xml =================================================================== --- components/wci/trunk/test/servers/src/common/resources/common.xml 2012-01-18 19:19:09 UTC (rev 8301) +++ components/wci/trunk/test/servers/src/common/resources/common.xml 2012-01-18 19:28:13 UTC (rev 8302) @@ -64,14 +64,15 @@ <target name="test-native" if="test.native.enable"> <property name="test.archive.path" value="${test.apps.dir}/${test.server.name}-${test.server.version}-native"/> - <!-- setup the generic tests --> + <!-- setup the native tests --> <mkdir dir="${test.archive.path}"/> <copy file="${test.native.portlet.war}" tofile="${test.archive.path}/test-spi-app.war"/> <copy file="${test.native.server.war}" tofile="${test.archive.path}/test-spi-server.war"/> <copy file="${test.generic.portlet.war}" tofile="${test.archive.path}/test-generic-app.war"/> <copy file="${test.exo.portlet.war}" tofile="${test.archive.path}/test-exo-app.war"/> + <copy file="${test.native-skip.portlet.war}" tofile="${test.archive.path}/test-native-skip-app.war"/> + <copy file="${test.native-skip-with-gateinservlet.portlet.war}" tofile="${test.archive.path}/test-native-skip-with-gateinservlet-app.war"/> - <antcall target="tests.execute"> <param name="test.id" value="${test.remote.server.name}-spi-native"/> <param name="test.war" value="${test.native.server.war}"/> Modified: components/wci/trunk/test/servers/tomcat6/pom.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/pom.xml 2012-01-18 19:19:09 UTC (rev 8301) +++ components/wci/trunk/test/servers/tomcat6/pom.xml 2012-01-18 19:28:13 UTC (rev 8302) @@ -38,6 +38,18 @@ </dependency> <dependency> <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-native-skipped-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> <artifactId>wci-test-gatein-portlet</artifactId> <scope>test</scope> <type>war</type> @@ -387,6 +399,8 @@ <property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" /> <property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" /> + <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}"/> + <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}"/> <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" /> <!-- location of common.xml shared between the different server's build.xml --> Modified: components/wci/trunk/test/servers/tomcat7/pom.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/pom.xml 2012-01-18 19:19:09 UTC (rev 8301) +++ components/wci/trunk/test/servers/tomcat7/pom.xml 2012-01-18 19:28:13 UTC (rev 8302) @@ -38,6 +38,18 @@ </dependency> <dependency> <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-native-skipped-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> <artifactId>wci-test-gatein-portlet</artifactId> <scope>test</scope> <type>war</type> @@ -381,6 +393,8 @@ <property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" /> <property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" /> + <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}"/> + <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}"/> <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" /> <!-- location of common.xml shared between the different server's build.xml -->