Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 38445 invoked from network); 15 Aug 2008 19:20:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Aug 2008 19:20:39 -0000 Received: (qmail 59248 invoked by uid 500); 15 Aug 2008 19:20:38 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 59129 invoked by uid 500); 15 Aug 2008 19:20:37 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 59120 invoked by uid 99); 15 Aug 2008 19:20:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Aug 2008 12:20:37 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Aug 2008 19:19:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3CE1B23889A0; Fri, 15 Aug 2008 12:19:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r686329 - in /geronimo/server/trunk/plugins/console/plugin-portlets/src/main: java/org/apache/geronimo/console/car/ resources/ webapp/WEB-INF/view/car/ Date: Fri, 15 Aug 2008 19:19:47 -0000 To: scm@geronimo.apache.org From: linsun@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080815191948.3CE1B23889A0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: linsun Date: Fri Aug 15 12:19:45 2008 New Revision: 686329 URL: http://svn.apache.org/viewvc?rev=686329&view=rev Log: allow a user to click a plugin to see plugin metadata in assembly listServer page and replace some hardcoded values Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyViewHandler.java 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/assemblyConfirm.jsp geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyViewHandler.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyViewHandler.java?rev=686329&r1=686328&r2=686329&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyViewHandler.java (original) +++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyViewHandler.java Fri Aug 15 12:19:45 2008 @@ -59,6 +59,7 @@ String version = request.getParameter("version"); String format = request.getParameter("format"); + response.setRenderParameter("clickedConfigId", isEmpty(configId) ? "" : configId); response.setRenderParameter("pluginIds", pluginIds); response.setRenderParameter("relativeServerPath", isEmpty(relativeServerPath) ? "var/temp/assembly" : relativeServerPath); if(!isEmpty(groupId)) response.setRenderParameter("groupId", groupId); @@ -72,6 +73,7 @@ public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException { PluginInstaller pluginInstaller = ManagementHelper.getManagementHelper(request).getPluginInstaller(); + String clickedConfigId = request.getParameter("clickedConfigId"); String[] configIds = request.getParameterValues("pluginIds"); String relativeServerPath = request.getParameter("relativeServerPath"); String groupId = request.getParameter("groupId"); @@ -89,6 +91,7 @@ plugins.add(infoBean); } + request.setAttribute("clickedConfigId", clickedConfigId); request.setAttribute("plugins", plugins); request.setAttribute("relativeServerPath", relativeServerPath); request.setAttribute("groupId", groupId); 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=686329&r1=686328&r2=686329&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 Fri Aug 15 12:19:45 2008 @@ -23,6 +23,7 @@ car.addRepository.howToAddPluginRepositories = To add a new plugin repository to this list, enter the URL to the repository. The repository must have a geronimo-plugins.xml file in the root directory listing the available plugins in the repository. car.addRepository.title = Add Plugin Repository car.common.addRepository = Add Repository +car.common.assemble = Assemble car.common.author = Author car.common.category = Category car.common.createGeronimoPlugin = Create Geronimo Plugin 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=686329&r1=686328&r2=686329&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 Fri Aug 15 12:19:45 2008 @@ -23,6 +23,7 @@ car.addRepository.howToAddPluginRepositories = \u8981\u6DFB\u52A0\u4E00\u4E2A\u65B0\u7684\u63D2\u4EF6\u4ED3\u5E93\u5230\u5217\u8868\u4E2D\uFF0C\u5728\u4E0B\u9762\u7684\u6587\u672C\u6846\u4E2D\u8F93\u5165\u4ED3\u5E93\u7684URL\u3002\u4ED3\u5E93\u7684\u9876\u5C42\u76EE\u5F55\u4E2D\u5FC5\u987B\u6709\u4E00\u4E2Ageronimo-plugins.xml\u6587\u4EF6\uFF0C\u6587\u4EF6\u4E2D\u5217\u51FA\u4E86\u8BE5\u5B58\u4ED3\u4E2D\u53EF\u7528\u7684\u63D2\u4EF6\u3002 car.addRepository.title = \u6DFB\u52A0\u63D2\u4EF6\u4ED3\u5E93 car.common.addRepository = \u6DFB\u52A0\u63D2\u4EF6\u4ED3\u5E93 +car.common.assemble = Assemble car.common.author = \u4F5C\u8005 car.common.category = \u79CD\u7C7B car.common.createGeronimoPlugin = \u521B\u5EFAGeronimo\u63D2\u4EF6 Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyConfirm.jsp URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyConfirm.jsp?rev=686329&r1=686328&r2=686329&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyConfirm.jsp (original) +++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyConfirm.jsp Fri Aug 15 12:19:45 2008 @@ -45,6 +45,6 @@

File Location: ${absoluteDeployedPath}


- +
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=686329&r1=686328&r2=686329&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 Fri Aug 15 12:19:45 2008 @@ -108,8 +108,8 @@ - - + + Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp?rev=686329&r1=686328&r2=686329&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp (original) +++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp Fri Aug 15 12:19:45 2008 @@ -141,21 +141,34 @@ - - - - type="hidden"type="submit" value="" /> - <%----%> - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + " onclick="history.go(-1); return false;" />