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 2014/05/17 15:58:01 UTC
svn commit: r1595483 - in /tomee/tomee/trunk/arquillian:
arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/
arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/
Author: rmannibucau
Date: Sat May 17 13:58:01 2014
New Revision: 1595483
URL: http://svn.apache.org/r1595483
Log:
TOMEE-1208 keepServerXmlAsThis to not touch server.xml provided to arquillian but keeping http/stop port propagated to get @ArquillianResource and adapter working + supporting server.xml either pointer directly (serverXml property) or using property conf (folder) + getting the port to use correctly (either configuration one or file one) accordingly previous cited configuration
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.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-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java?rev=1595483&r1=1595482&r2=1595483&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java Sat May 17 13:58:01 2014
@@ -64,8 +64,14 @@ public class Setup {
}
public static void updateServerXml(File tomeeHome, TomEEConfiguration configuration) throws IOException {
- final File serverXml = Files.path(tomeeHome, "conf", "server.xml");
+ final File serverXml = Files.path(new File(tomeeHome.getAbsolutePath()), "conf", "server.xml");
final QuickServerXmlParser ports = QuickServerXmlParser.parse(serverXml);
+ if (configuration.getKeepServerXmlAsThis()) {
+ // force ports to be able to stop the server and get @ArquillianResource
+ configuration.setHttpPort(Integer.parseInt(ports.http()));
+ configuration.setStopPort(Integer.parseInt(ports.stop()));
+ return; // in this case we don't want to override the conf
+ }
final Map<String, String> replacements = new HashMap<String, String>();
replacements.put(ports.http(), String.valueOf(configuration.getHttpPort()));
@@ -232,9 +238,14 @@ public class Setup {
final String data = IO.slurp(serverXml);
IO.copy(data.getBytes(), Files.path(tomeeHome, "conf", "server.xml"));
- configuration.setStopPort(Integer.parseInt(QuickServerXmlParser.parse(data).stop()));
- return; // in this case we don't want to override the conf
+ if (configuration.getKeepServerXmlAsThis()) {
+ final QuickServerXmlParser parser = QuickServerXmlParser.parse(data);
+ // force ports to be able to stop the server
+ configuration.setHttpPort(Integer.parseInt(parser.http()));
+ configuration.setStopPort(Integer.parseInt(parser.stop()));
+ return; // in this case we don't want to override the conf
+ }
}
}
updateServerXml(tomeeHome, configuration);
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java?rev=1595483&r1=1595482&r2=1595483&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java Sat May 17 13:58:01 2014
@@ -42,6 +42,7 @@ public class TomEEConfiguration implemen
protected String properties = "";
protected String webContextToUseWithEars = null;
+ protected boolean keepServerXmlAsThis;
public boolean isUnpackWars() {
return unpackWars;
@@ -189,4 +190,12 @@ public class TomEEConfiguration implemen
public void setWebContextToUseWithEars(final String webContextToUseWithEars) {
this.webContextToUseWithEars = webContextToUseWithEars;
}
+
+ public boolean getKeepServerXmlAsThis() {
+ return keepServerXmlAsThis;
+ }
+
+ public void setKeepServerXmlAsThis(final boolean keepServerXmlAsThis) {
+ this.keepServerXmlAsThis = keepServerXmlAsThis;
+ }
}
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=1595483&r1=1595482&r2=1595483&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 13:58:01 2014
@@ -197,12 +197,12 @@ public class RemoteTomEEContainer extend
Files.readable(tomeeHome);
Files.writable(tomeeHome);
- Setup.configureServerXml(tomeeHome, configuration);
-
Setup.synchronizeFolder(tomeeHome, configuration.getConf(), "conf");
Setup.synchronizeFolder(tomeeHome, configuration.getBin(), "bin");
Setup.synchronizeFolder(tomeeHome, configuration.getLib(), "lib");
+ Setup.configureServerXml(tomeeHome, configuration);
+
Setup.configureSystemProperties(tomeeHome, configuration);
final String opts = configuration.getCatalina_opts();