geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r705317 - in /geronimo/server/trunk/plugins/console/plugin-portlets/src/main: java/org/apache/geronimo/console/car/ resources/ webapp/WEB-INF/view/car/
Date Thu, 16 Oct 2008 18:36:52 GMT
Author: linsun
Date: Thu Oct 16 11:36:50 2008
New Revision: 705317

URL: http://svn.apache.org/viewvc?rev=705317&view=rev
Log:
GERONIMO-4364 Split the assemblylist page to 2 pages

Added:
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyNameHandler.java
  (with props)
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyName.jsp
  (with props)
Modified:
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyPortlet.java
    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/java/org/apache/geronimo/console/car/BaseImportExportHandler.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/assemblyIndex.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp

Added: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyNameHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyNameHandler.java?rev=705317&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyNameHandler.java
(added)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyNameHandler.java
Thu Oct 16 11:36:50 2008
@@ -0,0 +1,93 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console.car;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.WindowState;
+
+import org.apache.geronimo.console.MultiPageModel;
+import org.apache.geronimo.kernel.repository.Dependency;
+import org.apache.geronimo.system.plugin.PluginInstaller;
+import org.apache.geronimo.system.plugin.PluginInstallerGBean;
+import org.apache.geronimo.system.plugin.model.ArtifactType;
+import org.apache.geronimo.system.plugin.model.PluginArtifactType;
+import org.apache.geronimo.system.plugin.model.PluginListType;
+import org.apache.geronimo.system.plugin.model.PluginType;
+
+/**
+ * Handler for the assembly name screen.
+ *
+ * @version $Rev$ $Date$
+ */
+public class AssemblyNameHandler extends BaseImportExportHandler{
+
+    public AssemblyNameHandler() {
+        super(ASSEMBLY_NAME_MODE, "/WEB-INF/view/car/assemblyName.jsp");
+    }
+
+    public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel
model) throws PortletException, IOException {
+        String column = (String) request.getAttribute("column");
+        String type = request.getParameter("type");
+
+        if(!isEmpty(column)) response.setRenderParameter("column", column);
+        if(!isEmpty(type)) response.setRenderParameter("type", type);
+        
+        response.setWindowState(WindowState.MAXIMIZED);
+        return getMode();
+    }
+
+    public void renderView(RenderRequest request, RenderResponse response, MultiPageModel
model) throws PortletException, IOException {
+        String column = request.getParameter("column");
+        String type = request.getParameter("type");
+            
+        request.setAttribute("column", column);
+        request.setAttribute("type", type);
+        request.setAttribute("containsPlugin", containsPlugin(request));
+    }
+
+    public String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel
model) throws PortletException, IOException {
+        return getMode()+BEFORE_ACTION;
+    }
+    
+    //this function checks if server contains any plugins.  If so, ask users to name their
server assembly.
+    private boolean containsPlugin(RenderRequest request) throws IOException, PortletException
{
+
+        PluginInstaller pluginInstaller = ManagementHelper.getManagementHelper(request).getPluginInstaller();
+
+        // try to reuse the catalog data if it was already downloaded
+        PluginListType data = getServerPluginList(request, pluginInstaller);
+
+        if(data == null || data.getPlugin() == null) {
+            return false;
+        }
+        
+        // don't cache plugin list or application module list - see GERONIMO-4306
+        //request.getPortletSession(true).setAttribute(SERVER_CONFIG_LIST_SESSION_KEY, data);
+
+        return true;
+    }
+}
\ No newline at end of file

