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:17 UTC
[1/3] tomee git commit: be closer to tomcat for header sending,
dont concatenate them with a comma
Repository: tomee
Updated Branches:
refs/heads/master 3375c201e -> f78d33274
be closer to tomcat for header sending, dont concatenate them with a comma
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/831a2f76
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/831a2f76
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/831a2f76
Branch: refs/heads/master
Commit: 831a2f76656bb7b8d97d30090f81807ab0ee633a
Parents: 3375c20
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Wed Sep 7 15:42:20 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Wed Sep 7 15:42:20 2016 +0200
----------------------------------------------------------------------
.../openejb/server/httpd/HttpResponseImpl.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/831a2f76/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
----------------------------------------------------------------------
diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
index c1a7af5..df96298 100644
--- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
+++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
@@ -525,22 +525,23 @@ public class HttpResponseImpl implements HttpResponse {
*/
private void writeHeaders(final DataOutput out) throws IOException {
for (final Map.Entry<String, List<String>> entry : headers.entrySet()) {
- out.writeBytes("" + entry.getKey());
- out.writeBytes(CSP);
if (entry.getValue().size() == 1) {
- out.writeBytes("" + entry.getValue().get(0));
+ writeHeader(out, entry.getKey(), entry.getValue().get(0));
} else if (entry.getValue().size() > 1) {
- final StringBuilder builder = new StringBuilder();
- for (final String e : entry.getValue()) {
- builder.append(e).append(',');
+ for (final String val : entry.getValue()) {
+ writeHeader(out, entry.getKey(), val);
}
- builder.setLength(builder.length() - 1);
- out.write(builder.toString().getBytes(encoding));
}
- out.writeBytes(CRLF);
}
}
+ private void writeHeader(final DataOutput out, final String name, final String value) throws IOException {
+ out.writeBytes(name);
+ out.writeBytes(CSP);
+ out.writeBytes(value);
+ out.writeBytes(CRLF);
+ }
+
/**
* writes the body out to the browser
*
[2/3] tomee git commit: remove deprecated tomcat 8 api for
addServletMapping
Posted by rm...@apache.org.
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());
}
}
[3/3] tomee git commit: comment on why we need this cxf property in
the test
Posted by rm...@apache.org.
comment on why we need this cxf property in the test
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f78d3327
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f78d3327
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f78d3327
Branch: refs/heads/master
Commit: f78d3327471deb2d561011a8d017c147ca1b3068
Parents: 5446ef9
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Wed Sep 7 15:42:55 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Wed Sep 7 15:42:55 2016 +0200
----------------------------------------------------------------------
.../src/test/java/org/apache/openejb/server/cxf/rs/LinkTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/f78d3327/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/LinkTest.java
----------------------------------------------------------------------
diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/LinkTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/LinkTest.java
index f34f32f..85cc25b 100644
--- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/LinkTest.java
+++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/LinkTest.java
@@ -48,6 +48,7 @@ public class LinkTest {
public void get() throws IOException {
final Response response = ClientBuilder.newClient()
.target(base.toExternalForm()).path("openejb/link")
+ // cxf is not consistent for Link and other headers, see org.apache.cxf.transport.http.Headers.copyToResponse()
.property("org.apache.cxf.http.header.split", true)
.request(WILDCARD_TYPE).get();
assertEquals(2, Collection.class.cast(response.getHeaders().get("a")).size());