diff options
| author | Jan Bartel | 2014-08-01 06:22:03 +0000 |
|---|---|---|
| committer | Jan Bartel | 2014-08-01 06:22:03 +0000 |
| commit | 9167a0927958e3eea96a1695cab6c9190290f237 (patch) | |
| tree | 0a51e3d63f96ba986b7c04e38886091285b4328a /examples | |
| parent | 424de52d96dd099b3437510669565f691f7c35f9 (diff) | |
| download | org.eclipse.jetty.project-9167a0927958e3eea96a1695cab6c9190290f237.tar.gz org.eclipse.jetty.project-9167a0927958e3eea96a1695cab6c9190290f237.tar.xz org.eclipse.jetty.project-9167a0927958e3eea96a1695cab6c9190290f237.zip | |
Update embedded example for annotations and jndi to point to demo-base wars
Diffstat (limited to 'examples')
3 files changed, 6 insertions, 2 deletions
diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index a5e4caae99..dfd5f3afda 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -91,6 +91,10 @@ <artifactId>apache-jstl</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.mail.glassfish</artifactId> + </dependency> <dependency> <groupId>org.eclipse.jetty.toolchain</groupId> <artifactId>jetty-test-helper</artifactId> diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithAnnotations.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithAnnotations.java index d5f9928959..2caa312f0a 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithAnnotations.java +++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithAnnotations.java @@ -43,7 +43,7 @@ public class ServerWithAnnotations //Create a WebApp WebAppContext webapp = new WebAppContext(); webapp.setContextPath("/"); - webapp.setWar("../../tests/test-webapps/test-servlet-spec/test-spec-webapp/target/test-spec-webapp-9.1.0-SNAPSHOT.war"); + webapp.setWar("../../jetty-distribution/target/distribution/demo-base/webapps/test-spec.war"); webapp.setAttribute("org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern",".*/javax.servlet-[^/]*\\.jar$|.*/servlet-api-[^/]*\\.jar$"); server.setHandler(webapp); diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithJNDI.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithJNDI.java index 760a60b949..997bb761f3 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithJNDI.java +++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithJNDI.java @@ -45,7 +45,7 @@ public class ServerWithJNDI //Create a WebApp WebAppContext webapp = new WebAppContext(); webapp.setContextPath("/"); - webapp.setWar("../../tests/test-webapps/test-jndi-webapp/target/test-jndi-webapp-9.0.4-SNAPSHOT.war"); + webapp.setWar("../../jetty-distribution/target/distribution/demo-base/webapps/test-jndi.war"); server.setHandler(webapp); //Register new transaction manager in JNDI |