Propchange: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyNameHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyNameHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyNameHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyPortlet.java?rev=705317&r1=705316&r2=705317&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyPortlet.java
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyPortlet.java
Thu Oct 16 11:36:50 2008
@@ -39,6 +39,7 @@
     public void init(PortletConfig config) throws PortletException {
         super.init(config);
         addHelper(new AssemblyIndexHandler(), config);
+        addHelper(new AssemblyNameHandler(), config);
         addHelper(new AssemblyConfirmHandler(), config);
         addHelper(new AssemblyListHandler(), config);
         addHelper(new AssemblyViewHandler(), config);

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=705317&r1=705316&r2=705317&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
Thu Oct 16 11:36:50 2008
@@ -23,9 +23,10 @@
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 import javax.portlet.PortletException;
+import javax.portlet.PortletSession;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletSession;
+import javax.portlet.WindowState;
 
 import org.apache.geronimo.console.MultiPageModel;
 import org.apache.geronimo.kernel.repository.Artifact;
@@ -66,7 +67,8 @@
         if(!isEmpty(artifactId)) response.setRenderParameter("artifactId", artifactId);
         response.setRenderParameter("version", isEmpty(version) ? "1.0" : version);
         if(!isEmpty(format)) response.setRenderParameter("format", format);
-
+        
+        response.setWindowState(WindowState.MAXIMIZED);
         return getMode();
     }
 

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/BaseImportExportHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/BaseImportExportHandler.java?rev=705317&r1=705316&r2=705317&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/BaseImportExportHandler.java
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/BaseImportExportHandler.java
Thu Oct 16 11:36:50 2008
@@ -58,6 +58,7 @@
     protected static final String ASSEMBLY_CONFIRM_MODE = "assemblyConfirm";
     protected static final String LIST_SERVER_MODE = "listServer";
     protected static final String ASSEMBLY_VIEW_MODE = "assemblyView";
