fixing build failures
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0f57945c Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0f57945c Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0f57945c Branch: refs/heads/develop Commit: 0f57945c6cd78dfa9d8441d8dbf65bc97b7e2613 Parents: 5881af9 Author: scnakandala <[email protected]> Authored: Wed Dec 23 01:34:06 2015 -0500 Committer: scnakandala <[email protected]> Committed: Wed Dec 23 01:34:06 2015 -0500 ---------------------------------------------------------------------- .../airavata/gfac/server/GfacServerHandler.java | 2 +- .../core/impl/RabbitMQStatusConsumer.java | 34 +++++++++++--------- .../catalog/impl/ApplicationInterfaceImpl.java | 6 ++-- .../app/catalog/impl/ComputeResourceImpl.java | 3 +- 4 files changed, 24 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/0f57945c/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java index c1c08a5..753fe75 100644 --- a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java +++ b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java @@ -78,7 +78,7 @@ public class GfacServerHandler implements GfacService.Iface { private CuratorFramework curatorClient; private Publisher statusPublisher; private String airavataServerHostPort; - private BlockingQueue<TaskSubmitEvent> taskSubmitEvents; +// private BlockingQueue<TaskSubmitEvent> taskSubmitEvents; private static List<AbstractActivityListener> activityListeners = new ArrayList<AbstractActivityListener>(); private ExecutorService executorService; http://git-wip-us.apache.org/repos/asf/airavata/blob/0f57945c/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQStatusConsumer.java ---------------------------------------------------------------------- diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQStatusConsumer.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQStatusConsumer.java index 561cde2..65185dd 100644 --- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQStatusConsumer.java +++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQStatusConsumer.java @@ -193,23 +193,25 @@ public class RabbitMQStatusConsumer implements Consumer { jobStatusChangeEvent.getState()); event = jobStatusChangeEvent; gatewayId = jobStatusChangeEvent.getJobIdentity().getGatewayId(); - } else if (message.getMessageType().equals(MessageType.LAUNCHPROCESS)) { - TaskSubmitEvent taskSubmitEvent = new TaskSubmitEvent(); - ThriftUtils.createThriftFromBytes(message.getEvent(), taskSubmitEvent); - log.debug(" Message Received with message id '" + message.getMessageId() - + "' and with message type '" + message.getMessageType() + "' for experimentId: " + - taskSubmitEvent.getExperimentId() + "and taskId: " + taskSubmitEvent.getTaskId()); - event = taskSubmitEvent; - gatewayId = taskSubmitEvent.getGatewayId(); - } else if (message.getMessageType().equals(MessageType.TERMINATEPROCESS)) { - TaskTerminateEvent taskTerminateEvent = new TaskTerminateEvent(); - ThriftUtils.createThriftFromBytes(message.getEvent(), taskTerminateEvent); - log.debug(" Message Received with message id '" + message.getMessageId() - + "' and with message type '" + message.getMessageType() + "' for experimentId: " + - taskTerminateEvent.getExperimentId() + "and taskId: " + taskTerminateEvent.getTaskId()); - event = taskTerminateEvent; - gatewayId = null; } +// FIXME TaskSubmit is no longer in the data models +// else if (message.getMessageType().equals(MessageType.LAUNCHPROCESS)) { +// TaskSubmitEvent taskSubmitEvent = new TaskSubmitEvent(); +// ThriftUtils.createThriftFromBytes(message.getEvent(), taskSubmitEvent); +// log.debug(" Message Received with message id '" + message.getMessageId() +// + "' and with message type '" + message.getMessageType() + "' for experimentId: " + +// taskSubmitEvent.getExperimentId() + "and taskId: " + taskSubmitEvent.getTaskId()); +// event = taskSubmitEvent; +// gatewayId = taskSubmitEvent.getGatewayId(); +// } else if (message.getMessageType().equals(MessageType.TERMINATEPROCESS)) { +// TaskTerminateEvent taskTerminateEvent = new TaskTerminateEvent(); +// ThriftUtils.createThriftFromBytes(message.getEvent(), taskTerminateEvent); +// log.debug(" Message Received with message id '" + message.getMessageId() +// + "' and with message type '" + message.getMessageType() + "' for experimentId: " + +// taskTerminateEvent.getExperimentId() + "and taskId: " + taskTerminateEvent.getTaskId()); +// event = taskTerminateEvent; +// gatewayId = null; +// } MessageContext messageContext = new MessageContext(event, message.getMessageType(), message.getMessageId(), gatewayId); messageContext.setUpdatedTime(AiravataUtils.getTime(message.getUpdatedTime())); messageContext.setIsRedeliver(envelope.isRedeliver()); http://git-wip-us.apache.org/repos/asf/airavata/blob/0f57945c/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationInterfaceImpl.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationInterfaceImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationInterfaceImpl.java index 0a5806a..40a9833 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationInterfaceImpl.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationInterfaceImpl.java @@ -23,9 +23,9 @@ package org.apache.airavata.registry.core.app.catalog.impl; import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule; import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription; -import org.apache.airavata.model.appcatalog.appinterface.application_interface_modelConstants; import org.apache.airavata.model.application.io.InputDataObjectType; import org.apache.airavata.model.application.io.OutputDataObjectType; +import org.apache.airavata.model.commons.airavata_commonsConstants; import org.apache.airavata.registry.core.app.catalog.resources.*; import org.apache.airavata.registry.core.app.catalog.util.AppCatalogThriftConversion; import org.apache.airavata.registry.core.app.catalog.util.AppCatalogUtils; @@ -48,7 +48,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface { AppModuleResource moduleResource = new AppModuleResource(); moduleResource.setModuleName(applicationModule.getAppModuleName()); moduleResource.setGatewayId(gatewayId); - if (!applicationModule.getAppModuleId().equals("") && !applicationModule.getAppModuleId().equals(application_interface_modelConstants.DEFAULT_ID)){ + if (!applicationModule.getAppModuleId().equals("") && !applicationModule.getAppModuleId().equals(airavata_commonsConstants.DEFAULT_ID)){ moduleResource.setModuleId(applicationModule.getAppModuleId()); }else { moduleResource.setModuleId(AppCatalogUtils.getID(applicationModule.getAppModuleName())); @@ -69,7 +69,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface { try { AppInterfaceResource resource = new AppInterfaceResource(); resource.setAppName(applicationInterfaceDescription.getApplicationName()); - if (!applicationInterfaceDescription.getApplicationInterfaceId().equals("") && !applicationInterfaceDescription.getApplicationInterfaceId().equals(application_interface_modelConstants.DEFAULT_ID)){ + if (!applicationInterfaceDescription.getApplicationInterfaceId().equals("") && !applicationInterfaceDescription.getApplicationInterfaceId().equals(airavata_commonsConstants.DEFAULT_ID)){ resource.setInterfaceId(applicationInterfaceDescription.getApplicationInterfaceId()); }else { resource.setInterfaceId(AppCatalogUtils.getID(applicationInterfaceDescription.getApplicationName())); http://git-wip-us.apache.org/repos/asf/airavata/blob/0f57945c/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java index 3dbf671..f89d5b6 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java @@ -22,6 +22,7 @@ package org.apache.airavata.registry.core.app.catalog.impl; import org.apache.airavata.model.appcatalog.computeresource.*; +import org.apache.airavata.model.commons.airavata_commonsConstants; import org.apache.airavata.model.data.movement.*; import org.apache.airavata.model.data.movement.DMType; import org.apache.airavata.registry.core.app.catalog.resources.*; @@ -43,7 +44,7 @@ public class ComputeResourceImpl implements ComputeResource { @Override public String addComputeResource(ComputeResourceDescription description) throws AppCatalogException { try { - if (description.getComputeResourceId().equals("") || description.getComputeResourceId().equals(compute_resource_modelConstants.DEFAULT_ID)){ + if (description.getComputeResourceId().equals("") || description.getComputeResourceId().equals(airavata_commonsConstants.DEFAULT_ID)){ description.setComputeResourceId(AppCatalogUtils.getID(description.getHostName())); } return saveComputeResourceDescriptorData(description);
