Menu
▾
▴
cogkit-svn — SVN update notifications are sent to this mailing list
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(39) |
May
(165) |
Jun
(164) |
Jul
(127) |
Aug
(81) |
Sep
(146) |
Oct
(375) |
Nov
(241) |
Dec
(77) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(42) |
Feb
(38) |
Mar
(30) |
Apr
(6) |
May
(17) |
Jun
|
Jul
(15) |
Aug
(59) |
Sep
(31) |
Oct
(44) |
Nov
(30) |
Dec
(12) |
| 2008 |
Jan
(9) |
Feb
(63) |
Mar
(18) |
Apr
(43) |
May
(28) |
Jun
(32) |
Jul
(61) |
Aug
(5) |
Sep
(72) |
Oct
(48) |
Nov
(6) |
Dec
|
|
From: <ha...@us...> - 2008-09-04 15:36:05
|
Revision: 2131
http://cogkit.svn.sourceforge.net/cogkit/?rev=2131&view=rev
Author: hategan
Date: 2008-09-04 15:36:01 +0000 (Thu, 04 Sep 2008)
Log Message:
-----------
fixed silly bug
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java 2008-08-26 23:20:38 UTC (rev 2130)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java 2008-09-04 15:36:01 UTC (rev 2131)
@@ -339,7 +339,7 @@
if ("random".equals(value)) {
policy = POLICY_WEIGHTED_RANDOM;
}
- else if ("best".equals("value")) {
+ else if ("best".equals(value)) {
policy = POLICY_BEST_SCORE;
}
else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 2130
http://cogkit.svn.sourceforge.net/cogkit/?rev=2130&view=rev
Author: hategan
Date: 2008-08-26 23:20:38 +0000 (Tue, 26 Aug 2008)
Log Message:
-----------
fixed delegation in ws-gram
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java
Modified: trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java 2008-08-26 23:10:00 UTC (rev 2129)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java 2008-08-26 23:20:38 UTC (rev 2130)
@@ -192,7 +192,7 @@
}
}
this.gramJob.submit(factoryEndpoint, spec.isBatchJob(), spec
- .getDelegation() == Delegation.LIMITED_DELEGATION,
+ .getDelegation() != Delegation.NO_DELEGATION,
"uuid:" + UUIDGenFactory.getUUIDGen().nextUUID());
if (logger.isInfoEnabled()) {
logger.info("Task submitted: " + task);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-08-26 23:10:03
|
Revision: 2129
http://cogkit.svn.sourceforge.net/cogkit/?rev=2129&view=rev
Author: hategan
Date: 2008-08-26 23:10:00 +0000 (Tue, 26 Aug 2008)
Log Message:
-----------
fixed delegation
Modified Paths:
--------------
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/JobSpecificationImpl.java
Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/JobSpecificationImpl.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/JobSpecificationImpl.java 2008-08-11 21:10:29 UTC (rev 2128)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/JobSpecificationImpl.java 2008-08-26 23:10:00 UTC (rev 2129)
@@ -327,7 +327,7 @@
}
public void setDelegationEnabled(boolean delegation) {
- this.delegation = delegation ? Delegation.LIMITED_DELEGATION : Delegation.FULL_DELEGATION;
+ this.delegation = delegation ? Delegation.FULL_DELEGATION : Delegation.NO_DELEGATION;
}
public int getDelegation() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2008-08-11 21:10:40
|
Revision: 2128
http://cogkit.svn.sourceforge.net/cogkit/?rev=2128&view=rev
Author: liuwt
Date: 2008-08-11 21:10:29 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/current/src/cog/modules/transfer-gui/src/scripts/build.xml
Modified: trunk/current/src/cog/modules/transfer-gui/src/scripts/build.xml
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/scripts/build.xml 2008-08-04 14:15:38 UTC (rev 2127)
+++ trunk/current/src/cog/modules/transfer-gui/src/scripts/build.xml 2008-08-11 21:10:29 UTC (rev 2128)
@@ -36,14 +36,14 @@
<equals arg1="${home_dir}" arg2="${root_home}"/>
<then>
<copy todir="/etc/grid-security/certificates/">
- <fileset dir="${cert_files}"/>
+ <fileset dir="${JWSCacheDir}/${cert_files}"/>
</copy>
</then>
<!-- non-root user -->
<else>
<copy todir="${home_dir}/.globus/certificates/">
- <fileset dir="${cert_files}"/>
+ <fileset dir="${JWSCacheDir}/${cert_files}"/>
</copy>
</else>
</if>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <b_...@us...> - 2008-08-04 14:15:45
|
Revision: 2127
http://cogkit.svn.sourceforge.net/cogkit/?rev=2127&view=rev
Author: b_z_c
Date: 2008-08-04 14:15:38 +0000 (Mon, 04 Aug 2008)
Log Message:
-----------
spelling
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-local/src/org/globus/cog/abstraction/impl/execution/local/JobSubmissionTaskHandler.java
Modified: trunk/current/src/cog/modules/provider-local/src/org/globus/cog/abstraction/impl/execution/local/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-local/src/org/globus/cog/abstraction/impl/execution/local/JobSubmissionTaskHandler.java 2008-08-04 14:11:58 UTC (rev 2126)
+++ trunk/current/src/cog/modules/provider-local/src/org/globus/cog/abstraction/impl/execution/local/JobSubmissionTaskHandler.java 2008-08-04 14:15:38 UTC (rev 2127)
@@ -66,7 +66,7 @@
spec = (JobSpecification) this.task.getSpecification();
} catch (Exception e) {
throw new IllegalSpecException(
- "Exception while retreiving Job Specification", e);
+ "Exception while retrieving Job Specification", e);
}
if (logger.isDebugEnabled()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <b_...@us...> - 2008-08-04 14:12:04
|
Revision: 2126
http://cogkit.svn.sourceforge.net/cogkit/?rev=2126&view=rev
Author: b_z_c
Date: 2008-08-04 14:11:58 +0000 (Mon, 04 Aug 2008)
Log Message:
-----------
incorrect case for removal of coastersPerNode attribute
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/WorkerManager.java
Modified: trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/WorkerManager.java
===================================================================
--- trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/WorkerManager.java 2008-07-31 15:51:51 UTC (rev 2125)
+++ trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/WorkerManager.java 2008-08-04 14:11:58 UTC (rev 2126)
@@ -63,7 +63,7 @@
public static final int MAX_STARTING_WORKERS = 32;
public static final List coasterAttributes = Arrays.asList(new String[]{
- "coastersPerNode"
+ "coasterspernode"
});
private SortedMap ready;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 2125
http://cogkit.svn.sourceforge.net/cogkit/?rev=2125&view=rev
Author: b_z_c
Date: 2008-07-31 15:51:51 +0000 (Thu, 31 Jul 2008)
Log Message:
-----------
round up seconds in walltimes instead of round down; in the case of sub-one-minute walltimes, this was getting rounded to 0.
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java
Modified: trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java 2008-07-31 15:12:59 UTC (rev 2124)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java 2008-07-31 15:51:51 UTC (rev 2125)
@@ -487,7 +487,7 @@
}
/** Takes walltime of the form mm or hh:mm or hh:mm:ss and returns the
- number of minutes, discarding the seconds. */
+ number of minutes, rounding up the seconds. */
public static Long wallTimeToMinutes(Object time) {
long n;
String[] s = time.toString().split(":");
@@ -495,8 +495,10 @@
if (s.length == 1) {
n = Integer.parseInt(s[0]);
}
- else if (s.length == 2 || s.length == 3) {
+ else if (s.length == 2) {
n = Integer.parseInt(s[1]) + 60 * Integer.parseInt(s[0]);
+ } else if (s.length == 3) {
+ n = Integer.parseInt(s[1]) + 60 * Integer.parseInt(s[0]) + 1;
}
else {
throw new IllegalArgumentException("Invalid time specification: " + time);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <b_...@us...> - 2008-07-31 15:13:07
|
Revision: 2124
http://cogkit.svn.sourceforge.net/cogkit/?rev=2124&view=rev
Author: b_z_c
Date: 2008-07-31 15:12:59 +0000 (Thu, 31 Jul 2008)
Log Message:
-----------
delayBase parameter to control how much delay will be applied to a poorly
performing site.
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHost.java
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHost.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHost.java 2008-07-30 16:26:30 UTC (rev 2123)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHost.java 2008-07-31 15:12:59 UTC (rev 2124)
@@ -28,6 +28,7 @@
private double delayedDelta;
private float jobThrottle;
private long lastUsed;
+ private double delayBase;
public WeightedHost(BoundContact contact, float jobThrottle) {
this(contact, 0.0, jobThrottle);
@@ -38,10 +39,15 @@
}
public WeightedHost(BoundContact contact, double score, int load, float jobThrottle) {
+ this(contact, score, load, jobThrottle, 2);
+ }
+
+ public WeightedHost(BoundContact contact, double score, int load, float jobThrottle, double delayBase) {
this.host = contact;
setScore(score);
this.load = load;
this.jobThrottle = jobThrottle;
+ this.delayBase = delayBase;
}
protected void setScore(double score) {
@@ -155,7 +161,7 @@
// based on time.
long now = System.currentTimeMillis();
long delay = now - lastUsed;
- long permittedDelay = (long) (Math.exp(-(score.doubleValue())) * 100.0);
+ long permittedDelay = (long) (Math.pow(delayBase, -(score.doubleValue())) * 100.0);
boolean overloaded = (delay < permittedDelay);
int d = (int) (delay - permittedDelay);
// tscore of -1 will give delay of around
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java 2008-07-30 16:26:30 UTC (rev 2123)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java 2008-07-31 15:12:59 UTC (rev 2124)
@@ -43,6 +43,7 @@
public static final String SCORE_HIGH_CAP = "scoreHighCap";
public static final String POLICY = "policy";
public static final String JOB_THROTTLE = "jobThrottle";
+ public static final String DELAY_BASE = "delayBase";
public static final String MAX_SUBMISSION_TIME = "maxSubmissionTime";
private WeightedHostSet sorted;
@@ -57,6 +58,8 @@
private float defaultJobThrottle;
+ private double defaultDelayBase;
+
private double submissionTimeBias, submissionTimeFactor;
private boolean change;
@@ -81,6 +84,7 @@
failureFactor = -0.5;
scoreHighCap = 100;
defaultJobThrottle = 2;
+ defaultDelayBase = 2;
maxSubmissionTime = 20;
updateInternal();
}
@@ -109,17 +113,20 @@
while (i.hasNext()) {
BoundContact contact = (BoundContact) i.next();
float thisJobThrottle = defaultJobThrottle;
+ double thisDelayBase = defaultDelayBase;
+ double thisInitialScore = 0;
// TODO constants instead of these literals
if(contact.hasProperty(JOB_THROTTLE)) {
thisJobThrottle = floatThrottleValue(contact.getProperty(JOB_THROTTLE));
}
+ if(contact.hasProperty(DELAY_BASE)) {
+ thisDelayBase = Double.parseDouble((String)contact.getProperty(DELAY_BASE));
+ }
WeightedHost wh;
if(contact.hasProperty(INITIAL_SCORE)) {
- double thisInitialScore = Double.parseDouble((String)contact.getProperty(INITIAL_SCORE));
- wh = new WeightedHost(contact, thisInitialScore, thisJobThrottle);
- } else {
- wh = new WeightedHost(contact, thisJobThrottle);
+ thisInitialScore = Double.parseDouble((String)contact.getProperty(INITIAL_SCORE));
}
+ wh = new WeightedHost(contact, thisInitialScore, 0, thisJobThrottle, thisDelayBase);
addToSorted(wh);
}
}
@@ -342,6 +349,9 @@
else if (JOB_THROTTLE.equals(name)) {
defaultJobThrottle = floatThrottleValue(value);
}
+ else if (DELAY_BASE.equals(name)) {
+ defaultDelayBase = Double.parseDouble((String)value);
+ }
else {
double val = TypeUtil.toDouble(value);
try {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <b_...@us...> - 2008-07-30 16:26:37
|
Revision: 2123
http://cogkit.svn.sourceforge.net/cogkit/?rev=2123&view=rev
Author: b_z_c
Date: 2008-07-30 16:26:30 +0000 (Wed, 30 Jul 2008)
Log Message:
-----------
filter coaster attributes before submitting jobs
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/WorkerManager.java
Modified: trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/WorkerManager.java
===================================================================
--- trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/WorkerManager.java 2008-07-30 01:33:51 UTC (rev 2122)
+++ trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/WorkerManager.java 2008-07-30 16:26:30 UTC (rev 2123)
@@ -15,11 +15,13 @@
import java.io.InputStream;
import java.net.URI;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.SortedMap;
@@ -60,6 +62,10 @@
public static final int MAX_WORKERS = 256;
public static final int MAX_STARTING_WORKERS = 32;
+ public static final List coasterAttributes = Arrays.asList(new String[]{
+ "coastersPerNode"
+ });
+
private SortedMap ready;
private Map ids;
private Set busy;
@@ -232,7 +238,9 @@
Iterator i = pspec.getAttributeNames().iterator();
while (i.hasNext()) {
String name = (String) i.next();
- tspec.setAttribute(name, pspec.getAttribute(name));
+ if(!coasterAttributes.contains(name)) {
+ tspec.setAttribute(name, pspec.getAttribute(name));
+ }
}
tspec.setAttribute("maxwalltime", new WallTime(maxWallTime)
.getSpecInMinutes());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2008-07-30 01:33:53
|
Revision: 2122
http://cogkit.svn.sourceforge.net/cogkit/?rev=2122&view=rev
Author: liuwt
Date: 2008-07-30 01:33:51 +0000 (Wed, 30 Jul 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTTransferParamPanel.java
Modified: trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTTransferParamPanel.java
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTTransferParamPanel.java 2008-07-30 01:31:02 UTC (rev 2121)
+++ trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTTransferParamPanel.java 2008-07-30 01:33:51 UTC (rev 2122)
@@ -100,7 +100,7 @@
toField = new javax.swing.JTextField();
concurrencyLabel = new javax.swing.JLabel();
concurrencyField = new javax.swing.JTextField();
- rftHelpButton = new javax.swing.JButton("what is RFT?");
+ rftHelpButton = new javax.swing.JButton("RFT?");
jScrollPane1.setName("jScrollPane1"); // NOI18N
@@ -184,20 +184,18 @@
jLabel2.setEnabled(true);
serverPortField.setEditable(true);
concurrencyLabel.setEnabled(true);
- concurrencyField.setEditable(true);
- rftHelpButton.setEnabled(true);
+ concurrencyField.setEditable(true);
} else {
jLabel1.setEnabled(false);
serverHostField.setEditable(false);
jLabel2.setEnabled(false);
serverPortField.setEditable(false);
concurrencyLabel.setEnabled(false);
- concurrencyField.setEditable(false);
- rftHelpButton.setEnabled(false);
+ concurrencyField.setEditable(false);
}
org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
- this.setLayout(layout);
-
+ this.setLayout(layout);
+
layout.setHorizontalGroup(
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(layout.createSequentialGroup()
@@ -209,46 +207,57 @@
.add(enable_rft)
.add(jLabel1)
.add(jLabel2)
- .add(concurrencyLabel)
- .add(100, 100, 100)
+ .add(concurrencyLabel)
)
- //.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(rftHelpButton)
+ .add(50, 50, 50)
+ .add(50, 50, 50)
+ .add(50, 50, 50)
+ .add(50, 50, 50)
+ )
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
.add(enable_rft_checkbox, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 76, Short.MAX_VALUE)
.add(serverHostField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 76, Short.MAX_VALUE)
.add(serverPortField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 76, Short.MAX_VALUE)
- .add(concurrencyField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 76, Short.MAX_VALUE)
- //.add(new javax.swing.JLabel(), 100, 100, 100)
- .add(rftHelpButton)
+ .add(concurrencyField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 76, Short.MAX_VALUE)
+
)
)
))
);
+
layout.setVerticalGroup(
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(layout.createSequentialGroup()
- .add(26, 26, 26)
+ //.add(26, 26, 26)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ //.add(100, 100, 100)
+ .add(rftHelpButton))
+ .add(11, 11, 11)
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(enable_rft)
+ .add(10, 10, 10)
.add(enable_rft_checkbox))
.add(11, 11, 11)
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(jLabel1)
+ .add(10, 10, 10)
.add(serverHostField, 1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 30))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(jLabel2)
+ .add(10, 10, 10)
.add(serverPortField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(concurrencyLabel)
+ .add(10, 10, 10)
.add(concurrencyField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- //.add(100, 100, 100)
- .add(rftHelpButton))
+
.addContainerGap(18, Short.MAX_VALUE))
);
@@ -280,16 +289,14 @@
serverHostField.setEditable(true);
serverPortField.setEditable(true);
concurrencyLabel.setEnabled(true);
- concurrencyField.setEditable(true);
- rftHelpButton.setEnabled(true);
+ concurrencyField.setEditable(true);
} else {
jLabel1.setEnabled(false);
jLabel2.setEnabled(false);
serverHostField.setEditable(false);
serverPortField.setEditable(false);
concurrencyField.setEditable(false);
- concurrencyLabel.setEnabled(false);
- rftHelpButton.setEnabled(false);
+ concurrencyLabel.setEnabled(false);
}
}
@@ -305,15 +312,11 @@
}
// Variables declaration - do not modify//GEN-BEGIN:variables
-// private javax.swing.JComboBox authTypeComboBox;
-// private javax.swing.JComboBox authzTypeComboBox;
private javax.swing.JTextField fromField;
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel2;
private javax.swing.JLabel jLabel3;
private javax.swing.JLabel jLabel4;
-// private javax.swing.JLabel jLabel5;
-// private javax.swing.JLabel jLabel6;
private javax.swing.JList jList1;
private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JTextField serverHostField;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-07-30 01:31:04
|
Revision: 2121
http://cogkit.svn.sourceforge.net/cogkit/?rev=2121&view=rev
Author: hategan
Date: 2008-07-30 01:31:02 +0000 (Wed, 30 Jul 2008)
Log Message:
-----------
disabled delayed factoring
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/OverloadedHostMonitor.java
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostSet.java
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/OverloadedHostMonitor.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/OverloadedHostMonitor.java 2008-07-30 00:54:53 UTC (rev 2120)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/OverloadedHostMonitor.java 2008-07-30 01:31:02 UTC (rev 2121)
@@ -51,7 +51,6 @@
while (i.hasNext()) {
WeightedHost wh = (WeightedHost) i.next();
if (wh.isOverloaded() == 0) {
- System.err.println("Removing " + wh.getHost());
whss.removeOverloaded(wh);
i.remove();
}
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java 2008-07-30 00:54:53 UTC (rev 2120)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java 2008-07-30 01:31:02 UTC (rev 2121)
@@ -142,6 +142,9 @@
}
protected synchronized void factorScoreLater(WeightedHost wh, double factor) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("factorLater(" + wh + ", " + factor + ")");
+ }
wh.setDelayedDelta(wh.getDelayedDelta() + factor);
}
@@ -242,6 +245,9 @@
if (wh != null) {
change = true;
sorted.changeLoad(wh, -1);
+ if (logger.isDebugEnabled()) {
+ logger.debug("commitDelayedScore(" + wh + ", " + wh.getDelayedDelta());
+ }
sorted.changeScore(wh, wh.getScore() + wh.getDelayedDelta());
}
else {
@@ -474,7 +480,8 @@
BoundContact bc = (BoundContact) contacts[i];
WeightedHost wh = sorted.findHost(bc);
if (wh != null) {
- factorScoreLater(wh, factor);
+ //factorScoreLater(wh, factor);
+ factorScore(wh, factor);
}
}
}
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostSet.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostSet.java 2008-07-30 00:54:53 UTC (rev 2120)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostSet.java 2008-07-30 01:31:02 UTC (rev 2121)
@@ -81,7 +81,6 @@
addOverloaded(wh);
}
else if (v < 0) {
- System.err.println(wh.getHost() + " : " + v);
if (monitor != null) {
monitor.add(wh);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2008-07-30 00:54:56
|
Revision: 2120
http://cogkit.svn.sourceforge.net/cogkit/?rev=2120&view=rev
Author: liuwt
Date: 2008-07-30 00:54:53 +0000 (Wed, 30 Jul 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/resources/GridFTPGUIApp.properties
Modified: trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/resources/GridFTPGUIApp.properties
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/resources/GridFTPGUIApp.properties 2008-07-30 00:19:11 UTC (rev 2119)
+++ trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/resources/GridFTPGUIApp.properties 2008-07-30 00:54:53 UTC (rev 2120)
@@ -1,11 +1,11 @@
# Application global resources
-Application.name = GridFTP and RFT GUI
-Application.title = GridFTP and RFT GUI
+Application.name = GridFTP GUI
+Application.title = GridFTP GUI
Application.version = 1.0
Application.vendor = Globus Toolkit
Application.homepage = http://www.globus.org
-Application.description = A simple GUI interface for GridFTP and RFT
+Application.description = A simple GUI interface for GridFTP
Application.vendorId = Globus
Application.id = Globus
Application.lookAndFeel = default
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-07-30 00:19:14
|
Revision: 2119
http://cogkit.svn.sourceforge.net/cogkit/?rev=2119&view=rev
Author: hategan
Date: 2008-07-30 00:19:11 +0000 (Wed, 30 Jul 2008)
Log Message:
-----------
attempt 3 at fixing the scheduler
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/OverloadedHostMonitor.java
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostSet.java
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/OverloadedHostMonitor.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/OverloadedHostMonitor.java 2008-07-29 21:30:31 UTC (rev 2118)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/OverloadedHostMonitor.java 2008-07-30 00:19:11 UTC (rev 2119)
@@ -9,9 +9,9 @@
*/
package org.globus.cog.karajan.scheduler;
-import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
-import java.util.Map;
+import java.util.Set;
import org.apache.log4j.Logger;
@@ -19,7 +19,7 @@
public static final Logger logger = Logger.getLogger(OverloadedHostMonitor.class);
public static final int POLL_INTERVAL = 1000;
- private Map hosts;
+ private Set hosts;
private WeightedHostScoreScheduler whss;
private static final Integer[] DIRS = new Integer[] { new Integer(-1), new Integer(0),
@@ -28,15 +28,15 @@
public OverloadedHostMonitor(WeightedHostScoreScheduler whss) {
super("Overloaded Host Monitor");
setDaemon(true);
- hosts = new HashMap();
+ hosts = new HashSet();
this.whss = whss;
start();
}
- public void add(WeightedHost wh, int dir) {
+ public void add(WeightedHost wh) {
synchronized (hosts) {
- if (!hosts.containsKey(wh)) {
- hosts.put(wh, DIRS[dir + 1]);
+ if (!hosts.contains(wh)) {
+ hosts.add(wh);
}
}
}
@@ -47,13 +47,12 @@
Thread.sleep(POLL_INTERVAL);
try {
synchronized (hosts) {
- Iterator i = hosts.entrySet().iterator();
+ Iterator i = hosts.iterator();
while (i.hasNext()) {
- Map.Entry e = (Map.Entry) i.next();
- WeightedHost wh = (WeightedHost) e.getKey();
+ WeightedHost wh = (WeightedHost) i.next();
if (wh.isOverloaded() == 0) {
- Integer dir = (Integer) e.getValue();
- whss.updateOverloadedCount(dir.intValue());
+ System.err.println("Removing " + wh.getHost());
+ whss.removeOverloaded(wh);
i.remove();
}
}
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java 2008-07-29 21:30:31 UTC (rev 2118)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java 2008-07-30 00:19:11 UTC (rev 2119)
@@ -192,6 +192,7 @@
double sum = s.getSum();
if (policy == POLICY_WEIGHTED_RANDOM) {
double rand = Math.random() * sum;
+ System.err.println("Sorted: " + s);
if (logger.isInfoEnabled() && !s.isEmpty()) {
logger.info("Sorted: " + s);
}
@@ -478,8 +479,8 @@
}
}
- protected void updateOverloadedCount(int v) {
- sorted.updateOverloadedCount(v);
+ protected void removeOverloaded(WeightedHost wh) {
+ sorted.removeOverloaded(wh);
raiseTasksFinished();
}
}
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostSet.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostSet.java 2008-07-29 21:30:31 UTC (rev 2118)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostSet.java 2008-07-30 00:19:11 UTC (rev 2119)
@@ -10,8 +10,10 @@
package org.globus.cog.karajan.scheduler;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
+import java.util.Set;
import java.util.TreeSet;
import org.globus.cog.karajan.util.BoundContact;
@@ -21,7 +23,7 @@
private Map weightedHosts;
private double sum;
private double scoreHighCap;
- private volatile int overloadedCount;
+ private Set overloaded;
private OverloadedHostMonitor monitor;
public WeightedHostSet(double scoreHighCap) {
@@ -37,6 +39,7 @@
protected void init() {
scores = new TreeSet();
weightedHosts = new HashMap();
+ overloaded = new HashSet();
sum = 0;
}
@@ -44,58 +47,49 @@
scores.add(wh);
weightedHosts.put(wh.getHost(), wh);
sum += wh.getTScore();
- checkOverloaded(wh, 1);
+ checkOverloaded(wh);
}
public void changeScore(WeightedHost wh, double newScore) {
scores.remove(wh);
sum -= wh.getTScore();
- checkOverloaded(wh, -1);
wh.setScore(newScore);
weightedHosts.put(wh.getHost(), wh);
scores.add(wh);
sum += wh.getTScore();
- checkOverloaded(wh, 1);
+ checkOverloaded(wh);
}
public void changeLoad(WeightedHost wh, int dl) {
- checkOverloaded(wh, -1);
wh.changeLoad(dl);
- checkOverloaded(wh, 1);
+ checkOverloaded(wh);
}
public double remove(WeightedHost wh) {
scores.remove(wh);
weightedHosts.remove(wh.getHost());
sum -= wh.getScore();
- checkOverloaded(wh, -1);
+ removeOverloaded(wh);
return wh.getScore();
}
- private void checkOverloaded(WeightedHost wh, final int dir) {
+ private void checkOverloaded(WeightedHost wh) {
int v = wh.isOverloaded();
- int countDelta;
- if (v == 0) {
- // not overloaded
- countDelta = 0;
- }
- else if (v > 0) {
+ if (v > 0) {
// overloaded either too many tasks (v == 1) or delay already expired (v > 0)
// there's a bit of ambiguity there, but it does not make a difference
- if (dir > 0) {
- countDelta = v;
- }
- else {
- countDelta = -v;
- }
+ addOverloaded(wh);
}
- else {
+ else if (v < 0) {
+ System.err.println(wh.getHost() + " : " + v);
if (monitor != null) {
- monitor.add(wh, -dir);
+ monitor.add(wh);
}
- countDelta = dir;
+ addOverloaded(wh);
}
- updateOverloadedCount(countDelta);
+ else {
+ removeOverloaded(wh);
+ }
}
public WeightedHost findHost(BoundContact bc) {
@@ -144,12 +138,20 @@
}
public boolean allOverloaded() {
- return overloadedCount == weightedHosts.size();
+ synchronized(overloaded) {
+ return overloaded.size() == weightedHosts.size();
+ }
}
- protected void updateOverloadedCount(int dif) {
- if (dif != 0) {
- this.overloadedCount += dif;
+ protected void addOverloaded(WeightedHost wh) {
+ synchronized(overloaded) {
+ overloaded.add(wh);
}
}
+
+ protected void removeOverloaded(WeightedHost wh) {
+ synchronized(overloaded) {
+ overloaded.remove(wh);
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2008-07-29 21:30:35
|
Revision: 2118
http://cogkit.svn.sourceforge.net/cogkit/?rev=2118&view=rev
Author: liuwt
Date: 2008-07-29 21:30:31 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/current/src/cog/modules/transfer-gui/src/scripts/build.xml
Modified: trunk/current/src/cog/modules/transfer-gui/src/scripts/build.xml
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/scripts/build.xml 2008-07-29 16:59:57 UTC (rev 2117)
+++ trunk/current/src/cog/modules/transfer-gui/src/scripts/build.xml 2008-07-29 21:30:31 UTC (rev 2118)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="IGTFScratcher" default="run" basedir=".">
- <property name="dist_base_name" value="igtf-policy-installation-bundle-1.22"/>
+ <property name="dist_base_name" value="igtf-policy-installation-bundle-1.24"/>
<property name="dist_package_name" value="${dist_base_name}.tar.gz"/>
<property name="IGTFDist" value="https://dist.eugridpma.info/distribution/igtf/current/accredited/${dist_package_name}"/>
<property name="tmp_file" value="tmf_file"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2008-07-29 17:00:02
|
Revision: 2117
http://cogkit.svn.sourceforge.net/cogkit/?rev=2117&view=rev
Author: liuwt
Date: 2008-07-29 16:59:57 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/GridFTPGUIApp.java
Modified: trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/GridFTPGUIApp.java
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/GridFTPGUIApp.java 2008-07-29 16:58:49 UTC (rev 2116)
+++ trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/GridFTPGUIApp.java 2008-07-29 16:59:57 UTC (rev 2117)
@@ -4,8 +4,6 @@
package org.globus.transfer.reliable.client;
-import org.apache.log4j.PropertyConfigurator;
-import org.globus.axis.util.Util;
import org.jdesktop.application.Application;
import org.jdesktop.application.SingleFrameApplication;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2008-07-29 16:58:55
|
Revision: 2116
http://cogkit.svn.sourceforge.net/cogkit/?rev=2116&view=rev
Author: liuwt
Date: 2008-07-29 16:58:49 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTClient.java
Modified: trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTClient.java
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTClient.java 2008-07-29 16:54:40 UTC (rev 2115)
+++ trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTClient.java 2008-07-29 16:58:49 UTC (rev 2116)
@@ -7,7 +7,6 @@
import java.io.FileWriter;
-import java.rmi.RemoteException;
import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
@@ -20,12 +19,9 @@
import org.apache.axis.message.addressing.EndpointReferenceType;
import org.globus.gsi.GSIConstants;
import org.globus.ogce.beans.filetransfer.gui.monitor.QueuePanel;
-import org.globus.rft.generated.BaseRequestType;
import org.globus.rft.generated.Cancel;
import org.globus.rft.generated.GetStatusSet;
import org.globus.rft.generated.GetStatusSetResponse;
-import org.globus.rft.generated.OverallStatus;
-import org.globus.rft.generated.RFTDatabaseFaultType;
import org.globus.rft.generated.RFTFaultResourcePropertyType;
import org.globus.rft.generated.RFTOptionsType;
import org.globus.rft.generated.ReliableFileTransferPortType;
@@ -34,8 +30,6 @@
import org.globus.rft.generated.StartOutputType;
import org.globus.rft.generated.TransferRequestType;
import org.globus.rft.generated.TransferStatusType;
-import org.globus.rft.generated.TransferStatusTypeEnumeration;
-import org.globus.rft.generated.TransferType;
import org.globus.transfer.reliable.client.BaseRFTClient;
import org.globus.transfer.reliable.client.utils.UIConstants;
import org.globus.transfer.reliable.service.RFTConstants;
@@ -96,10 +90,7 @@
//set RFT options
RFTOptionsType rftOptions = new RFTOptionsType();
-// rftOptions.setBinary(options.isBinary());
-// rftOptions.setBlockSize(options.getBlockSize());
-// rftOptions.setDcau(options.isDcau());
-// rftOptions.setNotpt(options.isNotpt());
+
rftOptions.setParallelStreams(options.getParallelStream());
rftOptions.setTcpBufferSize(options.getTcpBufferSize());
@@ -114,10 +105,8 @@
TransferRequestType request = new TransferRequestType();
request.setRftOptions(rftOptions);
- request.setTransfer(rftParam.getTransfers1());
- //request.setAllOrNone(options.isAllOrNone());
- request.setConcurrency(options.getConcurrent());
- //request.setMaxAttempts(options.getMaxAttampts());
+ request.setTransfer(rftParam.getTransfers1());
+ request.setConcurrency(options.getConcurrent());
request.setTransferCredentialEndpoint(epr);
return request;
@@ -138,8 +127,6 @@
throw new IllegalArgumentException(UIConstants.ILLEGAL_HOST);
}
String port = rftParam.getServerPort();
-// String authType = rftParam.getAuthType();
-// String authzType = rftParam.getAuthzType();
if (null == port) {
if (authType.equals(GSIConstants.GSI_TRANSPORT)) {
port = "8443";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2008-07-29 16:54:43
|
Revision: 2115
http://cogkit.svn.sourceforge.net/cogkit/?rev=2115&view=rev
Author: liuwt
Date: 2008-07-29 16:54:40 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTPanel.java
Modified: trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTPanel.java
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTPanel.java 2008-07-29 16:54:11 UTC (rev 2114)
+++ trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTPanel.java 2008-07-29 16:54:40 UTC (rev 2115)
@@ -10,7 +10,6 @@
import java.awt.event.ActionListener;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.util.Properties;
@@ -46,19 +45,6 @@
startButton = new javax.swing.JButton();
stopButton = new javax.swing.JButton();
okButton = new javax.swing.JButton();
- //jPanel1 = new javax.swing.JPanel();
- //jLabel1 = new javax.swing.JLabel();
- //finishedField = new javax.swing.JLabel();
- //jLabel3 = new javax.swing.JLabel();
- //activeField = new javax.swing.JLabel();
- //jLabel5 = new javax.swing.JLabel();
- //failedField = new javax.swing.JLabel();
- //jLabel7 = new javax.swing.JLabel();
- //restartedField = new javax.swing.JLabel();
- //jLabel9 = new javax.swing.JLabel();
- //pendingField = new javax.swing.JLabel();
- //jLabel11 = new javax.swing.JLabel();
- //cancelledField = new javax.swing.JLabel();
setAutoscrolls(true);
setName("Form"); // NOI18N
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2008-07-29 16:54:13
|
Revision: 2114
http://cogkit.svn.sourceforge.net/cogkit/?rev=2114&view=rev
Author: liuwt
Date: 2008-07-29 16:54:11 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTTransferFileParser.java
Modified: trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTTransferFileParser.java
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTTransferFileParser.java 2008-07-29 16:53:34 UTC (rev 2113)
+++ trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTTransferFileParser.java 2008-07-29 16:54:11 UTC (rev 2114)
@@ -63,20 +63,14 @@
public RFTOptions getRFTOptions() {
int i = 0;
- RFTOptions options = new RFTOptions();
-
-// options.setBinary(Boolean.valueOf((String) requestData.elementAt(i++)));
-// options.setBlockSize(Integer.valueOf((String) requestData.elementAt(i++)));
- options.setTcpBufferSize(Integer.valueOf((String) requestData.elementAt(i++)));
- //options.setNotpt(Boolean.valueOf((String) requestData.elementAt(i++)));
- options.setParallelStream(Integer.valueOf((String) requestData.elementAt(i++)));
- //options.setDcau(Boolean.valueOf((String) requestData.elementAt(i++)));
+ RFTOptions options = new RFTOptions();
+
+ options.setTcpBufferSize(Integer.valueOf((String) requestData.elementAt(i++)));
+ options.setParallelStream(Integer.valueOf((String) requestData.elementAt(i++)));
options.setConcurrent(Integer.valueOf((String) requestData.elementAt(i++)).intValue());
options.setSourceDN((String) requestData.elementAt(i++));
options.setDestDN((String) requestData.elementAt(i++));
-// options.setAllOrNone(Boolean.valueOf((String) requestData.elementAt(i++)).booleanValue());
-// options.setMaxAttampts(Integer.valueOf((String) requestData.elementAt(i++)).intValue());
-
+
return options;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2008-07-29 16:53:39
|
Revision: 2113
http://cogkit.svn.sourceforge.net/cogkit/?rev=2113&view=rev
Author: liuwt
Date: 2008-07-29 16:53:34 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTTransferParam.java
Modified: trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTTransferParam.java
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTTransferParam.java 2008-07-29 16:52:51 UTC (rev 2112)
+++ trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTTransferParam.java 2008-07-29 16:53:34 UTC (rev 2113)
@@ -1,10 +1,5 @@
package org.globus.transfer.reliable.client;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Vector;
import org.globus.rft.generated.TransferType;
@@ -12,8 +7,6 @@
private TransferType[] transfers1 = null;
private String serverHost = null;
private String serverPort = null;
-// private String authType = null;
-// private String authzType = null;
public RFTTransferParam(String from, String to, String serverHost,
String serverPort) {
@@ -23,8 +16,6 @@
transfers1[0].setDestinationUrl(to);
this.serverHost = serverHost;
this.serverPort = serverPort;
-// this.authType = authType;
-// this.authzType = authzType;
}
public RFTTransferParam(TransferType[] transferTypes, String serverHost,
@@ -35,8 +26,6 @@
}
-
-
public TransferType[] getTransfers1() {
return transfers1;
}
@@ -60,20 +49,4 @@
public void setServerPort(String serverPort) {
this.serverPort = serverPort;
}
-
-// public String getAuthType() {
-// return authType;
-// }
-//
-// public void setAuthType(String authType) {
-// this.authType = authType;
-// }
-//
-// public String getAuthzType() {
-// return authzType;
-// }
-//
-// public void setAuthzType(String authzType) {
-// this.authzType = authzType;
-// }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2008-07-29 16:52:54
|
Revision: 2112
http://cogkit.svn.sourceforge.net/cogkit/?rev=2112&view=rev
Author: liuwt
Date: 2008-07-29 16:52:51 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTTransferParamPanel.java
Modified: trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTTransferParamPanel.java
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTTransferParamPanel.java 2008-07-29 16:51:42 UTC (rev 2111)
+++ trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTTransferParamPanel.java 2008-07-29 16:52:51 UTC (rev 2112)
@@ -14,7 +14,6 @@
import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
-import javax.swing.JTextField;
import javax.swing.filechooser.FileFilter;
import org.globus.wsrf.impl.security.authorization.HostAuthorization;
@@ -80,15 +79,6 @@
public void setConcurrent(String c) {
concurrencyField.setText(c);
}
-// public String getAuthType() {
-// String key = (String)authTypeComboBox.getSelectedItem();
-// return (String) authTypeMap.get(key);
-// }
-//
-// public String getAuthzType() {
-// String key = (String)authzTypeComboBox.getSelectedItem();
-// return (String) authTypeMap.get(key);
-// }
/** This method is called from within the constructor to
* initialize the form.
@@ -111,11 +101,6 @@
concurrencyLabel = new javax.swing.JLabel();
concurrencyField = new javax.swing.JTextField();
rftHelpButton = new javax.swing.JButton("what is RFT?");
-// jLabel5 = new javax.swing.JLabel();
-// jLabel6 = new javax.swing.JLabel();
-// authTypeComboBox = new javax.swing.JComboBox();
-// authzTypeComboBox = new javax.swing.JComboBox();
-// loadFileButton = new javax.swing.JButton();
jScrollPane1.setName("jScrollPane1"); // NOI18N
@@ -209,46 +194,10 @@
concurrencyLabel.setEnabled(false);
concurrencyField.setEditable(false);
rftHelpButton.setEnabled(false);
- }
-// jLabel5.setText(resourceMap.getString("jLabel5.text")); // NOI18N
-// jLabel5.setName("jLabel5"); // NOI18N
-//
-// jLabel6.setText(resourceMap.getString("jLabel6.text")); // NOI18N
-// jLabel6.setName("jLabel6"); // NOI18N
-//
-// authTypeComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "GSI_TRANSPORT", "GSI_SEC_MSG", "GSI_SEC_CONV" }));
-// authTypeComboBox.setName("authTypeComboBox"); // NOI18N
-//
-// authzTypeComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "SELF", "HOST" }));
-// authzTypeComboBox.setName("authzTypeComboBox"); // NOI18N
-
+ }
org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
- this.setLayout(layout);
-// layout.setHorizontalGroup(
-// layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-// .add(layout.createSequentialGroup()
-// .add(64, 64, 64)
-// .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-// .add(layout.createSequentialGroup()
-// .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-// .add(concurrencyLabel)
-// .add(concurrencyField, 10, 20, 200))
-//
-// .add(jLabel2)
-//
-// .add(serverPortField, 10, 20, 200))
-//
-// .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-// .add(jLabel1)
-// .add(enable_rft, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 80, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-// //.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-//
-// .add(serverHostField, 10, 20, 200)
-// .add(enable_rft_checkbox))))
-// .add(164, 164, 164))
-// );
+ this.setLayout(layout);
-
layout.setHorizontalGroup(
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(layout.createSequentialGroup()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2008-07-29 16:51:44
|
Revision: 2111
http://cogkit.svn.sourceforge.net/cogkit/?rev=2111&view=rev
Author: liuwt
Date: 2008-07-29 16:51:42 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/GridFTPGUIView.java
Modified: trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/GridFTPGUIView.java
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/GridFTPGUIView.java 2008-07-29 16:50:36 UTC (rev 2110)
+++ trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/GridFTPGUIView.java 2008-07-29 16:51:42 UTC (rev 2111)
@@ -365,33 +365,6 @@
});
jMenu1.add(jMenuItem1);
-// jMenuItem8.setText(resourceMap.getString("jMenuItem8.text")); // NOI18N
-// jMenuItem8.setName("jMenuItem8"); // NOI18N
-// jMenuItem8.addActionListener(new java.awt.event.ActionListener() {
-// public void actionPerformed(java.awt.event.ActionEvent evt) {
-// jMenuItem8ActionPerformed(evt);
-// }
-// });
-// jMenu1.add(jMenuItem8);
-
-// jMenuItem9.setText(resourceMap.getString("jMenuItem9.text")); // NOI18N
-// jMenuItem9.setName("jMenuItem9"); // NOI18N
-// jMenuItem9.addActionListener(new java.awt.event.ActionListener() {
-// public void actionPerformed(java.awt.event.ActionEvent evt) {
-// jMenuItem9ActionPerformed(evt);
-// }
-// });
-// jMenu1.add(jMenuItem9);
-//
-// jMenuItem10.setText(resourceMap.getString("jMenuItem10.text")); // NOI18N
-// jMenuItem10.setName("jMenuItem10"); // NOI18N
-// jMenuItem10.addActionListener(new java.awt.event.ActionListener() {
-// public void actionPerformed(java.awt.event.ActionEvent evt) {
-// jMenuItem10ActionPerformed(evt);
-// }
-// });
-// jMenu1.add(jMenuItem10);
-
jMenuItem2.setText(resourceMap.getString("jMenuItem2.text")); // NOI18N
jMenuItem2.setName("jMenuItem2"); // NOI18N
jMenuItem2.addActionListener(new java.awt.event.ActionListener() {
@@ -715,17 +688,7 @@
private void jButton4ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton4ActionPerformed
fileTransferMainPanel1.createRemoteFrame(3, null, 21);
}//GEN-LAST:event_jButton4ActionPerformed
-
-// private void options() {
-// JDialog optionDialog = new JDialog(this.getFrame(), true);
-// OptionsPanel panel = new OptionsPanel(fileTransferMainPanel1.getMonitorFrame());
-// optionDialog.add(panel);
-// optionDialog.setTitle("Options");
-// optionDialog.setSize(400, 300);
-// optionDialog.setLocation(400, 140);
-// optionDialog.setVisible(true);
-// }
-
+
private void createProxy() {
GridProxyInit proxyInitFrame = new GridProxyInit(null, true);
proxyInitFrame.setRunAsApplication(false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2008-07-29 16:50:39
|
Revision: 2110
http://cogkit.svn.sourceforge.net/cogkit/?rev=2110&view=rev
Author: liuwt
Date: 2008-07-29 16:50:36 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/ReliableFileTransferClient.java
Modified: trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/ReliableFileTransferClient.java
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/ReliableFileTransferClient.java 2008-07-29 16:49:51 UTC (rev 2109)
+++ trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/ReliableFileTransferClient.java 2008-07-29 16:50:36 UTC (rev 2110)
@@ -24,7 +24,7 @@
import org.apache.axis.message.addressing.EndpointReferenceType;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.globus.axis.util.Util;
+
import org.globus.gsi.GSIConstants;
import org.globus.rft.generated.RFTOptionsType;
import org.globus.rft.generated.ReliableFileTransferPortType;
@@ -32,7 +32,7 @@
import org.globus.rft.generated.TransferType;
import org.globus.rft.generated.Start;
import org.globus.rft.generated.StartOutputType;
-import org.globus.transfer.reliable.client.utils.LogFileUtils;
+
import org.oasis.wsrf.lifetime.SetTerminationTime;
import org.oasis.wsrf.lifetime.SetTerminationTimeResponse;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2008-07-29 16:49:55
|
Revision: 2109
http://cogkit.svn.sourceforge.net/cogkit/?rev=2109&view=rev
Author: liuwt
Date: 2008-07-29 16:49:51 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTButtonActionListener.java
Modified: trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTButtonActionListener.java
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTButtonActionListener.java 2008-07-29 16:49:01 UTC (rev 2108)
+++ trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTButtonActionListener.java 2008-07-29 16:49:51 UTC (rev 2109)
@@ -67,20 +67,5 @@
rftClient.startTransfer(job);
}
-
- /**
- * update Overall status panel of the GUI, this method delegate the task to
- * RFTPanel
- *
- * @param finished
- * @param Active
- * @param failed
- * @param retrying
- * @param Pending
- * @param cancelled
- */
-// public void updateOverallStatus(int finished, int active, int failed,
-// int retrying, int pending, int cancelled) {
-// panel.updateOverallStatus(finished, active, failed, retrying, pending, cancelled);
-// }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2008-07-29 16:49:06
|
Revision: 2108
http://cogkit.svn.sourceforge.net/cogkit/?rev=2108&view=rev
Author: liuwt
Date: 2008-07-29 16:49:01 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTClient.java
Modified: trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTClient.java
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTClient.java 2008-07-29 16:48:02 UTC (rev 2107)
+++ trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTClient.java 2008-07-29 16:49:01 UTC (rev 2108)
@@ -378,37 +378,6 @@
}
}
i++;
-// int jobID = Integer.parseInt(queuePanel.getColumnValue(i, 0));
-// int j = 1;
-// while (j + i < queuePanel.tableSize()) {
-// int nextJobID = Integer.parseInt(queuePanel.getColumnValue(j + i, 0));
-// if (jobID == nextJobID) {
-// //System.out.println("jobid=" + jobID + ", nextjobid=" + nextJobID + ", j=" + j);
-// j++;
-// } else {
-// break;
-// }
-// }
-//
-// ReliableFileTransferPortType rft = (ReliableFileTransferPortType)ID2Stub.get(Integer.toString(jobID));
-// if (null != rft) {
-// try {
-// GetStatusSetResponse response = rft.getStatusSet(new GetStatusSet(1, j));
-// for (int k = 0; k < j; k++) {
-// TransferStatusType statusType = response.getTransferStatusSet(k);
-// String status = statusType.getStatus().getValue();
-// if (i + k < queuePanel.tableSize()) {
-// queuePanel.setColumnValue(i + k, 3, status);
-// }
-// }
-// } catch (Exception e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// }
-//
-// i+=j;
-// }
-
}
try {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2008-07-29 16:48:06
|
Revision: 2107
http://cogkit.svn.sourceforge.net/cogkit/?rev=2107&view=rev
Author: liuwt
Date: 2008-07-29 16:48:02 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTOptions.java
Modified: trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTOptions.java
===================================================================
--- trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTOptions.java 2008-07-29 16:46:58 UTC (rev 2106)
+++ trunk/current/src/cog/modules/transfer-gui/src/org/globus/transfer/reliable/client/RFTOptions.java 2008-07-29 16:48:02 UTC (rev 2107)
@@ -1,15 +1,9 @@
package org.globus.transfer.reliable.client;
-public class RFTOptions {
- //private int blockSize;
+public class RFTOptions {
private int concurrent;
private int parallelStream;
private int tcpBufferSize;
- //private int maxAttampts;
- //private boolean dcau;
- //private boolean notpt;
- //private boolean binary;
- //private boolean allOrNone;
private String destDN;
private String sourceDN;
@@ -20,28 +14,14 @@
public RFTOptions(int concurrent, int parallelStream,
int tcpBufferSize, String destDN, String sourceDN) {
- super();
- //this.blockSize = blockSize;
+ super();
this.concurrent = concurrent;
this.parallelStream = parallelStream;
this.tcpBufferSize = tcpBufferSize;
-// this.maxAttampts = maxAttampts;
-// this.dcau = dcau;
-// this.notpt = notpt;
-// this.binary = binary;
-// this.allOrNone = allOrNone;
this.destDN = destDN;
this.sourceDN = sourceDN;
}
-// public int getBlockSize() {
-// return blockSize;
-// }
-//
-// public void setBlockSize(int blockSize) {
-// this.blockSize = blockSize;
-// }
-
public int getConcurrent() {
return concurrent;
}
@@ -66,46 +46,6 @@
this.tcpBufferSize = tcpBufferSize;
}
-// public int getMaxAttampts() {
-// return maxAttampts;
-// }
-//
-// public void setMaxAttampts(int maxAttampts) {
-// this.maxAttampts = maxAttampts;
-// }
-
-// public boolean isDcau() {
-// return dcau;
-// }
-//
-// public void setDcau(boolean dcau) {
-// this.dcau = dcau;
-// }
-//
-// public boolean isNotpt() {
-// return notpt;
-// }
-//
-// public void setNotpt(boolean notpt) {
-// this.notpt = notpt;
-// }
-//
-// public boolean isBinary() {
-// return binary;
-// }
-//
-// public void setBinary(boolean binary) {
-// this.binary = binary;
-// }
-//
-// public boolean isAllOrNone() {
-// return allOrNone;
-// }
-//
-// public void setAllOrNone(boolean allOrNone) {
-// this.allOrNone = allOrNone;
-// }
-
public String getDestDN() {
return destDN;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
