Repository: tomee Updated Branches: refs/heads/master 1adec5221 -> 0486f3f7f
TOMEE-1871 deactivate tomee GUI link by default Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0486f3f7 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0486f3f7 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0486f3f7 Branch: refs/heads/master Commit: 0486f3f7f3482972d89bed06000d9a6456e3b2df Parents: 1adec52 Author: Romain manni-Bucau <rmannibu...@gmail.com> Authored: Sun Jul 17 14:13:42 2016 +0200 Committer: Romain manni-Bucau <rmannibu...@gmail.com> Committed: Sun Jul 17 14:13:42 2016 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/tomee/installer/Installer.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/0486f3f7/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 c420008..687f17f 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 @@ -97,7 +97,7 @@ public class Installer implements InstallerInterface { addTomEEJuli(); addTomEEAdminConfInTomcatUsers(); - addTomEELinkToTomcatHome(); + // addTomEELinkToTomcatHome(); // we don't provide tomee GUI anymore workaroundOnBat(); @@ -152,14 +152,14 @@ public class Installer implements InstallerInterface { final String content; if (!securityActivated) { content = - " <!-- Activate those lines to get access to TomEE GUI -->\n" + + " <!-- Activate those lines to get access to TomEE GUI if added (tomee-webaccess) -->\n" + " <!--\n" + roleUserTags + " -->\n" + "</tomcat-users>\n"; } else { content = - " <!-- Activate those lines to get access to TomEE GUI\n -->" + + " <!-- Activate those lines to get access to TomEE GUI if added (tomee-webaccess)\n -->" + roleUserTags + "</tomcat-users>\n"; @@ -185,7 +185,7 @@ public class Installer implements InstallerInterface { moveLibs(); addTomEEAdminConfInTomcatUsers(); - addTomEELinkToTomcatHome(); + // addTomEELinkToTomcatHome(); // we don't provide it anymore workaroundOnBat(); @@ -233,6 +233,7 @@ public class Installer implements InstallerInterface { } } + /* private void addTomEELinkToTomcatHome() { final File home = paths.getHome(); if(!home.exists()) { @@ -255,6 +256,7 @@ public class Installer implements InstallerInterface { " </div>"); Installers.writeAll(home, newIndeJsp, alerts); } +*/ private void moveLibs() { final File libs = paths.getCatalinaLibDir();
