You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/09/07 13:43:18 UTC
[2/3] tomee git commit: remove deprecated tomcat 8 api for
addServletMapping
remove deprecated tomcat 8 api for addServletMapping
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/5446ef9e
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/5446ef9e
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/5446ef9e
Branch: refs/heads/master
Commit: 5446ef9e0ded43e032821d5fbce2a94c47baff43
Parents: 831a2f7
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Wed Sep 7 15:42:41 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Wed Sep 7 15:42:41 2016 +0200
----------------------------------------------------------------------
.../org/apache/openejb/server/hessian/TomcatHessianRegistry.java | 2 +-
.../java/org/apache/catalina/startup/OpenEJBContextConfig.java | 2 +-
.../java/org/apache/tomee/catalina/remote/TomEERemoteWebapp.java | 2 +-
.../java/org/apache/tomee/embedded/ManualDeploymentTest.java | 2 +-
.../main/java/org/apache/tomee/webservices/TomcatWsRegistry.java | 2 +-
.../java/org/apache/tomee/livereload/LiveReloadInstaller.java | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/5446ef9e/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/TomcatHessianRegistry.java
----------------------------------------------------------------------
diff --git a/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/TomcatHessianRegistry.java b/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/TomcatHessianRegistry.java
index fe9df61..87b6379 100644
--- a/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/TomcatHessianRegistry.java
+++ b/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/TomcatHessianRegistry.java
@@ -120,7 +120,7 @@ public class TomcatHessianRegistry implements HessianRegistry {
wrapper.setName(HESSIAN.replace("/", "") + "_" + name);
wrapper.setServlet(new OpenEJBHessianServlet(listener));
context.addChild(wrapper);
- context.addServletMapping(servletMapping, wrapper.getName());
+ context.addServletMappingDecoded(servletMapping, wrapper.getName());
if ("BASIC".equals(authMethod) && StandardContext.class.isInstance(context)) {
final StandardContext standardContext = StandardContext.class.cast(context);
http://git-wip-us.apache.org/repos/asf/tomee/blob/5446ef9e/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java b/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java
index da82715..2d2f795 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java
@@ -153,7 +153,7 @@ public class OpenEJBContextConfig extends ContextConfig {
// add servlet to context
context.addChild(wrapper);
- context.addServletMapping(servlet.mappings.iterator().next(), wrapper.getName());
+ context.addServletMappingDecoded(servlet.mappings.iterator().next(), wrapper.getName());
}
break;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/5446ef9e/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/remote/TomEERemoteWebapp.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/remote/TomEERemoteWebapp.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/remote/TomEERemoteWebapp.java
index dbac236..3e05fac 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/remote/TomEERemoteWebapp.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/remote/TomEERemoteWebapp.java
@@ -44,6 +44,6 @@ public class TomEERemoteWebapp extends IgnoredStandardContext {
servlet.setName(ServerServlet.class.getSimpleName());
servlet.setServletClass(ServerServlet.class.getName());
addChild(servlet);
- addServletMapping(MAPPING, ServerServlet.class.getSimpleName());
+ addServletMappingDecoded(MAPPING, ServerServlet.class.getSimpleName());
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/5446ef9e/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/ManualDeploymentTest.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/ManualDeploymentTest.java b/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/ManualDeploymentTest.java
index f298ad8..6888307 100644
--- a/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/ManualDeploymentTest.java
+++ b/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/ManualDeploymentTest.java
@@ -57,7 +57,7 @@ public class ManualDeploymentTest {
final Context ctx = container.addContext("", war.getAbsolutePath());
final Wrapper wrapper = Tomcat.addServlet(ctx, "awesome", AServlet.class.getName());
- ctx.addServletMapping("/awesome", wrapper.getName());
+ ctx.addServletMappingDecoded("/awesome", wrapper.getName());
assertEquals("Awesome", IO.slurp(new URL("http://localhost:" + configuration.getHttpPort() + "/awesome")).trim());
} catch (final Exception e) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/5446ef9e/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java b/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java
index e16c983..7fdb323 100644
--- a/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java
+++ b/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java
@@ -360,7 +360,7 @@ public class TomcatWsRegistry implements WsRegistry {
// add servlet to context
context.addChild(wrapper);
- context.addServletMapping(mapping, wrapper.getName());
+ context.addServletMappingDecoded(mapping, wrapper.getName());
final String webServicecontainerID = wrapper.getName() + WsServlet.WEBSERVICE_CONTAINER + httpListener.hashCode();
wrapper.addInitParameter(WsServlet.WEBSERVICE_CONTAINER, webServicecontainerID);
http://git-wip-us.apache.org/repos/asf/tomee/blob/5446ef9e/utils/livereload-tomee/src/main/java/org/apache/tomee/livereload/LiveReloadInstaller.java
----------------------------------------------------------------------
diff --git a/utils/livereload-tomee/src/main/java/org/apache/tomee/livereload/LiveReloadInstaller.java b/utils/livereload-tomee/src/main/java/org/apache/tomee/livereload/LiveReloadInstaller.java
index e8df96d..a9df8ba 100644
--- a/utils/livereload-tomee/src/main/java/org/apache/tomee/livereload/LiveReloadInstaller.java
+++ b/utils/livereload-tomee/src/main/java/org/apache/tomee/livereload/LiveReloadInstaller.java
@@ -105,7 +105,7 @@ public class LiveReloadInstaller {
servlet.setName(DefaultServlet.class.getSimpleName());
servlet.setServletClass(DefaultServlet.class.getName());
addChild(servlet);
- addServletMapping("/*", DefaultServlet.class.getSimpleName());
+ addServletMappingDecoded("/*", DefaultServlet.class.getSimpleName());
}
{// the js injected in the page
@@ -113,7 +113,7 @@ public class LiveReloadInstaller {
servlet.setName(LiveReloadJs.class.getSimpleName());
servlet.setServletClass(LiveReloadJs.class.getName());
addChild(servlet);
- addServletMapping("/livereload.js", LiveReloadJs.class.getSimpleName());
+ addServletMappingDecoded("/livereload.js", LiveReloadJs.class.getSimpleName());
}
}