Author: rmannibucau
Date: Thu Jan 3 11:02:24 2013
New Revision: 1428274
URL: http://svn.apache.org/viewvc?rev=1428274&view=rev
Log:
renaming getNoShutdownHook to getWaitTomEE (and switching tests) to be human
readable (only an internal change)
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/BuildTomEEMojo.java
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/RunTomEEMojo.java
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StartTomEEMojo.java
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StopTomEEMojo.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=1428274&r1=1428273&r2=1428274&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
Thu Jan 3 11:02:24 2013
@@ -529,7 +529,7 @@ public abstract class AbstractTomEEMojo
if (args != null) {
strings.addAll(Arrays.asList(args.split(" ")));
}
- if (getNoShutdownHook()) {
+ if (!getWaitTomEE()) {
strings.add("-Dtomee.noshutdownhook=true");
}
if (quickSession) {
@@ -545,7 +545,7 @@ public abstract class AbstractTomEEMojo
final RemoteServer server = new RemoteServer(getConnectAttempts(),
false);
addShutdownHooks(server); // some shutdown hooks are always added (see
UpdatableTomEEMojo)
- if (!getNoShutdownHook()) {
+ if (getWaitTomEE()) {
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public void run() {
@@ -560,7 +560,7 @@ public abstract class AbstractTomEEMojo
serverCmd(server, strings);
- if (!getNoShutdownHook()) {
+ if (getWaitTomEE()) {
try {
server.getServer().waitFor(); // connect attempts = 0
} catch (InterruptedException e) {
@@ -585,7 +585,7 @@ public abstract class AbstractTomEEMojo
return new File(System.getProperty("java.home"),
"/bin/java").getAbsolutePath();
}
- protected boolean getNoShutdownHook() {
+ protected boolean getWaitTomEE() {
return true;
}
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/BuildTomEEMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/BuildTomEEMojo.java?rev=1428274&r1=1428273&r2=1428274&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/BuildTomEEMojo.java
(original)
+++
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/BuildTomEEMojo.java
Thu Jan 3 11:02:24 2013
@@ -82,4 +82,9 @@ public class BuildTomEEMojo extends Abst
public String getCmd() {
return null; // no need
}
+
+ @Override
+ protected boolean getWaitTomEE() {
+ return false;
+ }
}
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/RunTomEEMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/RunTomEEMojo.java?rev=1428274&r1=1428273&r2=1428274&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/RunTomEEMojo.java
(original)
+++
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/RunTomEEMojo.java
Thu Jan 3 11:02:24 2013
@@ -26,9 +26,4 @@ public class RunTomEEMojo extends Updata
public String getCmd() {
return "start";
}
-
- @Override
- protected boolean getNoShutdownHook() {
- return false;
- }
}
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StartTomEEMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StartTomEEMojo.java?rev=1428274&r1=1428273&r2=1428274&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StartTomEEMojo.java
(original)
+++
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StartTomEEMojo.java
Thu Jan 3 11:02:24 2013
@@ -31,4 +31,9 @@ public class StartTomEEMojo extends Upda
public void run() {
super.run();
}
+
+ @Override
+ protected boolean getWaitTomEE() {
+ return false;
+ }
}
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StopTomEEMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StopTomEEMojo.java?rev=1428274&r1=1428273&r2=1428274&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StopTomEEMojo.java
(original)
+++
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StopTomEEMojo.java
Thu Jan 3 11:02:24 2013
@@ -46,4 +46,9 @@ public class StopTomEEMojo extends Abstr
getLog().error(e.getMessage(), e);
}
}
+
+ @Override
+ protected boolean getWaitTomEE() {
+ return false;
+ }
}
