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 2011/12/19 08:53:13 UTC
svn commit: r1220635 -
/openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
Author: rmannibucau
Date: Mon Dec 19 07:53:13 2011
New Revision: 1220635
URL: http://svn.apache.org/viewvc?rev=1220635&view=rev
Log:
preventing replacement of web.xml if tomee is already installed (== listener + javaagent))
Modified:
openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
Modified: openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java?rev=1220635&r1=1220634&r2=1220635&view=diff
==============================================================================
--- openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java (original)
+++ openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java Mon Dec 19 07:53:13 2011
@@ -134,7 +134,9 @@ public class TomcatLoader implements Loa
Paths paths = new Paths(new File(openejbWarDir));
if (paths.verify()) {
Installer installer = new Installer(paths);
- installer.installConfigFiles();
+ if (installer.getStatus() != Installer.Status.INSTALLED) {
+ installer.installConfigFiles();
+ }
}
}