geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1081650 - in /geronimo/server/trunk/plugins/console/console-base-portlets/src/main: java/org/apache/geronimo/console/bundlemanager/ webapp/WEB-INF/view/bundlemanager/ webapp/images/
Date Tue, 15 Mar 2011 02:55:45 GMT
Author: rwonly
Date: Tue Mar 15 02:55:44 2011
New Revision: 1081650

URL: http://svn.apache.org/viewvc?rev=1081650&view=rev
Log:
GERONIMO-5847 add show services functionality

Added:
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/ServiceInfo.java
  (with props)
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowServices.jsp
  (with props)
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/icon_serv.png
  (with props)
Modified:
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleManagerPortlet.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/BundleManager.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowManifest.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/icon_wb.png

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleManagerPortlet.java?rev=1081650&r1=1081649&r2=1081650&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleManagerPortlet.java
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleManagerPortlet.java
Tue Mar 15 02:55:44 2011
@@ -91,10 +91,14 @@ public class BundleManagerPortlet extend
     
     private PortletRequestDispatcher showWiredBundlesView;
     
+    private PortletRequestDispatcher showServicesView;
+    
     private static final String VIEW_MANIFEST_PAGE = "view_manifest";
     
     private static final String VIEW_WIRED_BUNDLES_PAGE = "view_wired_bundles";
     
+    private static final String VIEW_SERVICES_PAGE = "view_services";
+    
     protected void doHelp(RenderRequest renderRequest, RenderResponse renderResponse) throws
PortletException, IOException {
         helpView.include(renderRequest, renderResponse);
     }
@@ -105,6 +109,7 @@ public class BundleManagerPortlet extend
         bundleManagerView = portletConfig.getPortletContext().getRequestDispatcher("/WEB-INF/view/bundlemanager/BundleManager.jsp");
         showManifestView = portletConfig.getPortletContext().getRequestDispatcher("/WEB-INF/view/bundlemanager/ShowManifest.jsp");
         showWiredBundlesView = portletConfig.getPortletContext().getRequestDispatcher("/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp");
+        showServicesView = portletConfig.getPortletContext().getRequestDispatcher("/WEB-INF/view/bundlemanager/ShowServices.jsp");
 
     }
 
@@ -251,6 +256,30 @@ public class BundleManagerPortlet extend
                 renderRequest.setAttribute("bundleInfo", bundleInfo);
                 showManifestView.include(renderRequest, renderResponse);
                 
+            }else if(VIEW_SERVICES_PAGE.equals(page)) {
+                
+                BundleContext bundleContext = getBundleContext(renderRequest);
+                
+                long id = Long.valueOf(renderRequest.getParameter("bundleId"));
+                Bundle bundle = bundleContext.getBundle(id);
+                
+                // because this page should not be very complex ,so we only have a Service
Perspective
+                // if user wants 2 perspective like wired bundle page, we can extend this
page to add a new Bundle Perspective.
+                List<ServicePerspective> usingServicePerspectives = getUsingServicePerspectives(bundle);
+                List<ServicePerspective> registeredServicePerspectives = getRegisteredServicePerspectives(bundle);
+                
+                Collections.sort(usingServicePerspectives);
+                Collections.sort(registeredServicePerspectives);
+                
+                renderRequest.setAttribute("usingServicePerspectives", usingServicePerspectives);
+                renderRequest.setAttribute("registeredServicePerspectives", registeredServicePerspectives);
+                
+                SimpleBundleInfo bundleInfo = new SimpleBundleInfo(bundle);
+                
+                renderRequest.setAttribute("bundleInfo", bundleInfo);
+                
+                showServicesView.include(renderRequest, renderResponse);
+                
             }else if(VIEW_WIRED_BUNDLES_PAGE.equals(page)) {
                 
                 BundleContext bundleContext = getBundleContext(renderRequest);
@@ -508,7 +537,24 @@ public class BundleManagerPortlet extend
         }
     }
     