+    protected static final String ASSEMBLY_NAME_MODE = "assemblyName";
 
     protected BaseImportExportHandler(String mode, String viewName) {
         super(mode, viewName);

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=705317&r1=705316&r2=705317&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
Thu Oct 16 11:36:50 2008
@@ -86,11 +86,14 @@
 car.list.assemblyGroupId                      = Assembly groupId:
 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.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: 
 car.list.pluginRepo                           = Plugins listed at
 car.list.requiredPlugin                       = Required plugin in local server:
+car.list.selectPlugin                         = Select from plugins in current server:
 car.list.systemPlugin                         = System plugins in local server:
 car.pluginParams.JVMVersionsExp               = An optional list of JVM version prefixes
supported by this plugin.  If no values are listed, the plugin can be installed in Geronimo
running in any version of the JVM.  Otherwise, list one acceptable JVM version prefix per
line, like "1.4.2 \r\n 1.5 \r\n ..." (ideally, of course,
this means you've actually tested the plugin with Geronimo on each JVM version listed here).
 car.pluginParams.authorExp                    = The author of the plug, which may be a person,
company, open source project, etc.

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=705317&r1=705316&r2=705317&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
Thu Oct 16 11:36:50 2008
@@ -85,11 +85,14 @@
 car.list.assemblyGroupId                      = Assembly groupId:
 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.nameServer                           = Name the server to be assembled: 
 car.list.noPlugins                            = \u6B64\u7AD9\u70B9\u4E0B\u6CA1\u6709Plugin.
 car.list.PluginGroup                          = Plugin Groups in local server: 
 car.list.pluginRepo                           = Plugins\u4F4D\u4E8E
 car.list.requiredPlugin                       = Required plugin in local server:
+car.list.selectPlugin                         = Select from plugins in current server:
 car.list.systemPlugin                         = System plugins in local server:
 car.pluginParams.JVMVersionsExp               = \u4E00\u4E2A\u53EF\u9009\u7684\u5217\u8868\uFF0C\u7528\u4E8E\u5217\u51FA\u8FD9\u4E2A\u63D2\u4EF6\u652F\u6301\u7684JVM\u7248\u672C\u7684\u524D\u7F00\u3002\u5982\u679C\u6CA1\u6709\u5217\u51FA\u4EFB\u4F55\u503C\u7684\u8BDD\uFF0C\u8FD9\u4E2A\u63D2\u4EF6\u53EF\u5B89\u88C5\u5728\u8FD0\u884C\u4E8E\u4EFB\u4F55\u7248\u672C\u7684JVM\u7684Geronimo\u4E2D\u3002\u4E0D\u7136\u7684\u8BDD\uFF0C\u6BCF\u4E00\u884C\u5217\u51FA\u4E00\u4E2A\u53EF\u63A5\u53D7\u7684JVM\u7248\u672C\u524D\u7F00\uFF0C\u5C31\u50CF"1.4.2 \r\n 1.5 \r\n ..."
(\u5F53\u7136\uFF0C\u7406\u60F3\u60C5\u51B5\u4E0B\uFF0C\u8FD9\u610F\u5473\u7740\u5728\u8FD9\u91CC\u5217\u51FA\u7684JVN\u7248\u672C\u4E2D\uFF0C\u4F60\u786E\u5B9E\u5DF2\u7ECF\u6D4B\u8BD5\u8FC7\u8FD9\u4E2A\u63D2\u4EF6)\u3002
 car.pluginParams.authorExp                    = \u63D2\u4EF6\u7684\u4F5C\u8005\uFF0C\u8FD9\u53EF\u80FD\u662F\u4EBA\u540D\uFF0C\u516C\u53F8\u540D\uFF0C\u5F00\u6E90\u9879\u76EE\u7684\u540D\u79F0\u7B49\u7B49\u3002

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=705317&r1=705316&r2=705317&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
Thu Oct 16 11:36:50 2008
@@ -45,6 +45,6 @@
 <p>File Location: ${absoluteDeployedPath}</p>
 <br>
 <form>
-<input type="submit" value='<fmt:message key="consolebase.common.done" />' onclick="history.go(-3);
return false;" />
+<input type="submit" value='<fmt:message key="consolebase.common.done" />' onclick="history.go(-4);
return false;" />
 </form>
 

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyIndex.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyIndex.jsp?rev=705317&r1=705316&r2=705317&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyIndex.jsp
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyIndex.jsp
Thu Oct 16 11:36:50 2008
@@ -30,7 +30,7 @@
         <option selected>Function Centric</option>
         <option>Application Centric</option>
     </select>
-    <input type="hidden" name="mode" value="listServer-before"/>
+    <input type="hidden" name="mode" value="assemblyName-before"/>
     <input type="submit" value='<fmt:message key="car.index.assembleServer"/>'/>
 </form>
 

Added: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyName.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyName.jsp?rev=705317&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyName.jsp
(added)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyName.jsp
Thu Oct 16 11:36:50 2008
@@ -0,0 +1,82 @@
+<%--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="pluginportlets"/>
+<portlet:defineObjects/>
+
+<script language="javascript" type="text/javascript">
+  function checkArtifactId() {
+     if(document.frmlst.artifactId.value == "") {
+      alert("You must provide an Artifact Id Name.");
+      return false;
+    }
+    return true;
+  }
+</script>
+
+
+<c:choose>
+<c:when test="${!containsPlugin}">
+  <fmt:message key="car.list.noPlugins" />
+  <p>
+  <form>
+    <input type="submit" value="Cancel" onclick="history.go(-1); return false;" />
+  </form>
+</c:when>
+<c:otherwise>
+<form name="frmlst" action="<portlet:actionURL/>">
+
+    <h3><fmt:message key="car.list.nameServer" /></h3>
+    <input id="mode" type="hidden" name="mode" value="listServer-before"/>
+    
+<table border="0" cellpadding="3">
+<tr>
+  <td><label for="<portlet:namespace/>groupId"><fmt:message key="car.list.assemblyGroupId"/></label></td>
+  <td><input type="text" name="groupId" id="<portlet:namespace/>groupId" value="${groupId}"/></td>
+</tr>
+<tr>
+  <td><label for="<portlet:namespace/>artifactId"><fmt:message key="car.list.assemblyArtifactId"/></label></td>
+  <td><input type="text" name="artifactId" id="<portlet:namespace/>artifactId"
value="${artifactId}"/></td>
+</tr>
+<tr>
+  <td><label for="<portlet:namespace/>version"><fmt:message key="car.list.assemblyVersion"/></label></td>
+  <td><input type="text" name="version" id="<portlet:namespace/>version" value="${version}"/></td>
+</tr>
+<tr>
+  <td><label for="<portlet:namespace/>relativeServerPath"><fmt:message
key="car.list.assemblyPath"/></label></td>
+  <td><input type="text" name="relativeServerPath" id="<portlet:namespace/>relativeServerPath"
value="${relativeServerPath}"/></td>
+</tr>
+<tr>
+  <td><label for="<portlet:namespace/>format"><fmt:message key="car.list.assemblyFormat"/></label></td>
+  <td><select name="format" id="<portlet:namespace/>format">
+        <option <c:if test="${format ne 'zip'}">selected="true"</c:if>>tar.gz</option>
+        <option <c:if test="${format eq 'zip'}">selected="true"</c:if>>zip</option>
+      </select>
+  </td>
+</table>
+
+    <input type="hidden" name="type" value="${type}"/>
+    <input type="submit" value="Next" onclick="if(!checkArtifactId()){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>
+

Propchange: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyName.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyName.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyName.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

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=705317&r1=705316&r2=705317&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
Thu Oct 16 11:36:50 2008
@@ -25,10 +25,6 @@
   var EXPERT_COOKIE = "org.apache.geronimo.assembly.expertmode";
   function checkAllVal(val) {
     val = document.getElementsByName(val);
-    if(document.frmlst.artifactId.value == "") {
-      alert("You must provide an Artifact Id Name.");
-      return false;
-    }
     for (i = 0; i < val.length; i++) {
       if(val[i].checked == true) {
         return true;
@@ -130,58 +126,21 @@
     }
 </script>
 
-
-<c:choose>
-<c:when test="${fn:length(appPlugins) < 1 || fn:length(sysPlugins) < 1 }">
-  <fmt:message key="car.list.noPlugins" />
-  <p>
-  <form>
-    <input type="submit" value="Cancel" onclick="history.go(-1); return false;" />
-  </form>
-</c:when>
-<c:otherwise>
 <form name="frmlst" action="<portlet:actionURL/>">
 
-    <h3><fmt:message key="car.list.nameServer" /></h3>
     <input id="mode" type="hidden" name="mode" value="assemblyView-before"/>
-    
-<table border="0" cellpadding="3">
-<tr>
-  <td><label for="<portlet:namespace/>groupId"><fmt:message key="car.list.assemblyGroupId"/></label></td>
-  <td><input type="text" name="groupId" id="<portlet:namespace/>groupId" value="${groupId}"/></td>
-</tr>
-<tr>
-  <td><label for="<portlet:namespace/>artifactId"><fmt:message key="car.list.assemblyArtifactId"/></label></td>
-  <td><input type="text" name="artifactId" id="<portlet:namespace/>artifactId"
value="${artifactId}"/></td>
-</tr>
-<tr>
-  <td><label for="<portlet:namespace/>version"><fmt:message key="car.list.assemblyVersion"/></label></td>
-  <td><input type="text" name="version" id="<portlet:namespace/>version" value="${version}"/></td>
-</tr>
-<tr>
-  <td><label for="<portlet:namespace/>relativeServerPath"><fmt:message
key="car.list.assemblyPath"/></label></td>
-  <td><input type="text" name="relativeServerPath" id="<portlet:namespace/>relativeServerPath"
value="${relativeServerPath}"/></td>
-</tr>
-<tr>
-  <td><label for="<portlet:namespace/>format"><fmt:message key="car.list.assemblyFormat"/></label></td>
-  <td><select name="format" id="<portlet:namespace/>format">
-        <option <c:if test="${format ne 'zip'}">selected="true"</c:if>>tar.gz</option>
-        <option <c:if test="${format eq 'zip'}">selected="true"</c:if>>zip</option>
-      </select>
-  </td>
-</table>
 
-<h3>Select from plugins in current server:</h3>
+<h3><fmt:message key="car.list.selectPlugin"/></h3>
 <p><input type="checkbox" name="expertMode" id="<portlet:namespace/>expertMode"
onClick="toggleExpertMode();" />&nbsp;
-<label for="<portlet:namespace/>expertMode">Expert User (view all system plugins)</label>
+<label for="<portlet:namespace/>expertMode"><fmt:message key="car.list.expertUser"/></label>
 </p>
 
 <c:choose>
 <c:when test="${type eq 'Application Centric'}">   
-<p>Filter by category: <input name="filterbyca" onkeyup="filterTables(this, 'appPlugin',
'sysPlugin')" type="text"></p>
+<p><fmt:message key="car.list.filterByCategory"/><input name="filterbyca"
onkeyup="filterTables(this, 'appPlugin', 'sysPlugin')" type="text"></p>
 </c:when>
 <c:otherwise>
-<p>Filter by category: <input name="filterbyca" onkeyup="filterTables(this, 'groupPlugin',
'appPlugin', 'sysPlugin')" type="text"></p>
+<p><fmt:message key="car.list.filterByCategory"/><input name="filterbyca"
onkeyup="filterTables(this, 'groupPlugin', 'appPlugin', 'sysPlugin')" type="text"></p>
 </c:otherwise>
 </c:choose>
 
@@ -358,12 +317,15 @@
 </c:otherwise>
 </c:choose>
 
+    <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}"/>
     <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;" />
+    <input type="submit" value='<fmt:message key="consolebase.common.cancel"/>'
onclick="history.go(-2); return false;" />
 
 </form>
-</c:otherwise>
-</c:choose>
 
 <script>
 // Call to set initial expert mode actions correctly



Mime
View raw message