diff options
Diffstat (limited to 'test')
4 files changed, 42 insertions, 39 deletions
diff --git a/test/servlet-containers/generic/build.xml b/test/servlet-containers/generic/build.xml index ee16b2c0e1..da6731ea0d 100644 --- a/test/servlet-containers/generic/build.xml +++ b/test/servlet-containers/generic/build.xml @@ -13,6 +13,9 @@ <property name="result.dir" value="result" /> <property name="result.war" location="${uitest.dir}/target/${module.name}-${vaadin.version}.war" /> + <!--todo automate version number --> + <property name="result.jboss6.war" + location="${uitest.dir}/target/${module.name}-8.0-SNAPSHOT-jboss6.war" /> <!-- Need to give a default value to keep Ivy happy --> <property name="vaadin.build.repository" value="http://maven.vaadin.com/vaadin-prereleases"/> @@ -23,12 +26,12 @@ </target> <target name="test-server" depends="clean-testbench-errors"> - <property name="war.file" location="${result.war}" /> <mkdir dir="${vaadin.basedir}/result" /> <ant antfile="integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="false"> - <property name="demo.war" value="${war.file}" /> + <property name="demo.war" value="${result.war}" /> + <property name="demo.jboss6.war" value="${result.jboss6.war}" /> </ant> </target> diff --git a/test/servlet-containers/generic/integration_tests.xml b/test/servlet-containers/generic/integration_tests.xml index a46670b6a3..c10af3042b 100644 --- a/test/servlet-containers/generic/integration_tests.xml +++ b/test/servlet-containers/generic/integration_tests.xml @@ -121,6 +121,7 @@ <antcall target="run-generic-integration-test"> <param name="startDelay" value="10" /> <param name="target-server" value="jbosseap6" /> + <param name="demo.war" value="${demo.jboss6.war}"/> </antcall> </target> <target name="integration-test-wildfly8"> diff --git a/test/servlet-containers/generic/pom.xml b/test/servlet-containers/generic/pom.xml index 545ef8b52e..8ff752483c 100644 --- a/test/servlet-containers/generic/pom.xml +++ b/test/servlet-containers/generic/pom.xml @@ -14,37 +14,26 @@ <dependencies> - <!-- LIBRARY DEPENDENCIES (compile time) --> <!-- Project modules --> <dependency> - <groupId>${project.groupId}</groupId> + <groupId>com.vaadin</groupId> <artifactId>vaadin-compatibility-server</artifactId> - <version>${project.version}</version> </dependency> <dependency> - <groupId>${project.groupId}</groupId> + <groupId>com.vaadin</groupId> <artifactId>vaadin-compatibility-client-compiled</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-client-compiled</artifactId> - <version>${project.version}</version> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-themes</artifactId> - <version>${project.version}</version> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-push</artifactId> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-push</artifactId> - <version>${project.version}</version> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-client-compiled</artifactId> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> + <groupId>com.vaadin</groupId> <artifactId>vaadin-uitest-common</artifactId> <version>${project.version}</version> <scope>test</scope> @@ -57,7 +46,9 @@ <plugins> <!--TODO run this on different servers--> <plugin> - <artifactId>maven-install-plugin</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>${jetty.version}</version> <configuration> <skip>true</skip> </configuration> @@ -75,24 +66,25 @@ </configuration> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-maven-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <configuration> - <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> - </configuration> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> + <artifactId>maven-war-plugin</artifactId> + <!-- This execution builds an additional .war file with JBoss 6 specific descriptor --> + <executions> + <execution> + <id>jboss6-war</id> + <phase>package</phase> + <goals> + <goal>war</goal> + </goals> + <configuration> + <classifier>jboss6</classifier> + <webResources> + <resource> + <directory>src/main/jboss-6</directory> + </resource> + </webResources> + </configuration> + </execution> + </executions> </plugin> </plugins> </build> diff --git a/test/servlet-containers/generic/src/main/jboss-6/WEB-INF/jboss-web.xml b/test/servlet-containers/generic/src/main/jboss-6/WEB-INF/jboss-web.xml new file mode 100644 index 0000000000..bfa4bac003 --- /dev/null +++ b/test/servlet-containers/generic/src/main/jboss-6/WEB-INF/jboss-web.xml @@ -0,0 +1,7 @@ +<jboss-web version="7.2" xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee + schema/jboss-web_7_2.xsd"> + <!-- Enable websockets on JBoss EAP 6.4 --> + <enable-websockets>true</enable-websockets> +</jboss-web> |