Quellcode durchsuchen

Small updates to servlet container test setup. (#12318)

* Small updates to servlet container test setup.

- Upgraded to use cargo-maven3-plugin since cargo-maven2-plugin is now
EOL.
- Defined supported packagings as the current jetty-maven-plugin default
only covers war.
- Changed a test pojo to implement Serializable in order to prevent an
error in cargo-maven3-plugin stop-container phase.
tags/8.14.0.alpha1
Zhe Sun vor 3 Jahren
Ursprung
Commit
45e7afb51c
Es ist kein Account mit der E-Mail-Adresse des Committers verbunden

+ 3
- 1
test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/ServletIntegrationUI.java Datei anzeigen

package com.vaadin.tests.integration; package com.vaadin.tests.integration;


import java.io.Serializable;

import com.vaadin.annotations.DesignRoot; import com.vaadin.annotations.DesignRoot;
import com.vaadin.annotations.Widgetset; import com.vaadin.annotations.Widgetset;
import com.vaadin.server.ClassResource; import com.vaadin.server.ClassResource;
@Widgetset("com.vaadin.DefaultWidgetSet") @Widgetset("com.vaadin.DefaultWidgetSet")
public class ServletIntegrationUI extends UI { public class ServletIntegrationUI extends UI {


public static class Country {
public static class Country implements Serializable {
private final String name; private final String name;
private final String id; private final String id;
private final Resource icon; private final Resource icon;

+ 3
- 1
test/servlet-containers/pom.xml Datei anzeigen

<!-- Generic cargo plugin configuration. Define container to use in submodule. --> <!-- Generic cargo plugin configuration. Define container to use in submodule. -->
<plugin> <plugin>
<groupId>org.codehaus.cargo</groupId> <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<artifactId>cargo-maven3-plugin</artifactId>
<version>1.9.4</version>
<configuration> <configuration>
<configuration> <configuration>
<type>standalone</type> <type>standalone</type>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<configuration> <configuration>
<supportedPackagings>pom,jar,war</supportedPackagings>
<webApp> <webApp>
<contextPath>${context.path}</contextPath> <contextPath>${context.path}</contextPath>
</webApp> </webApp>

+ 1
- 1
test/servlet-containers/tomcat7/pom.xml Datei anzeigen

<!-- Server configuration --> <!-- Server configuration -->
<plugin> <plugin>
<groupId>org.codehaus.cargo</groupId> <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<artifactId>cargo-maven3-plugin</artifactId>
<configuration> <configuration>
<container> <container>
<containerId>tomcat7x</containerId> <containerId>tomcat7x</containerId>

+ 1
- 1
test/servlet-containers/tomcat80/pom.xml Datei anzeigen

<!-- Server configuration --> <!-- Server configuration -->
<plugin> <plugin>
<groupId>org.codehaus.cargo</groupId> <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<artifactId>cargo-maven3-plugin</artifactId>
<configuration> <configuration>
<container> <container>
<containerId>tomcat8x</containerId> <containerId>tomcat8x</containerId>

+ 1
- 1
test/servlet-containers/tomcat85/pom.xml Datei anzeigen

<!-- Server configuration --> <!-- Server configuration -->
<plugin> <plugin>
<groupId>org.codehaus.cargo</groupId> <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<artifactId>cargo-maven3-plugin</artifactId>
<configuration> <configuration>
<container> <container>
<containerId>tomcat8x</containerId> <containerId>tomcat8x</containerId>

+ 1
- 1
test/servlet-containers/tomcat9/pom.xml Datei anzeigen

<!-- Server configuration --> <!-- Server configuration -->
<plugin> <plugin>
<groupId>org.codehaus.cargo</groupId> <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<artifactId>cargo-maven3-plugin</artifactId>
<configuration> <configuration>
<container> <container>
<containerId>tomcat9x</containerId> <containerId>tomcat9x</containerId>

Laden…
Abbrechen
Speichern