You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2014/05/17 20:38:56 UTC
svn commit: r1595526 - in
/tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote:
RemoteTomEEConfiguration.java RemoteTomEEContainer.java
Author: jlmonteiro
Date: Sat May 17 18:38:55 2014
New Revision: 1595526
URL: http://svn.apache.org/r1595526
Log:
TOMEE-1208 Add the ability to keep server.xml unchanged
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java?rev=1595526&r1=1595525&r2=1595526&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java Sat May 17 18:38:55 2014
@@ -40,12 +40,21 @@ public class RemoteTomEEConfiguration ex
private String bin;
private String lib;
private boolean cleanOnStartUp;
+ protected boolean keepServerXmlAsthis = false;
private boolean debug;
private int debugPort = 5005;
private String catalina_opts = null; // using this format to match the script one
private boolean simpleLog = false;
private String deployerProperties = "";
+ public boolean isKeepServerXmlAsthis() {
+ return keepServerXmlAsthis;
+ }
+
+ public void setKeepServerXmlAsthis(boolean keepServerXmlAsthis) {
+ this.keepServerXmlAsthis = keepServerXmlAsthis;
+ }
+
public String getGroupId() {
return groupId;
}
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java?rev=1595526&r1=1595525&r2=1595526&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java Sat May 17 18:38:55 2014
@@ -30,6 +30,7 @@ import org.jboss.arquillian.container.sp
import org.jboss.arquillian.protocol.servlet.ServletMethodExecutor;
import org.jboss.shrinkwrap.api.Archive;
+import javax.naming.NamingException;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -43,7 +44,6 @@ import java.util.Properties;
import java.util.TreeMap;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.naming.NamingException;
public class RemoteTomEEContainer extends TomEEContainer<RemoteTomEEConfiguration> {
private static final Logger logger = Logger.getLogger(RemoteTomEEContainer.class.getName());
@@ -201,7 +201,9 @@ public class RemoteTomEEContainer extend
Setup.synchronizeFolder(tomeeHome, configuration.getBin(), "bin");
Setup.synchronizeFolder(tomeeHome, configuration.getLib(), "lib");
- Setup.configureServerXml(tomeeHome, configuration);
+ if (!configuration.isKeepServerXmlAsthis()) {
+ Setup.configureServerXml(tomeeHome, configuration);
+ }
Setup.configureSystemProperties(tomeeHome, configuration);