-    
+    private static class ServiceObjectClassComparator implements Comparator<ServiceInfo>{
+        @Override
+        public int compare(ServiceInfo infoA, ServiceInfo infoB) {
+            if (infoA == null && infoB ==null) return 0;
+            if (infoA == null) return -1;
+            if (infoB == null) return 1;
+            
+            String objectClassA = "";
+            for ( String str : infoA.getObjectClass()){
+                objectClassA += str+",";
+            }
+            String objectClassB = "";
+            for ( String str : infoB.getObjectClass()){
+                objectClassB += str+",";
+            }
+            return objectClassA.compareTo(objectClassB);
+        }
+    }
     
     
     /*************************************************************
@@ -959,4 +1005,94 @@ public class BundleManagerPortlet extend
             
         }
     }
+    
+    
+    /************************************************
+     * Show services definitions
+     ************************************************/
+    public static class ServicePerspective implements Comparable<ServicePerspective>{
+
+        private ServiceInfo serviceInfo;
+        private List<BundleInfo> bundleInfos = new ArrayList<BundleInfo>();
+        private final Comparator<ServiceInfo> comparator = new ServiceObjectClassComparator();
+        
+        
+        public ServicePerspective(ServiceInfo serviceInfo) {
+            this.serviceInfo = serviceInfo;
+        }
+        
+        public ServicePerspective(ServiceInfo serviceInfo, List<BundleInfo> bundleInfos)
{
+            this.serviceInfo = serviceInfo;
+            this.bundleInfos = bundleInfos;
+        }
+        
+        @Override
+        public int compareTo(ServicePerspective another) {
+            if (another != null) {
+                return comparator.compare(serviceInfo,another.serviceInfo);
+            } else {
+                return -1;
+            } 
+        }
+        
+        public ServiceInfo getServiceInfo() {
+            return serviceInfo;
+        }
+
+        public List<BundleInfo> getBundleInfos() {
+            return bundleInfos;
+        }
+        
+        public void addBundleInfo(BundleInfo info){
+            this.bundleInfos.add(info);
+        }
+        
+        public void sortBundleInfos(Comparator<BundleInfo> comparator){
+            Collections.sort(bundleInfos, comparator);
+        }
+    }
+    
+    private List<ServicePerspective> getUsingServicePerspectives(Bundle bundle){
+        ServiceReference[] serviceRefs = bundle.getServicesInUse();
+        
+        List<ServicePerspective> usingServicePerspectives = new ArrayList<ServicePerspective>();
+        
+        if (serviceRefs != null && serviceRefs.length!=0){
+            for (ServiceReference ref : serviceRefs){
+                ServiceInfo info = new ServiceInfo(ref);
+                ServicePerspective perspective = new ServicePerspective(info);
+                perspective.addBundleInfo(new SimpleBundleInfo(ref.getBundle()));
+                usingServicePerspectives.add(perspective);
+            }
+        }
+        
+        
+        return usingServicePerspectives;
+    }
+    
+    private List<ServicePerspective> getRegisteredServicePerspectives(Bundle bundle){
+        ServiceReference[] serviceRefs = bundle.getRegisteredServices();
+        
+        List<ServicePerspective> registeredServicePerspectives = new ArrayList<ServicePerspective>();
+        
+        if (serviceRefs != null && serviceRefs.length!=0){
+            for (ServiceReference ref : serviceRefs){
+                ServiceInfo info = new ServiceInfo(ref);
+                ServicePerspective perspective = new ServicePerspective(info);
+                
+                Bundle[] usingBundles = ref.getUsingBundles();
+                if (usingBundles!=null && usingBundles.length!=0){
+                    for (Bundle usingBundle : usingBundles){
+                        perspective.addBundleInfo(new SimpleBundleInfo(usingBundle));
+                    }
+                }
+                                
+                registeredServicePerspectives.add(perspective);
+            }
+        }
+        
+        
+        return registeredServicePerspectives;
+    }
+    
 }

