You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2015/05/07 21:31:23 UTC
tomee git commit: Add TomEE response header
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 6f3cbcbae -> c0818f9c6
Add TomEE response header
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c0818f9c
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c0818f9c
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c0818f9c
Branch: refs/heads/tomee-1.7.x
Commit: c0818f9c6c0b1542cd9056ab659fc447f2026f92
Parents: 6f3cbcb
Author: AndyGee <an...@gmx.de>
Authored: Thu May 7 21:30:40 2015 +0200
Committer: AndyGee <an...@gmx.de>
Committed: Thu May 7 21:30:40 2015 +0200
----------------------------------------------------------------------
.../apache/tomee/RemoteTomEEEJBContainerIT.java | 2 +-
.../java/org/apache/tomee/installer/Installer.java | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/c0818f9c/tomee/apache-tomee/src/test/java/org/apache/tomee/RemoteTomEEEJBContainerIT.java
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/src/test/java/org/apache/tomee/RemoteTomEEEJBContainerIT.java b/tomee/apache-tomee/src/test/java/org/apache/tomee/RemoteTomEEEJBContainerIT.java
index 0fa6828..94bfe30 100644
--- a/tomee/apache-tomee/src/test/java/org/apache/tomee/RemoteTomEEEJBContainerIT.java
+++ b/tomee/apache-tomee/src/test/java/org/apache/tomee/RemoteTomEEEJBContainerIT.java
@@ -67,7 +67,7 @@ public class RemoteTomEEEJBContainerIT {
" <!-- TomEE plugin for Tomcat -->\n" +
" <Listener className=\"org.apache.tomee.catalina.ServerListener\" />\n" +
" <Service name=\"Catalina\">\n" +
- " <Connector port=\"" + http + "\" protocol=\"HTTP/1.1\" />\n" +
+ " <Connector port=\"" + http + "\" protocol=\"HTTP/1.1\" xpoweredBy=\"false\" server=\"Apache TomEE\" />\n" +
" <Engine name=\"Catalina\" defaultHost=\"localhost\">\n" +
" <Host name=\"localhost\" appBase=\"webapps\"\n" +
" unpackWARs=\"true\" autoDeploy=\"true\">\n" +
http://git-wip-us.apache.org/repos/asf/tomee/blob/c0818f9c/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
index 6febc40..aae1fbc 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
@@ -447,6 +447,23 @@ public class Installer implements InstallerInterface {
alerts.addError("Error while adding listener to server.xml file", e);
}
+ //Add TomEE header
+ try {
+ newServerXml = Installers.replace(serverXmlOriginal,
+ "<Connector port=\"8080\"",
+ "<Connector port=\"8080\"",
+ "/>",
+ "xpoweredBy=\"false\" server=\"Apache TomEE\" />");
+
+ newServerXml = Installers.replace(serverXmlOriginal,
+ "<Connector port=\"8443\"",
+ "<Connector port=\"8443\"",
+ "/>",
+ "xpoweredBy=\"false\" server=\"Apache TomEE\" />");
+ } catch (final IOException e) {
+ alerts.addError("Error adding server attribute to server.xml file", e);
+ }
+
// overwrite server.xml
if (Installers.writeAll(paths.getServerXmlFile(), newServerXml, alerts)) {
alerts.addInfo("Add OpenEJB listener to server.xml");