incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r921513 - in /incubator/aries/trunk/application: application-api/src/main/java/org/apache/aries/application/ application-itests/src/test/java/org/apache/aries/application/runtime/itests/ application-management/src/main/java/org/apache/aries...
Date Wed, 10 Mar 2010 19:06:01 GMT
Author: gawor
Date: Wed Mar 10 19:06:01 2010
New Revision: 921513

URL: http://svn.apache.org/viewvc?rev=921513&view=rev
Log:
ARIES-238: a) Move BundleInfoImpl.java to application-utils module, b) Add additional methods
to DeploymentMetadataFactory for creating DeploymentMetadata, c) Update AriesApplicationImpl.store()
to save application into a directory

Added:
    incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/management/
    incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java
  (contents, props changed)
      - copied, changed from r921494, incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/BundleInfoImpl.java
Removed:
    incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/BundleInfoImpl.java
Modified:
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadataFactory.java
    incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
    incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationImpl.java
    incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java
    incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/impl/AriesApplicationManagerImplTest.java
    incubator/aries/trunk/application/application-utils/pom.xml
    incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataFactoryImpl.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/DeploymentMetadataFactory.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadataFactory.java?rev=921513&r1=921512&r2=921513&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadataFactory.java
(original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadataFactory.java
Wed Mar 10 19:06:01 2010
@@ -20,12 +20,13 @@
 package org.apache.aries.application;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Set;
+import java.util.jar.Manifest;
 
 import org.apache.aries.application.filesystem.IFile;
 import org.apache.aries.application.management.AriesApplication;
 import org.apache.aries.application.management.BundleInfo;
-import org.apache.aries.application.management.ManagementException;
 import org.apache.aries.application.management.ResolverException;
 
 /**
@@ -35,6 +36,7 @@ public interface DeploymentMetadataFacto
 
   /** 
    * Create a DeploymentMetadata from an AriesApplication and its by-value bundles. 
+   * 
    * @param  app The AriesApplication in question
    * @param  bundleInfo A resolved set of BundleInfo objects
    * @throws ResolverException
@@ -45,10 +47,29 @@ public interface DeploymentMetadataFacto
   
   /**
    * Extract a DeploymentMetadata instance from an IFile
+   * 
    * @param src DEPLOYMENT.MF file, either in an exploded directory or within a jar file.

    * @throws IOException
    * @return DeploymentMetadata instance
    */
   public DeploymentMetadata createDeploymentMetadata (IFile src) throws IOException;
   
+  /**
+   * Extract a DeploymentMetadata instance from InputStream.
+   * 
+   * @param in InputStream
+   * @throws IOException
+   * @return DeploymentMetadata instance
+   */
+  public DeploymentMetadata createDeploymentMetadata (InputStream in) throws IOException;
+  
+  /**
+   * Extract a DeploymentMetadata instance from Manifest.
+   * 
+   * @param manifest Manifest
+   * @throws IOException
+   * @return DeploymentMetadata instance
+   */
+  public DeploymentMetadata createDeploymentMetadata (Manifest manifest) throws IOException;
+  
 }

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java?rev=921513&r1=921512&r2=921513&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
(original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
Wed Mar 10 19:06:01 2010
@@ -232,7 +232,7 @@ public class OBRResolverTest extends Abs
     
     Bundle b = getBundle("org.apache.aries.application.management");
     @SuppressWarnings("unchecked")
-    Class<BundleInfo> clazz = b.loadClass("org.apache.aries.application.management.impl.BundleInfoImpl");
+    Class<BundleInfo> clazz = b.loadClass("org.apache.aries.application.utils.management.SimpleBundleInfo");
     Constructor<BundleInfo> c = clazz.getConstructor(ApplicationMetadataFactory.class,
BundleManifest.class, String.class);
     
     return c.newInstance(factory, BundleManifest.fromBundle(new URL(urlToBundle).openStream()),
urlToBundle);

Modified: incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationImpl.java?rev=921513&r1=921512&r2=921513&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationImpl.java
(original)
+++ incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationImpl.java
Wed Mar 10 19:06:01 2010
@@ -25,6 +25,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
 import java.util.Map;
@@ -104,9 +105,13 @@ public class AriesApplicationImpl implem
   }
 
   public void store(File f) throws FileNotFoundException, IOException {
-    OutputStream os = new FileOutputStream (f);
-    store(os);
-    os.close();
+    if (f.isDirectory()) {
+      storeInDirectory(f);
+    } else {
+      OutputStream os = new FileOutputStream (f);
+      store(os);
+      os.close();
+    }
   }
 
   /**
@@ -124,10 +129,20 @@ public class AriesApplicationImpl implem
     // be quite large: the app server implementation will be better able to select
     // an appropriate location. 
     File tempDir = _localPlatform.getTemporaryDirectory();
+    storeInDirectory(tempDir);    
+    // We now have an exploded eba in tempDir which we need to copy into targetStream
+    IOUtils.zipUp(tempDir, targetStream);
+    if (!IOUtils.deleteRecursive(tempDir))
+    {
+      _logger.warn("APPMANAGEMENT0001E", tempDir);
+    }
+  }
+
+  private void storeInDirectory(File dir) throws IOException, MalformedURLException {
     OutputStream out = null;
     InputStream in = null;
     try {
-      out = IOUtils.getOutputStream(tempDir, AppConstants.APPLICATION_MF);
+      out = IOUtils.getOutputStream(dir, AppConstants.APPLICATION_MF);
       _applicationMetadata.store(out);
 
     } finally {
@@ -135,7 +150,7 @@ public class AriesApplicationImpl implem
     }
     if (_deploymentMetadata != null) {
       try {
-        out = IOUtils.getOutputStream(tempDir, AppConstants.DEPLOYMENT_MF);
+        out = IOUtils.getOutputStream(dir, AppConstants.DEPLOYMENT_MF);
         _deploymentMetadata.store(out);
       } finally {
         IOUtils.close(out);
@@ -150,7 +165,7 @@ public class AriesApplicationImpl implem
       String bundleLocation = bi.getLocation();
       String bundleFileName = bundleLocation.substring(bundleLocation.lastIndexOf('/') +
1);
       try { 
-        out = IOUtils.getOutputStream(tempDir, bundleFileName);
+        out = IOUtils.getOutputStream(dir, bundleFileName);
         URL bundleURL = new URL (bundleLocation);
         InputStream is = bundleURL.openStream();
         IOUtils.copy(is, out);
@@ -164,19 +179,12 @@ public class AriesApplicationImpl implem
     if (_modifiedBundles != null) { 
       for (Map.Entry<String, InputStream> modifiedBundle : _modifiedBundles.entrySet())
{
         try { 
-          out = IOUtils.getOutputStream(tempDir, modifiedBundle.getKey());
+          out = IOUtils.getOutputStream(dir, modifiedBundle.getKey());
           IOUtils.copy(modifiedBundle.getValue(), out);
         } finally { 
           IOUtils.close(out);
         }
       }
     }
-    
-    // We now have an exploded eba in tempDir which we need to copy into targetStream
-    IOUtils.zipUp(tempDir, targetStream);
-    if (!IOUtils.deleteRecursive(tempDir))
-    {
-      _logger.warn("APPMANAGEMENT0001E", tempDir);
-    }
   }
 }

Modified: incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java?rev=921513&r1=921512&r2=921513&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java
(original)
+++ incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java
Wed Mar 10 19:06:01 2010
@@ -57,6 +57,7 @@ import org.apache.aries.application.mana
 import org.apache.aries.application.utils.AppConstants;
 import org.apache.aries.application.utils.filesystem.FileSystem;
 import org.apache.aries.application.utils.filesystem.IOUtils;
+import org.apache.aries.application.utils.management.SimpleBundleInfo;
 import org.apache.aries.application.utils.manifest.BundleManifest;
 import org.apache.aries.application.utils.manifest.ManifestDefaultsInjector;
 import org.apache.aries.application.utils.manifest.ManifestProcessor;
@@ -143,7 +144,7 @@ public class AriesApplicationManagerImpl
         BundleManifest bm = getBundleManifest (f);
         if (bm != null) {
           if (bm.isValid()) {
-            extraBundlesInfo.add(new BundleInfoImpl(_applicationMetadataFactory, bm, f.toURL().toExternalForm()));
+            extraBundlesInfo.add(new SimpleBundleInfo(_applicationMetadataFactory, bm, f.toURL().toExternalForm()));
           } else if (deploymentMetadata != null) {
             throw new ManagementException (MessageUtil.getMessage("APPMANAGEMENT0003E", f.getName(),
ebaFile.getName()));
           } else { 
@@ -169,7 +170,7 @@ public class AriesApplicationManagerImpl
             if (convertedBinary != null) { 
               modifiedBundles.put (f.getName(), convertedBinary);
               bm = BundleManifest.fromBundle(f);
-              extraBundlesInfo.add(new BundleInfoImpl(_applicationMetadataFactory, bm, f.getName()));
+              extraBundlesInfo.add(new SimpleBundleInfo(_applicationMetadataFactory, bm,
f.getName()));
             }
           }
         } 

Modified: incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/impl/AriesApplicationManagerImplTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/impl/AriesApplicationManagerImplTest.java?rev=921513&r1=921512&r2=921513&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/impl/AriesApplicationManagerImplTest.java
(original)
+++ incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/impl/AriesApplicationManagerImplTest.java
Wed Mar 10 19:06:01 2010
@@ -52,9 +52,9 @@ import org.apache.aries.application.mana
 import org.apache.aries.application.management.ResolveConstraint;
 import org.apache.aries.application.management.ResolverException;
 import org.apache.aries.application.management.impl.AriesApplicationManagerImpl;
-import org.apache.aries.application.management.impl.BundleInfoImpl;
 import org.apache.aries.application.utils.filesystem.FileSystem;
 import org.apache.aries.application.utils.filesystem.IOUtils;
+import org.apache.aries.application.utils.management.SimpleBundleInfo;
 import org.apache.aries.application.utils.manifest.BundleManifest;
 import org.apache.aries.unittest.utils.EbaUnitTestUtils;
 import org.junit.Before;
@@ -204,8 +204,8 @@ public class AriesApplicationManagerImpl
     String persistenceLibraryLocation = "../src/test/resources/bundles/repository/a.handy.persistence.library.jar";
     File persistenceLibrary = new File (persistenceLibraryLocation);
     BundleManifest mf = BundleManifest.fromBundle(persistenceLibrary);
-    BundleInfo resolvedPersistenceLibrary = new BundleInfoImpl(_appMetaFactory, mf, persistenceLibraryLocation);

-    Field v = BundleInfoImpl.class.getDeclaredField("_version");
+    BundleInfo resolvedPersistenceLibrary = new SimpleBundleInfo(_appMetaFactory, mf, persistenceLibraryLocation);

+    Field v = SimpleBundleInfo.class.getDeclaredField("_version");
     v.setAccessible(true);
     v.set(resolvedPersistenceLibrary, new Version("1.1.0"));
     nextResolverResult.add(resolvedPersistenceLibrary);

Modified: incubator/aries/trunk/application/application-utils/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/pom.xml?rev=921513&r1=921512&r2=921513&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/pom.xml (original)
+++ incubator/aries/trunk/application/application-utils/pom.xml Wed Mar 10 19:06:01 2010
@@ -98,7 +98,8 @@
                         <Export-Package>
                             org.apache.aries.application.utils;version="${pom.version}",
                             org.apache.aries.application.utils.filesystem;version="${pom.version}",
-                            org.apache.aries.application.utils.manifest;version="${pom.version}"
+                            org.apache.aries.application.utils.manifest;version="${pom.version}",
+                            org.apache.aries.application.utils.management;version="${pom.version}"
                         </Export-Package>
                         <Export-Service>
                             org.apache.aries.application.ApplicationMetadataFactory,

Modified: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataFactoryImpl.java?rev=921513&r1=921512&r2=921513&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataFactoryImpl.java
(original)
+++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataFactoryImpl.java
Wed Mar 10 19:06:01 2010
@@ -20,24 +20,39 @@
 package org.apache.aries.application.impl;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Set;
+import java.util.jar.Manifest;
 
 import org.apache.aries.application.DeploymentMetadata;
 import org.apache.aries.application.DeploymentMetadataFactory;
 import org.apache.aries.application.filesystem.IFile;
 import org.apache.aries.application.management.AriesApplication;
 import org.apache.aries.application.management.BundleInfo;
-import org.apache.aries.application.management.ManagementException;
 import org.apache.aries.application.management.ResolverException;
+import org.apache.aries.application.utils.manifest.ManifestProcessor;
 
 public class DeploymentMetadataFactoryImpl implements DeploymentMetadataFactory {
 
   public DeploymentMetadata createDeploymentMetadata(AriesApplication app,
-      Set<BundleInfo> additionalBundlesRequired) throws ResolverException {
-    return new DeploymentMetadataImpl (app, additionalBundlesRequired);
+                                                     Set<BundleInfo> additionalBundlesRequired)
throws ResolverException {
+    return new DeploymentMetadataImpl(app, additionalBundlesRequired);
   }
   
   public DeploymentMetadata createDeploymentMetadata(IFile src) throws IOException { 
-    return new DeploymentMetadataImpl (src);
+    InputStream is = src.open();
+    try { 
+      return createDeploymentMetadata(is);
+    } finally { 
+      is.close();
+    }
+  }
+
+  public DeploymentMetadata createDeploymentMetadata(InputStream in) throws IOException {
+    return createDeploymentMetadata(ManifestProcessor.parseManifest(in));
+  }
+
+  public DeploymentMetadata createDeploymentMetadata(Manifest manifest) throws IOException
{
+    return new DeploymentMetadataImpl(manifest);
   }
 }

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=921513&r1=921512&r2=921513&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 Mar 10 19:06:01 2010
@@ -23,7 +23,6 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -39,10 +38,8 @@ import org.apache.aries.application.Cont
 import org.apache.aries.application.DeploymentContent;
 import org.apache.aries.application.DeploymentMetadata;
 import org.apache.aries.application.VersionRange;
-import org.apache.aries.application.filesystem.IFile;
 import org.apache.aries.application.management.AriesApplication;
 import org.apache.aries.application.management.BundleInfo;
-import org.apache.aries.application.management.ManagementException;
 import org.apache.aries.application.management.ResolverException;
 import org.apache.aries.application.utils.AppConstants;
 import org.apache.aries.application.utils.manifest.ManifestProcessor;
@@ -82,25 +79,17 @@ public class DeploymentMetadataImpl impl
   }
   
   /**
-   * Construct a DeploymentMetadata from an IFile
+   * Construct a DeploymentMetadata from Manifest
    * @param src
    * @throws IOException
    */
