[cig-commits] r7806 - in
cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal:
portlets util
wei at geodynamics.org
wei at geodynamics.org
Fri Aug 10 17:09:36 PDT 2007
Author: wei
Date: 2007-08-10 17:09:36 -0700 (Fri, 10 Aug 2007)
New Revision: 7806
Modified:
cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/portlets/CigMagPortlet.java
cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/util/MAGPortletConfig.java
cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/util/SimpleGridConstants.java
Log:
Change some portlet attributes, parameters. Keep them consistant through the code.
Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/portlets/CigMagPortlet.java
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/portlets/CigMagPortlet.java 2007-08-10 23:56:37 UTC (rev 7805)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/portlets/CigMagPortlet.java 2007-08-11 00:09:36 UTC (rev 7806)
@@ -6,29 +6,34 @@
package org.cig.portal.portlets;
//JSR-168
-import javax.portlet.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Calendar;
-// GridSphere
-import org.gridsphere.services.core.user.User;
-import org.gridsphere.portlet.impl.SportletProperties;
-// velocity
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+import javax.portlet.PortletSession;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
import org.apache.velocity.context.Context;
-//import org.apache.velocity.VelocityContext;
-import org.ogce.portlets.VelocityPortlet;
-
-import java.util.*;
-import java.io.*;
-import java.text.DateFormat;
-import org.ietf.jgss.GSSCredential;
-
import org.cig.portal.beans.MagjobBean;
+import org.cig.portal.grid.data.SimpleTransferThread;
+import org.cig.portal.grid.job.SimpleRSL;
+import org.cig.portal.grid.job.SimpleRunGT2;
+import org.cig.portal.grid.job.SimpleRunGT4;
+import org.cig.portal.grid.security.SimpleCred;
import org.cig.portal.util.Config;
import org.cig.portal.util.SimpleGridConstants;
-import org.cig.portal.util.MAGPortletConfig;
-import org.cig.portal.grid.data.SimpleTransferThread;
-import org.cig.portal.grid.job.*;
-import org.cig.portal.grid.security.*;
import org.gisolve.demo.app.IDWVizThread;
+import org.gridsphere.portlet.impl.SportletProperties;
+import org.gridsphere.services.core.user.User;
+import org.ietf.jgss.GSSCredential;
+import org.ogce.portlets.VelocityPortlet;
public class CigMagPortlet extends VelocityPortlet {
/* This method is called whenever porlet is loaded */
@@ -207,7 +212,7 @@
mysession.setAttribute(SimpleGridConstants.MagPage + uid, "Main", PortletSession.APPLICATION_SCOPE);
mysession.setAttribute("cigportal_mag_status_info" + uid, job.getDataset() + "(jobId="+job.getId()+"): Job is created. Clieck \"Next\" to transfer dataset to remote site", PortletSession.APPLICATION_SCOPE);
}catch (Exception e) {
- error += "GISolveMagAction::doMag_create: error\n"+e.toString()+"\nBe sure to select required parameters\n";
+ error += "CigPortalMagAction::doMag_create: error\n"+e.toString()+"\nBe sure to select required parameters\n";
}
this.fillTemplate(aContext, req, res, error);
}
@@ -221,7 +226,7 @@
String uid = user.getUserID();
mysession.setAttribute(SimpleGridConstants.MagPage + uid, "Main", PortletSession.APPLICATION_SCOPE);
}catch (Exception e) {
- error += "GISolveMagAction::doMag_return: error\n"+e.toString()+"\n";
+ error += "CigPortalMagAction::doMag_return: error\n"+e.toString()+"\n";
}
this.fillTemplate(aContext, req, res, error);
}
@@ -237,7 +242,7 @@
if (viewdataset.equals("")) viewdataset = null;
mysession.setAttribute("cigportal_mag_viz_vieworig" + uid, viewdataset, PortletSession.APPLICATION_SCOPE);
}catch (Exception e) {
- error += "GISolveMagAction::doMag_view_dataset: error\n"+e.toString() + "\n";
+ error += "CigPortalMagAction::doMag_view_dataset: error\n"+e.toString() + "\n";
}
this.fillTemplate(aContext, req, res, error);
}
@@ -273,7 +278,7 @@
}
}
} catch (Exception e) {
- error += "GISolveMagAction::doMag_delete: error\n"+e.toString() + "\n";
+ error += "CigPortalMagAction::doMag_delete: error\n"+e.toString() + "\n";
if (job != null) job.setStatus("Error");
//req.getPortletSession().setAttribute("cigportal_mag_status_info", e.toString(), PortletSession.APPLICATION_SCOPE);
}
@@ -323,7 +328,7 @@
} else throw new PortletException("Couldn't find this job: " + selectedjobid);
}
}catch (Exception e) {
- error += "GISolveMagAction::doMag_submit: error\n"+e.toString() + "\n";
+ error += "CigPortalMagAction::doMag_submit: error\n"+e.toString() + "\n";
if (job != null) job.setStatus("Error");
//req.getPortletSession().setAttribute("cigportal_mag_status_info", e.toString(), PortletSession.APPLICATION_SCOPE);
}
@@ -569,7 +574,6 @@
* This is where we initialize in-memory storage for cigportal
*/
public void doView(RenderRequest req, RenderResponse res) throws PortletException, java.io.IOException {
- //if (!GISolveConfig.isSetup(request)) GISolveConfig.init(request, response);
PortletSession mysession = req.getPortletSession(true);
User user = (User) req.getAttribute(SportletProperties.PORTLET_USER);
String uid = user.getUserID();
Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/util/MAGPortletConfig.java
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/util/MAGPortletConfig.java 2007-08-10 23:56:37 UTC (rev 7805)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/util/MAGPortletConfig.java 2007-08-11 00:09:36 UTC (rev 7806)
@@ -64,7 +64,7 @@
// mag portlet: mag job list
ArrayList joblist = (ArrayList)mysession.getAttribute(SimpleGridConstants.magJobList + uid, PortletSession.APPLICATION_SCOPE);
if (joblist == null) {
- joblist = new ArrayList<DmsjobBean>();
+ joblist = new ArrayList<MagjobBean>();
mysession.setAttribute(SimpleGridConstants.magJobList + uid, joblist, PortletSession.APPLICATION_SCOPE);
}
// mag portlet: current page name
Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/util/SimpleGridConstants.java
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/util/SimpleGridConstants.java 2007-08-10 23:56:37 UTC (rev 7805)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/util/SimpleGridConstants.java 2007-08-11 00:09:36 UTC (rev 7806)
@@ -13,26 +13,26 @@
public final static String errorInfo = "cig_portal_error_info";
// mag portlet attributes
- public final static String magJobList = "cig_mag_job_list";
- public final static String magJobSid = "cig_mag_cur_sid";
- public final static String magPage = "cig_mag_cur_page";
- public final static String magResultLink = "cig_mag_viz_resultlink";
- public final static String magImageLink = "cig_mag_viz_imagelink";
- public final static String magDatasetLink = "cig_mag_viz_datasetlink";
- public final static String magDatasetImageLink = "cig_mag_viz_datasetimagelink";
- public final static String magStatusInfo = "cig_mag_status_info";
- public final static String magSiteList = "cig_mag_site_list";
- public final static String magParmDatasetList = "cig_mag_parm_datalist";
+ public final static String MagJobList = "cig_mag_job_list";
+ public final static String MagJobSid = "cig_mag_cur_sid";
+ public final static String MagPage = "cig_mag_cur_page";
+ public final static String MagResultLink = "cig_mag_viz_resultlink";
+ public final static String MagImageLink = "cig_mag_viz_imagelink";
+ public final static String MagDatasetLink = "cig_mag_viz_datasetlink";
+ public final static String MagDatasetImageLink = "cig_mag_viz_datasetimagelink";
+ public final static String MagStatusInfo = "cig_mag_status_info";
+ public final static String MagSiteList = "cig_mag_site_list";
+ public final static String MagParmDatasetList = "cig_mag_parm_datalist";
// input parameters
- public static final String magParamDataset = "cig_mag_parm_dataset";
- public static final String magParamK = "cig_mag_parm_k";
- public static final String magParamR = "cig_mag_parm_r";
- public static final String magParamSite = "cig_mag_parm_site";
+ public static final String MagParamDataset = "cig_mag_parm_dataset";
+ public static final String MagParamK = "cig_mag_parm_k";
+ public static final String MagParamR = "cig_mag_parm_r";
+ public static final String MagParamSite = "cig_mag_parm_site";
- public static final String magId = "cig_mag_id";
+ public static final String MagId = "cig_mag_id";
// service instance names
public static final String gridFtpService = "cig_mag_ft_thread";
- public static final String magVizService = "cig_mag_viz_thread";
+ public static final String MagVizService = "cig_mag_viz_thread";
}
More information about the cig-commits
mailing list