From bd2add0ae952706737652f1b45b6746a5280c1bb Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Fri, 12 Jul 2013 13:20:26 +1000 Subject: [PATCH] Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release. --- examples/embedded/pom.xml | 4 + jetty-annotations/pom.xml | 6 +- jetty-deploy/pom.xml | 2 +- jetty-distribution/pom.xml | 65 +++++----- jetty-http/pom.xml | 2 +- jetty-jaas/pom.xml | 5 +- jetty-jaspi/pom.xml | 2 +- jetty-jndi/pom.xml | 16 +-- jetty-jsp/pom.xml | 52 +++----- jetty-maven-plugin/pom.xml | 10 ++ jetty-nosql/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-context/pom.xml | 4 +- jetty-overlay-deployer/pom.xml | 4 +- jetty-plus/pom.xml | 9 +- jetty-proxy/pom.xml | 2 +- jetty-rewrite/pom.xml | 2 +- jetty-security/pom.xml | 2 +- jetty-server/pom.xml | 2 +- jetty-servlet/pom.xml | 2 +- jetty-servlets/pom.xml | 2 +- jetty-spdy/pom.xml | 2 +- jetty-spdy/spdy-client/pom.xml | 2 +- jetty-spdy/spdy-http-server/pom.xml | 4 +- jetty-spdy/spdy-server/pom.xml | 2 +- .../org/eclipse/jetty/start/start.config | 1 + jetty-util-ajax/pom.xml | 2 +- jetty-util/pom.xml | 2 +- jetty-webapp/pom.xml | 2 +- jetty-websocket/pom.xml | 2 +- pom.xml | 117 ++++++++---------- tests/test-webapps/test-jetty-webapp/pom.xml | 7 +- tests/test-webapps/test-jndi-webapp/pom.xml | 47 +++---- .../test-webapps/test-mock-resources/pom.xml | 21 ++-- .../src/main/java/com/acme/MockTransport.java | 55 ++++++++ .../resources/META-INF/javaxmail.providers | 1 + .../test-spec-webapp/pom.xml | 8 -- 37 files changed, 239 insertions(+), 233 deletions(-) create mode 100644 tests/test-webapps/test-mock-resources/src/main/java/com/acme/MockTransport.java create mode 100644 tests/test-webapps/test-mock-resources/src/main/resources/META-INF/javaxmail.providers diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index 253f08278ab..f1f5bee89f8 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -67,6 +67,10 @@ test-mock-resources ${project.version} + + javax.transaction + javax.transaction-api + org.eclipse.jetty jetty-proxy diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index c3b6cbd3b70..cf1576fecb7 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -43,7 +43,7 @@ - javax.servlet.*;version="2.6.0",* + javax.servlet.*;version="[2.6.0,3.2)",* @@ -93,8 +93,8 @@ ${project.version} - org.eclipse.jetty.orbit - javax.annotation + javax.annotation + javax.annotation-api org.eclipse.jetty.orbit diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index abd72178d78..c34aa179b61 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -25,7 +25,7 @@ - org.eclipse.jetty.jmx.*;version="9.0";resolution:=optional,* + org.eclipse.jetty.jmx.*;version="9.1";resolution:=optional,* <_nouses>true diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 7c74d130cd5..ca036e8e558 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -335,7 +335,7 @@ - copy-orbit-servlet-api-deps + copy-servlet-api-deps generate-resources copy @@ -346,15 +346,18 @@ javax.servlet javax.servlet-api 3.1.0 - true ${assembly-directory}/lib servlet-api-3.1.jar + + org.eclipse.jetty.toolchain + jetty-schemas + 3.1-SNAPSHOT + true + ${assembly-directory}/lib + jetty-schemas-3.1.jar + @@ -385,47 +388,47 @@ - copy-orbit-lib-annotations-deps + copy-annotations-deps generate-resources copy-dependencies - org.eclipse.jetty.orbit - javax.annotation,org.objectweb.asm + javax.annotation,org.eclipse.jetty.orbit + javax.annotation-api,org.objectweb.asm jar ${assembly-directory}/lib/annotations - copy-orbit-lib-jta-deps + copy-jta-deps + generate-resources + + copy-dependencies + + + javax.transaction + javax.transaction-api + jar + ${assembly-directory}/lib/jndi + + + + copy-jndi-deps generate-resources copy-dependencies org.eclipse.jetty.orbit - javax.transaction + javax.activation jar ${assembly-directory}/lib/jndi - copy-orbit-lib-jndi-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.orbit - javax.mail.glassfish,javax.activation - jar - ${assembly-directory}/lib/jndi - - - - copy-orbit-lib-jsp-deps + copy-jsp-deps generate-resources copy-dependencies @@ -493,8 +496,8 @@ - org.eclipse.jetty.orbit - javax.annotation + javax.annotation + javax.annotation-api org.eclipse.jetty.orbit @@ -505,12 +508,8 @@ javax.activation - org.eclipse.jetty.orbit - javax.mail.glassfish - - - org.eclipse.jetty.orbit - javax.transaction + javax.transaction + javax.transaction-api org.eclipse.jetty.orbit diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 930304c2719..3da73581264 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -37,7 +37,7 @@ - javax.servlet.*;version="2.6.0",javax.net.*,* + javax.servlet.*;version="[2.6.0,3.2)",javax.net.*,* diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index b0b111fb3ec..313e2184bf1 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -13,9 +13,6 @@ - org.apache.felix maven-bundle-plugin @@ -29,7 +26,7 @@ <_versionpolicy> javax.sql.*,javax.security.*,javax.naming.*, - javax.servlet.*;version="2.6.0", + javax.servlet.*;version="[2.6.0,3.2)", * diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index e65c83749f2..71be42c1fb4 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -25,7 +25,7 @@ - javax.servlet.*;version="2.6.0",* + javax.servlet.*;version="[2.6.0,3.2)",* org.eclipse.jetty.security.jaspi.*;version="${parsedVersion.osgiVersion}" diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 404a420b8c2..dbd3fbcbdd4 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -67,20 +67,8 @@ org.eclipse.jetty.orbit javax.mail.glassfish + 1.4.1.v201005082020 + provided - - - below-jdk1.6 - - (,1.6) - - - - org.eclipse.jetty.orbit - javax.activation - - - - diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml index 76ae6ef3964..b8067b473a4 100644 --- a/jetty-jsp/pom.xml +++ b/jetty-jsp/pom.xml @@ -13,6 +13,18 @@ + + + org.eclipse.jetty.toolchain + jetty-schemas + + + + + javax.servlet + javax.servlet-api + + javax.servlet.jsp @@ -28,32 +40,20 @@ org.eclipse.jetty.orbit javax.servlet.jsp.jstl - 1.2.0.v201105211821 - - - org.eclipse.jetty.orbit - javax.servlet - - - org.eclipse.jetty.orbit - javax.servlet.jsp - - org.eclipse.jetty.orbit org.apache.taglibs.standard.glassfish - 1.2.0.v201112081803 - - - org.eclipse.jetty.orbit - javax.servlet - - + @@ -62,26 +62,10 @@ - - javax.el - javax.el-api - - org.eclipse.jetty.orbit org.eclipse.jdt.core - 3.8.2.v20130121 - - - org.eclipse.jetty.orbit - javax.servlet - - - - - javax.servlet - javax.servlet-api diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 218fed26930..133832c6ab1 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -120,6 +120,16 @@ jetty-jsp ${project.version} + + org.eclipse.jetty.orbit + javax.activation + compile + + + javax.transaction + javax.transaction-api + compile + diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 02c37e707f6..e821e4fd48f 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -29,7 +29,7 @@ maven-bundle-plugin - javax.servlet.*;version="2.6.0",org.eclipse.jetty.server.session.jmx;version="9.0.0";resolution:=optional,,org.eclipse.jetty.*;version="9.0",* + javax.servlet.*;version="[2.6.0,3.2)",org.eclipse.jetty.server.session.jmx;version="9.1";resolution:=optional,,org.eclipse.jetty.*;version="9.1",* true diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 538822b46fd..6d808444474 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -93,7 +93,7 @@ com.sun.el.parser;resolution:=optional, com.sun.el.util;resolution:=optional, javax.el;version="[3.0,3.1)";resolution:=optional, - javax.servlet;version="(2.6.0,3.2)", + javax.servlet;version="[2.6.0,3.2)", javax.servlet.jsp;version="2.3", javax.servlet.jsp.el;version="2.3", javax.servlet.jsp.jstl.core;version="1.2.0";resolution:=optional, diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml index 5eb121f629f..a904c2de151 100644 --- a/jetty-osgi/test-jetty-osgi-context/pom.xml +++ b/jetty-osgi/test-jetty-osgi-context/pom.xml @@ -86,8 +86,8 @@ compilation time. --> <_nouses>true - javax.servlet;version="2.6.0", - javax.servlet.resources;version="2.6.0", + javax.servlet;version="[2.6.0,3.2)", + javax.servlet.resources;version="[2.6.0,3.2)", org.osgi.framework, org.osgi.service.cm;version="1.2.0", org.osgi.service.packageadmin, diff --git a/jetty-overlay-deployer/pom.xml b/jetty-overlay-deployer/pom.xml index 2ad9d75931f..a531f464f59 100644 --- a/jetty-overlay-deployer/pom.xml +++ b/jetty-overlay-deployer/pom.xml @@ -49,8 +49,8 @@ ${project.version} - org.eclipse.jetty.orbit - javax.transaction + javax.transaction + javax.transaction-api test diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 84b3c818951..bcd6f5c84db 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -14,9 +14,6 @@ - org.apache.felix maven-bundle-plugin @@ -30,7 +27,7 @@ <_versionpolicy> javax.sql.*,javax.security.*,javax.naming.*, - javax.servlet.*;version="2.6.0",javax.transaction.*;version="[1.1,1.2)", + javax.servlet.*;version="[2.6.0,3.2)",javax.transaction.*;version="[1.1,1.3)", * @@ -91,8 +88,8 @@ test - org.eclipse.jetty.orbit - javax.transaction + javax.transaction + javax.transaction-api org.eclipse.jetty diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index 91efb8a05cd..de26eee605c 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -25,7 +25,7 @@ - javax.servlet.*;version="2.6.0",* + javax.servlet.*;version="[2.6.0,3.2)",* diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 3d9f34a9d04..e1b5f85446a 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -25,7 +25,7 @@ - javax.servlet.*;version="2.6.0",* + javax.servlet.*;version="[2.6.0,3.2)",* diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 2853c156cf2..b0f21bc16aa 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -25,7 +25,7 @@ - javax.servlet.*;version="2.6.0",javax.security.cert,* + javax.servlet.*;version="[2.6.0,3.2)",javax.security.cert,* diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index d01a90db9d7..e3dcd9e166b 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -26,7 +26,7 @@ - javax.servlet.*;version="2.6.0",org.eclipse.jetty.jmx.*;version="9.0";resolution:=optional,* + javax.servlet.*;version="[2.6.0,3.2)",org.eclipse.jetty.jmx.*;version="9.1";resolution:=optional,* <_nouses>true diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 8328869aeb5..c93342fc71c 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -26,7 +26,7 @@ - javax.servlet.*;version="2.6.0",org.eclipse.jetty.jmx.*;version="9.0";resolution:=optional,* + javax.servlet.*;version="[2.6.0,3.2)",org.eclipse.jetty.jmx.*;version="9.1";resolution:=optional,* <_nouses>true diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index e8c83e752d3..16aaa7e05f6 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -26,7 +26,7 @@ - javax.servlet.*;version="2.6.0",* + javax.servlet.*;version="[2.6.0,3.2)",* diff --git a/jetty-spdy/pom.xml b/jetty-spdy/pom.xml index c455e4cbf14..327028098cf 100644 --- a/jetty-spdy/pom.xml +++ b/jetty-spdy/pom.xml @@ -176,7 +176,7 @@ - org.eclipse.jetty.spdy.*;version="9.0" + org.eclipse.jetty.spdy.*;version="9.1" org.eclipse.jetty.*;version="[9.0,10.0)",* <_nouses>true diff --git a/jetty-spdy/spdy-client/pom.xml b/jetty-spdy/spdy-client/pom.xml index 05395c4b1fc..a4bb8d113ce 100644 --- a/jetty-spdy/spdy-client/pom.xml +++ b/jetty-spdy/spdy-client/pom.xml @@ -58,7 +58,7 @@ - org.eclipse.jetty.spdy.client;version="9.0" + org.eclipse.jetty.spdy.client;version="9.1" !org.eclipse.jetty.npn,org.eclipse.jetty.*;version="[9.0,10.0)",* diff --git a/jetty-spdy/spdy-http-server/pom.xml b/jetty-spdy/spdy-http-server/pom.xml index 4244611cdbb..4df42f11004 100644 --- a/jetty-spdy/spdy-http-server/pom.xml +++ b/jetty-spdy/spdy-http-server/pom.xml @@ -74,8 +74,8 @@ - org.eclipse.jetty.spdy.server.http;version="9.0", - org.eclipse.jetty.spdy.server.proxy;version="9.0" + org.eclipse.jetty.spdy.server.http;version="9.1", + org.eclipse.jetty.spdy.server.proxy;version="9.1" !org.eclipse.jetty.npn,org.eclipse.jetty.*;version="[9.0,10.0)",* diff --git a/jetty-spdy/spdy-server/pom.xml b/jetty-spdy/spdy-server/pom.xml index a570389206c..8dd8f10f842 100644 --- a/jetty-spdy/spdy-server/pom.xml +++ b/jetty-spdy/spdy-server/pom.xml @@ -58,7 +58,7 @@ - org.eclipse.jetty.spdy.server;version="9.0" + org.eclipse.jetty.spdy.server;version="9.1" org.eclipse.jetty.npn,org.eclipse.jetty.*;version="[9.0,10.0)",* <_nouses>true diff --git a/jetty-start/src/main/resources/org/eclipse/jetty/start/start.config b/jetty-start/src/main/resources/org/eclipse/jetty/start/start.config index 5837685c09e..0fffaf178ec 100644 --- a/jetty-start/src/main/resources/org/eclipse/jetty/start/start.config +++ b/jetty-start/src/main/resources/org/eclipse/jetty/start/start.config @@ -93,6 +93,7 @@ $(jetty.home)/lib/jetty-xml-$(version).jar ! available org.eclipse.jetty.xml.X [Server,All,server,default] $(jetty.home)/lib/servlet-api-3.1.jar ! available javax.servlet.ServletContext +$(jetty.home)/lib/jetty-schemas-3.1.jar $(jetty.home)/lib/jetty-http-$(version).jar ! available org.eclipse.jetty.http.HttpParser $(jetty.home)/lib/jetty-continuation-$(version).jar ! available org.eclipse.jetty.continuation.Continuation $(jetty.home)/lib/jetty-server-$(version).jar ! available org.eclipse.jetty.server.Server diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index f566cf60a7f..4bc3464ad92 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -25,7 +25,7 @@ - javax.servlet.*;version="2.6.0",org.slf4j;version="[1.5,2.0)";resolution:=optional,org.slf4j.impl;version="[1.5,2.0)";resolution:=optional,* + javax.servlet.*;version="[2.6.0,3.2)",org.slf4j;version="[1.5,2.0)";resolution:=optional,org.slf4j.impl;version="[1.5,2.0)";resolution:=optional,* diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 217d9de12e7..a3a96ab6ce2 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -25,7 +25,7 @@ - javax.servlet.*;version="2.6.0",org.slf4j;version="[1.5,2.0)";resolution:=optional,org.slf4j.impl;version="[1.5,2.0)";resolution:=optional,* + javax.servlet.*;version="[2.6.0,3.2)",org.slf4j;version="[1.5,2.0)";resolution:=optional,org.slf4j.impl;version="[1.5,2.0)";resolution:=optional,* diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 77b32272073..b5d5aeffa77 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -55,7 +55,7 @@ - javax.servlet.*;version="2.6.0",* + javax.servlet.*;version="[2.6.0,3.2]",* diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index a7de0c2e54e..22cb585c28b 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -43,7 +43,7 @@ - ${bundle-symbolic-name}.*;version="9.0" + ${bundle-symbolic-name}.*;version="9.1" javax.servlet.*;version="[3.0,4.0)",org.eclipse.jetty.*;version="[9.0,10.0)",* <_nouses>true diff --git a/pom.xml b/pom.xml index 789e86c38e4..2cbf90b52a5 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,6 @@ pom http://www.eclipse.org/jetty - 3.0.0.v201112011016 UTF-8 1.1 1.6.1 @@ -137,39 +136,6 @@ - - enforce-orbit-deps - - enforce - - - - - - - - org.apache.geronimo.specs - javax.mail - javax.activation - - - - org.apache.geronimo.specs:geronimo-atinject_1.0_spec:jar:* - javax.net.websocket:*:*:* - javax.websocket:*:*:* - javax.servlet:*:*:*:provided - javax.servlet.jsp:*:*:*:provided - - true - This dependency is banned, use the ORBIT provided dependency instead. - - - true - - ban-junit.jar @@ -466,33 +432,17 @@ javax.servlet javax.servlet-api 3.1.0 - - org.eclipse.jetty.orbit - javax.annotation - 1.1.0.v201108011116 + javax.annotation + javax.annotation-api + 1.2 org.eclipse.jetty.orbit org.objectweb.asm 3.1.0.v200803061910 - - org.eclipse.jetty.orbit - javax.activation - 1.1.0.v201105071233 - - - org.eclipse.jetty.orbit - javax.mail.glassfish - 1.4.1.v201005082020 - - - org.eclipse.jetty.orbit - javax.transaction - 1.1.1.v201105210645 - org.eclipse.jetty.orbit javax.security.auth.message @@ -500,6 +450,12 @@ + + org.eclipse.jetty.toolchain + jetty-schemas + 3.1-SNAPSHOT + + javax.servlet.jsp javax.servlet.jsp-api @@ -525,6 +481,31 @@ 3.0.0 + + org.eclipse.jetty.orbit + org.eclipse.jdt.core + 3.8.2.v20130121 + + + org.eclipse.jetty.orbit + javax.servlet + + + + + + + org.eclipse.jetty.orbit + org.apache.taglibs.standard.glassfish + 1.2.0.v201112081803 + + + org.eclipse.jetty.orbit + javax.servlet + + + + org.eclipse.jetty.orbit javax.servlet.jsp.jstl @@ -532,16 +513,8 @@ org.eclipse.jetty.orbit - javax.servlet.jsp + javax.servlet - - - - - org.eclipse.jetty.orbit - org.apache.taglibs.standard.glassfish - 1.2.0.v201112081803 - org.eclipse.jetty.orbit javax.servlet.jsp @@ -549,12 +522,28 @@ + org.eclipse.jetty.orbit - org.eclipse.jdt.core - 3.7.1 + javax.activation + 1.1.0.v201105071233 + provided + + org.eclipse.jetty.orbit + javax.mail.glassfish + 1.4.1.v201005082020 + + + + javax.transaction + javax.transaction-api + 1.2 + provided + + + org.apache.maven diff --git a/tests/test-webapps/test-jetty-webapp/pom.xml b/tests/test-webapps/test-jetty-webapp/pom.xml index fb957fa209c..ff24123a4b0 100644 --- a/tests/test-webapps/test-jetty-webapp/pom.xml +++ b/tests/test-webapps/test-jetty-webapp/pom.xml @@ -98,7 +98,7 @@ org.eclipse.jetty.test-jetty-webapp - javax.servlet.jsp.*;version="2.2.0",javax.servlet.*;version="[2.6,3.0)",org.eclipse.jetty.*;version="9.0",* + javax.servlet.jsp.*;version="[2.2.0, 3.0)",javax.servlet.*;version="[2.6,3.2)",org.eclipse.jetty.*;version="9.1",* !com.acme* @@ -192,11 +192,6 @@ jetty-servlets ${project.version} - - org.eclipse.jetty - jetty-continuation - ${project.version} - javax.servlet javax.servlet-api diff --git a/tests/test-webapps/test-jndi-webapp/pom.xml b/tests/test-webapps/test-jndi-webapp/pom.xml index 2c6b5079cd4..f33a6d4df66 100644 --- a/tests/test-webapps/test-jndi-webapp/pom.xml +++ b/tests/test-webapps/test-jndi-webapp/pom.xml @@ -19,7 +19,7 @@ true - + maven-antrun-plugin @@ -61,35 +61,20 @@ true ${project.build.directory}/lib/jndi + + org.eclipse.jetty.orbit + javax.mail.glassfish + 1.4.1.v201005082020 + jar + ** + true + ${project.build.directory}/lib/jndi + - - maven-resources-plugin - - - copy-transaction-properties - process-resources - - copy-resources - - - ${project.build.directory}/resources - - - src/main/config/resources - - **/transactions.properties - - true - - - - - - org.apache.maven.plugins maven-assembly-plugin @@ -134,15 +119,19 @@ test-mock-resources ${project.version} + + org.eclipse.jetty.orbit + javax.mail.glassfish + 1.4.1.v201005082020 + - org.eclipse.jetty.orbit - javax.transaction - 1.1.1.v201105210645 + javax.transaction + javax.transaction-api provided @@ -153,8 +142,8 @@ org.eclipse.jetty.orbit javax.mail.glassfish - provided 1.4.1.v201005082020 + provided diff --git a/tests/test-webapps/test-mock-resources/pom.xml b/tests/test-webapps/test-mock-resources/pom.xml index 0f2ac4a5c30..dba37fb0ad3 100644 --- a/tests/test-webapps/test-mock-resources/pom.xml +++ b/tests/test-webapps/test-mock-resources/pom.xml @@ -22,21 +22,26 @@ - org.eclipse.jetty.orbit - javax.transaction - 1.1.1.v201105210645 + javax.transaction + javax.transaction-api provided - javax.servlet - javax.servlet-api + javax.servlet + javax.servlet-api - + + org.eclipse.jetty.orbit + javax.mail.glassfish + 1.4.1.v201005082020 + provided + + diff --git a/tests/test-webapps/test-mock-resources/src/main/java/com/acme/MockTransport.java b/tests/test-webapps/test-mock-resources/src/main/java/com/acme/MockTransport.java new file mode 100644 index 00000000000..adb86dab5ed --- /dev/null +++ b/tests/test-webapps/test-mock-resources/src/main/java/com/acme/MockTransport.java @@ -0,0 +1,55 @@ +// +// ======================================================================== +// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + + +package com.acme; + +import javax.mail.Address; +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.Session; +import javax.mail.Transport; +import javax.mail.URLName; + +/** + * MockTransport + * + * + */ +public class MockTransport extends Transport +{ + + /** + * @param session + * @param urlname + */ + public MockTransport(Session session, URLName urlname) + { + super(session, urlname); + } + + /** + * @see javax.mail.Transport#sendMessage(javax.mail.Message, javax.mail.Address[]) + */ + @Override + public void sendMessage(Message arg0, Address[] arg1) throws MessagingException + { + System.err.println ("Sending message"); + } + +} diff --git a/tests/test-webapps/test-mock-resources/src/main/resources/META-INF/javaxmail.providers b/tests/test-webapps/test-mock-resources/src/main/resources/META-INF/javaxmail.providers new file mode 100644 index 00000000000..5ab3340c05a --- /dev/null +++ b/tests/test-webapps/test-mock-resources/src/main/resources/META-INF/javaxmail.providers @@ -0,0 +1 @@ + protocol=smtp; type=transport; class=com.acme.MockTransport; vendor=Acme Tests; diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml b/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml index cae58cf5c0b..bd27bb82f72 100644 --- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml +++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml @@ -140,14 +140,6 @@ javax.servlet-api provided - - org.eclipse.jetty.orbit javax.annotation