cogkit-svn

[Cogkit-svn] SF.net SVN: cogkit: [1578] trunk/current/src/cog/modules/karajan/src/org/ globus/cog/karajan/util/BoundContact.java

[<ha...@us...>]

Revision: 1578
          http://svn.sourceforge.net/cogkit/?rev=1578&view=rev
Author:   hategan
Date:     2007-02-12 16:49:05 -0800 (Mon, 12 Feb 2007)

Log Message:
-----------
there are other providers than "local" on localhost

Modified Paths:
--------------
    trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/util/BoundContact.java

Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/util/BoundContact.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/util/BoundContact.java	2007-02-13 00:47:41 UTC (rev 1577)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/util/BoundContact.java	2007-02-13 00:49:05 UTC (rev 1578)
@@ -213,7 +213,7 @@
 		public Service getService(int type, String provider) {
 			if (type == Service.FILE_OPERATION || type == Service.FILE_TRANSFER
 					|| type == Service.JOB_SUBMISSION) {
-				return new ServiceImpl("local", LOCALHOST, null);
+				return new ServiceImpl(provider, LOCALHOST, null);
 			}
 			else {
 				return super.getService(type, provider);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Cogkit-svn] SF.net SVN: cogkit: [1720] trunk/current/src/cog/modules/karajan/src/org/ globus/cog/karajan/util/BoundContact.java

[<ha...@us...>]

Revision: 1720
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1720&view=rev
Author:   hategan
Date:     2007-08-23 17:49:23 -0700 (Thu, 23 Aug 2007)

Log Message:
-----------
a few fixes

Modified Paths:
--------------
    trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/util/BoundContact.java

Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/util/BoundContact.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/util/BoundContact.java	2007-08-24 00:48:54 UTC (rev 1719)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/util/BoundContact.java	2007-08-24 00:49:23 UTC (rev 1720)
@@ -85,7 +85,7 @@
 
 	public static int getServiceType(int handlerType) {
 		if (handlerType == TaskHandler.EXECUTION) {
-			return Service.JOB_SUBMISSION;
+			return Service.EXECUTION;
 		}
 		else if (handlerType == TaskHandler.FILE_TRANSFER) {
 			return Service.FILE_OPERATION;
@@ -100,15 +100,15 @@
 
 	public static int getServiceType(String type) {
 		if (type == null) {
-			return Service.JOB_SUBMISSION;
+			return Service.EXECUTION;
 		}
 		if (type.equalsIgnoreCase("execution") || type.equalsIgnoreCase("job-submission")) {
-			return Service.JOB_SUBMISSION;
+			return Service.EXECUTION;
 		}
 		if (type.equalsIgnoreCase("file")) {
 			return Service.FILE_OPERATION;
 		}
-		return Service.JOB_SUBMISSION;
+		return Service.EXECUTION;
 	}
 
 	public Map getServices() {
@@ -172,9 +172,11 @@
 		public boolean equals(Object obj) {
 			if (obj instanceof TypeProviderPair) {
 				TypeProviderPair other = (TypeProviderPair) obj;
+				
 				if (type != other.type) {
 					return false;
 				}
+
 				if (provider == null) {
 					return other.provider == null;
 				}
@@ -184,7 +186,7 @@
 		}
 
 		public int hashCode() {
-			return type + (provider == null ? 0 : provider.hashCode());
+			return (provider == null ? 0 : provider.hashCode());
 		}
 
 		public String toString() {
@@ -205,14 +207,16 @@
 		public Localhost() {
 			fileService.setType(Service.FILE_OPERATION);
 			transferService.setType(Service.FILE_TRANSFER);
+			executionService.setType(Service.EXECUTION);
 			addService(fileService);
 			addService(transferService);
+			addService(executionService);
 			setHost("localhost");
 		}
 
 		public Service getService(int type, String provider) {
 			if (type == Service.FILE_OPERATION || type == Service.FILE_TRANSFER
-					|| type == Service.JOB_SUBMISSION) {
+					|| type == Service.EXECUTION) {
 				return new ServiceImpl(provider, LOCALHOST, null);
 			}
 			else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Cogkit-svn] SF.net SVN: cogkit: [1835] trunk/current/src/cog/modules/karajan/src/org/ globus/cog/karajan/util/BoundContact.java

[<ha...@us...>]

Revision: 1835
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1835&view=rev
Author:   hategan
Date:     2007-11-09 15:55:06 -0800 (Fri, 09 Nov 2007)

Log Message:
-----------
avoid conflicts with other hosts

Modified Paths:
--------------
    trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/util/BoundContact.java

Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/util/BoundContact.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/util/BoundContact.java	2007-11-09 22:09:59 UTC (rev 1834)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/util/BoundContact.java	2007-11-09 23:55:06 UTC (rev 1835)
@@ -211,7 +211,9 @@
 			addService(fileService);
 			addService(transferService);
 			addService(executionService);
-			setHost("localhost");
+			//TODO A better way to avoid this being equal to a host who happens
+			//to have the same name should be implemented
+			setHost("_localhost");
 		}
 
 		public Service getService(int type, String provider) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.