Return-Path: 
 <scm-return-48521-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
X-Original-To: apmail-geronimo-scm-archive@www.apache.org
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A08239F1B
	for <apmail-geronimo-scm-archive@www.apache.org>;
 Tue, 29 May 2012 05:44:08 +0000 (UTC)
Received: (qmail 89204 invoked by uid 500); 29 May 2012 05:44:08 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 89163 invoked by uid 500); 29 May 2012 05:44:07 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 89140 invoked by uid 99); 29 May 2012 05:44:07 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 May 2012 05:44:07 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 May 2012 05:44:05 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id A7EA02388978;
	Tue, 29 May 2012 05:43:43 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1343548 - in
 /geronimo/server/branches/3.0-beta/plugins/console/console-base-portlets/src/main:
 java/org/apache/geronimo/console/bundlemanager/
 webapp/WEB-INF/view/bundlemanager/
Date: Tue, 29 May 2012 05:43:43 -0000
To: scm@geronimo.apache.org
From: gawor@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120529054343.A7EA02388978@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gawor
Date: Tue May 29 05:43:43 2012
New Revision: 1343548

URL: http://svn.apache.org/viewvc?rev=1343548&view=rev
Log:
GERONIMO-6359: show import packages that are not wired in OSGi portlet

Modified:
    geronimo/server/branches/3.0-beta/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleManagerPortlet.java
    geronimo/server/branches/3.0-beta/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/SimpleBundleInfo.java
    geronimo/server/branches/3.0-beta/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp

Modified: geronimo/server/branches/3.0-beta/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleManagerPortlet.java?rev=1343548&r1=1343547&r2=1343548&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleManagerPortlet.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleManagerPortlet.java Tue May 29 05:43:43 2012
@@ -381,8 +381,9 @@ public class BundleManagerPortlet extend
                 PackageAdmin packageAdmin = (PackageAdmin) bundle.getBundleContext().getService(reference);
                 
 
-                Set<PackageBundlePair> importingPairs = getImportingPairs(packageAdmin, bundle);
-                Set<PackageBundlePair> dynamicImportingPairs = getDynamicImportingPairs(packageAdmin, bundle, importingPairs);
+                Set<String> wiredPackages = new HashSet<String>();                
+                Set<PackageBundlePair> importingPairs = getImportingPairs(packageAdmin, bundle, wiredPackages);
+                Set<PackageBundlePair> dynamicImportingPairs = getDynamicImportingPairs(packageAdmin, bundle, wiredPackages);
                 Set<PackageBundlePair> requireBundlesImportingPairs = getRequireBundlesImportingPairs(packageAdmin, bundle);
                 Set<PackageBundlePair> exportingPairs = getExportingPairs(packageAdmin, bundle);
                 
@@ -758,34 +759,44 @@ public class BundleManagerPortlet extend
         }
     }
     
