You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rw...@apache.org on 2011/03/06 10:42:30 UTC
svn commit: r1078438 [2/2] - in /geronimo/server/trunk/plugins/console:
console-base-portlets/
console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/
console-base-portlets/src/main/webapp/WEB-INF/
console-base-portlets/src/main/...
Added: 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=1078438&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/BundleManager.jsp (added)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/BundleManager.jsp Sun Mar 6 09:42:29 2011
@@ -0,0 +1,261 @@
+<%--
+ 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/>
+
+<CommonMsg:confirmMsg/>
+
+<script>
+
+// Check to see if a component is "safe" to stop within a running server.
+// Service components with names that begin with "org.apache.geronimo.configs/", for example,
+// may not be safe to stop because doing so might prevent other components
+// that depend on them (like the console itself) from functioning properly.
+// If the component is not safe to stop then prompt to make sure that
+// the user really intends to stop the component prior to any action.
+function promptIfUnsafeToStop(target, bundleId, bundleName) {
+ // otherwise don't challenge the stop operation
+ return true;
+}
+function promptIfUnsafeToRestart(target, bundleId, bundleName) {
+ // otherwise don't challenge the restart operation
+ return true;
+}
+function promptIfUnsafeToUpdate(target, bundleId, bundleName) {
+ return true;
+}
+
+// Uninstall is always a potentially dangerous action, so we should prompt the
+// the user to ensure that they really indent to do this. Uninistalling
+// some modules is more destructive than others (such as modules which are
+// dependencies of the web console or dependencies of other core server
+// modules. In such cases. it may leave the server in a state where it
+// cannot be restarted. These situations require more stringent warnings.
+function uninstallPrompt(target, bundleId, bundleName) {
+ // if the component is none of the above provide a standard warning
+ return showConfirmMessage(target, '<fmt:message key="configmanager.normal.confirmMsg10"/> ' + bundleName + '?', '<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
+}
+
+
+
+
+</script>
+
+<CommonMsg:commonMsg/>
+
+<br/>
+<table width="100%" class="TableLine" summary="OSGi install">
+ <tr>
+ <td>
+ <form id="installForm" enctype="multipart/form-data" method="POST" action="<portlet:actionURL><portlet:param name='action' value='install'/></portlet:actionURL>">
+ Install New:
+ <input type="file" name="bundleFile" />
+
+ Start:
+ <input type="checkbox" name="startAfterInstalled" value="yes"/>
+
+ Start Level:
+ <input type="text" id="startLevel" name="startLevel" value="${initStartLevel}" style="width:30" size="4" />
+
+ <input type="submit" style="width:80px" onClick="return checkStartLevel()" value="install" />
+ </form>
+ <script language="javascript">
+ function checkStartLevel(){
+ if (document.getElementById("startLevel").value < ${initStartLevel}) {
+ if (!confirm("The start-level you are setting is less than the framework initial start-level(" + ${initStartLevel} + "). Will you continue?")) {
+ return false;
+ }
+ }
+ }
+ </script>
+ </td>
+ </tr>
+</table>
+
+<br/>
+
+
+<table width="100%" class="TableLine" summary="OSGi filter">
+ <tr>
+ <td>
+ <form id="listForm" method="POST" action="<portlet:actionURL><portlet:param name='action' value='list'/></portlet:actionURL>">
+ Show Bundles:
+ <input type="radio" name="listType" value="all" onclick="submitListForm(this)" />All
+ <input type="radio" name="listType" value="wab" onclick="submitListForm(this)" />WAB
+ <input type="radio" name="listType" value="blueprint" onclick="submitListForm(this)" />Blueprint
+ <input type="radio" name="listType" value="system" onclick="submitListForm(this)" />System
+ <input type="radio" name="listType" value="configuration" onclick="submitListForm(this)" />Geronimo Configuration
+ </form>
+ <script language="javascript">
+ var radiogroup = document.getElementsByName("listType");
+ for(var i=0;i<radiogroup.length;i++){
+ if(radiogroup[i].value == "${listTypeValue}"){
+ radiogroup[i].checked = true;
+ }
+ }
+ </script>
+ <script language="javascript">
+ function submitListForm(radiobutton){
+ if (radiobutton.value != "${listTypeValue}"){
+ document.getElementById("listForm").submit();
+ }
+ }
+ </script>
+ </td>
+ <td align="right">
+ <form id="searchForm" method="POST" action="<portlet:actionURL><portlet:param name='action' value='search'/></portlet:actionURL>">
+ Search by Symbolic Name:
+ <input type="text" id="searchString" name="searchString" value="${searchStringValue}"/>
+ <input type="submit" value="Go" />
+ <input type="button" value="Reset" onclick="resetSearchForm()" />
+ </form>
+ <script language="javascript">
+ function resetSearchForm(){
+ document.getElementById("searchString").value = "";
+ document.getElementById("searchForm").submit();
+ }
+ </script>
+ </td>
+ </tr>
+</table>
+
+<br/>
+
+<table width="100%" class="TableLine" summary="OSGi Manager">
+ <tr class="DarkBackground">
+ <th scope="col" width="40">Id</th>
+ <th scope="col">Symbolic Name</th>
+ <c:if test="${listTypeValue == 'wab'}" >
+ <th scope="col">URL</th>
+ </c:if>
+ <th scope="col" width="150">Version</th>
+ <th scope="col" width="150">Type</th>
+ <th scope="col" width="100">State</th>
+ <c:if test="${listTypeValue == 'blueprint'}" >
+ <th scope="col">blueprint</th>
+ </c:if>
+ <c:if test="${listTypeValue != 'system' && listTypeValue != 'configuration'}" >
+ <th scope="col" width="80">Actions</th>
+ </c:if>
+ <th scope="col" width="80">Utilities</th>
+ </tr>
+ <script language="javascript">
+ var oldcolor;
+ function highlightTr(theTr){
+ oldcolor = theTr.style.backgroundColor;
+ theTr.style.backgroundColor = '#e2ebfe';
+ }
+ function recoverTr(theTr){
+ theTr.style.backgroundColor = oldcolor;
+ }
+ </script>
+ <c:set var="backgroundClass" value='MediumBackground'/>
+ <c:forEach var="bundleInfo" items="${extendedBundleInfos}">
+ <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 class="${backgroundClass}" onmouseover="highlightTr(this)" onmouseout="recoverTr(this)">
+ <!-- bundle id -->
+ <td> ${bundleInfo.bundleId} </td>
+
+ <!-- bundle name -->
+ <td> ${bundleInfo.symbolicName} </td>
+
+ <!-- WAB context path -->
+ <c:if test="${listTypeValue == 'wab'}" >
+ <td>
+ <c:if test="${bundleInfo.state.running}">
+ <c:forEach var="contextPath" items="${bundleInfo.contextPaths}">
+ <a href="${contextPath}">${contextPath}</a> <br/>
+ </c:forEach>
+ </c:if>
+ </td>
+ </c:if>
+
+ <!-- version -->
+ <td> ${bundleInfo.bundleVersion} </td>
+
+ <!-- bundle type -->
+ <td>
+ <c:forEach var="type" items="${bundleInfo.types}">
+ ${type}
+ </c:forEach>
+ </td>
+
+ <!-- state -->
+ <td> ${bundleInfo.state} </td>
+
+ <!-- Blueprint info -->
+ <c:if test="${listTypeValue == 'blueprint'}" >
+ <td class="${backgroundClass}">
+
+ </td>
+ </c:if>
+
+ <!-- actions -->
+ <c:if test="${listTypeValue != 'system' && listTypeValue != 'configuration'}" >
+ <td>
+
+ <c:if test="${bundleInfo.operable}">
+ <!-- Start/Stop -->
+ <c:if test="${bundleInfo.state.running}">
+ <span>
+ <a href="<portlet:actionURL><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/><portlet:param name='action' value='bundle'/><portlet:param name='operation' value='stop'/></portlet:actionURL>"><img border="0" src="<%=request.getContextPath()%>/images/bundle_stop.png" title="stop"/></a>
+ </span>
+ </c:if>
+ <c:if test="${bundleInfo.state.stopped}">
+ <span>
+ <a href="<portlet:actionURL><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/><portlet:param name='action' value='bundle'/><portlet:param name='operation' value='start'/></portlet:actionURL>"><img border="0" src="<%=request.getContextPath()%>/images/bundle_start.png" title="start"/></a>
+ </span>
+ </c:if>
+
+ <!-- Update action -->
+ <span>
+ <a href="<portlet:actionURL><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/><portlet:param name='action' value='bundle'/><portlet:param name='operation' value='update'/></portlet:actionURL>"><img border="0" src="<%=request.getContextPath()%>/images/bundle_update.png" title="update"/></a>
+ </span>
+
+ <!-- Uninstall action -->
+ <span>
+ <a href="<portlet:actionURL><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/><portlet:param name='action' value='bundle'/><portlet:param name='operation' value='uninstall'/></portlet:actionURL>" onClick="return uninstallPrompt(this, '${bundleInfo.bundleId}','${bundleInfo.symbolicName}');"><img border="0" src="<%=request.getContextPath()%>/images/bundle_delete.png" title="uninstall"/></a>
+ </span>
+ </c:if>
+ </td>
+ </c:if>
+
+ <!-- Util -->
+ <td>
+
+ <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>
+ <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>
+ </c:if>
+ </td>
+
+ </tr>
+ </c:forEach>
+</table>
+
+
Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/BundleManager.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: 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=1078438&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowManifest.jsp (added)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowManifest.jsp Sun Mar 6 09:42:29 2011
@@ -0,0 +1,52 @@
+<%@ 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 Bundle Manifest
+<br/><br/>
+<table width="100%" class="TableLine" summary="OSGi install">
+ <tr>
+ <td>
+ The Manifest of Bundle:
+
+ <b>
+ ${bundleInfo.symbolicName}
+ </b>
+ (id=${bundleInfo.bundleId})
+ (version=${bundleInfo.bundleVersion})
+ [${bundleInfo.state}]
+ </td>
+ </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>
+ </c:if>
+ </td>
+ </tr>
+</table>
+<br/>
+<table width="100%" class="TableLine" summary="OSGi Manifest">
+ <tr class="DarkBackground">
+ <th scope="col" width="20%">Header</th>
+ <th scope="col" width="80%">Value</th>
+ </tr>
+ <c:set var="backgroundClass" value='MediumBackground'/>
+ <c:forEach var="manifestHeader" items="${manifestHeaders}">
+ <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>
+ <!-- bundle id -->
+ <td class="${backgroundClass}">${manifestHeader.key}</td>
+ <td class="${backgroundClass}">${manifestHeader.value}</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/ShowManifest.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: 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=1078438&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp (added)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp Sun Mar 6 09:42:29 2011
@@ -0,0 +1,173 @@
+<%@ 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/>
+
+<form id="perspectiveForm" method="POST" action="<portlet:actionURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${bundleInfo.bundleId}'/></portlet:actionURL>">
+ <a href="<portlet:actionURL/>" >OSGi Manager</a> > Show Wired Bundles
+ (
+ <input type="radio" name="perspectiveType" value="package" onclick="submitPerspectiveForm(this)" />Package Perspective
+ /
+ <input type="radio" name="perspectiveType" value="bundle" onclick="submitPerspectiveForm(this)" />Bundle Perspective
+ )
+</form>
+<script language="javascript">
+ var radiogroup = document.getElementsByName("perspectiveType");
+ for(var i=0;i<radiogroup.length;i++){
+ if(radiogroup[i].value == "${perspectiveTypeValue}"){
+ radiogroup[i].checked = true;
+ }
+ }
+</script>
+<script language="javascript">
+ function submitPerspectiveForm(radiobutton){
+ if (radiobutton.value != "${perspectiveTypeValue}"){
+ document.getElementById("perspectiveForm").submit();
+ }
+ }
+</script>
+<table width="100%" class="TableLine" summary="OSGi install">
+ <tr>
+ <td>
+ The Wired Bundles of Bundle:
+
+ <b>
+ ${bundleInfo.symbolicName}
+ </b>
+ (id=${bundleInfo.bundleId})
+ (version=${bundleInfo.bundleVersion})
+ [${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>
+ </td>
+ </tr>
+</table>
+<br/>
+<c:if test="${perspectiveTypeValue == 'package'}" >
+ <table width="100%" class="TableLine" summary="Wired Bundles">
+ <tr class="DarkBackground">
+ <th scope="col" width="40%">Importing Packages</th>
+ <th scope="col" width="60%">From Bundles</th>
+ </tr>
+ <c:set var="backgroundClass" value='MediumBackground'/>
+ <c:forEach var="ipp" items="${importingPackagePerspectives}">
+ <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}">
+ ${ipp.packageInfo.packageName} (version=${ipp.packageInfo.packageVersion})
+ </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" 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>
+ <br/>
+ </c:forEach>
+ </td>
+ </tr>
+ </c:forEach>
+ </table>
+ <br/>
+ <table width="100%" class="TableLine" summary="Wired Bundles">
+ <tr class="DarkBackground">
+ <th scope="col" width="40%">Exporting Packages</th>
+ <th scope="col" width="60%">To Bundles</th>
+ </tr>
+ <c:set var="backgroundClass" value='MediumBackground'/>
+ <c:forEach var="epp" items="${exportingPackagePerspectives}">
+ <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}">
+ ${epp.packageInfo.packageName} (version=${epp.packageInfo.packageVersion})
+ </td>
+ <td class="${backgroundClass}">
+ <c:forEach var="info" items="${epp.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>
+ <br/>
+ </c:forEach>
+ </td>
+ </tr>
+ </c:forEach>
+ </table>
+</c:if>
+
+<c:if test="${perspectiveTypeValue == 'bundle'}" >
+ <table width="100%" class="TableLine" summary="Wired Bundles">
+ <tr class="DarkBackground">
+ <th scope="col" width="40%">Importing Packages</th>
+ <th scope="col" width="60%">From Bundles</th>
+ </tr>
+ <c:set var="backgroundClass" value='MediumBackground'/>
+ <c:forEach var="ibp" items="${importingBundlePerspectives}">
+ <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="info" items="${ibp.packageInfos}">
+ ${info.packageName} (version=${info.packageVersion}) <br/>
+ </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" 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>
+ </td>
+ </tr>
+ </c:forEach>
+ </table>
+ <br/>
+ <table width="100%" class="TableLine" summary="Wired Bundles">
+ <tr class="DarkBackground">
+ <th scope="col" width="40%">Exporting Packages</th>
+ <th scope="col" width="60%">To Bundles</th>
+ </tr>
+ <c:set var="backgroundClass" value='MediumBackground'/>
+ <c:forEach var="ebp" items="${exportingBundlePerspectives}">
+ <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="info" items="${ebp.packageInfos}">
+ ${info.packageName} (version=${info.packageVersion}) <br/>
+ </c:forEach>
+ </td>
+ <td class="${backgroundClass}">
+ ${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>
+ </td>
+ </tr>
+ </c:forEach>
+ </table>
+</c:if>
\ No newline at end of file
Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml?rev=1078438&r1=1078437&r2=1078438&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml Sun Mar 6 09:42:29 2011
@@ -190,11 +190,11 @@ limitations under the License.
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
- <servlet-name>WABModules</servlet-name>
+ <servlet-name>BundleManagerPortletServlet</servlet-name>
<servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
<init-param>
<param-name>portlet-name</param-name>
- <param-value>WABModules</param-value>
+ <param-value>BundleManagerPortlet</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -353,8 +353,8 @@ limitations under the License.
<url-pattern>/PlutoInvoker/EBAModules</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>WABModules</servlet-name>
- <url-pattern>/PlutoInvoker/WABModules</url-pattern>
+ <servlet-name>BundleManagerPortletServlet</servlet-name>
+ <url-pattern>/PlutoInvoker/BundleManagerPortlet</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SystemModules</servlet-name>
Added: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/bundle_delete.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/bundle_delete.png?rev=1078438&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/bundle_delete.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/bundle_refresh.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/bundle_refresh.png?rev=1078438&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/bundle_refresh.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/bundle_start.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/bundle_start.png?rev=1078438&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/bundle_start.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/bundle_stop.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/bundle_stop.png?rev=1078438&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/bundle_stop.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/bundle_update.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/bundle_update.png?rev=1078438&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/bundle_update.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/icon_mf.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/icon_mf.png?rev=1078438&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/icon_mf.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: 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=1078438&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/icon_wb.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/ico_ariesapp_16x16.gif
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/ico_ariesapp_16x16.gif?rev=1078438&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/ico_ariesapp_16x16.gif
------------------------------------------------------------------------------
svn:mime-type = image/gif
Added: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/ico_osgibundles_16x16.gif
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/ico_osgibundles_16x16.gif?rev=1078438&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/ico_osgibundles_16x16.gif
------------------------------------------------------------------------------
svn:mime-type = image/gif
Modified: geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml?rev=1078438&r1=1078437&r2=1078438&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml Sun Mar 6 09:42:29 2011
@@ -201,20 +201,20 @@
</reference>
</gbean>
<gbean name="EBAModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">2-2-6/Applications/User Assets/OSGi Applications (EBA)</attribute>
+ <attribute name="pageTitle">2-2-6/Applications/User Assets/Aries Applications (EBA)</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[EBAModules]</attribute>
- <attribute name="icon">/images/ico_ear_16x16.gif</attribute>
+ <attribute name="icon">/images/ico_ariesapp_16x16.gif</attribute>
<attribute name="mode">basic</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
</gbean>
<gbean name="WABModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">2-2-5/Applications/User Assets/OSGi Web Apps (WAB)</attribute>
+ <attribute name="pageTitle">2-2-5/Applications/User Assets/OSGi Bundles</attribute>
<attribute name="portletContext">/console-base</attribute>
- <attribute name="portletList">[WABModules]</attribute>
- <attribute name="icon">/images/ico_webapp_16x16.gif</attribute>
+ <attribute name="portletList">[BundleManagerPortlet]</attribute>
+ <attribute name="icon">/images/ico_osgibundles_16x16.gif</attribute>
<attribute name="mode">basic</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>