You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2013/06/07 19:45:34 UTC
svn commit: r1490752 - in /airavata/trunk/modules/rest:
client/src/main/java/org/apache/airavata/rest/client/
mappings/src/main/java/org/apache/airavata/rest/mappings/utils/
service/src/main/java/org/apache/airavata/services/registry/rest/resources/
Author: chathuri
Date: Fri Jun 7 17:45:34 2013
New Revision: 1490752
URL: http://svn.apache.org/r1490752
Log:
fixing AIRAVATA-865
Modified:
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ResourcePathConstants.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java?rev=1490752&r1=1490751&r2=1490752&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java Fri Jun 7 17:45:34 2013
@@ -2269,9 +2269,9 @@ public class ProvenanceResourceClient {
return 0;
}
- public void addGFacJob(ApplicationJob job) {
+ public void addApplicationJob(ApplicationJob job) {
webResource = getProvenanceRegistryBaseResource().path(
- ResourcePathConstants.ProvenanceResourcePathConstants.ADD_GFAC_JOB);
+ ResourcePathConstants.ProvenanceResourcePathConstants.ADD_APPLICATION_JOB);
builder = BasicAuthHeaderUtil.getBuilder(
webResource, null, userName, null, cookie, gateway);
ClientResponse response = builder.accept(
@@ -2306,9 +2306,9 @@ public class ProvenanceResourceClient {
}
}
- public void updateGFacJob(ApplicationJob job) {
+ public void updateApplicationJob(ApplicationJob job) {
webResource = getProvenanceRegistryBaseResource().path(
- ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB);
+ ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_APPLICATION_JOB);
builder = BasicAuthHeaderUtil.getBuilder(
webResource, null, userName, null, cookie, gateway);
ClientResponse response = builder.accept(
@@ -2343,9 +2343,9 @@ public class ProvenanceResourceClient {
}
}
- public void updateGFacJobStatus(String gfacJobId, ApplicationJob.ApplicationJobStatus status, Date statusUpdateTime) {
+ public void updateApplicationJobStatus(String gfacJobId, ApplicationJob.ApplicationJobStatus status, Date statusUpdateTime) {
webResource = getProvenanceRegistryBaseResource().path(
- ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB_STATUS);
+ ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_APPLICATION_JOB_STATUS);
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String submittedDate = dateFormat.format(statusUpdateTime);
MultivaluedMap formParams = new MultivaluedMapImpl();
@@ -2386,9 +2386,9 @@ public class ProvenanceResourceClient {
}
}
- public void updateGFacJobData(String gfacJobId, String jobdata){
+ public void updateApplicationJobData(String gfacJobId, String jobdata){
webResource = getProvenanceRegistryBaseResource().path(
- ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB_DATA);
+ ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_APPLICATION_JOB_DATA);
MultivaluedMap formParams = new MultivaluedMapImpl();
formParams.add("gfacJobID", gfacJobId);
formParams.add("jobdata", jobdata);
@@ -2426,11 +2426,11 @@ public class ProvenanceResourceClient {
}
}
- public void updateGFacJobSubmittedTime(String gfacJobId, Date submitted){
+ public void updateApplicationJobSubmittedTime(String gfacJobId, Date submitted){
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String submittedDate = dateFormat.format(submitted);
webResource = getProvenanceRegistryBaseResource().path(
- ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB_SUBMITTED_TIME);
+ ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_APPLICATION_JOB_SUBMITTED_TIME);
MultivaluedMap formParams = new MultivaluedMapImpl();
formParams.add("gfacJobID", gfacJobId);
formParams.add("submittedDate", submittedDate);
@@ -2469,11 +2469,11 @@ public class ProvenanceResourceClient {
}
- public void updateGFacJobCompletedTime(String gfacJobId, Date completed){
+ public void updateApplicationJobCompletedTime(String gfacJobId, Date completed){
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String completedDate = dateFormat.format(completed);
webResource = getProvenanceRegistryBaseResource().path(
- ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB_COMPLETED_TIME);
+ ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_APPLICATION_JOB_COMPLETED_TIME);
MultivaluedMap formParams = new MultivaluedMapImpl();
formParams.add("gfacJobID", gfacJobId);
formParams.add("completedDate", completedDate);
@@ -2511,9 +2511,9 @@ public class ProvenanceResourceClient {
}
}
- public void updateGFacJobMetadata(String gfacJobId, String metadata){
+ public void updateApplicationJobMetadata(String gfacJobId, String metadata){
webResource = getProvenanceRegistryBaseResource().path(
- ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB_METADATA);
+ ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_APPLICATION_JOB_METADATA);
MultivaluedMap formParams = new MultivaluedMapImpl();
formParams.add("gfacJobID", gfacJobId);
formParams.add("metadata", metadata);
@@ -2551,9 +2551,9 @@ public class ProvenanceResourceClient {
}
}
- public ApplicationJob getGFacJob(String gfacJobId){
+ public ApplicationJob getApplicationJob(String gfacJobId){
webResource = getProvenanceRegistryBaseResource().path(
- ResourcePathConstants.ProvenanceResourcePathConstants.GET_GFAC_JOB);
+ ResourcePathConstants.ProvenanceResourcePathConstants.GET_APPLICATION_JOB);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("gfacJobId", gfacJobId);
builder = BasicAuthHeaderUtil.getBuilder(
@@ -2597,11 +2597,11 @@ public class ProvenanceResourceClient {
return gFacJob;
}
- public List<ApplicationJob> getGFacJobsForDescriptors(String serviceDescriptionId,
- String hostDescriptionId,
- String applicationDescriptionId){
+ public List<ApplicationJob> getApplicationJobsForDescriptors(String serviceDescriptionId,
+ String hostDescriptionId,
+ String applicationDescriptionId){
webResource = getProvenanceRegistryBaseResource().path(
- ResourcePathConstants.ProvenanceResourcePathConstants.GET_GFAC_JOBS_FOR_DESCRIPTORS);
+ ResourcePathConstants.ProvenanceResourcePathConstants.GET_APPLICATION_JOBS_FOR_DESCRIPTORS);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("serviceDescriptionId", serviceDescriptionId);
queryParams.add("hostDescriptionId", hostDescriptionId);
@@ -2647,11 +2647,11 @@ public class ProvenanceResourceClient {
return gFacJobList.getJobList();
}
- public List<ApplicationJob> getGFacJobs(String experimentId,
- String workflowExecutionId,
- String nodeId) {
+ public List<ApplicationJob> getApplicationJobs(String experimentId,
+ String workflowExecutionId,
+ String nodeId) {
webResource = getProvenanceRegistryBaseResource().path(
- ResourcePathConstants.ProvenanceResourcePathConstants.GET_GFAC_JOBS);
+ ResourcePathConstants.ProvenanceResourcePathConstants.GET_APPLICATION_JOBS);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("experimentId", experimentId);
queryParams.add("workflowExecutionId", workflowExecutionId);
@@ -2696,9 +2696,9 @@ public class ProvenanceResourceClient {
return gFacJobList.getJobList();
}
- public boolean isGFacJobExists(String gfacJobId){
+ public boolean isApplicationJobExists(String gfacJobId){
webResource = getProvenanceRegistryBaseResource().path(
- ResourcePathConstants.ProvenanceResourcePathConstants.GFAC_JOB_EXIST);
+ ResourcePathConstants.ProvenanceResourcePathConstants.APPLICATION_JOB_EXIST);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("gfacJobId", gfacJobId);
builder = BasicAuthHeaderUtil.getBuilder(
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java?rev=1490752&r1=1490751&r2=1490752&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java Fri Jun 7 17:45:34 2013
@@ -903,71 +903,71 @@ public class RegistryClient extends Aira
@Override
public void addApplicationJob(ApplicationJob job) throws RegistryException {
- getProvenanceResourceClient().addGFacJob(job);
+ getProvenanceResourceClient().addApplicationJob(job);
}
@Override
public void updateApplicationJob(ApplicationJob job) throws RegistryException {
- getProvenanceResourceClient().updateGFacJob(job);
+ getProvenanceResourceClient().updateApplicationJob(job);
}
@Override
public void updateApplicationJobStatus(String gfacJobId, ApplicationJobStatus status, Date statusUpdateTime)
throws RegistryException {
- getProvenanceResourceClient().updateGFacJobStatus(gfacJobId, status, statusUpdateTime);
+ getProvenanceResourceClient().updateApplicationJobStatus(gfacJobId, status, statusUpdateTime);
}
@Override
public void updateApplicationJobData(String gfacJobId, String jobdata)
throws RegistryException {
- getProvenanceResourceClient().updateGFacJobData(gfacJobId, jobdata);
+ getProvenanceResourceClient().updateApplicationJobData(gfacJobId, jobdata);
}
@Override
public void updateApplicationJobSubmittedTime(String gfacJobId, Date submitted)
throws RegistryException {
- getProvenanceResourceClient().updateGFacJobSubmittedTime(gfacJobId, submitted);
+ getProvenanceResourceClient().updateApplicationJobSubmittedTime(gfacJobId, submitted);
}
@Override
public void updateApplicationJobStatusUpdateTime(String gfacJobId, Date completed)
throws RegistryException {
- getProvenanceResourceClient().updateGFacJobCompletedTime(gfacJobId, completed);
+ getProvenanceResourceClient().updateApplicationJobCompletedTime(gfacJobId, completed);
}
@Override
public void updateApplicationJobMetadata(String gfacJobId, String metadata)
throws RegistryException {
- getProvenanceResourceClient().updateGFacJobMetadata(gfacJobId, metadata);
+ getProvenanceResourceClient().updateApplicationJobMetadata(gfacJobId, metadata);
}
@Override
public ApplicationJob getApplicationJob(String gfacJobId) throws RegistryException {
- return getProvenanceResourceClient().getGFacJob(gfacJobId);
+ return getProvenanceResourceClient().getApplicationJob(gfacJobId);
}
@Override
public List<ApplicationJob> getApplicationJobsForDescriptors(String serviceDescriptionId,
String hostDescriptionId, String applicationDescriptionId)
throws RegistryException {
- return getProvenanceResourceClient().getGFacJobsForDescriptors(serviceDescriptionId, hostDescriptionId, applicationDescriptionId);
+ return getProvenanceResourceClient().getApplicationJobsForDescriptors(serviceDescriptionId, hostDescriptionId, applicationDescriptionId);
}
@Override
public List<ApplicationJob> getApplicationJobs(String experimentId,
String workflowExecutionId, String nodeId) throws RegistryException {
- return getProvenanceResourceClient().getGFacJobs(experimentId, workflowExecutionId, nodeId);
+ return getProvenanceResourceClient().getApplicationJobs(experimentId, workflowExecutionId, nodeId);
}
@Override
public boolean isApplicationJobExists(String gfacJobId) throws RegistryException {
- return getProvenanceResourceClient().isGFacJobExists(gfacJobId);
+ return getProvenanceResourceClient().isApplicationJobExists(gfacJobId);
}
}
Modified: airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ResourcePathConstants.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ResourcePathConstants.java?rev=1490752&r1=1490751&r2=1490752&view=diff
==============================================================================
--- airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ResourcePathConstants.java (original)
+++ airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ResourcePathConstants.java Fri Jun 7 17:45:34 2013
@@ -152,17 +152,17 @@ public class ResourcePathConstants {
public static final String ADD_WORKFLOW_ERROR = "add/workflow/errors";
public static final String ADD_NODE_ERROR = "add/node/errors";
public static final String ADD_GFAC_ERROR = "add/gfac/errors";
- public static final String ADD_GFAC_JOB = "add/gfac/job";
- public static final String UPDATE_GFAC_JOB = "update/gfac/job";
- public static final String UPDATE_GFAC_JOB_STATUS = "update/gfac/jobstatus";
- public static final String UPDATE_GFAC_JOB_DATA = "update/gfac/jobdata";
- public static final String UPDATE_GFAC_JOB_SUBMITTED_TIME = "update/gfac/job/submit";
- public static final String UPDATE_GFAC_JOB_COMPLETED_TIME = "update/gfac/job/complete";
- public static final String UPDATE_GFAC_JOB_METADATA = "update/gfac/job/metadata";
- public static final String GET_GFAC_JOB = "get/gfac/job";
- public static final String GET_GFAC_JOBS_FOR_DESCRIPTORS = "get/gfac/jobs/descriptors";
- public static final String GET_GFAC_JOBS = "get/gfac/jobs";
- public static final String GFAC_JOB_EXIST = "gfac/job/exists";
+ public static final String ADD_APPLICATION_JOB = "add/application/job";
+ public static final String UPDATE_APPLICATION_JOB = "update/application/job";
+ public static final String UPDATE_APPLICATION_JOB_STATUS = "update/application/jobstatus";
+ public static final String UPDATE_APPLICATION_JOB_DATA = "update/application/jobdata";
+ public static final String UPDATE_APPLICATION_JOB_SUBMITTED_TIME = "update/application/job/submit";
+ public static final String UPDATE_APPLICATION_JOB_COMPLETED_TIME = "update/application/job/complete";
+ public static final String UPDATE_APPLICATION_JOB_METADATA = "update/application/job/metadata";
+ public static final String GET_APPLICATION_JOB = "get/application/job";
+ public static final String GET_APPLICATION_JOBS_FOR_DESCRIPTORS = "get/application/jobs/descriptors";
+ public static final String GET_APPLICATION_JOBS = "get/application/jobs";
+ public static final String APPLICATION_JOB_EXIST = "application/job/exists";
}
public final class PublishedWFConstants {
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java?rev=1490752&r1=1490751&r2=1490752&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java Fri Jun 7 17:45:34 2013
@@ -1620,10 +1620,10 @@ public class ProvenanceRegistryResource
}
@POST
- @Path(ResourcePathConstants.ProvenanceResourcePathConstants.ADD_GFAC_JOB)
+ @Path(ResourcePathConstants.ProvenanceResourcePathConstants.ADD_APPLICATION_JOB)
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Produces(MediaType.TEXT_PLAIN)
- public Response addGFacJob(ApplicationJob job) {
+ public Response addApplicationJob(ApplicationJob job) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.addApplicationJob(job);
@@ -1631,7 +1631,7 @@ public class ProvenanceRegistryResource
builder.entity("GFac Job added successfully");
return builder.build();
} catch (Throwable e) {
- return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.ADD_GFAC_JOB, e);
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.ADD_APPLICATION_JOB, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1640,10 +1640,10 @@ public class ProvenanceRegistryResource
}
@POST
- @Path(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB)
+ @Path(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_APPLICATION_JOB)
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Produces(MediaType.TEXT_PLAIN)
- public Response updateGFacJob(ApplicationJob job) {
+ public Response updateApplicationJob(ApplicationJob job) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.updateApplicationJob(job);
@@ -1651,7 +1651,7 @@ public class ProvenanceRegistryResource
builder.entity("GFac Job updated successfully");
return builder.build();
} catch (Throwable e) {
- return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB, e);
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_APPLICATION_JOB, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1660,12 +1660,12 @@ public class ProvenanceRegistryResource
}
@POST
- @Path(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB_STATUS)
+ @Path(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_APPLICATION_JOB_STATUS)
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Produces(MediaType.TEXT_PLAIN)
- public Response updateGFacJobStatus(@FormParam("gfacJobID") String gfacJobID,
- @FormParam("gfacJobStatus") String gfacJobStatus,
- @FormParam("statusUpdateDate") String statusUpdatedDate ) {
+ public Response updateApplicationJobStatus(@FormParam("gfacJobID") String gfacJobID,
+ @FormParam("gfacJobStatus") String gfacJobStatus,
+ @FormParam("statusUpdateDate") String statusUpdatedDate) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
ApplicationJob.ApplicationJobStatus status = ApplicationJob.ApplicationJobStatus.valueOf(gfacJobStatus);
@@ -1676,7 +1676,7 @@ public class ProvenanceRegistryResource
builder.entity("GFac Job status updated successfully");
return builder.build();
} catch (Throwable e) {
- return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB_STATUS, e);
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_APPLICATION_JOB_STATUS, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1685,11 +1685,11 @@ public class ProvenanceRegistryResource
}
@POST
- @Path(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB_DATA)
+ @Path(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_APPLICATION_JOB_DATA)
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Produces(MediaType.TEXT_PLAIN)
- public Response updateGFacJobData(@FormParam("gfacJobID") String gfacJobID,
- @FormParam("jobdata") String jobdata ) {
+ public Response updateApplicationJobData(@FormParam("gfacJobID") String gfacJobID,
+ @FormParam("jobdata") String jobdata) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.updateApplicationJobData(gfacJobID, jobdata);
@@ -1697,7 +1697,7 @@ public class ProvenanceRegistryResource
builder.entity("GFac Job data updated successfully");
return builder.build();
} catch (Throwable e) {
- return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB_DATA, e);
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_APPLICATION_JOB_DATA, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1706,11 +1706,11 @@ public class ProvenanceRegistryResource
}
@POST
- @Path(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB_SUBMITTED_TIME)
+ @Path(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_APPLICATION_JOB_SUBMITTED_TIME)
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Produces(MediaType.TEXT_PLAIN)
- public Response updateGFacJobSubmittedTime(@FormParam("gfacJobID") String gfacJobID,
- @FormParam("submittedDate") String submittedDate ) {
+ public Response updateApplicationJobSubmittedTime(@FormParam("gfacJobID") String gfacJobID,
+ @FormParam("submittedDate") String submittedDate) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1720,7 +1720,7 @@ public class ProvenanceRegistryResource
builder.entity("GFac Job data submitted date updated successfully");
return builder.build();
} catch (Throwable e) {
- return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB_SUBMITTED_TIME, e);
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_APPLICATION_JOB_SUBMITTED_TIME, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1729,11 +1729,11 @@ public class ProvenanceRegistryResource
}
@POST
- @Path(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB_COMPLETED_TIME)
+ @Path(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_APPLICATION_JOB_COMPLETED_TIME)
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Produces(MediaType.TEXT_PLAIN)
- public Response updateGFacJobCompletedTime(@FormParam("gfacJobID") String gfacJobID,
- @FormParam("completedDate") String completedDate ) {
+ public Response updateApplicationJobCompletedTime(@FormParam("gfacJobID") String gfacJobID,
+ @FormParam("completedDate") String completedDate) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1743,7 +1743,7 @@ public class ProvenanceRegistryResource
builder.entity("GFac Job data completed date updated successfully");
return builder.build();
} catch (Throwable e) {
- return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB_COMPLETED_TIME, e);
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_APPLICATION_JOB_COMPLETED_TIME, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1752,11 +1752,11 @@ public class ProvenanceRegistryResource
}
@POST
- @Path(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB_METADATA)
+ @Path(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_APPLICATION_JOB_METADATA)
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Produces(MediaType.TEXT_PLAIN)
- public Response updateGFacJobMetadata(@FormParam("gfacJobID") String gfacJobID,
- @FormParam("metadata") String metadata ) {
+ public Response updateApplicationJobMetadata(@FormParam("gfacJobID") String gfacJobID,
+ @FormParam("metadata") String metadata) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.updateApplicationJobMetadata(gfacJobID, metadata);
@@ -1764,7 +1764,7 @@ public class ProvenanceRegistryResource
builder.entity("GFac Job metadata updated successfully");
return builder.build();
} catch (Throwable e) {
- return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB_METADATA, e);
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_APPLICATION_JOB_METADATA, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1773,9 +1773,9 @@ public class ProvenanceRegistryResource
}
@GET
- @Path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_GFAC_JOB)
+ @Path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_APPLICATION_JOB)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- public Response getGFacJob(@QueryParam("gfacJobId") String gfacJobId){
+ public Response getApplicationJob(@QueryParam("gfacJobId") String gfacJobId){
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
ApplicationJob gFacJob = airavataRegistry.getApplicationJob(gfacJobId);
@@ -1788,7 +1788,7 @@ public class ProvenanceRegistryResource
return builder.build();
}
} catch (Throwable e) {
- return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_GFAC_JOB, e);
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_APPLICATION_JOB, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1797,11 +1797,11 @@ public class ProvenanceRegistryResource
}
@GET
- @Path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_GFAC_JOBS_FOR_DESCRIPTORS)
+ @Path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_APPLICATION_JOBS_FOR_DESCRIPTORS)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- public Response getGFacJobsForDescriptors(@QueryParam("serviceDescriptionId") String serviceDescriptionId,
- @QueryParam("hostDescriptionId") String hostDescriptionId,
- @QueryParam("applicationDescriptionId") String applicationDescriptionId){
+ public Response getApplicationJobsForDescriptors(@QueryParam("serviceDescriptionId") String serviceDescriptionId,
+ @QueryParam("hostDescriptionId") String hostDescriptionId,
+ @QueryParam("applicationDescriptionId") String applicationDescriptionId){
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
GFacJobList gFacJobList = new GFacJobList();
@@ -1816,7 +1816,7 @@ public class ProvenanceRegistryResource
return builder.build();
}
} catch (Throwable e) {
- return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_GFAC_JOBS_FOR_DESCRIPTORS, e);
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_APPLICATION_JOBS_FOR_DESCRIPTORS, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1825,11 +1825,11 @@ public class ProvenanceRegistryResource
}
@GET
- @Path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_GFAC_JOBS)
+ @Path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_APPLICATION_JOBS)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- public Response getGFacJobs(@QueryParam("experimentId") String experimentID,
- @QueryParam("workflowExecutionId") String workflowInstanceID,
- @QueryParam("nodeId") String nodeID){
+ public Response getApplicationJobs(@QueryParam("experimentId") String experimentID,
+ @QueryParam("workflowExecutionId") String workflowInstanceID,
+ @QueryParam("nodeId") String nodeID){
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
GFacJobList gFacJobList = new GFacJobList();
@@ -1844,7 +1844,7 @@ public class ProvenanceRegistryResource
return builder.build();
}
} catch (Throwable e) {
- return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_GFAC_JOBS_FOR_DESCRIPTORS, e);
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_APPLICATION_JOBS_FOR_DESCRIPTORS, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1853,9 +1853,9 @@ public class ProvenanceRegistryResource
}
@GET
- @Path(ResourcePathConstants.ProvenanceResourcePathConstants.GFAC_JOB_EXIST)
+ @Path(ResourcePathConstants.ProvenanceResourcePathConstants.APPLICATION_JOB_EXIST)
@Produces(MediaType.TEXT_PLAIN)
- public Response isGFacJobExists(@QueryParam("gfacJobId") String gfacJobId){
+ public Response isApplicationJobExists(@QueryParam("gfacJobId") String gfacJobId){
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
boolean gFacJobExists = airavataRegistry.isApplicationJobExists(gfacJobId);
@@ -1869,7 +1869,7 @@ public class ProvenanceRegistryResource
return builder.build();
}
} catch (Throwable e) {
- return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GFAC_JOB_EXIST, e);
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.APPLICATION_JOB_EXIST, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);