geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r686006 - in /geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main: java/org/apache/geronimo/console/car/ webapp/WEB-INF/view/car/
Date Thu, 14 Aug 2008 19:43:00 GMT
Author: linsun
Date: Thu Aug 14 12:43:00 2008
New Revision: 686006

URL: http://svn.apache.org/viewvc?rev=686006&view=rev
Log:
use name instead of moduleid and enable sort function to sort the plugins by name, category
and version

Modified:
    geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyConfirmHandler.java
    geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyIndexHandler.java
    geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyViewHandler.java
    geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp
    geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp

Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyConfirmHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyConfirmHandler.java?rev=686006&r1=686005&r2=686006&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyConfirmHandler.java
(original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyConfirmHandler.java
Thu Aug 14 12:43:00 2008
@@ -52,7 +52,7 @@
         
         request.setAttribute("plugins", plugins);
         request.setAttribute("absoluteDeployedPath", absoluteDeployedPath);
-        request.setAttribute("mode", ASSEMBLY_CONFIRM_MODE+"-after");
+        request.setAttribute("mode", ASSEMBLY_CONFIRM_MODE + AFTER_ACTION);
     }
 
     public String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel
model) throws PortletException, IOException {

Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyIndexHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyIndexHandler.java?rev=686006&r1=686005&r2=686006&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyIndexHandler.java
(original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyIndexHandler.java
Thu Aug 14 12:43:00 2008
@@ -46,6 +46,7 @@
     }
 
     public String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel
model) throws PortletException, IOException {
-        return LIST_MODE+BEFORE_ACTION;
+        request.setAttribute("column", request.getParameter("column"));
+        return LIST_SERVER_MODE+BEFORE_ACTION;
     }
 }

Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyViewHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyViewHandler.java?rev=686006&r1=686005&r2=686006&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyViewHandler.java
(original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyViewHandler.java
Thu Aug 14 12:43:00 2008
@@ -48,7 +48,11 @@
     }
 
     public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel
model) throws PortletException, IOException {
+        String configId = request.getParameter("configId");
         String[] pluginIds = request.getParameterValues("plugin");
+        if (configId != null) {
+            pluginIds = new String[]{configId};
+        }
         String relativeServerPath = request.getParameter("relativeServerPath");
         String groupId = request.getParameter("groupId");
         String artifactId = request.getParameter("artifactId");

Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp?rev=686006&r1=686005&r2=686006&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp
Thu Aug 14 12:43:00 2008
@@ -86,7 +86,7 @@
   <c:forEach var="column" items="Name,Version,Category">
   <th class="DarkBackground"><a href='<portlet:actionURL>
 	                                   <portlet:param name="column" value="${column}"/>
-	                                   <portlet:param name="mode" value="listServer-after"/>
+	                                   <portlet:param name="mode" value="index-after"/>
 	                                  </portlet:actionURL>'>${column}</a></th>
   </c:forEach>
 </tr>
@@ -98,7 +98,10 @@
         <input type="checkbox" name="plugin" value="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}"/>
     </td>
   <td class="${style}">
-    ${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}
+    <a href='<portlet:actionURL>
+      <portlet:param name="configId" value="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}"/>
+      <portlet:param name="mode" value="assemblyView-before"/>
+    </portlet:actionURL>'>${plugin.name}</a>
   </td>
   <td class="${style}">${artifact.version}</td>
   <td class="${style}">${plugin.category}</td>

Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp?rev=686006&r1=686005&r2=686006&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp
Thu Aug 14 12:43:00 2008
@@ -143,9 +143,9 @@
 <tr>
 <c:if test="${allInstallable}">
 <td valign="top">
-    <input type="submit" value="<fmt:message key="consolebase.common.install" />"
/>
-    <%--<input type="hidden" name="configIds" value="${configIds}" />--%>
     <input type="hidden" name="mode" value="${mode}" />
+    <input <c:choose><c:when test="${mode eq 'assemblyView-after'}">type="hidden"</c:when><c:otherwise>type="submit"</c:otherwise></c:choose>
value="<fmt:message key="consolebase.common.install" />" />
+    <%--<input type="hidden" name="configIds" value="${configIds}" />--%>
     <input type="hidden" name="repository" value="${repository}" />
     <input type="hidden" name="repo-user" value="${repouser}" />
     <input type="hidden" name="repo-pass" value="${repopass}" />



Mime
View raw message