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 2012/09/26 12:36:30 UTC
svn commit: r1390391 - in /openejb/branches/openejb-4.5.0/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: Wed Sep 26 10:36:30 2012
New Revision: 1390391
URL: http://svn.apache.org/viewvc?rev=1390391&view=rev
Log:
init of ports in remote arquillian adapter should take care of server.xml if provided
Modified:
openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
Modified: openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1390391&r1=1390390&r2=1390391&view=diff
==============================================================================
--- openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java (original)
+++ openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java Wed Sep 26 10:36:30 2012
@@ -102,6 +102,31 @@ public abstract class TomEEContainer<Con
}
}
+ setPorts();
+
+ // with multiple containers we don't want it so let the user eb able to skip it
+ if (configuration.getExportConfAsSystemProperty()) {
+ //
+ // Export the config back out to properties
+ //
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ for (String prefix : prefixes.value()) {
+ try {
+ final String property = prefix + "." + entry.getKey();
+ final String value = entry.getValue().toString();
+
+ LOGGER.log(Level.FINER, String.format("Exporting '%s=%s'", property, value));
+
+ System.setProperty(property, value);
+ } catch (Throwable e) {
+ // value cannot be converted to a string
+ }
+ }
+ }
+ }
+ }
+
+ protected void setPorts() {
//
// Set ports if they are unspecified
//
@@ -109,6 +134,8 @@ public abstract class TomEEContainer<Con
for (int i : configuration.portsAlreadySet()) { // ensure we don't use already initialized port (fixed ones)
randomPorts.add(i);
}
+
+ final ObjectMap map = new ObjectMap(configuration);
for (Map.Entry<String, Object> entry : map.entrySet()) {
if (!entry.getKey().toLowerCase().endsWith("port")) continue;
try {
@@ -133,27 +160,6 @@ public abstract class TomEEContainer<Con
}
}
randomPorts.clear();
-
- // with multiple containers we don't want it so let the user eb able to skip it
- if (configuration.getExportConfAsSystemProperty()) {
- //
- // Export the config back out to properties
- //
- for (Map.Entry<String, Object> entry : map.entrySet()) {
- for (String prefix : prefixes.value()) {
- try {
- final String property = prefix + "." + entry.getKey();
- final String value = entry.getValue().toString();
-
- LOGGER.log(Level.FINER, String.format("Exporting '%s=%s'", property, value));
-
- System.setProperty(property, value);
- } catch (Throwable e) {
- // value cannot be converted to a string
- }
- }
- }
- }
}
private int nextPort(final String portRange, final Collection<Integer> excluded) {
Modified: openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java?rev=1390391&r1=1390390&r2=1390391&view=diff
==============================================================================
--- openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java (original)
+++ openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java Wed Sep 26 10:36:30 2012
@@ -91,6 +91,11 @@ public class RemoteTomEEContainer extend
}
}
+ @Override
+ protected void setPorts() {
+ // done in configure to be consistent with the server.xml if set
+ }
+
private void configure() throws LifecycleException, IOException {
final File workingDirectory = new File(configuration.getDir()).getAbsoluteFile();
@@ -136,6 +141,8 @@ public class RemoteTomEEContainer extend
Setup.removeUselessWebapps(openejbHome);
}
+ super.setPorts();
+
if (logger.isLoggable(Level.FINE)) {
final Map<Object, Object> map = new TreeMap<Object, Object>(System.getProperties());
for (Map.Entry<Object, Object> entry : map.entrySet()) {