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 2014/12/09 09:49:08 UTC
tomee git commit: adding binding in ServerCreated + fixing
getRequestURL using rawpath
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 05a294f91 -> dbf0041fe
adding binding in ServerCreated + fixing getRequestURL using rawpath
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/dbf0041f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/dbf0041f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/dbf0041f
Branch: refs/heads/tomee-1.7.x
Commit: dbf0041fe1a6b5664b2cccadf2528121d9c5e7ab
Parents: 05a294f
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Tue Dec 9 09:48:48 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Tue Dec 9 09:48:48 2014 +0100
----------------------------------------------------------------------
.../apache/openejb/server/cxf/rs/CxfRsHttpListener.java | 11 ++++++-----
.../openejb/server/cxf/rs/event/ServerCreated.java | 8 +++++++-
.../org/apache/openejb/server/httpd/HttpRequestImpl.java | 2 +-
3 files changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/dbf0041f/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
----------------------------------------------------------------------
diff --git a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
index ee3b489..60e1cbd 100644
--- a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
+++ b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
@@ -388,7 +388,7 @@ public class CxfRsHttpListener implements RsHttpListener {
if (webContext == null && appCtx.getWebContexts().size() == 1 && appCtx.getWebContexts().get(0).getClassLoader() == oldLoader) {
webContext = appCtx.getWebContexts().get(0);
}
- SystemInstance.get().fireEvent(new ServerCreated(server, appCtx, webContext));
+ SystemInstance.get().fireEvent(new ServerCreated(server, appCtx, webContext, this.context));
}
private List<Object> providers(final Collection<ServiceInfo> services, final Collection<Object> additionalProviders, final WebBeansContext ctx) {
@@ -535,6 +535,11 @@ public class CxfRsHttpListener implements RsHttpListener {
factory.setResourceClasses(classes);
factory.setInvoker(new AutoJAXRSInvoker(restEjbs));
+ this.context = webContext;
+ if (!webContext.startsWith("/")) {
+ this.context = "/" + webContext;
+ } // /webcontext/servlet for event firing
+
final Level level = SERVER_IMPL_LOGGER.getLevel();
try {
SERVER_IMPL_LOGGER.setLevel(Level.OFF);
@@ -552,10 +557,6 @@ public class CxfRsHttpListener implements RsHttpListener {
}
}
- this.context = webContext;
- if (!webContext.startsWith("/")) {
- this.context = "/" + webContext;
- }
final int servletIdx = 1 + this.context.substring(1).indexOf('/');
if (servletIdx > 0) {
this.servlet = this.context.substring(servletIdx);
http://git-wip-us.apache.org/repos/asf/tomee/blob/dbf0041f/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/event/ServerCreated.java
----------------------------------------------------------------------
diff --git a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/event/ServerCreated.java b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/event/ServerCreated.java
index b35d78f..a6cf66d 100644
--- a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/event/ServerCreated.java
+++ b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/event/ServerCreated.java
@@ -26,11 +26,17 @@ public class ServerCreated {
private final Server server;
private final AppContext appContext;
private final WebContext webContext;
+ private final String mapping;
- public ServerCreated(final Server server, final AppContext appContext, final WebContext webContext) {
+ public ServerCreated(final Server server, final AppContext appContext, final WebContext webContext, final String mapping) {
this.server = server;
this.appContext = appContext;
this.webContext = webContext;
+ this.mapping = mapping;
+ }
+
+ public String getMapping() {
+ return mapping;
}
public Server getServer() {
http://git-wip-us.apache.org/repos/asf/tomee/blob/dbf0041f/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
----------------------------------------------------------------------
diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
index 315330d..4b797d3 100644
--- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
+++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
@@ -260,7 +260,7 @@ public class HttpRequestImpl implements HttpRequest {
@Override
public StringBuffer getRequestURL() {
- return new StringBuffer(uri.getScheme() + "://" + uri.getHost() + ":" + uri.getPort() + uri.getPath());
+ return new StringBuffer(uri.getScheme() + "://" + uri.getHost() + ":" + uri.getPort() + uri.getRawPath());
}
@Override