You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by no...@apache.org on 2011/03/01 20:16:30 UTC
svn commit: r1075982 - in /aries/trunk/application: application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/ application-runtime-framework-management/src/main/resources/OSGI-INF/blueprint/ applic...

Author: not
Date: Tue Mar  1 19:16:29 2011
New Revision: 1075982

URL: http://svn.apache.org/viewvc?rev=1075982&view=rev
Log:
ARIES-591 Force amnesia on the application isolation framework.

Modified:
    aries/trunk/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/BundleFrameworkManagerImpl.java
    aries/trunk/application/application-runtime-framework-management/src/main/resources/OSGI-INF/blueprint/bundle-framework-management.xml
    aries/trunk/application/application-runtime-isolated/src/main/resources/OSGI-INF/blueprint/app-context-management.xml

Modified: aries/trunk/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/BundleFrameworkManagerImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/BundleFrameworkManagerImpl.java?rev=1075982&r1=1075981&r2=1075982&view=diff
==============================================================================
--- aries/trunk/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/BundleFrameworkManagerImpl.java (original)
+++ aries/trunk/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/BundleFrameworkManagerImpl.java Tue Mar  1 19:16:29 2011
@@ -95,6 +95,18 @@ public class BundleFrameworkManagerImpl 
       }
     }
   }
+  
+  public void close()
+  {
+    synchronized (BundleFrameworkManager.SHARED_FRAMEWORK_LOCK) {
+      try {
+        _sharedBundleFramework.close();
+      } catch (BundleException e) {
+        // TODO Auto-generated catch block
+        e.printStackTrace();
+      }
+    }
+  }
 
   public BundleFramework getBundleFramework(Bundle frameworkBundle)
   {

Modified: aries/trunk/application/application-runtime-framework-management/src/main/resources/OSGI-INF/blueprint/bundle-framework-management.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-runtime-framework-management/src/main/resources/OSGI-INF/blueprint/bundle-framework-management.xml?rev=1075982&r1=1075981&r2=1075982&view=diff
==============================================================================
--- aries/trunk/application/application-runtime-framework-management/src/main/resources/OSGI-INF/blueprint/bundle-framework-management.xml (original)
+++ aries/trunk/application/application-runtime-framework-management/src/main/resources/OSGI-INF/blueprint/bundle-framework-management.xml Tue Mar  1 19:16:29 2011
@@ -19,7 +19,7 @@
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0">
   
-  <bean id="equinox-bundle-framework-manager" class="org.apache.aries.application.runtime.framework.management.BundleFrameworkManagerImpl" init-method="init">
+  <bean id="equinox-bundle-framework-manager" class="org.apache.aries.application.runtime.framework.management.BundleFrameworkManagerImpl" init-method="init" destroy-method="close">
       <property name="bundleFrameworkFactory" ref="bundle-framework-factory"/>
       <property name="bundleFrameworkConfigurationFactory" ref="bundle-framework-configuration-factory"/>
       <property name="bundleContext" ref="blueprintBundleContext"/>

Modified: aries/trunk/application/application-runtime-isolated/src/main/resources/OSGI-INF/blueprint/app-context-management.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-runtime-isolated/src/main/resources/OSGI-INF/blueprint/app-context-management.xml?rev=1075982&r1=1075981&r2=1075982&view=diff
==============================================================================
--- aries/trunk/application/application-runtime-isolated/src/main/resources/OSGI-INF/blueprint/app-context-management.xml (original)
+++ aries/trunk/application/application-runtime-isolated/src/main/resources/OSGI-INF/blueprint/app-context-management.xml Tue Mar  1 19:16:29 2011
@@ -19,7 +19,7 @@
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0">
   
-  <bean id="app-context-manager" class="org.apache.aries.application.runtime.isolated.impl.ApplicationContextManagerImpl" scope="singleton" activation="lazy">
+  <bean id="app-context-manager" class="org.apache.aries.application.runtime.isolated.impl.ApplicationContextManagerImpl" scope="singleton" activation="lazy" destroy-method="close">
     <property name="bundleFrameworkManager" ref="bundle-framework-manager"/>
     <property name="bundleRepositoryManager" ref="bundle-repository-manager"/>
   </bean>