[cig-commits] r7825 - in
cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal: .
src/org/cig/portal webapp/WEB-INF
wei at geodynamics.org
wei at geodynamics.org
Wed Aug 15 12:50:09 PDT 2007
Author: wei
Date: 2007-08-15 12:50:08 -0700 (Wed, 15 Aug 2007)
New Revision: 7825
Modified:
cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/.classpath
cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TG07.java
cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TG07GT4.java
cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TGHWGT4.java
cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/WEB-INF/portlet.xml
Log:
Minor change int the portlet definition, and more changes in the test scripts.
Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/.classpath
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/.classpath 2007-08-15 17:53:00 UTC (rev 7824)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/.classpath 2007-08-15 19:50:08 UTC (rev 7825)
@@ -7,10 +7,6 @@
<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="/home/wei/workspace/gs3/src/"/>
</attributes>
</classpathentry>
- <classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/simplegrid-common-lib"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/simplegrid-globus-lib"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/simplegrid-jfree-lib"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/simplegrid-viz-lib"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/simplegrid-lib"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TG07.java
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TG07.java 2007-08-15 17:53:00 UTC (rev 7824)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TG07.java 2007-08-15 19:50:08 UTC (rev 7825)
@@ -24,15 +24,16 @@
public static void main(String[] args) throws Exception {
String site = (args.length==0)?"NCSA":args[0];
TG07 test = new TG07();
- String testhome = System.getenv("HOME")+"/cigtg"+"/CigPortal/test2";
- String dataset = System.getenv("HOME")+"/cigtg"+"/CigPortal/cigportal/webapp/storage/samples/par.bnch0";
+ String cigportalhome = System.getenv("HOME")+"/cigtg"+"/CigPortal-svn";
+ String testhome = cigportalhome+"/test2";
+ String dataset = cigportalhome+"/cigportal/webapp/storage/samples/par.bnch0";
System.out.println("-----------------------------------------------------");
System.out.println("SimpleGrid java application workflow for MAG");
System.out.println("-----------------------------------------------------");
System.out.println("Anytime, press Ctrol+C to stop the workflow\n");
// 0. load our configuration
System.out.println("\nStep 0: load our configuration");
- String configPath = System.getenv("HOME")+"/cigtg"+"/CigPortal/cigportal/webapp/cigportal.properties";
+ String configPath = cigportalhome+"/cigportal/webapp/cigportal.properties";
org.cig.portal.util.Config myconfig= new org.cig.portal.util.Config(configPath);
System.out.println("Configuration is loaded from default config file "+configPath+". Please check:");
myconfig.print();
@@ -75,8 +76,8 @@
ft.remote2local(remotefile, testhome+"/.");
// 5. visualize results
- //String s1 = System.getenv("HOME")+"/cigtg"+"/CigPortal/cigportal/webapp/storage/";
- //String s12 = System.getenv("HOME")+"/cigtg"+"/CigPortal/cigportal/webapp/storage/";
+ //String s1 = cigportalhome+"/cigportal/webapp/storage/";
+ //String s12 = cigportalhome+/cigportal/webapp/storage/";
//String s2 = testhome+"/";
//String s3 = "";
//String s4 = testhome+"/result2.jpg";
Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TG07GT4.java
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TG07GT4.java 2007-08-15 17:53:00 UTC (rev 7824)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TG07GT4.java 2007-08-15 19:50:08 UTC (rev 7825)
@@ -24,15 +24,16 @@
public static void main(String[] args) throws Exception {
String site = (args.length==0)?"NCSA":args[0];
TG07GT4 test = new TG07GT4();
- String testhome = System.getenv("HOME")+"/cigtg"+"/CigPortal/test2";
- String dataset = System.getenv("HOME")+"/cigtg"+"/CigPortal/cigportal/webapp/storage/samples/par.bnch0";
+ String cigportalhome = System.getenv("HOME")+"/cigtg"+"/CigPortal-svn";
+ String testhome = cigportalhome+"/test2";
+ String dataset = cigportalhome+"/cigportal/webapp/storage/samples/par.bnch0";
System.out.println("-----------------------------------------------------");
System.out.println("SimpleGrid java application workflow for MAG ");
System.out.println("-----------------------------------------------------");
System.out.println("Anytime, press Ctrol+C to stop the workflow\n");
// 0. load our configuration
System.out.println("\nStep 0: load our configuration");
- String configPath = System.getenv("HOME")+"/cigtg"+"/CigPortal/cigportal/webapp/cigportal.properties";
+ String configPath = cigportalhome+"/cigportal/webapp/cigportal.properties";
org.cig.portal.util.Config myconfig= new org.cig.portal.util.Config(configPath);
System.out.println("Configuration is loaded from default config file "+configPath+". Please check:");
myconfig.print();
@@ -75,8 +76,8 @@
ft.remote2local(remotefile, testhome+"/.");
// 5. visualize results
- //String s1 = System.getenv("HOME")+"/cigtg"+"/CigPortal/cigportal/webapp/storage/";
- //String s12 = System.getenv("HOME")+"/cigtg"+"/CigPortal/cigportal/webapp/storage/";
+ //String s1 = cigportalhome+"/cigportal/webapp/storage/";
+ //String s12 = cigportalhome+"/cigportal/webapp/storage/";
//String s2 = testhome+"/p.sample";
//String s3 = "";
//String s4 = testhome+"/";
Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TGHWGT4.java
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TGHWGT4.java 2007-08-15 17:53:00 UTC (rev 7824)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/src/org/cig/portal/TGHWGT4.java 2007-08-15 19:50:08 UTC (rev 7825)
@@ -57,7 +57,7 @@
// 3. submit job : GT4 method
System.out.println("\nStep 3: submit job to "+site);
- String rsl = SimpleRSL.getRSL_GT4(myconfig, site, 500, 20, "helloworld.sample", "helloworld.result");
+ String rsl = SimpleRSL.getRSL_GT4(myconfig, site, 0, 1, "helloworld.sample", "helloworld.result");
System.out.println("RSL:\n"+rsl);
SimpleRunGT4 sr = new SimpleRunGT4(proxy);
String jobId = sr.execute(myconfig.get("grid.wsgram."+site), rsl);
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-08-15 17:53:00 UTC (rev 7824)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/WEB-INF/portlet.xml 2007-08-15 19:50:08 UTC (rev 7825)
@@ -5,10 +5,10 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
<portlet>
<!-- place portlet description here -->
- <description xml:lang="en">SimpleGrid user portlet</description>
+ <description xml:lang="en">CIG user portlet</description>
<!-- place unique portlet name here -->
- <portlet-name>SimpleGridUserCigportal</portlet-name>
- <display-name xml:lang="en">SimpleGrid user cigportal</display-name>
+ <portlet-name>CIGUserCigportal</portlet-name>
+ <display-name xml:lang="en">CIG user cigportal</display-name>
<!-- place your portlet class name here -->
<portlet-class>org.cig.portal.portlets.UserPortlet</portlet-class>
<expiration-cache>0</expiration-cache>
@@ -19,24 +19,24 @@
<supported-locale>en</supported-locale>
<portlet-info>
<title>CIG Portal User Home</title>
- <short-title>simplegrid-cigportal</short-title>
- <keywords>simplegrid, cigportal, user</keywords>
+ <short-title>cig-cigportal</short-title>
+ <keywords>cig, cigportal, user</keywords>
</portlet-info>
</portlet>
<portlet>
<!-- place portlet description here -->
- <description xml:lang="en">SimpleGrid MAG portlet</description>
+ <description xml:lang="en">CIG MAG portlet</description>
<!-- place unique portlet name here -->
- <portlet-name>SimpleGridMAGCigportal</portlet-name>
- <display-name xml:lang="en">SimpleGrid MAG</display-name>
+ <portlet-name>CIGMAGCigportal</portlet-name>
+ <display-name xml:lang="en">CIG MAG portal</display-name>
<!-- place your portlet class name here -->
<portlet-class>org.cig.portal.portlets.CigMagPortlet</portlet-class>
<expiration-cache>0</expiration-cache>
<supported-locale>en</supported-locale>
<portlet-info>
- <title>CIG Portal for MAG</title>
- <short-title>simplegrid-mag</short-title>
- <keywords>simplegrid, mag</keywords>
+ <title>CIG MAG Portal</title>
+ <short-title>cig-mag</short-title>
+ <keywords>cig, mag</keywords>
</portlet-info>
<init-param>
<name>org.apache.velocity.properties</name>
More information about the cig-commits
mailing list