You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2009/10/22 15:44:57 UTC
svn commit: r828690 - in
/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car:
InstallModulesMojo.java PackageMojo.java
Author: gawor
Date: Thu Oct 22 13:44:57 2009
New Revision: 828690
URL: http://svn.apache.org/viewvc?rev=828690&view=rev
Log:
stop the framework as well
Modified:
geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java
geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java?rev=828690&r1=828689&r2=828690&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java Thu Oct 22 13:44:57 2009
@@ -191,7 +191,12 @@
} catch (Exception e) {
throw new MojoExecutionException("Could not use plugin installer bean", e);
} finally {
- kernel.shutdown();
+ kernel.shutdown();
+ try {
+ bundleContext.getBundle().stop();
+ } catch (BundleException e) {
+ // ignore
+ }
}
getLog().info("Installed plugins: ");
for (Artifact artifact: downloadPoller.getInstalledConfigIDs()) {
Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java?rev=828690&r1=828689&r2=828690&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java Thu Oct 22 13:44:57 2009
@@ -338,6 +338,8 @@
//use a fresh kernel for each module
kernel.shutdown();
kernel = null;
+ bundleContext.getBundle().stop();
+ bundleContext = null;
}
/**