geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r720621 - in /geronimo/server/trunk: plugingroups/client/ plugingroups/clustering-jetty/ plugingroups/clustering-tomcat/ plugingroups/ejb/ plugingroups/framework/ plugingroups/javaee5-jetty/ plugingroups/javaee5-tomcat/ plugingroups/persist...
Date Tue, 25 Nov 2008 22:01:19 GMT
Author: linsun
Date: Tue Nov 25 14:01:19 2008
New Revision: 720621

URL: http://svn.apache.org/viewvc?rev=720621&view=rev
Log:
GERONIMO-4432 Allow users to filter plugins by category and name columns when selecting assembly
list

Modified:
    geronimo/server/trunk/plugingroups/client/pom.xml
    geronimo/server/trunk/plugingroups/clustering-jetty/pom.xml
    geronimo/server/trunk/plugingroups/clustering-tomcat/pom.xml
    geronimo/server/trunk/plugingroups/ejb/pom.xml
    geronimo/server/trunk/plugingroups/framework/pom.xml
    geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml
    geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml
    geronimo/server/trunk/plugingroups/persistence/pom.xml
    geronimo/server/trunk/plugingroups/web-jetty/pom.xml
    geronimo/server/trunk/plugingroups/web-tomcat/pom.xml
    geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml
    geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp

Modified: geronimo/server/trunk/plugingroups/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/client/pom.xml?rev=720621&r1=720620&r2=720621&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/client/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/client/pom.xml Tue Nov 25 14:01:19 2008
@@ -66,7 +66,7 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <category>Geronimo Plugin Group Client</category>
+                    <category>Geronimo Plugin Group</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugingroups/clustering-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/clustering-jetty/pom.xml?rev=720621&r1=720620&r2=720621&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/clustering-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/clustering-jetty/pom.xml Tue Nov 25 14:01:19 2008
@@ -72,7 +72,7 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <category>Geronimo Plugin Group Clustering</category>
+                    <category>Geronimo Plugin Group</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugingroups/clustering-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/clustering-tomcat/pom.xml?rev=720621&r1=720620&r2=720621&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/clustering-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/clustering-tomcat/pom.xml Tue Nov 25 14:01:19 2008
@@ -73,7 +73,7 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <category>Geronimo Plugin Group Clustering</category>
+                    <category>Geronimo Plugin Group</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugingroups/ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/ejb/pom.xml?rev=720621&r1=720620&r2=720621&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/ejb/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/ejb/pom.xml Tue Nov 25 14:01:19 2008
@@ -66,7 +66,7 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <category>Geronimo Plugin Group EJB</category>
+                    <category>Geronimo Plugin Group</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugingroups/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/framework/pom.xml?rev=720621&r1=720620&r2=720621&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/framework/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/framework/pom.xml Tue Nov 25 14:01:19 2008
@@ -134,7 +134,7 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <category>Geronimo Plugin Group Framework</category>
+                    <category>Geronimo Plugin Group</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml?rev=720621&r1=720620&r2=720621&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml Tue Nov 25 14:01:19 2008
@@ -225,7 +225,7 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <category>Geronimo Plugin Group Java EE 5</category>
+                    <category>Geronimo Plugin Group</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml?rev=720621&r1=720620&r2=720621&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml Tue Nov 25 14:01:19 2008
@@ -217,7 +217,7 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <category>Geronimo Plugin Group Java EE 5</category>
+                    <category>Geronimo Plugin Group</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugingroups/persistence/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/persistence/pom.xml?rev=720621&r1=720620&r2=720621&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/persistence/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/persistence/pom.xml Tue Nov 25 14:01:19 2008
@@ -59,7 +59,7 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <category>Geronimo Plugin Group Persistence</category>
+                    <category>Geronimo Plugin Group</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugingroups/web-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/web-jetty/pom.xml?rev=720621&r1=720620&r2=720621&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/web-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/web-jetty/pom.xml Tue Nov 25 14:01:19 2008
@@ -31,7 +31,7 @@
 
     <artifactId>web-jetty</artifactId>
     <packaging>car</packaging>
-    <name>Geronimo Plugin Group :: Web Jetty</name>
+    <name>Geronimo Plugin Group :: Web Little-G Jetty</name>
 
     <description>
         This plugin group provides the little-G Jetty functionality.
@@ -125,7 +125,7 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <category>Geronimo Plugin Group Web Little-G</category>
+                    <category>Geronimo Plugin Group</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugingroups/web-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/web-tomcat/pom.xml?rev=720621&r1=720620&r2=720621&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/web-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/web-tomcat/pom.xml Tue Nov 25 14:01:19 2008
@@ -31,7 +31,7 @@
 
     <artifactId>web-tomcat</artifactId>
     <packaging>car</packaging>
-    <name>Geronimo Plugin Group :: Web Tomcat</name>
+    <name>Geronimo Plugin Group ::  Web Little-G Tomcat</name>
 
     <description>
         This plugin group provides the little-G Tomcat functionality.
