geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1128134 - in /geronimo/server/trunk/plugins/console/console-base-portlets/src/main: java/org/apache/geronimo/console/bundlemanager/ webapp/WEB-INF/view/bundlemanager/
Date Fri, 27 May 2011 01:51:58 GMT
Author: rwonly
Date: Fri May 27 01:51:57 2011
New Revision: 1128134

URL: http://svn.apache.org/viewvc?rev=1128134&view=rev
Log:
GERONIMO-5978 View bundle packages in Geronimo admin console

Added:
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/FindPackages.jsp
  (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/ShowServices.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp

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=1128134&r1=1128133&r2=1128134&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
Fri May 27 01:51:57 2011
@@ -69,23 +69,7 @@ public class BundleManagerPortlet extend
 
     private static final Logger logger = LoggerFactory.getLogger(BundleManagerPortlet.class);
     
-    private static final String SERACH_ACTION = "search";
-    
-    private static final String LIST_ACTION = "list";
-    
-    private static final String INSTALL_ACTION = "install";
     
-    private static final String BUNDLE_ACTION = "bundle";
-
-    private static final String START_OPERATION = "start";
-
-    private static final String STOP_OPERATION = "stop";
-
-    private static final String UPDATE_OPERATION = "update";
-    
-    private static final String REFRESH_OPERATION = "refresh";
-    
-    private static final String UNINSTALL_OPERATION = "uninstall";
 
     private PortletRequestDispatcher helpView;
     
@@ -97,12 +81,34 @@ public class BundleManagerPortlet extend
     
     private PortletRequestDispatcher showServicesView;
     
+    private PortletRequestDispatcher findPackagesView;
+    
     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";
     
+    private static final String FIND_PACKAGES_PAGE = "find_packages";
+    
+    private static final String SERACH_ACTION = "search";
+    
+    private static final String LIST_ACTION = "list";
+    
+    private static final String INSTALL_ACTION = "install";
+    
+    private static final String BUNDLE_ACTION = "bundle";
+
+    private static final String START_OPERATION = "start";
+
+    private static final String STOP_OPERATION = "stop";
+
+    private static final String UPDATE_OPERATION = "update";
+    
+    private static final String REFRESH_OPERATION = "refresh";
+    
+    private static final String UNINSTALL_OPERATION = "uninstall";
+    
     protected void doHelp(RenderRequest renderRequest, RenderResponse renderResponse) throws
PortletException, IOException {
         helpView.include(renderRequest, renderResponse);
     }
@@ -114,7 +120,7 @@ public class BundleManagerPortlet extend
         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");
-
+        findPackagesView = portletConfig.getPortletContext().getRequestDispatcher("/WEB-INF/view/bundlemanager/FindPackages.jsp");
     }
 
     public void destroy() {
@@ -132,15 +138,23 @@ public class BundleManagerPortlet extend
             // no actions in this page
             actionResponse.setRenderParameter("page", VIEW_MANIFEST_PAGE);
             
-        }else if (VIEW_WIRED_BUNDLES_PAGE.equals(page)){
-            String id = actionRequest.getParameter("bundleId");;
+        } else if (VIEW_WIRED_BUNDLES_PAGE.equals(page)){
+            String id = actionRequest.getParameter("bundleId");
             String perspectiveType = actionRequest.getParameter("perspectiveType");
             //set render params
             actionResponse.setRenderParameter("page", VIEW_WIRED_BUNDLES_PAGE);
             actionResponse.setRenderParameter("bundleId", id);
             actionResponse.setRenderParameter("perspectiveTypeValue", perspectiveType);
             
-        }else { //main page
+        } else if (FIND_PACKAGES_PAGE.equals(page)) {
+            String packageString = actionRequest.getParameter("packageString");
+            String packageType = actionRequest.getParameter("packageType");
+            //set render params
+            actionResponse.setRenderParameter("page", FIND_PACKAGES_PAGE);
+            actionResponse.setRenderParameter("packageStringValue", packageString);
+            actionResponse.setRenderParameter("packageTypeValue", packageType);
+            
+        } else { //main page
             
             //we use session to control the listType and searchString for filtering list
so that
             //user can easily turn back to the page that he just jumped out.
@@ -241,7 +255,68 @@ public class BundleManagerPortlet extend
             
             String page = renderRequest.getParameter("page");
             
-            if (VIEW_MANIFEST_PAGE.equals(page)){
+            if (FIND_PACKAGES_PAGE.equals(page)){
+                BundleContext bundleContext = getBundleContext(renderRequest);
+                
+                ServiceReference reference = bundleContext.getServiceReference(PackageAdmin.class.getName());
+                PackageAdmin packageAdmin = (PackageAdmin) bundleContext.getService(reference);
+                
+                
+                String packageString = renderRequest.getParameter("packageStringValue");
+                String packageType = renderRequest.getParameter("packageTypeValue");
+                 
+                Map<PackageInfo,List<BundleInfo>> pbs = new HashMap<PackageInfo,List<BundleInfo>>();
+
+                for (Bundle bundle : bundleContext.getBundles()) {
+                    if (packageType.equals("export")){ //export pakcages
+                        BundleDescription description = new BundleDescription(bundle.getHeaders());
+                        List<BundleDescription.ExportPackage> exports = description.getExportPackage();
+                        for (BundleDescription.ExportPackage exportPkg :exports){
+                            if (exportPkg.getName().indexOf(packageString)!= -1){
+                                PackageInfo packageInfo = new PackageInfo(exportPkg.getName(),
exportPkg.getVersion().toString());
+                                BundleInfo bundleInfo = new SimpleBundleInfo(bundle);
+                                fillPackageBundlesMap(pbs, packageInfo, bundleInfo);
+                                
+                            }
+                        }
+                    } else {    //import packages, we get this by travel all exported packages
+                        ExportedPackage[] exportedPackages = packageAdmin.getExportedPackages(bundle);
+                        if (exportedPackages != null) {
+                            for (ExportedPackage exportedPackage : exportedPackages) {
+                                if (exportedPackage.getName().indexOf(packageString)!= -1)
{
+                                    Bundle[] importingBundles = exportedPackage.getImportingBundles();
+                                    if (importingBundles != null) {
+                                        
+                                        PackageInfo packageInfo = new PackageInfo(exportedPackage.getName(),
exportedPackage.getVersion().toString());
+                                        for (Bundle importingBundle : importingBundles) {
+                                            BundleInfo bundleInfo = new SimpleBundleInfo(importingBundle);
+                                            fillPackageBundlesMap(pbs, packageInfo, bundleInfo);
+                                        } 
+                                        
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                
+                List<PackagePerspective> packagePerspectives = new ArrayList<PackagePerspective>();
+                BundleSymbolicComparator bsc = new BundleSymbolicComparator();
+                for(Entry<PackageInfo,List<BundleInfo>> entry : pbs.entrySet()){
+                    PackagePerspective pp = new PackagePerspective(entry.getKey(),entry.getValue());
+                    pp.sortBundleInfos(bsc);
+                    packagePerspectives.add(pp);
+                }
+                
+                Collections.sort(packagePerspectives);
+                
+                renderRequest.setAttribute("packagePerspectives", packagePerspectives);
+                
+                renderRequest.setAttribute("packageTypeValue", packageType);
+                renderRequest.setAttribute("packageStringValue", packageString);
+                findPackagesView.include(renderRequest, renderResponse);
+                
+            } else if (VIEW_MANIFEST_PAGE.equals(page)){
                 BundleContext bundleContext = getBundleContext(renderRequest);
                 
                 long id = Long.valueOf(renderRequest.getParameter("bundleId"));
@@ -367,7 +442,7 @@ public class BundleManagerPortlet extend
                 StartLevel startLevelService = (StartLevel) bundleContext.getService(startLevelRef);
                 
                 // get configured bundle Ids
-                Set<Long> configedBundleIds = getConfigedBundleIds();
+                Set<Long> configurationBundleIds = getConfigurationBundleIds();
                 
                 Bundle[] bundles = bundleContext.getBundles();
                 for (Bundle bundle : bundles) {
@@ -379,13 +454,13 @@ public class BundleManagerPortlet extend
                     // construct the result bundleInfos by listType
                     if ("wab".equals(listType)){
                         if (checkWABBundle(bundle)){
-                            ExtendedBundleInfo info = createExtendedBundleInfo(bundle, startLevelService,
configedBundleIds);
+                            ExtendedBundleInfo info = createExtendedBundleInfo(bundle, startLevelService,
configurationBundleIds);
                             info.addContextPath(getContextPath(bundle));
                             bundleInfos.add(info);
                         }
                     }else if ("blueprint".equals(listType)){
                         if (checkBlueprintBundle(bundle)){
-                            ExtendedBundleInfo info = createExtendedBundleInfo(bundle, startLevelService,
configedBundleIds);
+                            ExtendedBundleInfo info = createExtendedBundleInfo(bundle, startLevelService,
configurationBundleIds);
                             
                             // currently, we try get the the blueprintContainer service to
determine if a blueprint bundle is created
                             // TODO A better way is using a BlueprintListener to track all
blueprint bundle events
@@ -405,16 +480,16 @@ public class BundleManagerPortlet extend
                         }
                     }else if ("system".equals(listType)){
                         if (checkSysBundle(bundle,startLevelService)){
-                            ExtendedBundleInfo info = createExtendedBundleInfo(bundle, startLevelService,
configedBundleIds);
+                            ExtendedBundleInfo info = createExtendedBundleInfo(bundle, startLevelService,
configurationBundleIds);
                             bundleInfos.add(info);
                         }
                     }else if ("configuration".equals(listType)){
-                        if (checkConfigedBundle(bundle,configedBundleIds)){
-                            ExtendedBundleInfo info = createExtendedBundleInfo(bundle, startLevelService,
configedBundleIds);
+                        if (checkConfigurationBundle(bundle,configurationBundleIds)){
+                            ExtendedBundleInfo info = createExtendedBundleInfo(bundle, startLevelService,
configurationBundleIds);
                             bundleInfos.add(info);
                         }
                     }else{
-                        ExtendedBundleInfo info = createExtendedBundleInfo(bundle, startLevelService,
configedBundleIds);
+                        ExtendedBundleInfo info = createExtendedBundleInfo(bundle, startLevelService,
configurationBundleIds);
                         bundleInfos.add(info);
                     }
                 }
@@ -438,7 +513,7 @@ public class BundleManagerPortlet extend
         }
     }
     
-    private ExtendedBundleInfo createExtendedBundleInfo(Bundle bundle, StartLevel startLevelService,
Set<Long> configedBundleIds){
+    private ExtendedBundleInfo createExtendedBundleInfo(Bundle bundle, StartLevel startLevelService,
Set<Long> configurationBundleIds){
         ExtendedBundleInfo info = new ExtendedBundleInfo(bundle);
       
         if (checkWABBundle(bundle)){
@@ -453,7 +528,7 @@ public class BundleManagerPortlet extend
             info.addType(BundleType.SYSTEM);
         }
         
-        if (checkConfigedBundle(bundle,configedBundleIds)){
+        if (checkConfigurationBundle(bundle,configurationBundleIds)){
             info.addType(BundleType.CONFIGURATION);
         }
         
@@ -509,30 +584,30 @@ public class BundleManagerPortlet extend
         return false;
     }
         
-    private static boolean checkConfigedBundle(Bundle bundle, Set<Long> configedBundleIds){
+    private static boolean checkConfigurationBundle(Bundle bundle, Set<Long> configurationBundleIds){
         // check configuration bundle
-        if (configedBundleIds.contains(bundle.getBundleId())){
+        if (configurationBundleIds.contains(bundle.getBundleId())){
             return true;
         }
         return false;
     }
     
-    private Set<Long> getConfigedBundleIds(){
-        Set<Long> configedBundleIds = new HashSet<Long> ();
+    private Set<Long> getConfigurationBundleIds(){
+        Set<Long> configurationBundleIds = new HashSet<Long> ();
         
         ConfigurationManager configManager = PortletManager.getConfigurationManager();
         List<ConfigurationInfo> infos = configManager.listConfigurations();
         
         for (ConfigurationInfo info : infos) {
-            Bundle configedBundle = configManager.getBundle(info.getConfigID());
-            if (configedBundle!=null){
-                configedBundleIds.add(configedBundle.getBundleId());
+            Bundle configurationBundle = configManager.getBundle(info.getConfigID());
+            if (configurationBundle!=null){
+                configurationBundleIds.add(configurationBundle.getBundleId());
             }else{
                 logger.info("Can not find the bundle for configuration: " +info.getConfigID()+
" in configuration manager");
             }
         }
         
-        return configedBundleIds;
+        return configurationBundleIds;
     }
     
     
@@ -884,19 +959,11 @@ public class BundleManagerPortlet extend
             PackageInfo packageInfo = new PackageInfo(pair.exportedPackage.getName(), pair.exportedPackage.getVersion().toString());
             BundleInfo bundleInfo = new SimpleBundleInfo(pair.bundle);
             
-            if (pbs.keySet().contains(packageInfo)){
-                if (!pbs.get(packageInfo).contains(bundleInfo)) {
-                    pbs.get(packageInfo).add(bundleInfo);
-                }
-            } else {
-                List<BundleInfo> bundleInfos = new ArrayList<BundleInfo>();
-                bundleInfos.add(bundleInfo);
-                pbs.put(packageInfo, bundleInfos);
-            }
+            fillPackageBundlesMap(pbs, packageInfo, bundleInfo);
             
         }
         
-        List<PackagePerspective>packagePerspectives = new ArrayList<PackagePerspective>();
+        List<PackagePerspective> packagePerspectives = new ArrayList<PackagePerspective>();
         BundleSymbolicComparator bsc = new BundleSymbolicComparator();
         for(Entry<PackageInfo,List<BundleInfo>> entry : pbs.entrySet()){
             PackagePerspective pp = new PackagePerspective(entry.getKey(),entry.getValue());
@@ -908,27 +975,19 @@ public class BundleManagerPortlet extend
     }
     
     private List<BundlePerspective> getBundlePerspectives(Set<PackageBundlePair>
pairs){
-        Map<BundleInfo,List<PackageInfo>> pbs = new HashMap<BundleInfo,List<PackageInfo>>();
+        Map<BundleInfo,List<PackageInfo>> bps = new HashMap<BundleInfo,List<PackageInfo>>();
         
         for (PackageBundlePair pair : pairs) {
             
             BundleInfo bundleInfo = new SimpleBundleInfo(pair.bundle);
             PackageInfo packageInfo = new PackageInfo(pair.exportedPackage.getName(), pair.exportedPackage.getVersion().toString());
             
-            if (pbs.keySet().contains(bundleInfo)){
-                if (!pbs.get(bundleInfo).contains(packageInfo)) {
-                    pbs.get(bundleInfo).add(packageInfo);
-                }
-            } else {
-                List<PackageInfo> packageInfos = new ArrayList<PackageInfo>();
-                packageInfos.add(packageInfo);
-                pbs.put(bundleInfo, packageInfos);
-            }
+            fillBundlePackagesMap(bps, bundleInfo, packageInfo);
             
         }
         
         List<BundlePerspective> bundlePerspectives = new ArrayList<BundlePerspective>();
-        for(Entry<BundleInfo,List<PackageInfo>> entry : pbs.entrySet()){
+        for(Entry<BundleInfo,List<PackageInfo>> entry : bps.entrySet()){
             BundlePerspective bp = new BundlePerspective(entry.getKey(),entry.getValue());
             bp.sortPackageInfos();
             bundlePerspectives.add(bp);
@@ -937,6 +996,30 @@ public class BundleManagerPortlet extend
         return bundlePerspectives;
     }
     
+    private void fillPackageBundlesMap(Map<PackageInfo,List<BundleInfo>> pbmap,
PackageInfo packageInfo, BundleInfo bundleInfo){
+        if (pbmap.keySet().contains(packageInfo)){
+            if (!pbmap.get(packageInfo).contains(bundleInfo)) {
+                pbmap.get(packageInfo).add(bundleInfo);
+            }
+        } else {
+            List<BundleInfo> bundleInfos = new ArrayList<BundleInfo>();
+            bundleInfos.add(bundleInfo);
+            pbmap.put(packageInfo, bundleInfos);
+        }
+    }
+    
+    private void fillBundlePackagesMap(Map<BundleInfo,List<PackageInfo>> bpmap,
BundleInfo bundleInfo, PackageInfo packageInfo){
+        if (bpmap.keySet().contains(bundleInfo)){
+            if (!bpmap.get(bundleInfo).contains(packageInfo)) {
+                bpmap.get(bundleInfo).add(packageInfo);
+            }
+        } else {
+            List<PackageInfo> packageInfos = new ArrayList<PackageInfo>();
+            packageInfos.add(packageInfo);
+            bpmap.put(bundleInfo, packageInfos);
+        }
+    }
+    
     /******************************
      * Install Action
      ******************************/

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=1128134&r1=1128133&r2=1128134&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
Fri May 27 01:51:57 2011
@@ -90,6 +90,17 @@ function refreshPrompt(target, bundleId,
                 }
             </script>
         </td>
+        <td align="right">
+            <form id="packageForm" method="POST" action="<portlet:actionURL><portlet:param
name='page' value='find_packages'/></portlet:actionURL>">
+                Find (
+                <input type="radio" name="packageType" value="import" />Import
+                /
+                <input type="radio" name="packageType" value="export" checked="true" />Export
+                ) Packages:
+                <input type="text" id="packageString" name="packageString" value=""/>&nbsp;
+                <input type="submit" value="Go" />
+            </form>
+        </td>
     </tr>
 </table>
 

Added: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/FindPackages.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/FindPackages.jsp?rev=1128134&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/FindPackages.jsp
(added)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/FindPackages.jsp
Fri May 27 01:51:57 2011
@@ -0,0 +1,81 @@
+<%--
+   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.
+--%>
+<%@ 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> > Find Packages 
+<br/><br/>
+<table width="100%" class="TableLine" summary="OSGi install">
+    <tr>
+        <td>
+            The <b>${packageTypeValue}</b> packages with keyword "<b>${packageStringValue}</b>"
+        </td>
+        <form id="packageForm" method="POST" action="<portlet:actionURL><portlet:param
name='page' value='find_packages'/></portlet:actionURL>">
+        <td align="right">
+                Find (
+                <input type="radio" name="packageType" value="import" />Import
+                /
+                <input type="radio" name="packageType" value="export" checked="true" />Export
+                ) Packages:
+                <input type="text" id="packageString" name="packageString" value=""/>&nbsp;
+                <input type="submit" value="Go" />
+        </td>
+        </form>
+    </tr>
+</table>
+<br/>
+<table width="100%" class="TableLine" summary="Wired Bundles">
+    <tr class="DarkBackground">
+        <c:if test="${packageTypeValue == 'import'}" >          
+            <th scope="col" width="40%">Import Packages</th>   
+            <th scope="col" width="60%">Imported by Bundles</th> 
+        </c:if>
+        <c:if test="${packageTypeValue == 'export'}" >   
+            <th scope="col" width="40%">Export Packages</th>   
+            <th scope="col" width="60%">Exported by Bundles</th> 
+        </c:if>
+    </tr>
+    <c:set var="backgroundClass" value='MediumBackground'/>
+    <c:forEach var="pp" items="${packagePerspectives}">
+        <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}">
+                ${pp.packageInfo.packageName} (version=${pp.packageInfo.packageVersion})
+            </td>
+            <td class="${backgroundClass}">
+                <c:forEach var="info" items="${pp.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>
+                    <br/>
+                </c:forEach>
+            </td>
+        </tr>
+    </c:forEach>
+</table>
\ No newline at end of file

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

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=1128134&r1=1128133&r2=1128134&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
Fri May 27 01:51:57 2011
@@ -1,3 +1,19 @@
+<%--
+   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.
+--%>
 <%@ 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"%>

Modified: 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=1128134&r1=1128133&r2=1128134&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowServices.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowServices.jsp
Fri May 27 01:51:57 2011
@@ -1,3 +1,19 @@
+<%--
+   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.
+--%>
 <%@ 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"%>

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=1128134&r1=1128133&r2=1128134&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
Fri May 27 01:51:57 2011
@@ -1,3 +1,19 @@
+<%--
+   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.
+--%>
 <%@ 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"%>



Mime
View raw message