Skip to content

Commit

Permalink
Issue #16. Auto discovery of servletName (@ExposedApplication)
Browse files Browse the repository at this point in the history 
When @ApplicationPath is used, @ExposedApplication does not need to define
a servletName, it is the JAXRS configuration class qualified name.
Add a new webapp with web.xml for integration-tests.
  • Loading branch information
@fbiville @jcgay
fbiville authored and jcgay committed Jan 26, 2015
1 parent 5ce41fe commit d4197ae
Show file tree
Hide file tree
Showing 20 changed files with 386 additions and 126 deletions.
78 changes: 78 additions & 0 deletions jax-rs-linker-integration-tests/no-xml-webapp/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>fr.vidal.oss</groupId>
<artifactId>jax-rs-linker-integration-tests</artifactId>
<version>0.2-SNAPSHOT</version>
</parent>

<artifactId>no-xml-webapp</artifactId>
<packaging>war</packaging>

<name>JAX RS Linker: webapp without any XML configuration</name>

<build>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>port-allocator-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jax-rs-linker</artifactId>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.squareup.okhttp</groupId>
<artifactId>okhttp</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
0 ...l/oss/jax_rs_linker/it/BrandResource.java → ...l/oss/jax_rs_linker/it/BrandResource.java
View file
File renamed without changes.
0 ...oss/jax_rs_linker/it/CompanyResource.java → ...oss/jax_rs_linker/it/CompanyResource.java
View file
File renamed without changes.
0 ...oss/jax_rs_linker/it/ProductResource.java → ...oss/jax_rs_linker/it/ProductResource.java
View file
File renamed without changes.
11 changes: 11 additions & 0 deletions ...tests/no-xml-webapp/src/main/java/fr/vidal/oss/jax_rs_linker/it/jersey/Configuration.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package fr.vidal.oss.jax_rs_linker.it.jersey;

import fr.vidal.oss.jax_rs_linker.api.ExposedApplication;

import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application;

@ApplicationPath("rest")
@ExposedApplication
public class Configuration extends Application {
}
0 ...idal/oss/jax_rs_linker/it/LinkerTest.java → ...idal/oss/jax_rs_linker/it/LinkerTest.java
View file
File renamed without changes.
0 ...ax_rs_linker/it/RelatedAndSelfLinkIT.java → ...ax_rs_linker/it/RelatedAndSelfLinkIT.java
View file
File renamed without changes.
200 changes: 87 additions & 113 deletions jax-rs-linker-integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,130 +8,104 @@
</parent>

<artifactId>jax-rs-linker-integration-tests</artifactId>
<packaging>war</packaging>
<packaging>pom</packaging>

<name>JAX RS Linker: integration test suite</name>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>port-allocator-maven-plugin</artifactId>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>allocate-ports</goal>
</goals>
<configuration>
<ports>
<port>
<name>jetty.port</name>
</port>
<port>
<name>jetty.stop.port</name>
</port>
</ports>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
<webApp>
<contextPath>/it-tests</contextPath>
</webApp>
<systemProperties>
<systemProperty>
<name>webserver.port</name>
<value>${jetty.port}</value>
</systemProperty>
</systemProperties>
<stopKey>toto</stopKey>
<stopPort>${jetty.stop.port}</stopPort>
<waitForChild>false</waitForChild>
</configuration>
<executions>
<execution>
<id>start-server</id>
<phase>pre-integration-test</phase>
<goals>
<goal>run-forked</goal>
</goals>
</execution>
<execution>
<id>stop-server</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>port-allocator-maven-plugin</artifactId>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>allocate-ports</goal>
</goals>
<configuration>
<ports>
<port>
<name>jetty.port</name>
</port>
<port>
<name>jetty.stop.port</name>
</port>
</ports>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
<webApp>
<contextPath>/it-tests</contextPath>
</webApp>
<systemProperties>
<systemProperty>
<name>webserver.port</name>
<value>${jetty.port}</value>
</systemProperty>
</systemProperties>
<stopKey>toto</stopKey>
<stopPort>${jetty.stop.port}</stopPort>
<waitForChild>false</waitForChild>
</configuration>
<executions>
<execution>
<id>start-server</id>
<phase>pre-integration-test</phase>
<goals>
<goal>run-forked</goal>
</goals>
</execution>
<execution>
<id>stop-server</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jax-rs-linker</artifactId>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.squareup.okhttp</groupId>
<artifactId>okhttp</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<modules>
<module>no-xml-webapp</module>
<module>xml-webapp</module>
</modules>
</project>
72 changes: 72 additions & 0 deletions jax-rs-linker-integration-tests/xml-webapp/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>fr.vidal.oss</groupId>
<artifactId>jax-rs-linker-integration-tests</artifactId>
<version>0.2-SNAPSHOT</version>
</parent>

<artifactId>xml-webapp</artifactId>
<packaging>war</packaging>

<name>JAX RS Linker: webapp with web.xml</name>

<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>port-allocator-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jax-rs-linker</artifactId>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.squareup.okhttp</groupId>
<artifactId>okhttp</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
Loading

0 comments on commit d4197ae

Please sign in to comment.