--- source-trees/wsrf-cvs/ws-gram/client/c/source/globus_i_delegate.c 20 Mar 2007 19:54:40 -0000 1.17.2.2 +++ source-trees/wsrf-cvs/ws-gram/client/c/source/globus_i_delegate.c 24 Apr 2008 15:57:09 -0000 1.17.2.3 @@ -652,9 +652,6 @@ switch (fault_type) { - case MANAGEDJOBFACTORYPORTTYPE_GETMULTIPLERESOURCEPROPERTIES_NOFAULT: - case MANAGEDJOBFACTORYPORTTYPE_GETMULTIPLERESOURCEPROPERTIES_UNKNOWN_FAULT: - break; case MANAGEDJOBFACTORYPORTTYPE_GETMULTIPLERESOURCEPROPERTIES_RESOURCEUNKNOWNFAULT: result = GlobusLErrorInvalid( "factory EPR", @@ -665,6 +662,10 @@ "resorce property QName", "Unable to query resource properties."); break; + case MANAGEDJOBFACTORYPORTTYPE_GETMULTIPLERESOURCEPROPERTIES_NOFAULT: + case MANAGEDJOBFACTORYPORTTYPE_GETMULTIPLERESOURCEPROPERTIES_UNKNOWN_FAULT: + default: + break; } if(result != GLOBUS_SUCCESS) @@ -1167,8 +1168,26 @@ if(result != GLOBUS_SUCCESS) { - result = GlobusLErrorWrapResult( - "cleaning up delegated credentials", result); + switch (fault_type) + { + case DELEGATIONPORTTYPE_DESTROY_RESOURCEUNKNOWNFAULT: + result = GlobusLErrorInvalid( + "or unknown reference to a delegated credential", + "Unable to clean up delegated credential. It may have expired or already been destroyed."); + break; + + case DELEGATIONPORTTYPE_DESTROY_RESOURCENOTDESTROYEDFAULT: + result = GlobusLErrorWrapFault( + "cleaning up delegated credential", fault->value); + break; + + case DELEGATIONPORTTYPE_DESTROY_NOFAULT: + case DELEGATIONPORTTYPE_DESTROY_UNKNOWN_FAULT: + default: + result = GlobusLErrorWrapResult( + "cleaning up delegated credentials", result); + break; + } } globus_mutex_lock(&monitor->lock); --- source-trees/wsrf-cvs/ws-gram/client/c/source/globus_i_kill.c 13 Jul 2005 15:37:31 -0000 1.10.2.2 +++ source-trees/wsrf-cvs/ws-gram/client/c/source/globus_i_kill.c 24 Apr 2008 15:57:09 -0000 1.10.2.3 @@ -69,12 +69,24 @@ &fault); if(result != GLOBUS_SUCCESS) { - if(fault_type != GLOBUS_SUCCESS) + switch (fault_type) { - xsd_any_destroy(fault); + case MANAGEDJOBPORTTYPE_DESTROY_RESOURCEUNKNOWNFAULT: + result = GlobusLErrorInvalid( + "or unknown job reference", + "Unable to destroy job. It may have expired or already been destroyed."); + break; + case MANAGEDJOBPORTTYPE_DESTROY_RESOURCENOTDESTROYEDFAULT: + result = GlobusLErrorWrapFault( + "Job not destroyed.", fault->value); + break; + case MANAGEDJOBPORTTYPE_DESTROY_NOFAULT: + case MANAGEDJOBPORTTYPE_DESTROY_UNKNOWN_FAULT: + default: + result = GlobusLErrorWrapResult("destroying job", result); + break; } - result = GlobusLErrorWrapResult("destroying job", result); goto error_op; } --- source-trees/wsrf-cvs/ws-gram/client/c/source/globus_i_monitor.c 6 Nov 2006 16:12:09 -0000 1.25.2.4 +++ source-trees/wsrf-cvs/ws-gram/client/c/source/globus_i_monitor.c 24 Apr 2008 15:57:09 -0000 1.25.2.5 @@ -204,7 +204,24 @@ if(result != GLOBUS_SUCCESS) { - result = GlobusLErrorWrapResult("querying stream urls", result); + switch (fault_type) + { + case MANAGEDEXECUTABLEJOBPORTTYPE_GETMULTIPLERESOURCEPROPERTIES_RESOURCEUNKNOWNFAULT: + result = GlobusLErrorInvalid( + "or unknown job reference. Job resource may have expired or been terminated", + "Unable to query stream URLs"); + break; + case MANAGEDEXECUTABLEJOBPORTTYPE_GETMULTIPLERESOURCEPROPERTIES_INVALIDRESOURCEPROPERTYQNAMEFAULT: + result = GlobusLErrorWrapFault( + "invalid resource property", + fault->value); + break; + case MANAGEDEXECUTABLEJOBPORTTYPE_GETMULTIPLERESOURCEPROPERTIES_NOFAULT: + case MANAGEDEXECUTABLEJOBPORTTYPE_GETMULTIPLERESOURCEPROPERTIES_UNKNOWN_FAULT: + default: + result = GlobusLErrorWrapResult("querying stream urls", result); + break; + } goto error; } @@ -448,7 +465,24 @@ globus_mutex_lock(&monitor->lock); if(result != GLOBUS_SUCCESS) { - result = GlobusLErrorWrapResult("querying multijob eprs", result); + switch (fault_type) + { + case MANAGEDMULTIJOBPORTTYPE_GETRESOURCEPROPERTY_RESOURCEUNKNOWNFAULT: + result = GlobusLErrorInvalid( + "or unknown multijob reference. Multijob resource may have expired or been terminated", + "Unable to query multijob eprs"); + break; + case MANAGEDMULTIJOBPORTTYPE_GETRESOURCEPROPERTY_INVALIDRESOURCEPROPERTYQNAMEFAULT: + result = GlobusLErrorWrapFault( + "invalid resource property", + fault->value); + break; + case MANAGEDMULTIJOBPORTTYPE_GETRESOURCEPROPERTY_NOFAULT: + case MANAGEDMULTIJOBPORTTYPE_GETRESOURCEPROPERTY_UNKNOWN_FAULT: + default: + result = GlobusLErrorWrapResult("querying multijob eprs", result); + break; + } goto error; } @@ -1114,7 +1148,24 @@ if(result != GLOBUS_SUCCESS) { - result = GlobusLErrorWrapResult("querying job state", result); + switch (fault_type) + { + case MANAGEDJOBPORTTYPE_GETMULTIPLERESOURCEPROPERTIES_RESOURCEUNKNOWNFAULT: + result = GlobusLErrorInvalid( + "or unknown job reference. Job resource may have expired or been terminated", + "Unable to query job state."); + break; + case MANAGEDJOBPORTTYPE_GETMULTIPLERESOURCEPROPERTIES_INVALIDRESOURCEPROPERTYQNAMEFAULT: + result = GlobusLErrorWrapFault( + "invalid resource property", + fault->value); + break; + case MANAGEDJOBPORTTYPE_GETMULTIPLERESOURCEPROPERTIES_NOFAULT: + case MANAGEDJOBPORTTYPE_GETMULTIPLERESOURCEPROPERTIES_UNKNOWN_FAULT: + default: + result = GlobusLErrorWrapResult("querying job state", result); + break; + } goto error; } @@ -1667,11 +1718,31 @@ &fault); if(result != GLOBUS_SUCCESS) { - if(fault_type != GLOBUS_SUCCESS) + switch (fault_type) { - xsd_any_destroy(fault); + case MANAGEDJOBPORTTYPE_SUBSCRIBE_RESOURCEUNKNOWNFAULT: + result = GlobusLErrorInvalid( + "or unknown job reference. Job resource may have expired or been terminated", + "Unable to subscribe for notifications."); + break; + /* These occur when the service can't handle the normal topics + * or some internal serialization or parsing error occurs + */ + case MANAGEDJOBPORTTYPE_SUBSCRIBE_SUBSCRIBECREATIONFAILEDFAULT: + case MANAGEDJOBPORTTYPE_SUBSCRIBE_TOPICPATHDIALECTUNKNOWNFAULT: + case MANAGEDJOBPORTTYPE_SUBSCRIBE_INVALIDTOPICEXPRESSIONFAULT: + case MANAGEDJOBPORTTYPE_SUBSCRIBE_TOPICNOTSUPPORTEDFAULT: + result = GlobusLErrorWrapFault( + "subcribing for job notitifications", + fault->value); + break; + + case MANAGEDJOBPORTTYPE_SUBSCRIBE_NOFAULT: + case MANAGEDJOBPORTTYPE_SUBSCRIBE_UNKNOWN_FAULT: + default: + result = GlobusLErrorWrapResult("subscribing", result); + break; } - result = GlobusLErrorWrapResult("subscribing", result); goto error_subscribe; } --- source-trees/wsrf-cvs/ws-gram/client/c/source/globus_i_query.c 16 Mar 2006 17:21:16 -0000 1.14.2.2 +++ source-trees/wsrf-cvs/ws-gram/client/c/source/globus_i_query.c 24 Apr 2008 15:57:09 -0000 1.14.2.3 @@ -153,11 +153,25 @@ &fault); if(result != GLOBUS_SUCCESS) { - if(fault_type != GLOBUS_SUCCESS) + switch (fault_type) { - xsd_any_destroy(fault); + case MANAGEDJOBPORTTYPE_GETMULTIPLERESOURCEPROPERTIES_RESOURCEUNKNOWNFAULT: + result = GlobusLErrorInvalid( + "or unknown job resource while querying job state", + "Job may have expired or been destroyed."); + break; + case MANAGEDJOBPORTTYPE_GETMULTIPLERESOURCEPROPERTIES_INVALIDRESOURCEPROPERTYQNAMEFAULT: + result = GlobusLErrorWrapFault( + "Unable to query job state because the server is not publishing a resource property", + fault->value); + break; + + case MANAGEDJOBPORTTYPE_GETMULTIPLERESOURCEPROPERTIES_NOFAULT: + case MANAGEDJOBPORTTYPE_GETMULTIPLERESOURCEPROPERTIES_UNKNOWN_FAULT: + default: + result = GlobusLErrorWrapResult("querying job state", result); + break; } - result = GlobusLErrorWrapResult("querying job state", result); goto error; } @@ -411,11 +425,24 @@ &fault); if(result != GLOBUS_SUCCESS) { - if(fault_type != GLOBUS_SUCCESS) + switch (fault_type) { - xsd_any_destroy(fault); + case MANAGEDJOBPORTTYPE_GETRESOURCEPROPERTY_RESOURCEUNKNOWNFAULT: + result = GlobusLErrorInvalid( + "or unknown job reference. Job resource may have expired or been terminated", + "Unable to query job description document."); + break; + case MANAGEDJOBPORTTYPE_GETRESOURCEPROPERTY_INVALIDRESOURCEPROPERTYQNAMEFAULT: + result = GlobusLErrorWrapFault( + "invalid resource property", + fault->value); + break; + case MANAGEDJOBPORTTYPE_GETRESOURCEPROPERTY_NOFAULT: + case MANAGEDJOBPORTTYPE_GETRESOURCEPROPERTY_UNKNOWN_FAULT: + default: + result = GlobusLErrorWrapResult("quering job description document", result); + break; } - result = GlobusLErrorWrapResult("querying job submission", result); goto error; } --- source-trees/wsrf-cvs/ws-gram/client/c/source/globus_i_submit.c 9 Jun 2005 12:50:52 -0000 1.23.2.2 +++ source-trees/wsrf-cvs/ws-gram/client/c/source/globus_i_submit.c 24 Apr 2008 15:57:09 -0000 1.23.2.3 @@ -724,11 +724,17 @@ factory_handle, epr, input, &output, &fault_type, &fault); if(result != GLOBUS_SUCCESS) { - if(fault_type != GLOBUS_SUCCESS) + switch (fault_type) { - xsd_any_destroy(fault); + case MANAGEDJOBFACTORYPORTTYPE_CREATEMANAGEDJOB_CREATEMANAGEDJOBFAULT: + result = GlobusLErrorWrapFault("submiting job", fault); + break; + case MANAGEDJOBFACTORYPORTTYPE_CREATEMANAGEDJOB_NOFAULT: + case MANAGEDJOBFACTORYPORTTYPE_CREATEMANAGEDJOB_UNKNOWN_FAULT: + default: + result = GlobusLErrorWrapResult("submitting job", result); + break; } - result = GlobusLErrorWrapResult("submitting job", result); goto error; } --- source-trees/wsrf-cvs/ws-gram/client/c/source/pkgdata/pkg_data_src.gpt.in 22 Jan 2008 16:17:33 -0000 1.16.8.13 +++ source-trees/wsrf-cvs/ws-gram/client/c/source/pkgdata/pkg_data_src.gpt.in 24 Apr 2008 15:57:10 -0000 1.16.8.14 @@ -1,7 +1,7 @@ - + globusrun-ws WS GRAM