Hi What's the goal? We already switch server info,isnt it enough?
Romain Manni-Bucau @rmannibucau <https://twitter.com/rmannibucau> | Blog <http://rmannibucau.wordpress.com> | Github <https://github.com/rmannibucau> | LinkedIn <https://www.linkedin.com/in/rmannibucau> | Tomitriber <http://www.tomitribe.com> ---------- Forwarded message ---------- From: <[email protected]> Date: 2015-05-07 22:03 GMT+02:00 Subject: tomee git commit: TomEE header To: [email protected] Repository: tomee Updated Branches: refs/heads/master 2c4047e14 -> 268b57c86 TomEE header Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/268b57c8 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/268b57c8 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/268b57c8 Branch: refs/heads/master Commit: 268b57c868c055e3788b85d6ed6a192da094e808 Parents: 2c4047e Author: [email protected] <[email protected]> Authored: Thu May 7 22:03:35 2015 +0200 Committer: [email protected] <[email protected]> Committed: Thu May 7 22:03:35 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/268b57c8/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 70fcf6f..17731b9 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/268b57c8/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 0308c3d..60bd8f7 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 @@ -448,6 +448,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");
