You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2015/11/07 03:32:57 UTC
tomee git commit: Formatting
Repository: tomee
Updated Branches:
refs/heads/master 2cef2ddbd -> 1d0e8e622
Formatting
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1d0e8e62
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1d0e8e62
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1d0e8e62
Branch: refs/heads/master
Commit: 1d0e8e6228fa7805620c9d13951c4e4c2de1eb68
Parents: 2cef2dd
Author: andygumbrecht@apache.org <an...@gmx.de>
Authored: Sat Nov 7 03:32:40 2015 +0100
Committer: andygumbrecht@apache.org <an...@gmx.de>
Committed: Sat Nov 7 03:32:40 2015 +0100
----------------------------------------------------------------------
.../arquillian/remote/RemoteTomEEContainer.java | 14 +++++++-------
.../arquillian/webapp/TomEEWebappContainer.java | 10 ++++++----
.../openejb/maven/plugin/runner/ExecRunner.java | 18 +++++++++---------
.../apache/tomee/RemoteTomEEEJBContainer.java | 20 ++++++++++----------
4 files changed, 32 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/1d0e8e62/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
index e5ce343..1593db2 100644
--- a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
+++ b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
@@ -30,6 +30,7 @@ import org.jboss.arquillian.container.spi.client.container.LifecycleException;
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());
@@ -162,9 +162,9 @@ public class RemoteTomEEContainer extends TomEEContainer<RemoteTomEEConfiguratio
}
if (opts == null || opts.isEmpty()) {
return Arrays.asList(
- "-Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=false",
- ARQUILLIAN_FILTER,
- "-Dopenejb.system.apps=true", "-Dtomee.remote.support=true"
+ "-Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=false",
+ ARQUILLIAN_FILTER,
+ "-Dopenejb.system.apps=true", "-Dtomee.remote.support=true"
);
}
@@ -289,9 +289,9 @@ public class RemoteTomEEContainer extends TomEEContainer<RemoteTomEEConfiguratio
final File conf = new File(configuration.getConf());
return !(conf.exists()
- && (new File(conf, "logging.properties").exists()
- || new File(conf, "log4j.properties").exists()
- || new File(conf, "log4j.xml").exists()));
+ && (new File(conf, "logging.properties").exists()
+ || new File(conf, "log4j.properties").exists()
+ || new File(conf, "log4j.xml").exists()));
}
@Override
http://git-wip-us.apache.org/repos/asf/tomee/blob/1d0e8e62/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java b/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
index bfd8fc4..152ce0d 100644
--- a/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
+++ b/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
@@ -180,12 +180,14 @@ public class TomEEWebappContainer extends TomEEContainer<TomEEWebappConfiguratio
container = new RemoteServer();
container.setPortStartup(httpPort);
container.start(Arrays.asList(
- "-Dopenejb.system.apps=true",
- "-Dtomee.remote.support=true",
- "-Dorg.apache.openejb.servlet.filters=" + ArquillianFilterRunner.class.getName() + "=" + ServletMethodExecutor.ARQUILLIAN_SERVLET_MAPPING), "start", true);
+ "-Dopenejb.system.apps=true",
+ "-Dtomee.remote.support=true",
+ "-Dorg.apache.openejb.servlet.filters=" + ArquillianFilterRunner.class.getName() + "=" + ServletMethodExecutor.ARQUILLIAN_SERVLET_MAPPING), "start", true);
container.killOnExit();
} catch (final Exception e) {
- if(null != container){container.destroy();}
+ if (null != container) {
+ container.destroy();
+ }
throw new LifecycleException("Unable to start remote container on port: " + httpPort, e);
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/1d0e8e62/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/runner/ExecRunner.java
----------------------------------------------------------------------
diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/runner/ExecRunner.java b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/runner/ExecRunner.java
index 0b76bed..6585f65 100644
--- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/runner/ExecRunner.java
+++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/runner/ExecRunner.java
@@ -44,7 +44,7 @@ public class ExecRunner {
public static void main(final String[] rawArgs) throws Exception {
final String[] args;
if (rawArgs == null || rawArgs.length == 0) {
- args = new String[] { "run" };
+ args = new String[]{"run"};
} else {
args = rawArgs;
}
@@ -173,18 +173,18 @@ public class ExecRunner {
params.addAll(asList(args));
final ProcessBuilder builder = new ProcessBuilder(params.toArray(new String[params.size()]))
- .inheritIO()
- .directory(findBase(distribOutput));
+ .inheritIO()
+ .directory(findBase(distribOutput));
final String existingOpts = System.getenv("CATALINA_OPTS");
final String catalinaOpts = config.getProperty("catalinaOpts");
if (catalinaOpts != null || existingOpts != null || additionalArgs != null) { // inherit from existing env
builder.environment()
- .put("CATALINA_OPTS",
- identityOrEmpty(catalinaOpts) + " " +
- identityOrEmpty(existingOpts) + " " +
- identityOrEmpty(additionalArgs) + " " +
- identityOrEmpty(String.class.cast(map.get("jvmArgs"))));
+ .put("CATALINA_OPTS",
+ identityOrEmpty(catalinaOpts) + " " +
+ identityOrEmpty(existingOpts) + " " +
+ identityOrEmpty(additionalArgs) + " " +
+ identityOrEmpty(String.class.cast(map.get("jvmArgs"))));
}
if (doWait) {
@@ -225,7 +225,7 @@ public class ExecRunner {
private static void setExecutable(final File f) {
if (f.getName().endsWith(".sh") && !f.canExecute()) {
- if(!f.setExecutable(true, true)){
+ if (!f.setExecutable(true, true)) {
System.err.println("Failed make file executable: " + f);
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/1d0e8e62/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java b/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java
index bc3f961..e39a5b5 100644
--- a/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java
+++ b/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java
@@ -5,14 +5,14 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.tomee;
@@ -69,8 +69,8 @@ public class RemoteTomEEEJBContainer extends EJBContainer {
}
if ((provider == null && ejbContainerProviders > 1)
- || (!RemoteTomEEEJBContainer.class.equals(provider)
- && !CONTAINER_NAMES.contains(String.valueOf(provider)))) {
+ || (!RemoteTomEEEJBContainer.class.equals(provider)
+ && !CONTAINER_NAMES.contains(String.valueOf(provider)))) {
return null;
}