-    private Set<PackageBundlePair> getImportingPairs(PackageAdmin packageAdmin, Bundle bundle) {
+    private boolean containsBundle(Bundle[] bundles, Bundle bundle) {
+        if (bundles != null) {
+            for (Bundle importingBundle : bundles) {
+                if (importingBundle == bundle) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    
+    private String toString(ExportedPackage exportedPackage) {
+        return exportedPackage.getName() + ":" + exportedPackage.getVersion().toString();
+    }
+    
+    private Set<PackageBundlePair> getImportingPairs(PackageAdmin packageAdmin, Bundle bundle, Set<String> wiredPackages) {
+                
         BundleDescription description = new BundleDescription(bundle.getHeaders());
         
         Set<PackageBundlePair> importingPairs = new HashSet<PackageBundlePair>();
 
-
-        // description.getExternalImports() only shows the packages from other bundles. This will exclude the packages
-        // which are exported by itself, but may actually import from others during resolve.
         List<BundleDescription.ImportPackage> imports = description.getImportPackage();
         for (BundleDescription.ImportPackage packageImport : imports) {
             //find the packages that we are importing
             ExportedPackage[] exportedPackages = packageAdmin.getExportedPackages(packageImport.getName());
-            if (exportedPackages!=null){
+            if (exportedPackages == null) {
+                importingPairs.add(new PackageBundlePair(packageImport.getName(), packageImport.getVersionRange().toString(), null));
+            } else {
                 for (ExportedPackage exportedPackage : exportedPackages) {
                     Bundle exportingBundle = exportedPackage.getExportingBundle();
-                    Bundle[] importingBundles = exportedPackage.getImportingBundles();
-                    if (importingBundles != null) {
-                        for (Bundle importingBundle : importingBundles) {
-                            if (exportingBundle != bundle && importingBundle == bundle) {
-                                importingPairs.add(new PackageBundlePair(exportedPackage, exportedPackage.getExportingBundle()));
-                            }
-                        }
-                    }
+                    if (exportingBundle != bundle && containsBundle(exportedPackage.getImportingBundles(), bundle)) {
+                        importingPairs.add(new PackageBundlePair(packageImport.getName(), packageImport.getVersionRange().toString(), exportedPackage.getExportingBundle()));
+                        wiredPackages.add(toString(exportedPackage));
+                    }                    
                 }
             }
             
         }
-        //TODO  the result set may contains 2 items which have the same package name but different versions.
         return importingPairs;
     }
 
@@ -814,13 +825,9 @@ public class BundleManagerPortlet extend
                     if (exportedPackages != null) {
                         for (ExportedPackage exportedPackage : exportedPackages) {
                             Bundle[] importingBundles = exportedPackage.getImportingBundles();
-                            if (importingBundles != null) {
-                                for (Bundle importingBundle : importingBundles) {
-                                    if (importingBundle == bundle) {
-                                        requireBundlesImportingPairs.add(new PackageBundlePair(exportedPackage, b));
-                                    }
-                                }
-                            }
+                            if (containsBundle(importingBundles, bundle)) {
+                                requireBundlesImportingPairs.add(new PackageBundlePair(exportedPackage, b));                                  
+                            }                            
                         }
                     }
 
@@ -834,7 +841,7 @@ public class BundleManagerPortlet extend
     }
     
     
-    private Set<PackageBundlePair> getDynamicImportingPairs(PackageAdmin packageAdmin, Bundle bundle, Set<PackageBundlePair> explicitImportingPairs) {
+    private Set<PackageBundlePair> getDynamicImportingPairs(PackageAdmin packageAdmin, Bundle bundle, Set<String> wiredPackages) {
         BundleDescription description = new BundleDescription(bundle.getHeaders());
         
         Set<PackageBundlePair> dynamicImportingPairs = new HashSet<PackageBundlePair>();
@@ -846,16 +853,12 @@ public class BundleManagerPortlet extend
                 ExportedPackage[] exportedPackages = packageAdmin.getExportedPackages(b);
                 if (exportedPackages != null) {
                     for (ExportedPackage exportedPackage : exportedPackages) {
-                        Bundle[] importingBundles = exportedPackage.getImportingBundles();
-                        if (importingBundles != null) {
-                            for (Bundle importingBundle : importingBundles) {
-                                if (importingBundle == bundle) {
-                                    PackageBundlePair pair = new PackageBundlePair(exportedPackage, b);
-                                    if (!explicitImportingPairs.contains(pair)){
-                                        dynamicImportingPairs.add(pair);
-                                    }
-                                }
-                            }
+                        if (wiredPackages.contains(toString(exportedPackage))) {
+                            continue;
+                        }
+                        Bundle[] importingBundles = exportedPackage.getImportingBundles();                        
+                        if (containsBundle(importingBundles, bundle)) {
+                            dynamicImportingPairs.add(new PackageBundlePair(exportedPackage, b));
                         }
                     }
                 }
@@ -879,7 +882,6 @@ public class BundleManagerPortlet extend
                 if (importingBundles != null) {
                     for (Bundle importingBundle : importingBundles) {
                         exportingPairs.add(new PackageBundlePair(exportedPackage, importingBundle));
-                        
                     }
                 }
             }
@@ -890,66 +892,85 @@ public class BundleManagerPortlet extend
     }
     
     private static class PackageBundlePair {
-        final ExportedPackage exportedPackage;
-        final Bundle bundle;
+        private final String packageName;
+        private final String version;
+        private final Bundle bundle;
+        
+        public PackageBundlePair(String packageName, String version, Bundle bundle) {
+            this.packageName = packageName;
+            this.version = version;
+            this.bundle = bundle;
+        }
         
-        PackageBundlePair(ExportedPackage exportedPackage,Bundle bundle ){
-            this.exportedPackage = exportedPackage;
+        public PackageBundlePair(ExportedPackage exportedPackage, Bundle bundle) {
+            this.packageName = exportedPackage.getName();
+            this.version = exportedPackage.getVersion().toString();
             this.bundle = bundle;
         }
         
+        public String getPackageName() {
+            return packageName;
+        }
+        
+        public String getVersion() {
+            return version;
+        }
+        
+        public Bundle getBundle() {
+            return bundle;
+        }
+
+        @Override
+        public int hashCode() {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + ((bundle == null) ? 0 : (int) bundle.getBundleId());
+            result = prime * result + ((packageName == null) ? 0 : packageName.hashCode());
+            result = prime * result + ((version == null) ? 0 : version.hashCode());
+            return result;
+        }
+
         @Override
         public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
             if (obj == null) {
                 return false;
             }
-
             if (getClass() != obj.getClass()) {
                 return false;
             }
-
-            final PackageBundlePair other = (PackageBundlePair) obj;
-// when using the following, there still be same pairs in the set. Maybe the equal method is not re-written.
-//            if (this.exportedPackage != other.exportedPackage && (this.exportedPackage == null || !this.exportedPackage.equals(other.exportedPackage))) {
-//                return false;
-//            }
-//            if (this.bundle != other.bundle && (this.bundle == null || !this.bundle.equals(other.bundle))) {
-//                return false;
-//            }
-            
-            if (this.exportedPackage != null && other.exportedPackage == null) return false;
-            if (this.exportedPackage == null && other.exportedPackage != null) return false;
-            if (this.exportedPackage != null && other.exportedPackage != null) {
-                if (this.exportedPackage.getName()!= other.exportedPackage.getName() || this.exportedPackage.getVersion() != other.exportedPackage.getVersion())
+            
+            PackageBundlePair other = (PackageBundlePair) obj;
+            
+            if (bundle == null) {
+                if (other.bundle != null) {
+                    return false;
+                }
+            } else if (bundle.getBundleId() != other.bundle.getBundleId()) {
+                return false;
+            }
+            
+            if (packageName == null) {
+                if (other.packageName != null) {
                     return false;
+                }
+            } else if (!packageName.equals(other.packageName)) {
+                return false;
             }
             
-            if (this.bundle != null && other.bundle == null) return false;
-            if (this.bundle == null && other.bundle != null) return false;
-            if (this.bundle != null && other.bundle != null) {
-                if (this.bundle.getSymbolicName()!= other.bundle.getSymbolicName() || this.bundle.getVersion() != other.bundle.getVersion())
+            if (version == null) {
+                if (other.version != null) {
                     return false;
+                }
+            } else if (!version.equals(other.version)) {
+                return false;
             }
             
             return true;
-            
         }
-        
-        @Override
-        public int hashCode() {
-            int hash = 11;
-// because we used exportedPackage.getName(); exportedPackage.getVersion();  bundle.getSymbolicName();bundle.getVersion()
-// to calculate equals(), we must use them to calculate hashCode()
-//            hash = 17 * hash + (exportedPackage != null ? exportedPackage.hashCode():0);
-//            hash = 17 * hash + (bundle != null ? bundle.hashCode():0);
-            hash = 17 * hash + (exportedPackage != null ? exportedPackage.getName().hashCode():0);
-            hash = 17 * hash + (exportedPackage != null ? exportedPackage.getVersion().hashCode():0);
-            hash = 17 * hash + (bundle != null ? bundle.getSymbolicName().hashCode():0);
-            hash = 17 * hash + (bundle != null ? bundle.getVersion().hashCode():0);
 
-            return hash;
-        }
-        
     }
     
 
@@ -958,8 +979,8 @@ public class BundleManagerPortlet extend
         
         for (PackageBundlePair pair : pairs) {
             
-            PackageInfo packageInfo = new PackageInfo(pair.exportedPackage.getName(), pair.exportedPackage.getVersion().toString());
-            BundleInfo bundleInfo = new SimpleBundleInfo(pair.bundle);
+            PackageInfo packageInfo = new PackageInfo(pair.getPackageName(), pair.getVersion());
+            BundleInfo bundleInfo = new SimpleBundleInfo(pair.getBundle());
             
             fillPackageBundlesMap(pbs, packageInfo, bundleInfo);
             
@@ -981,8 +1002,8 @@ public class BundleManagerPortlet extend
         
         for (PackageBundlePair pair : pairs) {
             
-            BundleInfo bundleInfo = new SimpleBundleInfo(pair.bundle);
-            PackageInfo packageInfo = new PackageInfo(pair.exportedPackage.getName(), pair.exportedPackage.getVersion().toString());
+            BundleInfo bundleInfo = new SimpleBundleInfo(pair.getBundle());
+            PackageInfo packageInfo = new PackageInfo(pair.getPackageName(), pair.getVersion());
             
             fillBundlePackagesMap(bps, bundleInfo, packageInfo);
             

Modified: geronimo/server/branches/3.0-beta/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/SimpleBundleInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/SimpleBundleInfo.java?rev=1343548&r1=1343547&r2=1343548&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/SimpleBundleInfo.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/SimpleBundleInfo.java Tue May 29 05:43:43 2012
@@ -18,19 +18,24 @@ package org.apache.geronimo.console.bund
 
 import org.osgi.framework.Bundle;
 
-public class SimpleBundleInfo implements BundleInfo{
-    private final long bundleId;
-    private final String symbolicName;
-    private final String bundleVersion;
-    private final String bundleName;
-    private final BundleState state;
-    
-    public SimpleBundleInfo(Bundle bundle){
-        this.bundleId = bundle.getBundleId();
-        this.symbolicName = BundleUtil.getSymbolicName(bundle);
-        this.bundleName = BundleUtil.getBundleName(bundle);
-        this.bundleVersion = bundle.getVersion().toString();
-        this.state = BundleState.getState(bundle);
+public class SimpleBundleInfo implements BundleInfo {
+    private long bundleId;
+    private String symbolicName;
+    private String bundleVersion;
+    private String bundleName;
+    private BundleState state;
+    
+    public SimpleBundleInfo(Bundle bundle) {
+        if (bundle == null) {
+            this.bundleId = -1;
+            this.symbolicName = "";
+        } else {
+            this.bundleId = bundle.getBundleId();
+            this.symbolicName = BundleUtil.getSymbolicName(bundle);
+            this.bundleName = BundleUtil.getBundleName(bundle);
+            this.bundleVersion = bundle.getVersion().toString();
+            this.state = BundleState.getState(bundle);
+        }
     }
     
     public long getBundleId() {
@@ -49,7 +54,6 @@ public class SimpleBundleInfo implements
         return bundleName;
     }
     
-    
     public BundleState getState() {
         return state;
     }

Modified: geronimo/server/branches/3.0-beta/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp?rev=1343548&r1=1343547&r2=1343548&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp (original)
+++ geronimo/server/branches/3.0-beta/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp Tue May 29 05:43:43 2012
@@ -91,10 +91,17 @@
             </td>
             <td class="${backgroundClass}">
                 <c:forEach var="info" items="${ipp.bundleInfos}">
-                    ${info.symbolicName} (id=${info.bundleId}) (version=${info.bundleVersion})
-                    <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_mf.png" alt="icon_mf.png" title="View Manifest" style="vertical-align:middle"/></a>
-                    <a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_wb.png" alt="icon_wb.png" title="View Wired Bundles" style="vertical-align:middle"/></a>
-                    <a href="<portlet:renderURL><portlet:param name='page' value='view_services'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_serv.png" alt="icon_serv.png" title="View Services" style="vertical-align:middle"/></a>
+                    <c:choose>
+                        <c:when test="${info.bundleId == -1}" >
+                            Package is not wired.
+                        </c:when>
+                        <c:otherwise>
+                            ${info.symbolicName} (id=${info.bundleId}) (version=${info.bundleVersion})
+                            <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_mf.png" alt="icon_mf.png" title="View Manifest" style="vertical-align:middle"/></a>
+                            <a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_wb.png" alt="icon_wb.png" title="View Wired Bundles" style="vertical-align:middle"/></a>
+                            <a href="<portlet:renderURL><portlet:param name='page' value='view_services'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_serv.png" alt="icon_serv.png" title="View Services" style="vertical-align:middle"/></a>
+                        </c:otherwise>
+                    </c:choose>
                     <br/>
                 </c:forEach>
             </td>
@@ -230,10 +237,17 @@
                 </c:forEach>
             </td>
             <td class="${backgroundClass}">
-                ${ibp.bundleInfo.symbolicName} (id=${ibp.bundleInfo.bundleId}) (version=${ibp.bundleInfo.bundleVersion})
-                <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param name='bundleId' value='${ibp.bundleInfo.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_mf.png" alt="icon_mf.png" title="View Manifest" style="vertical-align:middle"/></a>
-                <a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${ibp.bundleInfo.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_wb.png" alt="icon_wb.png" title="View Wired Bundles" style="vertical-align:middle"/></a>
-                <a href="<portlet:renderURL><portlet:param name='page' value='view_services'/><portlet:param name='bundleId' value='${ibp.bundleInfo.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_serv.png" alt="icon_serv.png" title="View Services" style="vertical-align:middle"/></a>
+                <c:choose>
+                    <c:when test="${ibp.bundleInfo.bundleId == -1}" >
+                        None. Packages are not wired.
+                    </c:when>
+                    <c:otherwise>
+                        ${ibp.bundleInfo.symbolicName} (id=${ibp.bundleInfo.bundleId}) (version=${ibp.bundleInfo.bundleVersion})
+                        <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param name='bundleId' value='${ibp.bundleInfo.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_mf.png" alt="icon_mf.png" title="View Manifest" style="vertical-align:middle"/></a>
+                        <a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${ibp.bundleInfo.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_wb.png" alt="icon_wb.png" title="View Wired Bundles" style="vertical-align:middle"/></a>
+                        <a href="<portlet:renderURL><portlet:param name='page' value='view_services'/><portlet:param name='bundleId' value='${ibp.bundleInfo.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_serv.png" alt="icon_serv.png" title="View Services" style="vertical-align:middle"/></a>
+                    </c:otherwise>
+                </c:choose>
             </td>
           </tr>
         </c:forEach>