Author: rmannibucau Date: Mon Sep 23 14:35:18 2013 New Revision: 1525608 URL: http://svn.apache.org/r1525608 Log: we don't need this ugly hack which makes tomee maven plugin don't look like tomee standalone - was before we fix NPE in DataTypeConverter
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java?rev=1525608&r1=1525607&r2=1525608&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java Mon Sep 23 14:35:18 2013 @@ -122,7 +122,7 @@ public class RemoteServer { } public void start() { - start(Collections.EMPTY_LIST, "start", true); + start(Collections.<String>emptyList(), "start", true); } public void start(final List<String> additionalArgs, final String cmd, final boolean checkPortAvailable) { @@ -201,14 +201,10 @@ public class RemoteServer { final File conf = new File(home, "conf"); final File loggingProperties = new File(conf, "logging.properties"); - File endorsed = new File(home, "endorsed"); - if (javaVersion != null && javaVersion.startsWith("1.7.")) { // java 7 - endorsed = new File(home, "endorsed7"); // doesn't exist but just to ignore it with j7 - } + final File endorsed = new File(home, "endorsed"); final File temp = new File(home, "temp"); - final List<String> argsList = new ArrayList<String>() { - }; + final List<String> argsList = new ArrayList<String>(); argsList.add(java); argsList.add("-XX:+HeapDumpOnOutOfMemoryError"); @@ -228,10 +224,7 @@ public class RemoteServer { } if (javaOpts != null) { - final String[] strings = javaOpts.split(" +"); - for (final String string : strings) { - argsList.add(string); - } + Collections.addAll(argsList, javaOpts.split(" +")); } final Map<String, String> addedArgs = new HashMap<String, String>();