-  public DeploymentMetadataImpl (IFile src) throws IOException { 
-    InputStream is = src.open();
-    try { 
-      // Populate application symbolic name and version fields
-      Manifest mf = ManifestProcessor.parseManifest(is);
-      _applicationMetadata = new ApplicationMetadataImpl (mf);
+  public DeploymentMetadataImpl(Manifest mf) { 
+    _applicationMetadata = new ApplicationMetadataImpl (mf);
 
-      Attributes attributes = mf.getMainAttributes();
-      
-      parseContent(attributes.getValue(AppConstants.DEPLOYMENT_CONTENT), _deploymentContent);
-      parseContent(attributes.getValue(AppConstants.PROVISION_CONTENT), _provisionSharedContent);
+    Attributes attributes = mf.getMainAttributes();
       
-    } finally { 
-      is.close();
-    }
+    parseContent(attributes.getValue(AppConstants.DEPLOYMENT_CONTENT), _deploymentContent);
+    parseContent(attributes.getValue(AppConstants.PROVISION_CONTENT), _provisionSharedContent);
   }
 
   public List<DeploymentContent> getApplicationDeploymentContents() {
@@ -137,8 +126,12 @@ public class DeploymentMetadataImpl impl
     attributes.putValue(Attributes.Name.MANIFEST_VERSION.toString(), AppConstants.MANIFEST_VERSION);
     attributes.putValue(AppConstants.APPLICATION_VERSION, getApplicationVersion().toString());
     attributes.putValue(AppConstants.APPLICATION_SYMBOLIC_NAME, getApplicationSymbolicName());
-    attributes.putValue(AppConstants.DEPLOYMENT_CONTENT, getDeploymentContentsAsString(_deploymentContent));
-    attributes.putValue(AppConstants.PROVISION_CONTENT, getDeploymentContentsAsString(_provisionSharedContent));
+    if (!_deploymentContent.isEmpty()) {
+      attributes.putValue(AppConstants.DEPLOYMENT_CONTENT, getDeploymentContentsAsString(_deploymentContent));
+    }
+    if (!_provisionSharedContent.isEmpty()) {
+      attributes.putValue(AppConstants.PROVISION_CONTENT, getDeploymentContentsAsString(_provisionSharedContent));
+    }
     mf.write(out);
   }
   

Copied: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java
(from r921494, incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/BundleInfoImpl.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java?p2=incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java&p1=incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/BundleInfoImpl.java&r1=921494&r2=921513&rev=921513&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/BundleInfoImpl.java
(original)
+++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java
Wed Mar 10 19:06:01 2010
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.aries.application.management.impl;
+package org.apache.aries.application.utils.management;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -35,7 +35,7 @@ import org.apache.aries.application.util
 import org.osgi.framework.Constants;
 import org.osgi.framework.Version;
 
-public final class BundleInfoImpl implements BundleInfo {
+public final class SimpleBundleInfo implements BundleInfo {
   private Content _symbolicName;
   private Version _version;
   private Attributes _attributes;
@@ -48,7 +48,7 @@ public final class BundleInfoImpl implem
   private String _location;
   private ApplicationMetadataFactory _applicationMetadataFactory;
   
-  public BundleInfoImpl (ApplicationMetadataFactory amf, BundleManifest bm, String location)
{ 
+  public SimpleBundleInfo(ApplicationMetadataFactory amf, BundleManifest bm, String location)
{ 
     _symbolicName = amf.parseContent(bm.getSymbolicName());
     _version = bm.getVersion();
     _attributes = bm.getRawAttributes();
@@ -145,8 +145,8 @@ public final class BundleInfoImpl implem
   {
     if (other == null) return false;
     if (other == this) return true;
-    if (other instanceof BundleInfoImpl) {
-      return _location.equals(((BundleInfoImpl)other)._location);
+    if (other instanceof SimpleBundleInfo) {
+      return _location.equals(((SimpleBundleInfo)other)._location);
     }
     
     return false;

Propchange: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message