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 2012/06/10 20:59:02 UTC
svn commit: r1348644 - in
/openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer:
Installer.java Paths.java
Author: rmannibucau
Date: Sun Jun 10 18:59:02 2012
New Revision: 1348644
URL: http://svn.apache.org/viewvc?rev=1348644&view=rev
Log:
adding tomee webapp link to root home page
Modified:
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Paths.java
Modified: openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java?rev=1348644&r1=1348643&r2=1348644&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java (original)
+++ openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java Sun Jun 10 18:59:02 2012
@@ -101,6 +101,8 @@ public class Installer {
addTomEEAdminConfInTomcatUsers();
+ addTomEELinkToTomcatHome();
+
if (!alerts.hasErrors()) {
status = Status.REBOOT_REQUIRED;
}
@@ -151,11 +153,33 @@ public class Installer {
addTomEEAdminConfInTomcatUsers();
+ addTomEELinkToTomcatHome();
+
if (!alerts.hasErrors()) {
status = Status.REBOOT_REQUIRED;
}
}
+ private void addTomEELinkToTomcatHome() {
+ final File home = paths.getHome();
+ final String indeJsp = Installers.readAll(home, alerts);
+ if (indeJsp == null) {
+ return;
+ }
+
+ if (!indeJsp.contains("tomcat7Url")) { // check the user didn't replaced the file, can be improved
+ alerts.addWarning("webapps/ROOT/index.jsp was modified");
+ return;
+ }
+
+ final String newIndeJsp = indeJsp.replaceFirst("<div id=\"actions\">",
+ "<div id=\\\"actions\\\">\r\n" +
+ " <div class=\"button\">\n" +
+ " <a class=\"container shadow\" href=\"/tomee\"><span>TomEE Gui</span></a>\n" +
+ " </div>");
+ Installers.writeAll(home, newIndeJsp, alerts);
+ }
+
private void moveLibs() {
final File libs = paths.getCatalinaLibDir();
Modified: openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Paths.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Paths.java?rev=1348644&r1=1348643&r2=1348644&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Paths.java (original)
+++ openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Paths.java Sun Jun 10 18:59:02 2012
@@ -127,6 +127,11 @@ public class Paths {
}
return serverXmlFile;
}
+
+ public File getHome() {
+ return new File(getCatalinaBaseDir(), "webapps/ROOT/index.jsp");
+ }
+
/**
* Sets the server.xml file
* @param serverXmlFile the absolute path of the server.xml file