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/12/16 19:06:38 UTC
svn commit: r1422643 - in /openejb/trunk/openejb:
maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/
tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/
Author: rmannibucau
Date: Sun Dec 16 18:06:37 2012
New Revision: 1422643
URL: http://svn.apache.org/viewvc?rev=1422643&view=rev
Log:
TOMEE-661 skipping openejb app by default with tomee maven plugin
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
Modified: openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1422643&r1=1422642&r2=1422643&view=diff
==============================================================================
--- openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java (original)
+++ openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java Sun Dec 16 18:06:37 2012
@@ -186,6 +186,9 @@ public abstract class AbstractTomEEMojo
@Parameter(property = "tomee-plugin.remove-default-webapps", defaultValue = "true")
protected boolean removeDefaultWebapps;
+ @Parameter(property = "tomee-plugin.deploy-openejb-internal-application", defaultValue = "false")
+ protected boolean deployOpenEjbApplication;
+
@Parameter(property = "tomee-plugin.remove-tomee-webapps", defaultValue = "false")
protected boolean removeTomeeWebapp;
@@ -510,13 +513,20 @@ public abstract class AbstractTomEEMojo
System.setProperty("server.debug.port", Integer.toString(debugPort));
}
+ final String deployOpenEjbAppKey = "openejb.system.apps";
+
final List<String> strings = new ArrayList<String>();
if (systemVariables != null) {
for (Map.Entry<String, String> entry : systemVariables.entrySet()) {
+ final String key = entry.getKey();
if (entry.getValue().contains(" ")) {
- strings.add(String.format("'-D%s=%s'", entry.getKey(), entry.getValue()));
+ strings.add(String.format("'-D%s=%s'", key, entry.getValue()));
} else {
- strings.add(String.format("-D%s=%s", entry.getKey(), entry.getValue()));
+ strings.add(String.format("-D%s=%s", key, entry.getValue()));
+ }
+
+ if (deployOpenEjbAppKey.equals(key)) {
+ deployOpenEjbApplication = true;
}
}
}
@@ -529,6 +539,11 @@ public abstract class AbstractTomEEMojo
if (quickSession) {
strings.add("-Dopenejb.session.manager=org.apache.tomee.catalina.session.QuickSessionManager");
}
+ if (!deployOpenEjbApplication) { // true is the default so don't need to set the property
+ if (args == null || !args.contains("-D" + deployOpenEjbAppKey)) {
+ strings.add("-D" + deployOpenEjbAppKey + "=false");
+ }
+ }
System.setProperty("server.shutdown.port", Integer.toString(tomeeShutdownPort));
final RemoteServer server = new RemoteServer(getConnectAttempts(), false);
Modified: openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java?rev=1422643&r1=1422642&r2=1422643&view=diff
==============================================================================
--- openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java (original)
+++ openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java Sun Dec 16 18:06:37 2012
@@ -81,6 +81,11 @@ public abstract class UpdatableTomEEMojo
synchronization.setExtensions(Arrays.asList(".html", ".css", ".js", ".xhtml"));
}
startSynchronizer();
+
+ if (reloadOnUpdate) {
+ // force it since we rely on it for reload
+ deployOpenEjbApplication = true;
+ }
}
super.run();
}
Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java?rev=1422643&r1=1422642&r2=1422643&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java Sun Dec 16 18:06:37 2012
@@ -321,7 +321,7 @@ public class TomcatLoader implements Loa
}
private void setIfNull(Properties properties, String key, String value) {
- if (!properties.containsKey(key)) properties.setProperty(key, value);
+ if (!properties.containsKey(key) && !System.getProperties().containsKey(key)) properties.setProperty(key, value);
}
/**