[cig-commits] r8020 - in
cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp: .
WEB-INF templates
wei at geodynamics.org
wei at geodynamics.org
Mon Sep 24 18:21:03 PDT 2007
Author: wei
Date: 2007-09-24 18:21:03 -0700 (Mon, 24 Sep 2007)
New Revision: 8020
Added:
cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/createjob.vm
Modified:
cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/WEB-INF/portlet.xml
cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/cigportal.properties
cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/mag-0.vm
Log:
Add seperate page for creating mag job; a text editor page and a query for grid resources. These are templates changes.
Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/WEB-INF/portlet.xml
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/WEB-INF/portlet.xml 2007-09-25 01:13:18 UTC (rev 8019)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/WEB-INF/portlet.xml 2007-09-25 01:21:03 UTC (rev 8020)
@@ -50,7 +50,68 @@
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
</supports>
- </portlet>
+ </portlet>
+ <portlet>
+ <!-- place portlet description here -->
+ <description xml:lang="en">Create MAG Job for Run</description>
+ <!-- place unique portlet name here -->
+ <portlet-name>CreateMagjobPortlet</portlet-name>
+ <display-name xml:lang="en">Create MAG Job</display-name>
+ <!-- place your portlet class name here -->
+ <portlet-class>org.cig.portal.portlets.CreateMagjobPortlet</portlet-class>
+ <expiration-cache>0</expiration-cache>
+ <supported-locale>en</supported-locale>
+ <portlet-info>
+ <title>Create MAG Job</title>
+ <short-title>cig-mag</short-title>
+ <keywords>cig, mag</keywords>
+ </portlet-info>
+ <init-param>
+ <name>org.apache.velocity.properties</name>
+ <value>/velocity.properties</value>
+ </init-param>
+ <init-param>
+ <name>default-view</name>
+ <value>createjob.vm</value>
+ </init-param>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ </portlet>
+
+ <portlet>
+ <description xml:lang="en">Google Map portlet</description>
+ <portlet-name>GoogleMapPortlet</portlet-name>
+ <display-name xml:lang="en">Google Map portlet</display-name>
+ <portlet-class>org.cig.portal.portlets.GoogleMapPortlet</portlet-class>
+ <expiration-cache>0</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <supported-locale>en</supported-locale>
+ <portlet-info>
+ <title>Google Map</title>
+ <short-title>Google Map</short-title>
+ <keywords>google map</keywords>
+ </portlet-info>
+ </portlet>
+ <portlet>
+ <description xml:lang="en">Text editor portlet</description>
+ <portlet-name>TextEditorPortlet</portlet-name>
+ <display-name xml:lang="en">\Text editor portlet</display-name>
+ <portlet-class>org.cig.portal.portlets.TextEditorPortlet</portlet-class>
+ <expiration-cache>0</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <supported-locale>en</supported-locale>
+ <portlet-info>
+ <title>Text Editor</title>
+ <short-title>Text Editor</short-title>
+ <keywords>text editor</keywords>
+ </portlet-info>
+ </portlet>
<custom-portlet-mode>
<description xml:lang="en">Pre-defined custom portlet mode CONFIGURE</description>
Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/cigportal.properties
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/cigportal.properties 2007-09-25 01:13:18 UTC (rev 8019)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/cigportal.properties 2007-09-25 01:21:03 UTC (rev 8020)
@@ -1,6 +1,6 @@
## Application configuration
app.mag.datadir = storage
-app.mag.remoteexe = release/runMag.sh
+app.mag.remoteexe = release/runMag-arg.sh
## Grid configuration
# Security
@@ -10,27 +10,32 @@
grid.myproxy.proxyfile = /tmp/x509up_u1000
# Grid resources
-grid.sites = NCSA, SDSC, UC
+grid.sites = NCSA, SDSC, UC, TACC
grid.sites.magdir.UC = /home/cigportl/MAG
grid.sites.magdir.NCSA = /home/ac/cigportl/MAG
grid.sites.magdir.SDSC = /users/cigportl/MAG
-grid.sites.testdir.NCSA = /users/as/cigportl/tg-try
+grid.sites.magdir.SDSC = /users/cigportl/MAG
+grid.sites.testdir.TACC = /home/teragrid/tg459131/MAG
# Data transfer
grid.gridftp.UC = tg-gridftp.uc.teragrid.org
grid.gridftp.NCSA = tg-login1.ncsa.teragrid.org
grid.gridftp.SDSC = tg-login1.sdsc.teragrid.org
+grid.gridftp.TACC = lonestar.tacc.utexas.edu
# Job submission
grid.gram.UC = tg-grid1.uc.teragrid.org:2120/jobmanager-pbs
grid.gram.NCSA = grid-hg.ncsa.teragrid.org:2120/jobmanager-pbs
grid.gram.SDSC = tg-login1.sdsc.teragrid.org/jobmanager-pbs
+grid.gram.TACC = tg-login.tacc.teragrid.org:2119/jobmanager-lsf
grid.wsgram.UC = https://tg-grid.uc.teragrid.org:8443/wsrf/services/ManagedJobFactoryService
grid.wsgram.rm.UC = PBS
grid.wsgram.NCSA = https://grid-hg.ncsa.teragrid.org:8443/wsrf/services/ManagedJobFactoryService
grid.wsgram.rm.NCSA = PBS
grid.wsgram.SDSC = https://tg-login1.sdsc.teragrid.org:8443/wsrf/services/ManagedJobFactoryService
grid.wsgram.rm.SDSC = PBS
+grid.wsgram.TACC = https://tg-login.tacc.teragrid.org:8443/wsrf/services/ManagedJobFactoryService
+grid.wsgram.rm.TACC = LSF
## Portal configuration
portal.webappname = cigportal
Added: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/createjob.vm
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/createjob.vm 2007-09-25 01:13:18 UTC (rev 8019)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/createjob.vm 2007-09-25 01:21:03 UTC (rev 8020)
@@ -0,0 +1,46 @@
+#if( !$cig_portal_error_info.equals("") )
+ <pre><p><font face="Arial Narrow" color="red">$cig_portal_error_info</font><p></pre>
+ <hr>
+#end
+
+<p><b><font color="#000080" face="MS Serif" size="4"><u>MAG: Create MAG Job </u></font></b></p>
+
+<form name="creatjob" method="POST" action="$actionURL">
+ <input type="hidden" name="cig_mag_job_list" value="$cig_mag_job_list">
+ <hr>
+ <p><b><font color="#000080" face="MS Serif" size="3"><u>Create a MAG job:</u></font></b></p>
+ <table border="1" cellpadding="0" cellspacing="0" style="border-collapse: collapse; border-width: 2px" bordercolor="#FFFFF0" width="100%" height="54">
+ <!-- dataset selection -->
+ <tr>
+ <td width="40%" style="border-style: groove; border-width: 1px" height="24" bgcolor="#99CCFF">
+ <font face="MS Sans Serif" color="#000080"> Spherical Harmonics Truncation Order: </font>
+ <input type="text" name="cig_mag_parm_r" value="32" size=4>
+ </td>
+ <td width="60%" style="border-style: groove; border-width: 1px" height="24" bgcolor="#99CCFF">
+ <font face="MS Sans Serif" color="#000080">Longitudinal Symmetry: </font>
+ <input type="text" name="cig_mag_parm_k" value="4" size=2>
+ </td>
+ </tr>
+ </table>
+ <table border="1" cellpadding="0" cellspacing="0" style="border-collapse: collapse; border-width: 2px" bordercolor="#FFFFF0" width="100%" height="54">
+ <tr>
+ <td width="100%" style="border-style: groove; border-width: 1px" height="24" bgcolor="#99CCFF">
+ <font face="MS Sans Serif" color="#000080">Grid site selection: </font>
+ #foreach( $magsite in $cig_mag_site_list )
+ #if( $magsite.equals($cig_mag_site_list.get(0)) )
+ <input type="radio" name="cig_mag_parm_site" value="$magsite" checked> $!magsite
+ #else
+ <input type="radio" name="cig_mag_parm_site" value="$magsite" > $!magsite
+ #end
+ #end
+ </td>
+ </tr>
+ </table>
+ <input type="submit" value="Create" name="actionMethod_doMag_create">
+</form>
+<hr>
+#if( $cig_mag_viz_vieworig )
+<p><b><font color="#000080" face="MS Serif" size="3">Original Input File: </font>
+<a href="$cig_mag_viz_datasetlink" target="new">Download</a>
+</b></p>
+#end
Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/mag-0.vm
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/mag-0.vm 2007-09-25 01:13:18 UTC (rev 8019)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/mag-0.vm 2007-09-25 01:21:03 UTC (rev 8020)
@@ -3,7 +3,7 @@
<hr>
#end
-<p><b><font color="#000080" face="MS Serif" size="4"><u>MAG: A Geodyanmo modeling and analyzing tool </u></font></b></p>
+<p><b><font color="#000080" face="MS Serif" size="4"><u>MAG: A Geodynamo modeling and analyzing tool </u></font></b></p>
<form name="mag0001" method="POST" action="$actionURL">
<input type="hidden" name="cig_mag_job_list" value="$cig_mag_job_list">
@@ -56,30 +56,26 @@
#end
<hr>
<table border="0"><tr>
- <td width="50%" align="left"> <input type="submit" value="Next" name="actionMethod_doMag_submit"> </td>
- <td width="50%" align="right"> <input type="submit" value="Delete" name="actionMethod_doMag_delete"> </td>
+ <td width="50%" align="left"> <input type="submit" value="Run" name="actionMethod_doMag_submit"> </td>
+ <td width="50%" align="right"> <input type="submit" value="Delete Job" name="actionMethod_doMag_delete"> </td>
+ <td width="50%" align="right"> <input type="submit" value="Update Status" name="actionMethod_doMag_return"> </td>
</tr></table>
<p> </p>
<hr>
<p><b><font color="#000080" face="MS Serif" size="3"><u>Create a MAG job:</u></font></b></p>
<table border="1" cellpadding="0" cellspacing="0" style="border-collapse: collapse; border-width: 2px" bordercolor="#FFFFF0" width="100%" height="54">
- <!-- dataset selection -->
+ <!-- dataset selection -->
<tr>
<td width="40%" style="border-style: groove; border-width: 1px" height="24" bgcolor="#99CCFF">
<font face="MS Sans Serif" color="#000080">Select Input File: </font>
- <select name="cig_mag_parm_dataset">
- #foreach( $dataitem in $cig_mag_parm_datalist )
- <option value="$dataitem">$!dataitem</option>
+ <select name="cig_mag_parm_result">
+ #foreach( $resultitem in $cig_mag_parm_resultlist )
+ <option value="$resultitem">$!resultitem</option>
#end
</select>
- <input type="submit" value="View Input File" name="actionMethod_doMag_view_dataset">
+ <input type="submit" value="Download" name="actionMethod_doMag_download_dataset">
</td>
- <td width="60%" style="border-style: groove; border-width: 1px" height="24" bgcolor="#99CCFF">
- <font face="MS Sans Serif" color="#000080">GT method selection: </font>
- <input type="radio" name="cigportal_mag_parm_globus" value="GT2" checked> GT2
- <input type="radio" name="cigportal_mag_parm_globus" value="GT4" > GT4
- </td>
- </tr>
+ </tr>
<tr>
<td width="40%" style="border-style: groove; border-width: 1px" height="24" bgcolor="#99CCFF">
<font face="MS Sans Serif" color="#000080"> Spherical Harmonics Truncation Order: </font>
More information about the cig-commits
mailing list