geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r439730 - in /geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo: StartServerMojo.java StopServerMojo.java
Date Sun, 03 Sep 2006 06:03:26 GMT
Author: jdillon
Date: Sat Sep  2 23:03:26 2006
New Revision: 439730

URL: http://svn.apache.org/viewvc?rev=439730&view=rev
Log:
Join the thread, don't wait

Modified:
    geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StartServerMojo.java
    geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StopServerMojo.java

Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StartServerMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StartServerMojo.java?rev=439730&r1=439729&r2=439730&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StartServerMojo.java
(original)
+++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StartServerMojo.java
Sat Sep  2 23:03:26 2006
@@ -215,9 +215,8 @@
 
         if (!background) {
             log.info("Waiting for Geronimo server to shutdown...");
-            synchronized (this) {
-                wait();
-            }
+
+            t.join();
         }
     }
 }

Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StopServerMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StopServerMojo.java?rev=439730&r1=439729&r2=439730&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StopServerMojo.java
(original)
+++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StopServerMojo.java
Sat Sep  2 23:03:26 2006
@@ -116,7 +116,7 @@
     //
 
     protected void doExecute() throws Exception {
-        log.info("Stopping server...");
+        log.info("Stopping Geronimo server...");
 
         log.debug("Using assembly: " + assembly);
 
@@ -139,6 +139,6 @@
         exec.setLogError(true);
         exec.execute();
 
-        log.info("Server stopped");
+        log.info("Geronimo server stopped");
     }
 }



Mime
View raw message