svn commit: r1039445 - in /incubator/aries/trunk/application: application-api/src/main/java/org/apache/aries/application/management/spi/repository/ application-itests/src/test/java/org/apache/aries/application/runtime/itests/util/ application-managemen...

[cw...@apache.org]

Author: cwilkin
Date: Fri Nov 26 16:26:46 2010
New Revision: 1039445

URL: http://svn.apache.org/viewvc?rev=1039445&view=rev
Log:
ARIES-493 : Adjust BundleFramework API to allow more flexibility on install

Modified:
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepository.java
    incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/util/IsolationTestUtils.java
    incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/repository/ApplicationRepository.java
    incubator/aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/BundleFrameworkImpl.java
    incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextManagerImpl.java

Modified: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepository.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepository.java?rev=1039445&r1=1039444&r2=1039445&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepository.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepository.java Fri Nov 26 16:26:46 2010
@@ -24,8 +24,8 @@ import java.util.Set;
 import org.apache.aries.application.Content;
 import org.apache.aries.application.DeploymentContent;
 import org.apache.aries.application.management.AriesApplication;
+import org.apache.aries.application.management.spi.framework.BundleFramework;
 import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.Version;
 
@@ -53,7 +53,7 @@ public interface BundleRepository {
 	     * @return the installed bundle
 	     * @throws BundleException
 	     */
-	    public Bundle install(BundleContext ctx, 
+	    public Bundle install(BundleFramework framework, 
 	                          AriesApplication app) throws BundleException;
 	    
 	    /**

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/util/IsolationTestUtils.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/util/IsolationTestUtils.java?rev=1039445&r1=1039444&r2=1039445&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/util/IsolationTestUtils.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/util/IsolationTestUtils.java Fri Nov 26 16:26:46 2010
@@ -31,6 +31,7 @@ import java.util.jar.Attributes;
 import org.apache.aries.application.Content;
 import org.apache.aries.application.DeploymentContent;
 import org.apache.aries.application.management.AriesApplication;
+import org.apache.aries.application.management.spi.framework.BundleFramework;
 import org.apache.aries.application.management.spi.repository.BundleRepository;
 import org.apache.aries.application.management.spi.repository.RepositoryGenerator;
 import org.apache.aries.application.modelling.ModelledResource;
@@ -94,10 +95,10 @@ public class IsolationTestUtils {
         if (content.getContentName().equals("org.apache.aries.isolated.sample")) {
           return new BundleSuggestion() {
 
-            public Bundle install(BundleContext ctx, AriesApplication app) throws BundleException {
+            public Bundle install(BundleFramework framework, AriesApplication app) throws BundleException {
               File f = new File("sample_2.0.0.jar");
               try {
-                return ctx.installBundle(f.toURL().toString());                
+                return framework.getIsolatedBundleContext().installBundle(f.toURL().toString());                
               } catch (MalformedURLException mue) {
                 throw new RuntimeException(mue);
               }

Modified: incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/repository/ApplicationRepository.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/repository/ApplicationRepository.java?rev=1039445&r1=1039444&r2=1039445&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/repository/ApplicationRepository.java (original)
+++ incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/repository/ApplicationRepository.java Fri Nov 26 16:26:46 2010
@@ -24,10 +24,10 @@ import org.apache.aries.application.Cont
 import org.apache.aries.application.DeploymentContent;
 import org.apache.aries.application.management.AriesApplication;
 import org.apache.aries.application.management.BundleInfo;
+import org.apache.aries.application.management.spi.framework.BundleFramework;
 import org.apache.aries.application.management.spi.repository.BundleRepository;
 import org.apache.aries.application.management.spi.resolve.AriesApplicationResolver;
 import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.Version;
 
@@ -110,10 +110,10 @@ public class ApplicationRepository imple
       
     }
 
-    public Bundle install(BundleContext ctx, AriesApplication app) throws BundleException
+    public Bundle install(BundleFramework framework, AriesApplication app) throws BundleException
     {
       if (bundleInfo != null ) {
-        return ctx.installBundle(bundleInfo.getLocation());
+        return framework.getIsolatedBundleContext().installBundle(bundleInfo.getLocation());
       } else {
         throw new BundleException("Unable to install the bundle, as the BundleInfo is null.");
       }

Modified: incubator/aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/BundleFrameworkImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/BundleFrameworkImpl.java?rev=1039445&r1=1039444&r2=1039445&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/BundleFrameworkImpl.java (original)
+++ incubator/aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/BundleFrameworkImpl.java Fri Nov 26 16:26:46 2010
@@ -139,7 +139,7 @@ public class BundleFrameworkImpl impleme
 
   public Bundle install(BundleSuggestion suggestion, AriesApplication app) throws BundleException
   {
-    Bundle installedBundle = suggestion.install(getIsolatedBundleContext(), app);
+    Bundle installedBundle = suggestion.install(this, app);
     _bundles.add(installedBundle);
     
     return installedBundle;

Modified: incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextManagerImpl.java?rev=1039445&r1=1039444&r2=1039445&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextManagerImpl.java (original)
+++ incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextManagerImpl.java Fri Nov 26 16:26:46 2010
@@ -139,10 +139,10 @@ public class ApplicationContextManagerIm
         break;
       }
     }
-    
+        
     LOGGER.debug(LOG_EXIT, "remove");
   }
-
+  
   public synchronized void close()
   {
     LOGGER.debug(LOG_ENTRY, "close");