incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mnutt...@apache.org
Subject svn commit: r1030476 - in /incubator/aries/trunk/application: application-api/src/main/java/org/apache/aries/application/ application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/ application-util...
Date Wed, 03 Nov 2010 14:32:17 GMT
Author: mnuttall
Date: Wed Nov  3 14:32:17 2010
New Revision: 1030476

URL: http://svn.apache.org/viewvc?rev=1030476&view=rev
Log:
ARIES-480: Unnecessary exception thrown on DeploymentMetadata interface. Patch by Chris Wilkinson

Modified:
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadata.java
    incubator/aries/trunk/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/BundleFrameworkManagerImpl.java
    incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.java

Modified: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadata.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadata.java?rev=1030476&r1=1030475&r2=1030476&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadata.java
(original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadata.java
Wed Nov  3 14:32:17 2010
@@ -76,7 +76,7 @@ public interface DeploymentMetadata {
    * Get the list of DeployedService-Import
    * @return DeployedService-Import
    */
-  public Collection<Filter> getDeployedServiceImport() throws InvalidAttributeException;
+  public Collection<Filter> getDeployedServiceImport();
   
   /**
    * get the contents of deployment manifest in a map

Modified: incubator/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/incubator/aries/trunk/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/BundleFrameworkManagerImpl.java?rev=1030476&r1=1030475&r2=1030476&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/BundleFrameworkManagerImpl.java
(original)
+++ incubator/aries/trunk/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/BundleFrameworkManagerImpl.java
Wed Nov  3 14:32:17 2010
@@ -173,26 +173,17 @@ public class BundleFrameworkManagerImpl 
      */
     StringBuffer serviceImportFilter = 
       new StringBuffer("(" + Constants.OBJECTCLASS + "=javax.transaction.TransactionSynchronizationRegistry)");
-    
-    try
-    {
-      for (Filter importFilter : app.getDeploymentMetadata().getDeployedServiceImport())
{
-        if (serviceImportFilter.length() > 0) {
-          serviceImportFilter.append(",");
-        }
-        serviceImportFilter.append(importFilter.toString());
+
+    for (Filter importFilter : app.getDeploymentMetadata().getDeployedServiceImport()) {
+      if (serviceImportFilter.length() > 0) {
+        serviceImportFilter.append(",");
       }
-      
-      frameworkBundleManifest.put("CompositeServiceFilter-Import",
-          serviceImportFilter.toString());
-    }
-    catch (InvalidAttributeException e)
-    {
-      LOGGER.debug(LOG_EXCEPTION, e);
-      LOGGER.debug(LOG_EXIT,"isolatedInstall", e);
-      throw new BundleException("Failed to process Service Imports" , e);
+      serviceImportFilter.append(importFilter.toString());
     }
     
+    frameworkBundleManifest.put("CompositeServiceFilter-Import",
+        serviceImportFilter.toString());
+    
     /**
      * Install and start the new isolated bundle framework
      */

Modified: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.java?rev=1030476&r1=1030475&r2=1030476&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.java
(original)
+++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.java
Wed Nov  3 14:32:17 2010
@@ -286,7 +286,7 @@ public class DeploymentMetadataImpl impl
     return Collections.unmodifiableSet(_deploymentImportPackage);
   }
 
-  public Collection<Filter> getDeployedServiceImport() throws InvalidAttributeException
+  public Collection<Filter> getDeployedServiceImport() 
   {
     return Collections.unmodifiableCollection(_deployedImportService);
   }



Mime
View raw message