You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2011/10/09 22:26:02 UTC

svn commit: r1180707 - /openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java

Author: jgallimore
Date: Sun Oct  9 20:26:02 2011
New Revision: 1180707

URL: http://svn.apache.org/viewvc?rev=1180707&view=rev
Log:
TOMEE-29 only overwrite/touch web.xml if the content has actually changed

Modified:
    openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java

Modified: openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java?rev=1180707&r1=1180706&r2=1180707&view=diff
==============================================================================
--- openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java (original)
+++ openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java Sun Oct  9 20:26:02 2011
@@ -459,11 +459,6 @@ public class Installer {
             return;
         }
         File webXmlFile = new File(confDir, "web.xml");
-        if (webXmlFile.exists()) {
-            if (!webXmlFile.delete()) {
-                alerts.addError("can't replace web.xml");
-            }
-        }
         String webXml = Installers.readEntry(openejbTomcatCommonJar, "conf/web.xml", alerts);
         if (Installers.writeAll(webXmlFile, webXml, alerts)) {
             alerts.addInfo("Set jasper in production mode in TomEE web.xml");