incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mnutt...@apache.org
Subject svn commit: r1005387 - in /incubator/aries/trunk/application: application-api/src/main/java/org/apache/aries/application/management/spi/resolve/ application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/ ap...
Date Thu, 07 Oct 2010 09:44:02 GMT
Author: mnuttall
Date: Thu Oct  7 09:44:02 2010
New Revision: 1005387

URL: http://svn.apache.org/viewvc?rev=1005387&view=rev
Log:
ARIES-361: Minor tidying up

Modified:
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/DeploymentManifestManager.java
    incubator/aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DeploymentManifestManagerImpl.java
    incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java
    incubator/aries/trunk/application/application-obr-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml

Modified: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/DeploymentManifestManager.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/DeploymentManifestManager.java?rev=1005387&r1=1005386&r2=1005387&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/DeploymentManifestManager.java
(original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/DeploymentManifestManager.java
Thu Oct  7 09:44:02 2010
@@ -73,11 +73,5 @@ public interface DeploymentManifestManag
       String appSymbolicName, 
       String appVersion, 
       DeployedBundles deployedBundles) throws ResolverException; 
-      
-  /**
-   * 
-   * @return the AriesApplicationResolver
-   */
-  AriesApplicationResolver getResolver();
-  
+       
 }

Modified: incubator/aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DeploymentManifestManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DeploymentManifestManagerImpl.java?rev=1005387&r1=1005386&r2=1005387&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DeploymentManifestManagerImpl.java
(original)
+++ incubator/aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DeploymentManifestManagerImpl.java
Thu Oct  7 09:44:02 2010
@@ -113,12 +113,6 @@ public class DeploymentManifestManagerIm
     this.modelledResourceManager = modelledResourceManager;
   }
 
-  @Override
-  public AriesApplicationResolver getResolver()
-  {
-    return resolver;
-  }
-
   public void setPostResolveTransformer(PostResolveTransformer transformer) {
     postResolveTransformer = transformer;
   }

Modified: incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java?rev=1005387&r1=1005386&r2=1005387&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java
(original)
+++ incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java
Thu Oct  7 09:44:02 2010
@@ -194,16 +194,20 @@ public class OBRAriesResolver implements
           attribs.put(Constants.VERSION_ATTRIBUTE, "[" + r.getVersion() + ',' + r.getVersion()
               + "]");
           ModelledResource modelledResourceForThisMatch = null; 
-          try { 
-            modelledResourceForThisMatch = new ModelledBundleResource (r, modellingManager,
modellingHelper);
-          } catch (InvalidAttributeException iax) { 
-            
-            ResolverException re = new ResolverException("Internal error occurred: " + iax.toString());
-            log.debug(LOG_EXIT, "resolve", re);
-            
-            throw re;
+          // OBR may give us back the global capabilities. Typically these do not have a
bundle symbolic name - they're a 
+          // list of packages available in the target runtime environment. If the resource
has no symbolic name, we can ignore it
+          if (r.getSymbolicName() != null) { 
+            try { 
+              modelledResourceForThisMatch = new ModelledBundleResource (r, modellingManager,
modellingHelper);
+            } catch (InvalidAttributeException iax) { 
+              
+              ResolverException re = new ResolverException("Internal error occurred: " +
iax.toString());
+              log.debug(LOG_EXIT, "resolve", re);
+              
+              throw re;
+            }
+            toReturn.add(modelledResourceForThisMatch);
           }
-          toReturn.add(modelledResourceForThisMatch);
         }
       }
       log.debug(LOG_EXIT, "resolve", toReturn); 

Modified: incubator/aries/trunk/application/application-obr-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-obr-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml?rev=1005387&r1=1005386&r2=1005387&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-obr-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml
(original)
+++ incubator/aries/trunk/application/application-obr-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml
Thu Oct  7 09:44:02 2010
@@ -19,8 +19,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
-    <bean id="obr-resolver" class="org.apache.aries.application.resolver.obr.OBRAriesResolver"
scope="singleton"
-          activation="eager">
+    <bean id="obr-resolver" class="org.apache.aries.application.resolver.obr.OBRAriesResolver"
scope="singleton">
         <argument>
             <reference interface="org.apache.felix.bundlerepository.RepositoryAdmin"/>
         </argument>



Mime
View raw message