Added: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/ServiceInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/ServiceInfo.java?rev=1081650&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/ServiceInfo.java
(added)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/ServiceInfo.java
Tue Mar 15 02:55:44 2011
@@ -0,0 +1,78 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+ 
+ package org.apache.geronimo.console.bundlemanager;
+
+import java.util.Arrays;
+
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
+
+public class ServiceInfo {
+    private long serviceId;
+    private String servicePid = null;
+    private String[] objectClass;
+    
+    public ServiceInfo(ServiceReference ref){
+        serviceId = (Long)ref.getProperty(Constants.SERVICE_ID);
+        servicePid = (String)ref.getProperty(Constants.SERVICE_PID);
+        objectClass = (String[])ref.getProperty(Constants.OBJECTCLASS);
+        sortObjectClass();
+    }
+    
+    public long getServiceId() {
+        return serviceId;
+    }
+
+    public String getServicePid() {
+        return servicePid;
+    }
+
+    public String[] getObjectClass() {
+        return objectClass;
+    }
+
+    public String[] sortObjectClass(){
+        Arrays.sort(objectClass);
+        return objectClass;
+    }
+    
+    @Override
+    public boolean equals(Object o) {
+        if (o == null) {
+            return false;
+        }
+        if (getClass() != o.getClass()) {
+            return false;
+        }
+
+        final ServiceInfo other = (ServiceInfo) o;
+        if (this.serviceId != other.serviceId ) {
+            return false;
+        }
+
+        return true;
+    }
+    
+    @Override
+    public int hashCode() {
+        int hash = 11;
+        hash = 17* hash + 19 * (int)serviceId;
+
+        return hash;
+    }
+}

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/ServiceInfo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/BundleManager.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/BundleManager.jsp?rev=1081650&r1=1081649&r2=1081650&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/BundleManager.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/BundleManager.jsp
Tue Mar 15 02:55:44 2011
@@ -155,7 +155,7 @@ function uninstallPrompt(target, bundleI
         <c:if test="${listTypeValue != 'system' && listTypeValue != 'configuration'}"
>
             <th scope="col" width="80">Actions</th>
         </c:if>
-        <th scope="col" width="80">Utilities</th>
+        <th scope="col" width="100">Utilities</th>
     </tr>
     <script language="javascript"> 
         var oldcolor;
@@ -250,7 +250,8 @@ function uninstallPrompt(target, bundleI
             &nbsp;
             <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param
name='bundleId' value='${bundleInfo.bundleId}'/></portlet:renderURL>"><img
border="0" src="<%=request.getContextPath()%>/images/icon_mf.png" title="View Manifest"/></a>&nbsp;
             <c:if test="${bundleInfo.state.running}" >
-                <a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param
name='bundleId' value='${bundleInfo.bundleId}'/></portlet:renderURL>"><img
border="0" src="<%=request.getContextPath()%>/images/icon_wb.png" title="View Wired
Bundles"/></a>
+                <a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param
name='bundleId' value='${bundleInfo.bundleId}'/></portlet:renderURL>"><img
border="0" src="<%=request.getContextPath()%>/images/icon_wb.png" title="View Wired
Bundles"/></a>&nbsp;
+                <a href="<portlet:renderURL><portlet:param name='page' value='view_services'/><portlet:param
name='bundleId' value='${bundleInfo.bundleId}'/></portlet:renderURL>"><img
border="0" src="<%=request.getContextPath()%>/images/icon_serv.png" title="View Services"/></a>&nbsp;
             </c:if>
         </td>
 

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowManifest.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowManifest.jsp?rev=1081650&r1=1081649&r2=1081650&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowManifest.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowManifest.jsp
Tue Mar 15 02:55:44 2011
@@ -22,7 +22,10 @@
         </td>
         <td align="right">
             <c:if test="${bundleInfo.state.running}" >          
-                <a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param
name='bundleId' value='${bundleInfo.bundleId}'/></portlet:renderURL>">View Wired
Bundles</a>
+                View:&nbsp;
+                <a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param
name='bundleId' value='${bundleInfo.bundleId}'/></portlet:renderURL>">Wired Bundles</a>
+                &nbsp;|&nbsp;
+                <a href="<portlet:renderURL><portlet:param name='page' value='view_services'/><portlet:param
name='bundleId' value='${bundleInfo.bundleId}'/></portlet:renderURL>">Services</a>
             </c:if>
         </td>
     </tr>

Added: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowServices.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowServices.jsp?rev=1081650&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowServices.jsp
(added)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowServices.jsp
Tue Mar 15 02:55:44 2011
@@ -0,0 +1,115 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
+<fmt:setBundle basename="consolebase"/>
+<portlet:defineObjects/>
+
+<a href="<portlet:actionURL/>" >OSGi Manager</a> > Show Services
+<br/><br/>
+<table width="100%" class="TableLine" summary="OSGi install">
+    <tr>
+        <td>
+            The Services related to Bundle:
+            &nbsp;
+            <b>
+            ${bundleInfo.symbolicName}
+            </b>
+            (id=${bundleInfo.bundleId})
+            (version=${bundleInfo.bundleVersion})
+            [${bundleInfo.state}]
+        </td>
+        </td>
+        <td align="right">
+            <c:if test="${bundleInfo.state.running}" >          
+                View:&nbsp;
+                <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param
name='bundleId' value='${bundleInfo.bundleId}'/></portlet:renderURL>">Manifest</a>
+                &nbsp;|&nbsp;
+                <a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param
name='bundleId' value='${bundleInfo.bundleId}'/></portlet:renderURL>">Wired Bundles</a>
+            </c:if>
+        </td>
+    </tr>
+</table>
+<br/>
+
+<!--  Using Services  -->
+Services in use:<br/>
+<table width="100%" class="TableLine" summary="Wired Bundles">
+    <tr class="DarkBackground">
+        <th scope="col" width="40%">Reference Services (Object Class)</th>  

+        <th scope="col" width="60%">From Bundles</th> 
+    </tr>
+    <c:set var="backgroundClass" value='MediumBackground'/>
+      <c:forEach var="usp" items="${usingServicePerspectives}">
+        <c:choose>
+          <c:when test="${backgroundClass == 'MediumBackground'}" >
+              <c:set var="backgroundClass" value='LightBackground'/>
+          </c:when>
+          <c:otherwise>
+              <c:set var="backgroundClass" value='MediumBackground'/>
+          </c:otherwise>
+        </c:choose>
+        <tr>
+            <td class="${backgroundClass}">
+                <c:forEach var="objectclass" items="${usp.serviceInfo.objectClass}">
+                    ${objectclass}<br/>
+                </c:forEach>
+                    &nbsp;&nbsp;(service.id=${usp.serviceInfo.serviceId})
+                <c:if test="${usp.serviceInfo.servicePid}" > 
+                    <br/>
+                    &nbsp;&nbsp;(service.pid=${usp.serviceInfo.servicePid})
+                </c:if>
+            </td>
+            <td class="${backgroundClass}">
+                <c:forEach var="info" items="${usp.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" 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" 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" title="View Services" style="vertical-align:middle"/></a>
+                    <br/>
+                </c:forEach>
+            </td>
+        </tr>
+      </c:forEach>
+</table>
+<br/>
+<!--  Registered Services  -->
+Registered Services:<br/>
+<table width="100%" class="TableLine" summary="Wired Bundles">
+    <tr class="DarkBackground">
+        <th scope="col" width="40%">Registered Services (Object Class)</th> 
 
+        <th scope="col" width="60%">Using Bundles</th> 
+    </tr>
+    <c:set var="backgroundClass" value='MediumBackground'/>
+      <c:forEach var="rsp" items="${registeredServicePerspectives}">
+        <c:choose>
+          <c:when test="${backgroundClass == 'MediumBackground'}" >
+              <c:set var="backgroundClass" value='LightBackground'/>
+          </c:when>
+          <c:otherwise>
+              <c:set var="backgroundClass" value='MediumBackground'/>
+          </c:otherwise>
+        </c:choose>
+        <tr>
+            <td class="${backgroundClass}">
+                <c:forEach var="objectclass" items="${rsp.serviceInfo.objectClass}">
+                    ${objectclass}<br/>
+                </c:forEach>
+                    &nbsp;&nbsp;(service.id=${rsp.serviceInfo.serviceId})
+                <c:if test="${rsp.serviceInfo.servicePid}" > 
+                    <br/>
+                    &nbsp;&nbsp;(service.pid=${rsp.serviceInfo.servicePid})
+                </c:if>
+            </td>
+            <td class="${backgroundClass}">
+                <c:forEach var="info" items="${rsp.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" 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" 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" title="View Services" style="vertical-align:middle"/></a>
+                    <br/>
+                </c:forEach>
+            </td>
+        </tr>
+      </c:forEach>
+</table>

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowServices.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp?rev=1081650&r1=1081649&r2=1081650&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp
Tue Mar 15 02:55:44 2011
@@ -41,7 +41,10 @@
             [${bundleInfo.state}]
         </td>
         <td align="right">
-            <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param
name='bundleId' value='${bundleInfo.bundleId}'/></portlet:renderURL>">View Manifest</a>&nbsp;
+            View:&nbsp;
+            <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param
name='bundleId' value='${bundleInfo.bundleId}'/></portlet:renderURL>">Manifest</a>
+            &nbsp;|&nbsp;
+            <a href="<portlet:renderURL><portlet:param name='page' value='view_services'/><portlet:param
name='bundleId' value='${bundleInfo.bundleId}'/></portlet:renderURL>">Services</a>
         </td>
     </tr>
 </table>
@@ -74,6 +77,7 @@
                     ${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" 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" 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" title="View Services" style="vertical-align:middle"/></a>
                     <br/>
                 </c:forEach>
             </td>
@@ -107,6 +111,7 @@
                     ${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" 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" 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" title="View Services" style="vertical-align:middle"/></a>
                     <br/>
                 </c:forEach>
             </td>
@@ -140,6 +145,7 @@
                     ${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" 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" 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" title="View Services" style="vertical-align:middle"/></a>
                     <br/>
                 </c:forEach>
             </td>
@@ -173,6 +179,7 @@
                     ${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" 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" 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" title="View Services" style="vertical-align:middle"/></a>
                     <br/>
                 </c:forEach>
             </td>
@@ -209,6 +216,7 @@
                 ${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" 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" 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" title="View Services"
style="vertical-align:middle"/></a>
             </td>
           </tr>
         </c:forEach>
@@ -241,6 +249,7 @@
                 ${dibp.bundleInfo.symbolicName} (id=${dibp.bundleInfo.bundleId}) (version=${dibp.bundleInfo.bundleVersion})
                 <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param
name='bundleId' value='${dibp.bundleInfo.bundleId}'/></portlet:renderURL>"><img
border="0" src="<%=request.getContextPath()%>/images/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='${dibp.bundleInfo.bundleId}'/></portlet:renderURL>"><img
border="0" src="<%=request.getContextPath()%>/images/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='${dibp.bundleInfo.bundleId}'/></portlet:renderURL>"><img
border="0" src="<%=request.getContextPath()%>/images/icon_serv.png" title="View Services"
style="vertical-align:middle"/></a>
             </td>
           </tr>
         </c:forEach>
@@ -273,6 +282,7 @@
                 ${rbibp.bundleInfo.symbolicName} (id=${rbibp.bundleInfo.bundleId}) (version=${rbibp.bundleInfo.bundleVersion})
                 <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param
name='bundleId' value='${rbibp.bundleInfo.bundleId}'/></portlet:renderURL>"><img
border="0" src="<%=request.getContextPath()%>/images/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='${rbibp.bundleInfo.bundleId}'/></portlet:renderURL>"><img
border="0" src="<%=request.getContextPath()%>/images/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='${rbibp.bundleInfo.bundleId}'/></portlet:renderURL>"><img
border="0" src="<%=request.getContextPath()%>/images/icon_serv.png" title="View Services"
style="vertical-align:middle"/></a>
             </td>
           </tr>
         </c:forEach>
@@ -305,6 +315,7 @@
                 ${ebp.bundleInfo.symbolicName} (id=${ebp.bundleInfo.bundleId}) (version=${ebp.bundleInfo.bundleVersion})
                 <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param
name='bundleId' value='${ebp.bundleInfo.bundleId}'/></portlet:renderURL>"><img
border="0" src="<%=request.getContextPath()%>/images/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='${ebp.bundleInfo.bundleId}'/></portlet:renderURL>"><img
border="0" src="<%=request.getContextPath()%>/images/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='${ebp.bundleInfo.bundleId}'/></portlet:renderURL>"><img
border="0" src="<%=request.getContextPath()%>/images/icon_serv.png" title="View Services"
style="vertical-align:middle"/></a>
             </td>
           </tr>
         </c:forEach>

Added: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/icon_serv.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/icon_serv.png?rev=1081650&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/icon_serv.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/icon_wb.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/icon_wb.png?rev=1081650&r1=1081649&r2=1081650&view=diff
==============================================================================
Binary files - no diff available.



Mime
View raw message