Repository: tomee Updated Branches: refs/heads/master f1cc8b9f3 -> 648604f11
http://git-wip-us.apache.org/repos/asf/tomee/blob/bdae43a0/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 2ac08fc..0308c3d 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 @@ -207,7 +207,7 @@ public class Installer implements InstallerInterface { .replace(" %_RUNJAVA%", " \"%_RUNJAVA%\""); // overwrite the catalina.bat file - if (Installers.writeAll(paths.getCatalinaBatFile(), catalinaBat, alerts)) { + if (!Installers.writeAll(paths.getCatalinaBatFile(), catalinaBat, alerts)) { alerts.addInfo("Can't add workarounds for catalina.bat"); } } @@ -227,7 +227,7 @@ public class Installer implements InstallerInterface { .replace("\"%JAVA_HOME%\" == \"\"", "NOT DEFINED JAVA_HOME"); // overwrite the catalina.bat file - if (Installers.writeAll(setclasspath, bat, alerts)) { + if (!Installers.writeAll(setclasspath, bat, alerts)) { alerts.addInfo("Can't add workarounds for setclasspath.bat"); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/bdae43a0/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml b/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml index 5806482..8a01385 100644 --- a/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml +++ b/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml @@ -23,6 +23,11 @@ <display-name>Apache TomEE</display-name> + <context-param> + <param-name>org.apache.tomee.catalina.TomcatWebAppBuilder.IGNORE</param-name> + <param-value>true</param-value> + </context-param> + <servlet> <servlet-name>LoaderServlet</servlet-name> <servlet-class>org.apache.tomee.loader.LoaderServlet</servlet-class>
