Author: rmannibucau
Date: Tue Dec 4 21:47:10 2012
New Revision: 1417207
URL: http://svn.apache.org/viewvc?rev=1417207&view=rev
Log:
don't override tomee.xml
Modified:
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.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=1417207&r1=1417206&r2=1417207&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
Tue Dec 4 21:47:10 2012
@@ -182,11 +182,14 @@ public class Installer {
}
private void commentDeploymentDir() {
- Installers.writeAll(new File(paths.getCatalinaConfDir(), "tomee.xml"),
+ final File tomeeXml = new File(paths.getCatalinaConfDir(),
"tomee.xml");
+ if (!tomeeXml.exists()) {
+ Installers.writeAll(tomeeXml,
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<tomee>\n" +
" <!-- see
http://tomee.apache.org/containers-and-resources.html -->\n" +
"</tomee\n", alerts);
+ }
}
private void addTomEELinkToTomcatHome() {
