You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/03/19 14:49:07 UTC
svn commit: r638831 - in
/geronimo/server/trunk/plugins/console/plugin-portlets/src/main:
java/org/apache/geronimo/console/car/ webapp/WEB-INF/view/car/
Author: gawor
Date: Wed Mar 19 06:48:21 2008
New Revision: 638831
URL: http://svn.apache.org/viewvc?rev=638831&view=rev
Log:
Improvements to Assemble a Server portlet (partial patch from Joseph Leong) (GERONIMO-3856)
Modified:
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyConfirmHandler.java
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyListHandler.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/webapp/WEB-INF/view/car/assemblylist.jsp
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyConfirmHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyConfirmHandler.java?rev=638831&r1=638830&r2=638831&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyConfirmHandler.java (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyConfirmHandler.java Wed Mar 19 06:48:21 2008
@@ -16,6 +16,7 @@
*/
package org.apache.geronimo.console.car;
+import java.io.File;
import java.io.IOException;
import java.util.List;
@@ -46,7 +47,8 @@
PortletSession assemblysession = request.getPortletSession(false);
List<PluginInfoBean> plugins = (List<PluginInfoBean>) assemblysession.getAttribute("plugins");
String relativeServerPath = request.getParameter("relativeServerPath");
- String absoluteDeployedPath = System.getProperty("org.apache.geronimo.home.dir")+"/"+relativeServerPath;
+ File deployedPath = new File(System.getProperty("org.apache.geronimo.home.dir"), relativeServerPath);
+ String absoluteDeployedPath = deployedPath.getAbsolutePath();
request.setAttribute("plugins", plugins);
request.setAttribute("absoluteDeployedPath", absoluteDeployedPath);
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyListHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyListHandler.java?rev=638831&r1=638830&r2=638831&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyListHandler.java (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyListHandler.java Wed Mar 19 06:48:21 2008
@@ -48,10 +48,10 @@
String format = request.getParameter("format");
if(!isEmpty(column)) response.setRenderParameter("column", column);
- response.setRenderParameter("relativeServerPath", isEmpty(relativeServerPath)? "var/temp/assembly": relativeServerPath);
+ response.setRenderParameter("relativeServerPath", isEmpty(relativeServerPath) ? "var/temp/assembly" : relativeServerPath);
if(!isEmpty(groupId)) response.setRenderParameter("groupId", groupId);
if(!isEmpty(artifactId)) response.setRenderParameter("artifactId", artifactId);
- if(!isEmpty(version)) response.setRenderParameter("version", version);
+ response.setRenderParameter("version", isEmpty(version) ? "1.0" : version);
if(!isEmpty(format)) response.setRenderParameter("format", format);
return getMode();
}
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=638831&r1=638830&r2=638831&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 Wed Mar 19 06:48:21 2008
@@ -56,10 +56,10 @@
String format = request.getParameter("format");
response.setRenderParameter("pluginIds", pluginIds);
- response.setRenderParameter("relativeServerPath", isEmpty(relativeServerPath)? "var/temp/assembly": relativeServerPath);
+ response.setRenderParameter("relativeServerPath", isEmpty(relativeServerPath) ? "var/temp/assembly" : relativeServerPath);
if(!isEmpty(groupId)) response.setRenderParameter("groupId", groupId);
if(!isEmpty(artifactId)) response.setRenderParameter("artifactId", artifactId);
- if(!isEmpty(version)) response.setRenderParameter("version", version);
+ response.setRenderParameter("version", isEmpty(version) ? "1.0" : version);
if(!isEmpty(format)) response.setRenderParameter("format", format);
return getMode();
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=638831&r1=638830&r2=638831&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 Wed Mar 19 06:48:21 2008
@@ -21,13 +21,34 @@
<fmt:setBundle basename="pluginportlets"/>
<portlet:defineObjects/>
+<script language="javascript" type="text/javascript">
+ 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;
+ }
+ }
+ alert("You must choose at least one plugin to install.");
+ return false;
+ }
+</script>
+
<c:choose>
<c:when test="${fn:length(plugins) < 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 action="<portlet:actionURL/>">
+<form name="frmlst" action="<portlet:actionURL/>">
<h3>Name the server to be assembled</h3>
<input id="mode" type="hidden" name="mode" value="assemblyView-before"/>
<p><fmt:message key="car.list.assemblyPath"/><input type="text" name="relativeServerPath" value="${relativeServerPath}"/></p>
@@ -65,11 +86,8 @@
</tr>
</c:forEach>
</table>
- <input type="submit" value="Assemble"/>
+ <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;" />
</form>
</c:otherwise>
</c:choose>
-
-<p><form>
-<input type="submit" value="Cancel" onclick="history.go(-1); return false;" />
-</form>