geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
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 GMT
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 <tt>geronimo-plugins.xml</tt>
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\u4E2A<tt>geronimo-plugins.xml</tt>\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 @@
 <p>File Location: ${absoluteDeployedPath}</p>
 <br>
 <form>
-<input type="submit" value="Done" onclick="history.go(-3); return false;" />
+<input type="submit" value='<fmt:message key="consolebase.common.done" />' onclick="history.go(-3);
return false;" />
 </form>
 

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 @@
 </tr>
 </c:forEach>
 </table>
-    <input type="submit" value="Assemble" onclick="if(!checkAllVal('plugin')){return false;}else
return true;"/>
-    <input type="submit" value="Cancel" onclick="history.go(-1); return false;" />
+    <input type="submit" value='<fmt:message key="car.common.assemble"/>' onclick="if(!checkAllVal('plugin')){return
false;}else return true;"/>
+    <input type="submit" value='<fmt:message key="consolebase.common.cancel"/>'
onclick="history.go(-1); return false;" />
 </form>
 </c:otherwise>
 </c:choose>

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 @@
 
 
 <tr>
-<c:if test="${allInstallable}">
-<td valign="top">
-    <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}" />
-    <input type="hidden" name="relativeServerPath" value="${relativeServerPath}"/>
-    <input type="hidden" name="groupId" value="${groupId}"/>
-    <input type="hidden" name="artifactId" value="${artifactId}"/>
-    <input type="hidden" name="version" value="${version}"/>
-    <input type="hidden" name="format" value="${format}"/>
-<td>
-</c:if>
+
+<c:choose>
+  <c:when test="${mode eq 'assemblyView-after'}">
+    <c:if test="${empty clickedConfigId}">
+      <td valign="top">
+        <input type="submit" value='<fmt:message key="car.common.assemble" />'/>
+        <input type="hidden" name="mode" value="${mode}" />
+        <input type="hidden" name="relativeServerPath" value="${relativeServerPath}"/>
+        <input type="hidden" name="groupId" value="${groupId}"/>
+        <input type="hidden" name="artifactId" value="${artifactId}"/>
+        <input type="hidden" name="version" value="${version}"/>
+        <input type="hidden" name="format" value="${format}"/>
+      <td>
+    </c:if>
+    </c:when>
+  <c:otherwise>
+    <c:if test="${allInstallable}">
+      <td valign="top">
+        <input type="submit" value='<fmt:message key="consolebase.common.install" />'/>
+        <input type="hidden" name="mode" value="${mode}" />
+        <input type="hidden" name="repository" value="${repository}" />
+        <input type="hidden" name="repo-user" value="${repouser}" />
+        <input type="hidden" name="repo-pass" value="${repopass}" />
+      <td>
+    </c:if>
+  </c:otherwise>
+</c:choose>
+
 <td valign="top">
 <input type="submit" value="<fmt:message key="consolebase.common.return" />" onclick="history.go(-1);
return false;" />
 </td>



Mime
View raw message