diff options
| author | Simone Bordet | 2013-09-13 09:20:02 +0000 |
|---|---|---|
| committer | Simone Bordet | 2013-09-13 09:20:17 +0000 |
| commit | a23e899affd83c9b0e0fe43f70d68f6008cc03bf (patch) | |
| tree | 8b0c2d4d253d2aa6e31563e018a393c49ba40f92 /jetty-maven-plugin | |
| parent | c86ecc50fa2c27a52cbc949a4e6353b304502dee (diff) | |
| download | org.eclipse.jetty.project-a23e899affd83c9b0e0fe43f70d68f6008cc03bf.tar.gz org.eclipse.jetty.project-a23e899affd83c9b0e0fe43f70d68f6008cc03bf.tar.xz org.eclipse.jetty.project-a23e899affd83c9b0e0fe43f70d68f6008cc03bf.zip | |
Enabled JSR WebSocket out of the box.
Diffstat (limited to 'jetty-maven-plugin')
| -rw-r--r-- | jetty-maven-plugin/pom.xml | 5 | ||||
| -rw-r--r-- | jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 133832c6ab..c937549f2d 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -112,6 +112,11 @@ </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>javax-websocket-server-impl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-server</artifactId> <version>${project.version}</version> </dependency> diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java index 0489a2d875..f8312f8f9d 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java @@ -30,6 +30,7 @@ import java.util.Set; import java.util.TreeSet; import org.eclipse.jetty.plus.webapp.EnvConfiguration; +import org.eclipse.jetty.plus.webapp.PlusConfiguration; import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.FilterMapping; import org.eclipse.jetty.servlet.ServletHolder; @@ -46,6 +47,7 @@ import org.eclipse.jetty.webapp.MetaInfConfiguration; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.webapp.WebInfConfiguration; import org.eclipse.jetty.webapp.WebXmlConfiguration; +import org.eclipse.jetty.websocket.jsr356.server.WebSocketConfiguration; /** * JettyWebAppContext @@ -109,7 +111,8 @@ public class JettyWebAppContext extends WebAppContext new MetaInfConfiguration(), new FragmentConfiguration(), _envConfig = new EnvConfiguration(), - new org.eclipse.jetty.plus.webapp.PlusConfiguration(), + new PlusConfiguration(), + new WebSocketConfiguration(), new MavenAnnotationConfiguration(), new JettyWebXmlConfiguration() }); |