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/18 12:16:15 UTC
svn commit: r1595587 - 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: Sun May 18 10:16:14 2014
New Revision: 1595587
URL: http://svn.apache.org/r1595587
Log:
removing useless code and ensuring we work on server.xml if it exists (= not custom package)
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
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-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=1595587&r1=1595586&r2=1595587&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 Sun May 18 10:16:14 2014
@@ -65,6 +65,10 @@ public class Setup {
public static void updateServerXml(File tomeeHome, TomEEConfiguration configuration) throws IOException {
final File serverXml = Files.path(new File(tomeeHome.getAbsolutePath()), "conf", "server.xml");
+ if (!serverXml.exists()) {
+ return;
+ }
+
final QuickServerXmlParser ports = QuickServerXmlParser.parse(serverXml);
if (configuration.getKeepServerXmlAsThis()) {
// force ports to be able to stop the server and get @ArquillianResource
@@ -238,14 +242,6 @@ public class Setup {
final String data = IO.slurp(serverXml);
IO.copy(data.getBytes(), Files.path(tomeeHome, "conf", "server.xml"));
-
- 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-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=1595587&r1=1595586&r2=1595587&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 Sun May 18 10:16:14 2014
@@ -40,21 +40,12 @@ 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=1595587&r1=1595586&r2=1595587&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 Sun May 18 10:16:14 2014
@@ -201,9 +201,7 @@ public class RemoteTomEEContainer extend
Setup.synchronizeFolder(tomeeHome, configuration.getBin(), "bin");
Setup.synchronizeFolder(tomeeHome, configuration.getLib(), "lib");
- if (!configuration.isKeepServerXmlAsthis()) {
- Setup.configureServerXml(tomeeHome, configuration);
- }
+ Setup.configureServerXml(tomeeHome, configuration);
Setup.configureSystemProperties(tomeeHome, configuration);