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-03-26 14:42:19
|
Revision: 1948
http://cogkit.svn.sourceforge.net/cogkit/?rev=1948&view=rev
Author: hategan
Date: 2008-03-26 07:40:52 -0700 (Wed, 26 Mar 2008)
Log Message:
-----------
changed value to string instead of long
Modified Paths:
--------------
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/Identity.java
Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/Identity.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/Identity.java 2008-03-26 14:40:11 UTC (rev 1947)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/Identity.java 2008-03-26 14:40:52 UTC (rev 1948)
@@ -36,20 +36,15 @@
* Sets the value for this <code>Identity</code>.
*
* @param value
- * a numeric value representing the namespace for this
+ * a String value representing the value for this
* <code>Identity</code>.
*/
- public void setValue(long value);
+ public void setValue(String value);
/**
* Returns the value for this <code>Identity</code>.
*
* @return the value for this <code>Identity</code>
*/
- public long getValue();
-
- /**
- * Compares this <Identity></code> with any other <code>Identity</code>.
- */
- public boolean equals(Identity id);
+ public String getValue();
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-03-26 14:42:00
|
Revision: 1947
http://cogkit.svn.sourceforge.net/cogkit/?rev=1947&view=rev
Author: hategan
Date: 2008-03-26 07:40:11 -0700 (Wed, 26 Mar 2008)
Log Message:
-----------
made specification serializable
Modified Paths:
--------------
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/Specification.java
Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/Specification.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/Specification.java 2008-03-26 14:38:33 UTC (rev 1946)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/Specification.java 2008-03-26 14:40:11 UTC (rev 1947)
@@ -6,6 +6,8 @@
package org.globus.cog.abstraction.interfaces;
+import java.io.Serializable;
+
/**
* Every Grid Task has an associated <code>Specification</code> that dictates
* the objective of the task and the environment required to achieve the
@@ -14,7 +16,7 @@
* specification is handler specific.
*/
-public interface Specification {
+public interface Specification extends Serializable {
public static final int JOB_SUBMISSION = 1;
public static final int FILE_TRANSFER = 2;
public static final int FILE_OPERATION = 3;
@@ -27,5 +29,4 @@
public void setSpecification(String specification);
public String getSpecification();
-
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-03-26 14:38:44
|
Revision: 1946
http://cogkit.svn.sourceforge.net/cogkit/?rev=1946&view=rev
Author: hategan
Date: 2008-03-26 07:38:33 -0700 (Wed, 26 Mar 2008)
Log Message:
-----------
made needlessly wasteful implementation better
Modified Paths:
--------------
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/IdentityImpl.java
Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/IdentityImpl.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/IdentityImpl.java 2008-03-26 14:36:46 UTC (rev 1945)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/IdentityImpl.java 2008-03-26 14:38:33 UTC (rev 1946)
@@ -7,8 +7,6 @@
package org.globus.cog.abstraction.impl.common;
-import java.net.URI;
-
import org.apache.log4j.Logger;
import org.globus.cog.abstraction.interfaces.Identity;
@@ -20,33 +18,29 @@
*/
public class IdentityImpl implements Identity {
static Logger logger = Logger.getLogger(IdentityImpl.class.getName());
- private URI uri = null;
- private final String scheme = "urn";
+
private String nameSpace = "cog";
- private long value;
- private String schemeSpecific = null;
+ private String value;
private static long count = System.currentTimeMillis();
+
+ protected static synchronized String nextId() {
+ return String.valueOf(count++);
+ }
/**
* The default constructor. Assigns a default namespace to this
* identity as <code>cog</code>.
*/
public IdentityImpl() {
- synchronized (this) {
- this.value = count++;
- }
- createURI();
+ this.value = nextId();
}
/**
* Instantiates an <code>Identity</code> with the given namespace.
*/
public IdentityImpl(String namespace) {
- synchronized (this) {
- this.value = count++;
- }
+ this.value = nextId();
this.nameSpace = namespace;
- createURI();
}
/**
@@ -58,24 +52,25 @@
public IdentityImpl(Identity identity) {
this.nameSpace = identity.getNameSpace();
this.value = identity.getValue();
- createURI();
}
public void setNameSpace(String namespace) {
this.nameSpace = namespace;
- createURI();
}
public String getNameSpace() {
return this.nameSpace;
}
-
+
public void setValue(long value) {
+ setValue(String.valueOf(value));
+ }
+
+ public void setValue(String value) {
this.value = value;
- createURI();
}
- public long getValue() {
+ public String getValue() {
return this.value;
}
@@ -88,20 +83,13 @@
}
public int hashCode() {
- return (int) this.value;
+ int hc = 0;
+ hc += nameSpace == null ? 0 : nameSpace.hashCode();
+ hc += value == null ? 0 : value.hashCode();
+ return hc;
}
public String toString() {
- return this.uri.toString();
+ return "urn:" + nameSpace + "-" + value;
}
-
- private void createURI() {
- this.schemeSpecific = this.nameSpace + "-" + this.value;
- try {
- this.uri = new URI(this.scheme + ":" + this.schemeSpecific);
- } catch (Exception e) {
- logger.error("Error while creating identity", e);
- }
- }
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-03-26 14:37:33
|
Revision: 1945
http://cogkit.svn.sourceforge.net/cogkit/?rev=1945&view=rev
Author: hategan
Date: 2008-03-26 07:36:46 -0700 (Wed, 26 Mar 2008)
Log Message:
-----------
added a decent constructor
Modified Paths:
--------------
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/StatusImpl.java
Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/StatusImpl.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/StatusImpl.java 2008-03-26 14:36:04 UTC (rev 1944)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/StatusImpl.java 2008-03-26 14:36:46 UTC (rev 1945)
@@ -16,6 +16,13 @@
private Exception exception = null;
private String message = null;
private Date time;
+
+ public StatusImpl(int status, String message, Exception exception) {
+ this.curStatus = status;
+ this.message = message;
+ this.exception = exception;
+ this.time = new Date();
+ }
public StatusImpl() {
this.curStatus = Status.UNSUBMITTED;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-03-26 14:37:25
|
Revision: 1944
http://cogkit.svn.sourceforge.net/cogkit/?rev=1944&view=rev
Author: hategan
Date: 2008-03-26 07:36:04 -0700 (Wed, 26 Mar 2008)
Log Message:
-----------
lazy attribute map initialization; clean-ups
Modified Paths:
--------------
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/TaskImpl.java
Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/TaskImpl.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/TaskImpl.java 2008-03-26 14:34:34 UTC (rev 1943)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/TaskImpl.java 2008-03-26 14:36:04 UTC (rev 1944)
@@ -9,6 +9,7 @@
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -54,8 +55,7 @@
public TaskImpl() {
this.id = new IdentityImpl();
- this.attributes = new HashMap();
- this.serviceList = new ArrayList();
+ this.serviceList = new ArrayList(2);
this.status = new StatusImpl();
statusListeners = new CopyOnWriteHashSet();
outputListeners = new CopyOnWriteHashSet();
@@ -106,8 +106,10 @@
}
public void setService(int index, Service service) {
- this.serviceList.ensureCapacity(index + 1);
- int sz = this.serviceList.size();
+ while (serviceList.size() < index) {
+ serviceList.add(null);
+ }
+ int sz = serviceList.size();
if (sz == index) {
this.serviceList.add(index, service);
}
@@ -121,11 +123,11 @@
}
public void addService(Service service) {
- this.serviceList.add(service);
+ serviceList.add(service);
}
public Service removeService(int index) {
- return (Service) this.serviceList.remove(index);
+ return (Service) serviceList.remove(index);
}
public Service getService(int index) {
@@ -137,7 +139,7 @@
public Collection removeAllServices() {
Collection services = this.serviceList;
- this.serviceList = new ArrayList();
+ this.serviceList = new ArrayList(2);
return services;
}
@@ -146,12 +148,11 @@
}
public Collection getAllServices() {
- return this.serviceList;
+ return serviceList;
}
public void setRequiredService(int value) {
this.requiredServices = value;
- this.serviceList.ensureCapacity(value);
}
public int getRequiredServices() {
@@ -222,7 +223,7 @@
notifyListeners(status);
}
// Now prove that this works correctly with concurrent updates.
- // I will pay $20 for the first one.
+ // I will pay $20 for the first such proof that I receive.
}
protected void notifyListeners(Status status) {
@@ -256,15 +257,28 @@
}
public void setAttribute(String name, Object value) {
- this.attributes.put(name.toLowerCase(), value);
+ if (attributes == null) {
+ attributes = new HashMap();
+ }
+ attributes.put(name.toLowerCase(), value);
}
public Object getAttribute(String name) {
- return this.attributes.get(name.toLowerCase());
+ if (attributes != null) {
+ return attributes.get(name.toLowerCase());
+ }
+ else {
+ return null;
+ }
}
public Collection getAttributeNames() {
- return this.attributes.keySet();
+ if (attributes != null) {
+ return attributes.keySet();
+ }
+ else {
+ return Collections.EMPTY_MAP.keySet();
+ }
}
public void addStatusListener(StatusListener listener) {
@@ -335,7 +349,7 @@
}
public int hashCode() {
- return (int) this.id.getValue();
+ return this.id.hashCode();
}
public synchronized void waitFor() throws InterruptedException {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-03-26 14:37:17
|
Revision: 1943
http://cogkit.svn.sourceforge.net/cogkit/?rev=1943&view=rev
Author: hategan
Date: 2008-03-26 07:34:34 -0700 (Wed, 26 Mar 2008)
Log Message:
-----------
use fields instead of a hash table
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-03-26 14:33:22 UTC (rev 1942)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/JobSpecificationImpl.java 2008-03-26 14:34:34 UTC (rev 1943)
@@ -8,6 +8,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
@@ -17,26 +18,24 @@
import java.util.Vector;
import org.globus.cog.abstraction.interfaces.Delegation;
+import org.globus.cog.abstraction.interfaces.FileLocation;
import org.globus.cog.abstraction.interfaces.JobSpecification;
import org.globus.cog.abstraction.interfaces.Specification;
-import org.globus.cog.abstraction.interfaces.FileLocation;
public class JobSpecificationImpl implements JobSpecification {
- public static final String ATTR_DELEGATION_ENABLED = "delegationEnabled";
- public static final String ATTR_DELEGATION = "delegation";
- // "rsl" is for backwards compatibility purposes
- public static final String ATTR_NATIVE_SPECIFICATION = "rsl";
- public static final String ATTR_STDOUT = "stdout";
- public static final String ATTR_STDERR = "stderror";// ??
- public static final String ATTR_STDIN = "stdin";
- public static final String ATTR_BATCH_JOB = "batchJob";
- public static final String ATTR_REDIRECTED = "redirected";
- public static final String ATTR_LOCAL_EXECUTABLE = "localExecutable";
- public static final String ATTR_LOCAL_INPUT = "localInput";
-
+ private Boolean delegationEnabled;
+ private int delegation;
+ private String nativeSpecification;
+ private String stdout;
+ private String stderr;
+ private String stdin;
+ private boolean batchJob;
+ private boolean redirected;
+ private boolean localExecutable;
+ private boolean localInput;
+
private int type;
private Map attributes;
- private Map additionalAttributes;
private List arguments;
private Map environment;
private String directory;
@@ -46,14 +45,12 @@
public JobSpecificationImpl() {
this.type = Specification.JOB_SUBMISSION;
- this.attributes = new HashMap();
- this.additionalAttributes = new HashMap();
- this.arguments = new ArrayList();
- this.environment = new HashMap();
+ this.arguments = new ArrayList(4);
this.stdinLocation = FileLocation.REMOTE;
this.stdoutLocation = FileLocation.REMOTE;
this.stderrLocation = FileLocation.REMOTE;
this.executableLocation = FileLocation.REMOTE;
+ this.delegation = Delegation.NO_DELEGATION;
}
public void setType(int type) {
@@ -65,11 +62,11 @@
}
public void setSpecification(String specification) {
- this.attributes.put(ATTR_NATIVE_SPECIFICATION, specification);
+ this.nativeSpecification = specification;
}
public String getSpecification() {
- return (String) this.attributes.get(ATTR_NATIVE_SPECIFICATION);
+ return this.nativeSpecification;
}
public void setExecutable(String executable) {
@@ -158,69 +155,88 @@
}
public void addEnvironmentVariable(String name, String value) {
- this.environment.put(name, value);
+ if (environment == null) {
+ environment = new HashMap();
+ }
+ environment.put(name, value);
}
public String removeEnvironmentVariable(String name) {
- return (String) this.environment.remove(name);
+ if (environment != null) {
+ return (String) environment.remove(name);
+ }
+ else {
+ return null;
+ }
}
public String getEnvironmentVariable(String name) {
- return (String) this.environment.get(name);
+ if (environment != null) {
+ return (String) environment.get(name);
+ }
+ else {
+ return null;
+ }
}
public Collection getEnvironment() {
- return this.environment.keySet();
+ if (environment != null) {
+ return environment.keySet();
+ }
+ else {
+ return Collections.EMPTY_MAP.keySet();
+ }
}
public Collection getEnvironmentVariableNames() {
- return this.environment.keySet();
+ if (environment != null) {
+ return environment.keySet();
+ }
+ else {
+ return Collections.EMPTY_MAP.keySet();
+ }
}
public void setStdOutput(String output) {
- this.attributes.put(ATTR_STDOUT, output);
- this.stdoutLocation = inferStreamType(isRedirected(), output != null,
+ this.stdout = output;
+ this.stdoutLocation = inferStreamType(redirected, output != null,
true);
}
public String getStdOutput() {
- return (String) this.attributes.get(ATTR_STDOUT);
+ return this.stdout;
}
public void setStdInput(String input) {
- this.attributes.put(ATTR_STDIN, input);
- if (this.attributes.containsKey(ATTR_REDIRECTED)) {
- this.stdinLocation = inferStreamType(isLocalExecutable(),
- input != null, false);
- }
+ this.stdin = input;
+ this.stdinLocation = inferStreamType(localExecutable, input != null,
+ false);
}
public String getStdInput() {
- return (String) this.attributes.get(ATTR_STDIN);
+ return this.stdin;
}
public void setStdError(String error) {
- this.attributes.put(ATTR_STDERR, error);
- if (this.attributes.containsKey(ATTR_REDIRECTED)) {
- this.stderrLocation = inferStreamType(isRedirected(),
- error != null, true);
- }
+ this.stderr = error;
+ this.stderrLocation = inferStreamType(redirected, error != null,
+ true);
}
public String getStdError() {
- return (String) this.attributes.get(ATTR_STDERR);
+ return this.stderr;
}
public void setBatchJob(boolean bool) {
- this.attributes.put(ATTR_BATCH_JOB, Boolean.valueOf(bool));
+ this.batchJob = bool;
}
public boolean isBatchJob() {
- return getBooleanAttribute(ATTR_BATCH_JOB, false);
+ return this.batchJob;
}
public void setRedirected(boolean bool) {
- this.attributes.put(ATTR_REDIRECTED, Boolean.valueOf(bool));
+ this.redirected = bool;
this.stdoutLocation = inferStreamType(isRedirected(),
getStdOutput() != null, true);
this.stderrLocation = inferStreamType(isRedirected(),
@@ -247,7 +263,7 @@
}
public boolean isRedirected() {
- return getBooleanAttribute(ATTR_REDIRECTED, false);
+ return this.redirected;
}
public void setLocalInput(boolean bool) {
@@ -267,60 +283,59 @@
return FileLocation.LOCAL.equals(this.executableLocation);
}
- private boolean getBooleanAttribute(final String name, boolean def) {
- Boolean bool = ((Boolean) this.attributes.get(name));
- if (bool == null) {
- return def;
+ public void setAttribute(String name, Object value) {
+ if (attributes == null) {
+ attributes = new HashMap();
}
- else {
- return bool.booleanValue();
- }
+ attributes.put(name.toLowerCase(), value);
}
- private int getIntAttribute(final String name, int def) {
- Integer val = ((Integer) this.attributes.get(name));
- if (val == null) {
- return def;
+ public Object getAttribute(String name) {
+ if (attributes != null) {
+ return attributes.get(name.toLowerCase());
}
else {
- return val.intValue();
+ return null;
}
}
- public void setAttribute(String name, Object value) {
- this.additionalAttributes.put(name.toLowerCase(), value);
- }
-
- public Object getAttribute(String name) {
- return this.additionalAttributes.get(name.toLowerCase());
- }
-
public Enumeration getAllAttributes() {
- return new Vector(additionalAttributes.keySet()).elements();
+ if (attributes != null) {
+ return new Vector(attributes.keySet()).elements();
+ }
+ else {
+ return new Vector().elements();
+ }
}
public Collection getAttributeNames() {
- return additionalAttributes.keySet();
+ if (attributes != null) {
+ return attributes.keySet();
+ }
+ else {
+ return Collections.EMPTY_MAP.keySet();
+ }
}
public boolean isDelegationEnabled() {
- return getBooleanAttribute(
- ATTR_DELEGATION_ENABLED,
- getIntAttribute(ATTR_DELEGATION, Delegation.NO_DELEGATION) != Delegation.NO_DELEGATION);
+ if (delegationEnabled != null) {
+ return delegationEnabled.booleanValue();
+ }
+ else {
+ return delegation != Delegation.NO_DELEGATION;
+ }
}
public void setDelegationEnabled(boolean delegation) {
- this.attributes.put(ATTR_DELEGATION, new Integer(
- delegation ? Delegation.LIMITED_DELEGATION
- : Delegation.FULL_DELEGATION));
+ this.delegation = delegation ? Delegation.LIMITED_DELEGATION : Delegation.FULL_DELEGATION;
}
public int getDelegation() {
- return getIntAttribute(ATTR_DELEGATION, Delegation.NO_DELEGATION);
+ return this.delegation;
}
public void setDelegation(int delegation) {
- this.attributes.put(ATTR_DELEGATION, new Integer(delegation));
+ this.delegation = delegation;
}
public String toString() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-03-26 14:34:47
|
Revision: 1942
http://cogkit.svn.sourceforge.net/cogkit/?rev=1942&view=rev
Author: hategan
Date: 2008-03-26 07:33:22 -0700 (Wed, 26 Mar 2008)
Log Message:
-----------
store the job manager in a field instead of an attribute
Modified Paths:
--------------
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/ExecutionServiceImpl.java
Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/ExecutionServiceImpl.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/ExecutionServiceImpl.java 2008-03-26 14:32:26 UTC (rev 1941)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/ExecutionServiceImpl.java 2008-03-26 14:33:22 UTC (rev 1942)
@@ -13,6 +13,7 @@
public class ExecutionServiceImpl extends ServiceImpl implements
ExecutionService {
+ private String jobManager;
public ExecutionServiceImpl() {
super(Service.JOB_SUBMISSION);
@@ -26,20 +27,14 @@
public ExecutionServiceImpl(String provider, ServiceContact serviceContact,
SecurityContext securityContext, String jobManager) {
super(provider, Service.JOB_SUBMISSION, serviceContact, securityContext);
- if (jobManager != null) {
- setAttribute("jobmanager", jobManager);
- }
+ this.jobManager = jobManager;
}
public void setJobManager(String jobManager) {
- if (jobManager != null) {
- setAttribute("jobmanager", jobManager);
- }
+ this.jobManager = jobManager;
}
public String getJobManager() {
-
- return (String) getAttribute("jobmanager");
+ return jobManager;
}
-
-}
\ No newline at end of file
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-03-26 14:33:12
|
Revision: 1941
http://cogkit.svn.sourceforge.net/cogkit/?rev=1941&view=rev
Author: hategan
Date: 2008-03-26 07:32:26 -0700 (Wed, 26 Mar 2008)
Log Message:
-----------
lazy initialization of attributes map; the identity is not initialize by default
Modified Paths:
--------------
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/ServiceImpl.java
Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/ServiceImpl.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/ServiceImpl.java 2008-03-26 14:29:20 UTC (rev 1940)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/ServiceImpl.java 2008-03-26 14:32:26 UTC (rev 1941)
@@ -6,10 +6,13 @@
package org.globus.cog.abstraction.impl.common.task;
+import java.util.Collection;
+import java.util.Collections;
import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Vector;
-import org.globus.cog.abstraction.impl.common.IdentityImpl;
import org.globus.cog.abstraction.interfaces.Identity;
import org.globus.cog.abstraction.interfaces.SecurityContext;
import org.globus.cog.abstraction.interfaces.Service;
@@ -20,26 +23,21 @@
private String name = "";
private ServiceContact serviceContact = null;
private SecurityContext securityContext = null;
- private Hashtable attributes;
+ private Map attributes;
private String provider = null;
private int type = 0;
private int totalCount = 0, failedCount = 0, activeCount = 0;
public ServiceImpl() {
- this.attributes = new Hashtable();
- this.identity = new IdentityImpl();
}
public ServiceImpl(int type) {
- this.attributes = new Hashtable();
- this.identity = new IdentityImpl();
this.type = type;
}
public ServiceImpl(String provider, ServiceContact serviceContact,
SecurityContext securityContext) {
- this.attributes = new Hashtable();
- this.identity = new IdentityImpl();
+ this();
this.provider = provider;
this.serviceContact = serviceContact;
this.securityContext = securityContext;
@@ -47,10 +45,8 @@
public ServiceImpl(String provider, int type,
ServiceContact serviceContact, SecurityContext securityContext) {
- this.attributes = new Hashtable();
- this.identity = new IdentityImpl();
+ this(type);
this.provider = provider;
- this.type = type;
this.serviceContact = serviceContact;
this.securityContext = securityContext;
}
@@ -128,18 +124,35 @@
}
public void setAttribute(String name, Object value) {
- this.attributes.put(name, value);
+ if (attributes == null) {
+ attributes = new HashMap();
+ }
+ attributes.put(name, value);
}
public Object getAttribute(String name) {
- return this.attributes.get(name);
+ if (attributes != null) {
+ return attributes.get(name);
+ }
+ else {
+ return null;
+ }
}
public Enumeration getAllAttributes() {
- return this.attributes.keys();
+ return new Vector(getAttributeNames()).elements();
}
+
+ public Collection getAttributeNames() {
+ if (attributes != null) {
+ return attributes.keySet();
+ }
+ else {
+ return Collections.EMPTY_MAP.keySet();
+ }
+ }
public String toString() {
return this.serviceContact.toString() + "(" + this.provider + ")";
}
-}
\ No newline at end of file
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-03-26 14:29:24
|
Revision: 1940
http://cogkit.svn.sourceforge.net/cogkit/?rev=1940&view=rev
Author: hategan
Date: 2008-03-26 07:29:20 -0700 (Wed, 26 Mar 2008)
Log Message:
-----------
more descriptive method name
Modified Paths:
--------------
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/Service.java
Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/Service.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/Service.java 2008-03-26 01:21:41 UTC (rev 1939)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/Service.java 2008-03-26 14:29:20 UTC (rev 1940)
@@ -6,6 +6,7 @@
package org.globus.cog.abstraction.interfaces;
+import java.util.Collection;
import java.util.Enumeration;
/**
@@ -154,5 +155,10 @@
public Object getAttribute(String name);
+ /**
+ * @deprecated Use {@link getAttributeNames}
+ */
public Enumeration getAllAttributes();
-}
\ No newline at end of file
+
+ public Collection getAttributeNames();
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-03-25 15:15:38
|
Revision: 1938
http://cogkit.svn.sourceforge.net/cogkit/?rev=1938&view=rev
Author: hategan
Date: 2008-03-25 08:14:57 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
fixed identity error
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-condor/CHANGES.txt
trunk/current/src/cog/modules/provider-condor/src/org/globus/cog/abstraction/impl/execution/condor/DescriptionFileGenerator.java
Modified: trunk/current/src/cog/modules/provider-condor/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/provider-condor/CHANGES.txt 2008-03-23 23:47:55 UTC (rev 1937)
+++ trunk/current/src/cog/modules/provider-condor/CHANGES.txt 2008-03-25 15:14:57 UTC (rev 1938)
@@ -1,3 +1,7 @@
+(03/25/2005)
+
+*** Fixed use of abstraction identities
+
(04/18/2005)
*** renamed this module from "core-provider-condor" to
Modified: trunk/current/src/cog/modules/provider-condor/src/org/globus/cog/abstraction/impl/execution/condor/DescriptionFileGenerator.java
===================================================================
--- trunk/current/src/cog/modules/provider-condor/src/org/globus/cog/abstraction/impl/execution/condor/DescriptionFileGenerator.java 2008-03-23 23:47:55 UTC (rev 1937)
+++ trunk/current/src/cog/modules/provider-condor/src/org/globus/cog/abstraction/impl/execution/condor/DescriptionFileGenerator.java 2008-03-25 15:14:57 UTC (rev 1938)
@@ -21,8 +21,7 @@
descriptionFile = new File(descriptionFileName);
return descriptionFile;
} else {
- descriptionFile = File.createTempFile(Long.toString(task
- .getIdentity().getValue()), ".desc");
+ descriptionFile = File.createTempFile(task.getIdentity().getValue(), ".desc");
constructDescriptionFile(descriptionFile, task);
return descriptionFile;
@@ -78,8 +77,7 @@
// set the default log (if not specified)
String log = (String) specification.getAttribute("log");
if (log == null) {
- File logFile = File.createTempFile(Long.toString(task.getIdentity()
- .getValue()), ".log");
+ File logFile = File.createTempFile(task.getIdentity().getValue(), ".log");
log = logFile.getAbsolutePath();
specification.setAttribute("log", log);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <b_...@us...> - 2008-03-15 19:40:19
|
Revision: 1936
http://cogkit.svn.sourceforge.net/cogkit/?rev=1936&view=rev
Author: b_z_c
Date: 2008-03-15 12:40:05 -0700 (Sat, 15 Mar 2008)
Log Message:
-----------
lock around File.mkdirs, because File.mkdirs is not threadsafe
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-local/src/org/globus/cog/abstraction/impl/file/local/FileResourceImpl.java
Modified: trunk/current/src/cog/modules/provider-local/src/org/globus/cog/abstraction/impl/file/local/FileResourceImpl.java
===================================================================
--- trunk/current/src/cog/modules/provider-local/src/org/globus/cog/abstraction/impl/file/local/FileResourceImpl.java 2008-03-15 19:10:21 UTC (rev 1935)
+++ trunk/current/src/cog/modules/provider-local/src/org/globus/cog/abstraction/impl/file/local/FileResourceImpl.java 2008-03-15 19:40:05 UTC (rev 1936)
@@ -43,6 +43,9 @@
private File cwd;
+ /** This object is used to prevent non-threadsafe use of File.mkdirs. */
+ private static Object mkdirsLock = new Object();
+
public FileResourceImpl() {
super();
}
@@ -152,8 +155,10 @@
return;
}
File f = resolve(directory);
- if (!f.mkdirs() && !f.exists()) {
- throw new FileResourceException("Failed to create directory: " + directory);
+ synchronized(mkdirsLock) {
+ if (!f.mkdirs() && !f.exists()) {
+ throw new FileResourceException("Failed to create directory: " + directory);
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <b_...@us...> - 2008-03-15 19:10:29
|
Revision: 1935
http://cogkit.svn.sourceforge.net/cogkit/?rev=1935&view=rev
Author: b_z_c
Date: 2008-03-15 12:10:21 -0700 (Sat, 15 Mar 2008)
Log Message:
-----------
The WeightedHost scheduler now has a lower bound (of -10)
on scoring to reduce the effect of penalising a host in the case of a
large number of transient errors. Previously, a large number of
transient errors would push the score so low that the score would
take far too long to return to a more appropriate value.
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/CHANGES.txt
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHost.java
Modified: trunk/current/src/cog/modules/karajan/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/karajan/CHANGES.txt 2008-03-06 12:06:19 UTC (rev 1934)
+++ trunk/current/src/cog/modules/karajan/CHANGES.txt 2008-03-15 19:10:21 UTC (rev 1935)
@@ -1,3 +1,11 @@
+(03/15/2008)
+
+*** The WeightedHost scheduler now has a lower bound (of -10)
+ on scoring to reduce the effect of penalising a host in the case of a
+ large number of transient errors. Previously, a large number of
+ transient errors would push the score so low that the score would
+ take far too long to return to a more appropriate value.
+
(02/22/2008)
*** Added sys:dateFormat(pattern, value)
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-03-06 12:06:19 UTC (rev 1934)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHost.java 2008-03-15 19:10:21 UTC (rev 1935)
@@ -15,6 +15,9 @@
import org.globus.cog.karajan.util.BoundContact;
public class WeightedHost implements Comparable {
+
+ static final int MINWEIGHT = -10;
+
private BoundContact host;
private Double score;
private double tscore;
@@ -38,6 +41,7 @@
}
protected void setScore(double score) {
+ if(score<MINWEIGHT) score=MINWEIGHT;
this.score = new Double(score);
this.tscore = smooth(score);
}
@@ -132,4 +136,4 @@
public float getJobThrottle() {
return jobThrottle;
}
-}
\ No newline at end of file
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-03-06 12:06:27
|
Revision: 1934
http://cogkit.svn.sourceforge.net/cogkit/?rev=1934&view=rev
Author: hategan
Date: 2008-03-06 04:06:19 -0800 (Thu, 06 Mar 2008)
Log Message:
-----------
added host_types support
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt4_0_0/CHANGES.txt
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/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/provider-gt4_0_0/CHANGES.txt 2008-02-28 17:42:14 UTC (rev 1933)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/CHANGES.txt 2008-03-06 12:06:19 UTC (rev 1934)
@@ -1,3 +1,7 @@
+(03/06/2008)
+
+*** Added support for host_types attribute (patch from benc)
+
(02/28/2008)
*** The previous axis update had a bug with the UUID generator.
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-02-28 17:42:14 UTC (rev 1933)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java 2008-03-06 12:06:19 UTC (rev 1934)
@@ -13,6 +13,7 @@
import java.util.Map;
import org.apache.axis.components.uuid.UUIDGenFactory;
+import org.apache.axis.message.MessageElement;
import org.apache.axis.message.addressing.EndpointReferenceType;
import org.apache.axis.types.NonNegativeInteger;
import org.apache.axis.types.PositiveInteger;
@@ -33,6 +34,7 @@
import org.globus.cog.abstraction.interfaces.Task;
import org.globus.exec.client.GramJob;
import org.globus.exec.client.GramJobListener;
+import org.globus.exec.generated.ExtensionsType;
import org.globus.exec.generated.FaultType;
import org.globus.exec.generated.JobDescriptionType;
import org.globus.exec.generated.JobTypeEnumeration;
@@ -300,6 +302,15 @@
desc.setQueue((String) spec.getAttribute("queue"));
}
+ if (spec.getAttribute("host_types") != null) {
+ MessageElement nodesMessageElement = new MessageElement("",
+ "nodes", spec.getAttribute("host_types"));
+ MessageElement[] messageElements = new MessageElement[] { nodesMessageElement };
+ ExtensionsType extensions = new ExtensionsType();
+ extensions.set_any(messageElements);
+ desc.setExtensions(extensions);
+ }
+
desc.setArgument((String[]) spec.getArgumentsAsList().toArray(
new String[0]));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-02-28 17:42:17
|
Revision: 1933
http://cogkit.svn.sourceforge.net/cogkit/?rev=1933&view=rev
Author: hategan
Date: 2008-02-28 09:42:14 -0800 (Thu, 28 Feb 2008)
Log Message:
-----------
updated gridshell
Modified Paths:
--------------
trunk/current/src/cog/modules/gridshell/src/org/globus/cog/gridshell/commands/AbstractCommand.java
Modified: trunk/current/src/cog/modules/gridshell/src/org/globus/cog/gridshell/commands/AbstractCommand.java
===================================================================
--- trunk/current/src/cog/modules/gridshell/src/org/globus/cog/gridshell/commands/AbstractCommand.java 2008-02-28 17:40:46 UTC (rev 1932)
+++ trunk/current/src/cog/modules/gridshell/src/org/globus/cog/gridshell/commands/AbstractCommand.java 2008-02-28 17:42:14 UTC (rev 1933)
@@ -5,7 +5,7 @@
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
-import java.util.Calendar;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -200,10 +200,10 @@
public String getMessage() {
return status.getMessage();
}
- public void setTime(Calendar time) {
+ public void setTime(Date time) {
status.setTime(time);
}
- public Calendar getTime() {
+ public Date getTime() {
return status.getTime();
}
public boolean isTerminal() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-02-28 17:40:48
|
Revision: 1932
http://cogkit.svn.sourceforge.net/cogkit/?rev=1932&view=rev
Author: hategan
Date: 2008-02-28 09:40:46 -0800 (Thu, 28 Feb 2008)
Log Message:
-----------
make this compile
Modified Paths:
--------------
trunk/current/src/cog/modules/gridfaces/src/org/globus/cog/gridface/impl/commands/GridCommandImpl.java
trunk/current/src/cog/modules/gridfaces/src/org/globus/cog/gridface/impl/desktop/util/GCMLoggerTable.java
trunk/current/src/cog/modules/gridfaces/src/org/globus/cog/gridface/interfaces/GridCommand.java
Modified: trunk/current/src/cog/modules/gridfaces/src/org/globus/cog/gridface/impl/commands/GridCommandImpl.java
===================================================================
--- trunk/current/src/cog/modules/gridfaces/src/org/globus/cog/gridface/impl/commands/GridCommandImpl.java 2008-02-28 17:35:09 UTC (rev 1931)
+++ trunk/current/src/cog/modules/gridfaces/src/org/globus/cog/gridface/impl/commands/GridCommandImpl.java 2008-02-28 17:40:46 UTC (rev 1932)
@@ -541,15 +541,10 @@
return attributes;
}
- public Calendar getCompletedTime() {
- return this.task.getCompletedTime();
- }
public Integer getId() {
return this.id;
}
- public Calendar getSubmittedTime() {
- return this.task.getSubmittedTime();
- }
+
public Task getTask() {
return this.task;
}
Modified: trunk/current/src/cog/modules/gridfaces/src/org/globus/cog/gridface/impl/desktop/util/GCMLoggerTable.java
===================================================================
--- trunk/current/src/cog/modules/gridfaces/src/org/globus/cog/gridface/impl/desktop/util/GCMLoggerTable.java 2008-02-28 17:35:09 UTC (rev 1931)
+++ trunk/current/src/cog/modules/gridfaces/src/org/globus/cog/gridface/impl/desktop/util/GCMLoggerTable.java 2008-02-28 17:40:46 UTC (rev 1932)
@@ -503,21 +503,22 @@
case DIRECTORY_COL:
return (String)command.getAttribute("directory");
case SUBMITTIME_COL :
- if (command.getSubmittedTime() != null) {
- String submitTime = sdf.format(command
- .getSubmittedTime().getTime());
- return submitTime;
- } else {
+ //TODO who is supposed to maintain this?
+ //if (command.getSubmittedTime() != null) {
+ // String submitTime = sdf.format(command
+ // .getSubmittedTime().getTime());
+ // return submitTime;
+ //} else {
return "Not available";
- }
+ //}
case COMPLETETIME_COL :
- if (command.getCompletedTime() != null) {
- String submitTime = sdf.format(command
- .getCompletedTime().getTime());
- return submitTime;
- } else {
+ //if (command.getCompletedTime() != null) {
+ // String submitTime = sdf.format(command
+ // .getCompletedTime().getTime());
+ // return submitTime;
+ //} else {
return "Not available";
- }
+ //}
case PROVIDER_COL :
return command.getAttribute("provider");
case SERVICE_COL :
Modified: trunk/current/src/cog/modules/gridfaces/src/org/globus/cog/gridface/interfaces/GridCommand.java
===================================================================
--- trunk/current/src/cog/modules/gridfaces/src/org/globus/cog/gridface/interfaces/GridCommand.java 2008-02-28 17:35:09 UTC (rev 1931)
+++ trunk/current/src/cog/modules/gridfaces/src/org/globus/cog/gridface/interfaces/GridCommand.java 2008-02-28 17:40:46 UTC (rev 1932)
@@ -71,10 +71,6 @@
/** validate the given command and return true or false */
public boolean validate();
-
- public Calendar getSubmittedTime();
-
- public Calendar getCompletedTime();
/** Get output of the given command when status changes to COMPLETED */
public Object getOutput();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-02-28 17:35:20
|
Revision: 1931
http://cogkit.svn.sourceforge.net/cogkit/?rev=1931&view=rev
Author: hategan
Date: 2008-02-28 09:35:09 -0800 (Thu, 28 Feb 2008)
Log Message:
-----------
changes
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt4_0_0/CHANGES.txt
Modified: trunk/current/src/cog/modules/provider-gt4_0_0/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/provider-gt4_0_0/CHANGES.txt 2008-02-28 17:33:46 UTC (rev 1930)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/CHANGES.txt 2008-02-28 17:35:09 UTC (rev 1931)
@@ -1,3 +1,13 @@
+(02/28/2008)
+
+*** The previous axis update had a bug with the UUID generator.
+ This update fixes that.
+
+(02/25/2008)
+
+*** Updated axis and wsrf jars to fix a scalability problem
+ with notifications.
+
(02/11/2008)
*** Updated gram jars to 4.0.6 plus a scalability patch.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-02-28 17:34:03
|
Revision: 1930
http://cogkit.svn.sourceforge.net/cogkit/?rev=1930&view=rev
Author: hategan
Date: 2008-02-28 09:33:46 -0800 (Thu, 28 Feb 2008)
Log Message:
-----------
updated wsrf jars
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/axis.jar
trunk/current/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/wsrf_core.jar
trunk/current/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/wsrf_core_stubs.jar
trunk/current/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/wsrf_tools.jar
Modified: trunk/current/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/axis.jar
===================================================================
(Binary files differ)
Modified: trunk/current/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/wsrf_core.jar
===================================================================
(Binary files differ)
Modified: trunk/current/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/wsrf_core_stubs.jar
===================================================================
(Binary files differ)
Modified: trunk/current/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/wsrf_tools.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-02-27 22:46:52
|
Revision: 1929
http://cogkit.svn.sourceforge.net/cogkit/?rev=1929&view=rev
Author: hategan
Date: 2008-02-27 14:46:48 -0800 (Wed, 27 Feb 2008)
Log Message:
-----------
Tagging branches/4.1.6 as tags/4.1.6rc2
Added Paths:
-----------
tags/4.1.6rc2/
Copied: tags/4.1.6rc2 (from rev 1928, branches/4.1.6)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-02-27 20:56:09
|
Revision: 1928
http://cogkit.svn.sourceforge.net/cogkit/?rev=1928&view=rev
Author: hategan
Date: 2008-02-27 12:55:40 -0800 (Wed, 27 Feb 2008)
Log Message:
-----------
updated version
Modified Paths:
--------------
branches/4.1.6/src/cog/VERSION
Modified: branches/4.1.6/src/cog/VERSION
===================================================================
--- branches/4.1.6/src/cog/VERSION 2008-02-27 20:52:32 UTC (rev 1927)
+++ branches/4.1.6/src/cog/VERSION 2008-02-27 20:55:40 UTC (rev 1928)
@@ -1 +1 @@
-cog.version = 4_1_6_rc1
+cog.version = 4_1_6_rc2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-02-27 20:53:26
|
Revision: 1927
http://cogkit.svn.sourceforge.net/cogkit/?rev=1927&view=rev
Author: hategan
Date: 2008-02-27 12:52:32 -0800 (Wed, 27 Feb 2008)
Log Message:
-----------
updated gram jars
Modified Paths:
--------------
branches/4.1.6/src/cog/modules/provider-gt4_0_0/CHANGES.txt
branches/4.1.6/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/axis.jar
branches/4.1.6/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/wsrf_core_stubs.jar
Modified: branches/4.1.6/src/cog/modules/provider-gt4_0_0/CHANGES.txt
===================================================================
--- branches/4.1.6/src/cog/modules/provider-gt4_0_0/CHANGES.txt 2008-02-25 23:22:28 UTC (rev 1926)
+++ branches/4.1.6/src/cog/modules/provider-gt4_0_0/CHANGES.txt 2008-02-27 20:52:32 UTC (rev 1927)
@@ -1,3 +1,8 @@
+(02/27/2008)
+
+*** Updated WS-GRAM jars again due to a mishap with the
+ first update.
+
(02/25/2008)
*** Updated axis and wsrf jars to fix a scalability problem
Modified: branches/4.1.6/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/axis.jar
===================================================================
(Binary files differ)
Modified: branches/4.1.6/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/wsrf_core_stubs.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-02-25 23:22:32
|
Revision: 1926
http://cogkit.svn.sourceforge.net/cogkit/?rev=1926&view=rev
Author: hategan
Date: 2008-02-25 15:22:28 -0800 (Mon, 25 Feb 2008)
Log Message:
-----------
Tagging branches/4.1.6 as tags/4.1.6rc1
Added Paths:
-----------
tags/4.1.6rc1/
Copied: tags/4.1.6rc1 (from rev 1925, branches/4.1.6)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-02-25 22:11:53
|
Revision: 1925
http://cogkit.svn.sourceforge.net/cogkit/?rev=1925&view=rev
Author: hategan
Date: 2008-02-25 14:11:03 -0800 (Mon, 25 Feb 2008)
Log Message:
-----------
removed test tag
Removed Paths:
-------------
tags/4.1.6rc1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-02-25 22:00:48
|
Revision: 1924
http://cogkit.svn.sourceforge.net/cogkit/?rev=1924&view=rev
Author: hategan
Date: 2008-02-25 14:00:14 -0800 (Mon, 25 Feb 2008)
Log Message:
-----------
missed a spot
Modified Paths:
--------------
branches/4.1.6/src/cog/bin/release/release.sh
Modified: branches/4.1.6/src/cog/bin/release/release.sh
===================================================================
--- branches/4.1.6/src/cog/bin/release/release.sh 2008-02-25 21:56:02 UTC (rev 1923)
+++ branches/4.1.6/src/cog/bin/release/release.sh 2008-02-25 22:00:14 UTC (rev 1924)
@@ -52,7 +52,7 @@
else
echo "Checking out $TAG tag of $CVSMODULE"
#cvs -q -d $CVSROOT export $TAG $CVSMODULE >>$LOG
- svn export --force $CVSROOT/tags/$TAG/$CVSMODULE src/cog >>$LOG
+ svn export --force $CVSROOT/$TAG/$CVSMODULE src/cog >>$LOG
fi
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-02-25 21:56:12
|
Revision: 1923
http://cogkit.svn.sourceforge.net/cogkit/?rev=1923&view=rev
Author: hategan
Date: 2008-02-25 13:56:02 -0800 (Mon, 25 Feb 2008)
Log Message:
-----------
fixed svn url
Modified Paths:
--------------
branches/4.1.6/src/cog/bin/release/Makefile
branches/4.1.6/src/cog/bin/release/release.sh
Modified: branches/4.1.6/src/cog/bin/release/Makefile
===================================================================
--- branches/4.1.6/src/cog/bin/release/Makefile 2008-02-25 21:52:45 UTC (rev 1922)
+++ branches/4.1.6/src/cog/bin/release/Makefile 2008-02-25 21:56:02 UTC (rev 1923)
@@ -1,5 +1,5 @@
#CVSROOT=:pserver:ano...@cv...:/cvs/cogkit
-CVSROOT=https://svn.sourceforge.net/svnroot/cogkit
+CVSROOT=https://cogkit.svn.sourceforge.net/svnroot/cogkit
# for example TAG=-r 4_0_alpha1
TAG=now
CRTDIR=$(shell pwd)
Modified: branches/4.1.6/src/cog/bin/release/release.sh
===================================================================
--- branches/4.1.6/src/cog/bin/release/release.sh 2008-02-25 21:52:45 UTC (rev 1922)
+++ branches/4.1.6/src/cog/bin/release/release.sh 2008-02-25 21:56:02 UTC (rev 1923)
@@ -127,7 +127,7 @@
OP=$1
if [ "$CVSROOT" == "" ]; then
- CVSROOT="https://svn.sourceforge.net/svnroot/cogkit"
+ CVSROOT="https://cogkit.svn.sourceforge.net/svnroot/cogkit"
fi
case $OP in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-02-25 21:53:18
|
Revision: 1922
http://cogkit.svn.sourceforge.net/cogkit/?rev=1922&view=rev
Author: hategan
Date: 2008-02-25 13:52:45 -0800 (Mon, 25 Feb 2008)
Log Message:
-----------
allow building from branch
Modified Paths:
--------------
branches/4.1.6/src/cog/bin/release/release.sh
Modified: branches/4.1.6/src/cog/bin/release/release.sh
===================================================================
--- branches/4.1.6/src/cog/bin/release/release.sh 2008-02-25 21:38:13 UTC (rev 1921)
+++ branches/4.1.6/src/cog/bin/release/release.sh 2008-02-25 21:52:45 UTC (rev 1922)
@@ -30,7 +30,7 @@
svn export --force $CVSROOT/trunk/current/src/cog/VERSION src/cog/VERSION 2>>$LOG
else
#cvs -d $CVSROOT export $TAG src/cog/VERSION 2>>$LOG
- svn export --force $CVSROOT/tags/$TAG/src/cog/VERSION src/cog/VERSION 2>>$LOG
+ svn export --force $CVSROOT/$TAG/src/cog/VERSION src/cog/VERSION 2>>$LOG
fi
fi
@@ -71,7 +71,7 @@
svn export --force $CVSROOT/trunk/current/src/cog/modules/provider-$PROVIDER/project.properties src/cog/modules/provider-$PROVIDER 2>>$LOG
else
#cvs -d $CVSROOT export $TAG src/cog/modules/provider-$PROVIDER/project.properties 2>>$LOG
- svn export --force $CVSROOT/tags/$TAG/src/cog/modules/provider-$PROVIDER/project.properties src/cog/modules/provider-$PROVIDER 2>>$LOG
+ svn export --force $CVSROOT/$TAG/src/cog/modules/provider-$PROVIDER/project.properties src/cog/modules/provider-$PROVIDER 2>>$LOG
fi
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
