geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1132672 - in /geronimo/server/trunk/plugins/console/console-base-portlets/src/main: java/org/apache/geronimo/console/bundlemanager/ webapp/WEB-INF/ webapp/WEB-INF/view/bundlemanager/
Date Mon, 06 Jun 2011 15:25:00 GMT
Author: rwonly
Date: Mon Jun  6 15:25:00 2011
New Revision: 1132672

URL: http://svn.apache.org/viewvc?rev=1132672&view=rev
Log:
GERONIMO-5978 input nothing to list all packages

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/portlet.xml
    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/FindPackages.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml

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=1132672&r1=1132671&r2=1132672&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
Mon Jun  6 15:25:00 2011
@@ -275,8 +275,8 @@ public class BundleManagerPortlet extend
                         BundleInfo exportBundleInfo = new SimpleBundleInfo(bundle);
                         
                         for (ExportedPackage exportedPackage : exportedPackages) {
-                            if (exportedPackage.getName().toLowerCase().indexOf(packageString.trim().toLowerCase())!=
-1) { // filter by keyword and ignore case 
-                                
+                            // filter by keyword and ignore case. if the keyword is null,
then return all the packages
+                            if (packageString==null || exportedPackage.getName().toLowerCase().indexOf(packageString.trim().toLowerCase())!=
-1) {
                                 // construct the package info
                                 // fill in its export bundle
                                 PackageInfo packageInfo = new PackageInfo(exportedPackage.getName(),
exportedPackage.getVersion().toString());

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=1132672&r1=1132671&r2=1132672&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
Mon Jun  6 15:25:00 2011
@@ -399,6 +399,30 @@ limitations under the License.
             <value>EBA</value>
         </init-param>
     </portlet>
+     <portlet>
+        <description>Portlet for displaying Bundle modules</description>
+        <portlet-name>BundleModules</portlet-name>
+        <display-name>Bundle Modules Portlet</display-name>
+        <portlet-class>org.apache.geronimo.console.configmanager.ConfigManagerPortlet</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
+        <portlet-info>
+            <title>Deployed OSGi Bundles</title>
+            <short-title>BundleModules</short-title>
+            <keywords>OSGi Bundle Module</keywords>
+        </portlet-info>
+        <init-param>
+            <name>config-type</name>
+            <value>BUNDLE</value>
+        </init-param>
+    </portlet>
     <portlet>
         <description>Portlet for displaying bundles</description>
         <portlet-name>BundleManagerPortlet</portlet-name>

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=1132672&r1=1132671&r2=1132672&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
Mon Jun  6 15:25:00 2011
@@ -93,7 +93,7 @@ function refreshPrompt(target, bundleId,
         <td align="right">
             <form id="packageForm" method="POST" action="<portlet:actionURL><portlet:param
name='page' value='find_packages'/></portlet:actionURL>">
                 Find Packages:
-                <input type="text" id="packageString" name="packageString" value=""/>&nbsp;
+                <input type="text" id="packageString" name="packageString" value="" title="Input
nothing to list all packages"/>&nbsp;
                 <input type="submit" value="Go" />
             </form>
         </td>

Modified: 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=1132672&r1=1132671&r2=1132672&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/FindPackages.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/FindPackages.jsp
Mon Jun  6 15:25:00 2011
@@ -31,7 +31,7 @@
         <form id="packageForm" method="POST" action="<portlet:actionURL><portlet:param
name='page' value='find_packages'/></portlet:actionURL>">
         <td align="right">
                 Find Packages:
-                <input type="text" id="packageString" name="packageString" value=""/>&nbsp;
+                <input type="text" id="packageString" name="packageString" value="" title="Input
nothing to list all packages"/>&nbsp;
                 <input type="submit" value="Go" />
         </td>
         </form>

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=1132672&r1=1132671&r2=1132672&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
Mon Jun  6 15:25:00 2011
@@ -189,6 +189,15 @@ limitations under the License.
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
+    <servlet>
+        <servlet-name>BundleModules</servlet-name>
+        <servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-name</param-name>
+            <param-value>BundleModules</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
      <servlet>
         <servlet-name>BundleManagerPortletServlet</servlet-name>
         <servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
@@ -352,6 +361,10 @@ limitations under the License.
         <servlet-name>EBAModules</servlet-name>
         <url-pattern>/PlutoInvoker/EBAModules</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>BundleModules</servlet-name>
+        <url-pattern>/PlutoInvoker/BundleModules</url-pattern>
+    </servlet-mapping>
      <servlet-mapping>
         <servlet-name>BundleManagerPortletServlet</servlet-name>
         <url-pattern>/PlutoInvoker/BundleManagerPortlet</url-pattern>



Mime
View raw message