geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1307717 - in /geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin: pom.xml src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
Date Sat, 31 Mar 2012 04:43:46 GMT
Author: gawor
Date: Sat Mar 31 04:43:46 2012
New Revision: 1307717

URL: http://svn.apache.org/viewvc?rev=1307717&view=rev
Log:
stop and wait for framework shutdown

Modified:
    geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/pom.xml
    geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java

Modified: geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/pom.xml?rev=1307717&r1=1307716&r2=1307717&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/pom.xml Sat
Mar 31 04:43:46 2012
@@ -299,11 +299,11 @@
             <id>equinox</id>
 
             <activation>
-            <activeByDefault>true</activeByDefault>
                 <property>
                     <name>framework</name>
                     <value>equinox</value>
                 </property>
+                <activeByDefault>true</activeByDefault>
             </activation>
 
             <dependencies>

Modified: geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java?rev=1307717&r1=1307716&r2=1307717&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
(original)
+++ geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
Sat Mar 31 04:43:46 2012
@@ -271,6 +271,10 @@ public class PackageMojo extends Abstrac
         boot.setExpanded(false);
 
         boot.bootstrap();
+
+        framework.stop();
+        getLog().debug("Waiting for shutdown (up to 5 minutes)...");
+        framework.waitForStop(60 * 5 * 1000);
     }
 
     //
@@ -341,7 +345,10 @@ public class PackageMojo extends Abstrac
         //use a fresh kernel for each module
         kernel.shutdown();
         kernel = null;
-        bundleContext.getBundle().stop();
+        Framework framework = (Framework) bundleContext.getBundle();
+        framework.stop();
+        getLog().debug("Waiting for shutdown (up to 5 minutes)...");
+        framework.waitForStop(60 * 5 * 1000);
         bundleContext = null;
     }
 



Mime
View raw message