@@ -125,7 +125,7 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <category>Geronimo Plugin Group Web Little-G</category>
+                    <category>Geronimo Plugin Group</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml?rev=720621&r1=720620&r2=720621&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml Tue Nov 25 14:01:19 2008
@@ -80,7 +80,7 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <category>Geronimo Plugin Group Web Services Axis2</category>
+                    <category>Geronimo Plugin Group</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml?rev=720621&r1=720620&r2=720621&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml Tue Nov 25 14:01:19 2008
@@ -80,7 +80,7 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <category>Geronimo Plugin Group Web Services CXF</category>
+                    <category>Geronimo Plugin Group</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties?rev=720621&r1=720620&r2=720621&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties
Tue Nov 25 14:01:19 2008
@@ -87,7 +87,7 @@
 car.list.assemblyPath                         = Assembly target path:
 car.list.assemblyVersion                      = Assembly version:
 car.list.expertUser                           = Expert User (view all system plugins)
-car.list.filterByCategory                     = Filter by category: 
+car.list.filterByCategoryAndName              = Filter by category and name: 
 car.list.nameServer                           = Name the server to be assembled: 
 car.list.noPlugins                            = No plugins are listed at this repository.
 car.list.PluginGroup                          = Plugin Groups in local server: 

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties?rev=720621&r1=720620&r2=720621&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties
Tue Nov 25 14:01:19 2008
@@ -86,7 +86,7 @@
 car.list.assemblyPath                         = Assembly target path:
 car.list.assemblyVersion                      = Assembly version:
 car.list.expertUser                           = Expert User (view all system plugins)
-car.list.filterByCategory                     = Filter by category: 
+car.list.filterByCategoryAndName              = Filter by category and name: 
 car.list.nameServer                           = Name the server to be assembled: 
 car.list.noPlugins                            = \u6B64\u7AD9\u70B9\u4E0B\u6CA1\u6709Plugin.
 car.list.PluginGroup                          = Plugin Groups in local server: 

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp?rev=720621&r1=720620&r2=720621&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp
Tue Nov 25 14:01:19 2008
@@ -34,19 +34,21 @@
     return false;
   }
 
-    //this function searches the category column and display
+    //this function searches the category & name columns and display
     //rows within the table (identified by tid) that contain the searchterm
-    function filterCategory(searchterm, tid) {
-	    var term = searchterm.value.toLowerCase().split(" ");;
-	    var table = document.getElementById(tid);
-	    var element;
-	    for (var i = 2; i < table.rows.length; i++) {
+    function filterCategoryAndName(searchterm, tid) {
+        var term = searchterm.value.toLowerCase().split(" ");;
+        var table = document.getElementById(tid);
+        var nameElement;
+        var categoryElement;
+        for (var i = 2; i < table.rows.length; i++) {
             //replace special characters with ""
-	        element = table.rows[i].cells[3].innerHTML.replace(/<>/g,"");
+            nameElement = table.rows[i].cells[1].innerHTML.replace(/<>/g,"");     
     
+            categoryElement = table.rows[i].cells[3].innerHTML.replace(/<>/g,"");
             table.rows[i].style.display = 'none';
 
-            for (var j = 0; j < term.length; j++) {
-                if (element.toLowerCase().indexOf(term[j]) >= 0) {
+            for (var j = 0; j < term.length; j++) {  
+                if (categoryElement.toLowerCase().indexOf(term[j]) >= 0 || nameElement.toLowerCase().indexOf(term[j])
>= 0) {
                     //if search term is found, display
                     table.rows[i].style.display = '';
                     break;
@@ -58,10 +60,10 @@
     //this function allows a user to search 2 tables
     function filterTables(searchterm, t1, t2) {
         if (document.frmlst.expertMode.checked) {
-            filterCategory(searchterm, t1);
-            filterCategory(searchterm, t2);
+        	filterCategoryAndName(searchterm, t1);
+        	filterCategoryAndName(searchterm, t2);
         } else {
-            filterCategory(searchterm, t1);
+        	filterCategoryAndName(searchterm, t1);
             toggleExpertMode();
         }
     }
@@ -69,12 +71,12 @@
     //this function allows a user to search 3 tables
     function filterTables(searchterm, t1, t2, t3) {
         if (document.frmlst.expertMode.checked) {
-            filterCategory(searchterm, t1);
-            filterCategory(searchterm, t2);
-            filterCategory(searchterm, t3);
+        	filterCategoryAndName(searchterm, t1);
+        	filterCategoryAndName(searchterm, t2);
+        	filterCategoryAndName(searchterm, t3);
         } else {
-            filterCategory(searchterm, t1);
-            filterCategory(searchterm, t2);
+        	filterCategoryAndName(searchterm, t1);
+        	filterCategoryAndName(searchterm, t2);
             toggleExpertMode();
         }
     }
@@ -137,10 +139,10 @@
 
 <c:choose>
 <c:when test="${type eq 'Application Centric'}">   
-<p><fmt:message key="car.list.filterByCategory"/><input name="filterbyca"
onkeyup="filterTables(this, 'appPlugin', 'sysPlugin')" type="text"></p>
+<p><fmt:message key="car.list.filterByCategoryAndName"/><input name="filterbyca"
onkeyup="filterTables(this, 'appPlugin', 'sysPlugin')" type="text"></p>
 </c:when>
 <c:otherwise>
-<p><fmt:message key="car.list.filterByCategory"/><input name="filterbyca"
onkeyup="filterTables(this, 'groupPlugin', 'appPlugin', 'sysPlugin')" type="text"></p>
+<p><fmt:message key="car.list.filterByCategoryAndName"/><input name="filterbyca"
onkeyup="filterTables(this, 'groupPlugin', 'appPlugin', 'sysPlugin')" type="text"></p>
 </c:otherwise>
 </c:choose>
 



Mime
View raw message