Updated Branches: refs/heads/master 926cd91d4 -> 0f06c3c55 creating gfac cpi, https://issues.apache.org/jira/browse/AIRAVATA-1010 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0f06c3c5 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0f06c3c5 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0f06c3c5 Branch: refs/heads/master Commit: 0f06c3c5562d77cca70fc25473230de44aa7ba1b Parents: 926cd91 Author: lahiru Authored: Tue Feb 4 14:40:13 2014 -0500 Committer: lahiru Committed: Tue Feb 4 14:40:13 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/airavata/gfac/GFacAPI.java | 179 ------------------ .../org/apache/airavata/gfac/cpi/GFacAPI.java | 180 +++++++++++++++++++ .../gfac/services/impl/BESParallelJobTest.java | 2 +- .../gfac/services/impl/BESProviderTest.java | 2 +- .../core/gfac/services/impl/BigRed2Test.java | 2 +- .../gfac/services/impl/GSISSHProviderTest.java | 2 +- .../gfac/services/impl/GramProviderTest.java | 2 +- .../gfac/services/impl/LocalProviderTest.java | 2 +- .../gfac/services/impl/SSHProviderTest.java | 2 +- .../core/gfac/services/impl/US3Test.java | 2 +- .../airavata/gfac/ec2/EC2ProviderTest.java | 2 +- .../core/impl/EmbeddedGFACJobSubmitter.java | 2 +- .../xbaya/invoker/EmbeddedGFacInvoker.java | 2 +- 13 files changed, 191 insertions(+), 190 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/0f06c3c5/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacAPI.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacAPI.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacAPI.java deleted file mode 100644 index 6c46d53..0000000 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacAPI.java +++ /dev/null @@ -1,179 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * -*/ - -package org.apache.airavata.gfac; - -import java.util.List; - -import org.apache.airavata.client.AiravataClient; -import org.apache.airavata.common.utils.AiravataJobState; -import org.apache.airavata.gfac.context.JobExecutionContext; -import org.apache.airavata.gfac.handler.GFacHandler; -import org.apache.airavata.gfac.handler.GFacHandlerConfig; -import org.apache.airavata.gfac.handler.GFacHandlerException; -import org.apache.airavata.gfac.notification.events.ExecutionFailEvent; -import org.apache.airavata.gfac.notification.listeners.LoggingListener; -import org.apache.airavata.gfac.notification.listeners.WorkflowTrackingListener; -import org.apache.airavata.gfac.provider.GFacProvider; -import org.apache.airavata.gfac.provider.GFacProviderException; -import org.apache.airavata.registry.api.AiravataRegistry2; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class GFacAPI { - private static final Logger log = LoggerFactory.getLogger(GFacAPI.class); - public static final String ERROR_SENT = "ErrorSent"; - - - public void submitJob(JobExecutionContext jobExecutionContext) throws GFacException { - // We need to check whether this job is submitted as a part of a large workflow. If yes, - // we need to setup workflow tracking listerner. - String workflowInstanceID = null; - if ((workflowInstanceID = (String) jobExecutionContext.getProperty(Constants.PROP_WORKFLOW_INSTANCE_ID)) != null) { - // This mean we need to register workflow tracking listener. - //todo implement WorkflowTrackingListener properly - registerWorkflowTrackingListener(workflowInstanceID, jobExecutionContext); - } - // Register log event listener. This is required in all scenarios. - jobExecutionContext.getNotificationService().registerListener(new LoggingListener()); - schedule(jobExecutionContext); - } - - private void schedule(JobExecutionContext jobExecutionContext) throws GFacException { - // Scheduler will decide the execution flow of handlers and provider which handles - // the job. - String experimentID = jobExecutionContext.getExperimentID(); - try { - AiravataRegistry2 registry2 = ((AiravataClient)jobExecutionContext.getGFacConfiguration().getAiravataAPI()).getRegistryClient(); - Scheduler.schedule(jobExecutionContext); - - // Executing in handlers in the order as they have configured in GFac configuration - invokeInFlowHandlers(jobExecutionContext); -// if (experimentID != null){ -// registry2.changeStatus(jobExecutionContext.getExperimentID(),AiravataJobState.State.INHANDLERSDONE); -// } - - // After executing the in handlers provider instance should be set to job execution context. - // We get the provider instance and execute it. - GFacProvider provider = jobExecutionContext.getProvider(); - if (provider != null) { - initProvider(provider, jobExecutionContext); - executeProvider(provider, jobExecutionContext); - disposeProvider(provider, jobExecutionContext); - } - invokeOutFlowHandlers(jobExecutionContext); -// if (experimentID != null){ -// registry2.changeStatus(jobExecutionContext.getExperimentID(),AiravataJobState.State.OUTHANDLERSDONE); -// } - }catch (Exception e){ - jobExecutionContext.setProperty(ERROR_SENT,"true"); - jobExecutionContext.getNotifier().publish(new ExecutionFailEvent(e.getCause())); - throw new GFacException(e.getMessage(),e); - } - } - - private void initProvider(GFacProvider provider, JobExecutionContext jobExecutionContext) throws GFacException { - try { - provider.initialize(jobExecutionContext); - } catch (Exception e) { - throw new GFacException("Error while initializing provider " + provider.getClass().getName() + ".", e); - } - } - - private void executeProvider(GFacProvider provider, JobExecutionContext jobExecutionContext) throws GFacException { - try { - provider.execute(jobExecutionContext); - } catch (Exception e) { - throw new GFacException("Error while executing provider " + provider.getClass().getName() + " functionality.", e); - } - } - - private void disposeProvider(GFacProvider provider, JobExecutionContext jobExecutionContext) throws GFacException { - try { - provider.dispose(jobExecutionContext); - } catch (Exception e) { - throw new GFacException("Error while invoking provider " + provider.getClass().getName() + " dispose method.", e); - } - } - - private void registerWorkflowTrackingListener(String workflowInstanceID, JobExecutionContext jobExecutionContext) { - String workflowNodeID = (String) jobExecutionContext.getProperty(Constants.PROP_WORKFLOW_NODE_ID); - String topic = (String) jobExecutionContext.getProperty(Constants.PROP_TOPIC); - String brokerUrl = (String) jobExecutionContext.getProperty(Constants.PROP_BROKER_URL); - jobExecutionContext.getNotificationService().registerListener( - new WorkflowTrackingListener(workflowInstanceID, workflowNodeID, brokerUrl, topic)); - - } - - private void invokeInFlowHandlers(JobExecutionContext jobExecutionContext) throws GFacException { - List handlers = jobExecutionContext.getGFacConfiguration().getInHandlers(); - for (GFacHandlerConfig handlerClassName : handlers) { - Class handlerClass; - GFacHandler handler; - try { - handlerClass = Class.forName(handlerClassName.getClassName().trim()).asSubclass(GFacHandler.class); - handler = handlerClass.newInstance(); - handler.initProperties(handlerClassName.getProperties()); - } catch (ClassNotFoundException e) { - throw new GFacException("Cannot load handler class " + handlerClassName, e); - } catch (InstantiationException e) { - throw new GFacException("Cannot instantiate handler class " + handlerClassName, e); - } catch (IllegalAccessException e) { - throw new GFacException("Cannot instantiate handler class " + handlerClassName, e); - } - try { - handler.invoke(jobExecutionContext); - } catch (GFacHandlerException e) { - throw new GFacException("Error Executing a InFlow Handler", e.getCause()); - } - } - } - - private void invokeOutFlowHandlers(JobExecutionContext jobExecutionContext) throws GFacException { - List handlers = jobExecutionContext.getGFacConfiguration().getOutHandlers(); - - for (GFacHandlerConfig handlerClassName : handlers) { - Class handlerClass; - GFacHandler handler; - try { - handlerClass = Class.forName(handlerClassName.getClassName().trim()).asSubclass(GFacHandler.class); - handler = handlerClass.newInstance(); - handler.initProperties(handlerClassName.getProperties()); - } catch (ClassNotFoundException e) { - log.error(e.getMessage()); - throw new GFacException("Cannot load handler class " + handlerClassName, e); - } catch (InstantiationException e) { - log.error(e.getMessage()); - throw new GFacException("Cannot instantiate handler class " + handlerClassName, e); - } catch (IllegalAccessException e) { - log.error(e.getMessage()); - throw new GFacException("Cannot instantiate handler class " + handlerClassName, e); - } - try { - handler.invoke(jobExecutionContext); - } catch (Exception e) { - // TODO: Better error reporting. - throw new GFacException("Error Executing a OutFlow Handler" , e); - } - } - } - -} http://git-wip-us.apache.org/repos/asf/airavata/blob/0f06c3c5/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/cpi/GFacAPI.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/cpi/GFacAPI.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/cpi/GFacAPI.java new file mode 100644 index 0000000..8464750 --- /dev/null +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/cpi/GFacAPI.java @@ -0,0 +1,180 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ + +package org.apache.airavata.gfac.cpi; + +import java.util.List; + +import org.apache.airavata.client.AiravataClient; +import org.apache.airavata.gfac.Constants; +import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.Scheduler; +import org.apache.airavata.gfac.context.JobExecutionContext; +import org.apache.airavata.gfac.handler.GFacHandler; +import org.apache.airavata.gfac.handler.GFacHandlerConfig; +import org.apache.airavata.gfac.handler.GFacHandlerException; +import org.apache.airavata.gfac.notification.events.ExecutionFailEvent; +import org.apache.airavata.gfac.notification.listeners.LoggingListener; +import org.apache.airavata.gfac.notification.listeners.WorkflowTrackingListener; +import org.apache.airavata.gfac.provider.GFacProvider; +import org.apache.airavata.registry.api.AiravataRegistry2; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class GFacAPI { + private static final Logger log = LoggerFactory.getLogger(GFacAPI.class); + public static final String ERROR_SENT = "ErrorSent"; + + + public void submitJob(JobExecutionContext jobExecutionContext) throws GFacException { + // We need to check whether this job is submitted as a part of a large workflow. If yes, + // we need to setup workflow tracking listerner. + String workflowInstanceID = null; + if ((workflowInstanceID = (String) jobExecutionContext.getProperty(Constants.PROP_WORKFLOW_INSTANCE_ID)) != null) { + // This mean we need to register workflow tracking listener. + //todo implement WorkflowTrackingListener properly + registerWorkflowTrackingListener(workflowInstanceID, jobExecutionContext); + } + // Register log event listener. This is required in all scenarios. + jobExecutionContext.getNotificationService().registerListener(new LoggingListener()); + schedule(jobExecutionContext); + } + + private void schedule(JobExecutionContext jobExecutionContext) throws GFacException { + // Scheduler will decide the execution flow of handlers and provider which handles + // the job. + String experimentID = jobExecutionContext.getExperimentID(); + try { + AiravataRegistry2 registry2 = ((AiravataClient)jobExecutionContext.getGFacConfiguration().getAiravataAPI()).getRegistryClient(); + Scheduler.schedule(jobExecutionContext); + + // Executing in handlers in the order as they have configured in GFac configuration + invokeInFlowHandlers(jobExecutionContext); +// if (experimentID != null){ +// registry2.changeStatus(jobExecutionContext.getExperimentID(),AiravataJobState.State.INHANDLERSDONE); +// } + + // After executing the in handlers provider instance should be set to job execution context. + // We get the provider instance and execute it. + GFacProvider provider = jobExecutionContext.getProvider(); + if (provider != null) { + initProvider(provider, jobExecutionContext); + executeProvider(provider, jobExecutionContext); + disposeProvider(provider, jobExecutionContext); + } + invokeOutFlowHandlers(jobExecutionContext); +// if (experimentID != null){ +// registry2.changeStatus(jobExecutionContext.getExperimentID(),AiravataJobState.State.OUTHANDLERSDONE); +// } + }catch (Exception e){ + jobExecutionContext.setProperty(ERROR_SENT,"true"); + jobExecutionContext.getNotifier().publish(new ExecutionFailEvent(e.getCause())); + throw new GFacException(e.getMessage(),e); + } + } + + private void initProvider(GFacProvider provider, JobExecutionContext jobExecutionContext) throws GFacException { + try { + provider.initialize(jobExecutionContext); + } catch (Exception e) { + throw new GFacException("Error while initializing provider " + provider.getClass().getName() + ".", e); + } + } + + private void executeProvider(GFacProvider provider, JobExecutionContext jobExecutionContext) throws GFacException { + try { + provider.execute(jobExecutionContext); + } catch (Exception e) { + throw new GFacException("Error while executing provider " + provider.getClass().getName() + " functionality.", e); + } + } + + private void disposeProvider(GFacProvider provider, JobExecutionContext jobExecutionContext) throws GFacException { + try { + provider.dispose(jobExecutionContext); + } catch (Exception e) { + throw new GFacException("Error while invoking provider " + provider.getClass().getName() + " dispose method.", e); + } + } + + private void registerWorkflowTrackingListener(String workflowInstanceID, JobExecutionContext jobExecutionContext) { + String workflowNodeID = (String) jobExecutionContext.getProperty(Constants.PROP_WORKFLOW_NODE_ID); + String topic = (String) jobExecutionContext.getProperty(Constants.PROP_TOPIC); + String brokerUrl = (String) jobExecutionContext.getProperty(Constants.PROP_BROKER_URL); + jobExecutionContext.getNotificationService().registerListener( + new WorkflowTrackingListener(workflowInstanceID, workflowNodeID, brokerUrl, topic)); + + } + + private void invokeInFlowHandlers(JobExecutionContext jobExecutionContext) throws GFacException { + List handlers = jobExecutionContext.getGFacConfiguration().getInHandlers(); + for (GFacHandlerConfig handlerClassName : handlers) { + Class handlerClass; + GFacHandler handler; + try { + handlerClass = Class.forName(handlerClassName.getClassName().trim()).asSubclass(GFacHandler.class); + handler = handlerClass.newInstance(); + handler.initProperties(handlerClassName.getProperties()); + } catch (ClassNotFoundException e) { + throw new GFacException("Cannot load handler class " + handlerClassName, e); + } catch (InstantiationException e) { + throw new GFacException("Cannot instantiate handler class " + handlerClassName, e); + } catch (IllegalAccessException e) { + throw new GFacException("Cannot instantiate handler class " + handlerClassName, e); + } + try { + handler.invoke(jobExecutionContext); + } catch (GFacHandlerException e) { + throw new GFacException("Error Executing a InFlow Handler", e.getCause()); + } + } + } + + private void invokeOutFlowHandlers(JobExecutionContext jobExecutionContext) throws GFacException { + List handlers = jobExecutionContext.getGFacConfiguration().getOutHandlers(); + + for (GFacHandlerConfig handlerClassName : handlers) { + Class handlerClass; + GFacHandler handler; + try { + handlerClass = Class.forName(handlerClassName.getClassName().trim()).asSubclass(GFacHandler.class); + handler = handlerClass.newInstance(); + handler.initProperties(handlerClassName.getProperties()); + } catch (ClassNotFoundException e) { + log.error(e.getMessage()); + throw new GFacException("Cannot load handler class " + handlerClassName, e); + } catch (InstantiationException e) { + log.error(e.getMessage()); + throw new GFacException("Cannot instantiate handler class " + handlerClassName, e); + } catch (IllegalAccessException e) { + log.error(e.getMessage()); + throw new GFacException("Cannot instantiate handler class " + handlerClassName, e); + } + try { + handler.invoke(jobExecutionContext); + } catch (Exception e) { + // TODO: Better error reporting. + throw new GFacException("Error Executing a OutFlow Handler" , e); + } + } + } + +} http://git-wip-us.apache.org/repos/asf/airavata/blob/0f06c3c5/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/BESParallelJobTest.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/BESParallelJobTest.java b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/BESParallelJobTest.java index 93d1193..9f5539b 100644 --- a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/BESParallelJobTest.java +++ b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/BESParallelJobTest.java @@ -25,7 +25,7 @@ import java.util.Date; import java.util.UUID; import org.apache.airavata.commons.gfac.type.ApplicationDescription; -import org.apache.airavata.gfac.GFacAPI; +import org.apache.airavata.gfac.cpi.GFacAPI; import org.apache.airavata.gfac.context.ApplicationContext; import org.apache.airavata.gfac.context.MessageContext; import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType; http://git-wip-us.apache.org/repos/asf/airavata/blob/0f06c3c5/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/BESProviderTest.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/BESProviderTest.java b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/BESProviderTest.java index 7a9dff6..41a4c7e 100644 --- a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/BESProviderTest.java +++ b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/BESProviderTest.java @@ -32,7 +32,7 @@ import java.util.UUID; import org.apache.airavata.commons.gfac.type.ActualParameter; import org.apache.airavata.commons.gfac.type.ApplicationDescription; import org.apache.airavata.commons.gfac.type.ServiceDescription; -import org.apache.airavata.gfac.GFacAPI; +import org.apache.airavata.gfac.cpi.GFacAPI; import org.apache.airavata.gfac.GFacException; import org.apache.airavata.gfac.context.ApplicationContext; import org.apache.airavata.gfac.context.MessageContext; http://git-wip-us.apache.org/repos/asf/airavata/blob/0f06c3c5/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2Test.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2Test.java b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2Test.java index eadc9e2..4443d23 100644 --- a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2Test.java +++ b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2Test.java @@ -24,7 +24,7 @@ import org.apache.airavata.commons.gfac.type.ActualParameter; import org.apache.airavata.commons.gfac.type.ApplicationDescription; import org.apache.airavata.commons.gfac.type.HostDescription; import org.apache.airavata.commons.gfac.type.ServiceDescription; -import org.apache.airavata.gfac.GFacAPI; +import org.apache.airavata.gfac.cpi.GFacAPI; import org.apache.airavata.gfac.GFacConfiguration; import org.apache.airavata.gfac.GFacException; import org.apache.airavata.gfac.SecurityContext; http://git-wip-us.apache.org/repos/asf/airavata/blob/0f06c3c5/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/GSISSHProviderTest.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/GSISSHProviderTest.java b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/GSISSHProviderTest.java index 28edc06..283d5e2 100644 --- a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/GSISSHProviderTest.java +++ b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/GSISSHProviderTest.java @@ -24,7 +24,7 @@ import org.apache.airavata.commons.gfac.type.ActualParameter; import org.apache.airavata.commons.gfac.type.ApplicationDescription; import org.apache.airavata.commons.gfac.type.HostDescription; import org.apache.airavata.commons.gfac.type.ServiceDescription; -import org.apache.airavata.gfac.GFacAPI; +import org.apache.airavata.gfac.cpi.GFacAPI; import org.apache.airavata.gfac.GFacConfiguration; import org.apache.airavata.gfac.GFacException; import org.apache.airavata.gfac.SecurityContext; http://git-wip-us.apache.org/repos/asf/airavata/blob/0f06c3c5/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/GramProviderTest.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/GramProviderTest.java b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/GramProviderTest.java index b9699aa..6c776cd 100644 --- a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/GramProviderTest.java +++ b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/GramProviderTest.java @@ -32,7 +32,7 @@ import org.apache.airavata.commons.gfac.type.ApplicationDescription; import org.apache.airavata.commons.gfac.type.HostDescription; import org.apache.airavata.commons.gfac.type.MappingFactory; import org.apache.airavata.commons.gfac.type.ServiceDescription; -import org.apache.airavata.gfac.GFacAPI; +import org.apache.airavata.gfac.cpi.GFacAPI; import org.apache.airavata.gfac.GFacConfiguration; import org.apache.airavata.gfac.GFacException; import org.apache.airavata.gfac.context.ApplicationContext; http://git-wip-us.apache.org/repos/asf/airavata/blob/0f06c3c5/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/LocalProviderTest.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/LocalProviderTest.java b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/LocalProviderTest.java index 8ec18df..5027372 100644 --- a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/LocalProviderTest.java +++ b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/LocalProviderTest.java @@ -21,7 +21,7 @@ package org.apache.airavata.core.gfac.services.impl; import org.apache.airavata.commons.gfac.type.*; -import org.apache.airavata.gfac.GFacAPI; +import org.apache.airavata.gfac.cpi.GFacAPI; import org.apache.airavata.gfac.GFacConfiguration; import org.apache.airavata.gfac.GFacException; import org.apache.airavata.gfac.context.ApplicationContext; http://git-wip-us.apache.org/repos/asf/airavata/blob/0f06c3c5/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/SSHProviderTest.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/SSHProviderTest.java b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/SSHProviderTest.java index 1c808a6..e425759 100644 --- a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/SSHProviderTest.java +++ b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/SSHProviderTest.java @@ -32,7 +32,7 @@ import org.apache.airavata.commons.gfac.type.ApplicationDescription; import org.apache.airavata.commons.gfac.type.HostDescription; import org.apache.airavata.commons.gfac.type.MappingFactory; import org.apache.airavata.commons.gfac.type.ServiceDescription; -import org.apache.airavata.gfac.GFacAPI; +import org.apache.airavata.gfac.cpi.GFacAPI; import org.apache.airavata.gfac.GFacConfiguration; import org.apache.airavata.gfac.GFacException; import org.apache.airavata.gfac.context.ApplicationContext; http://git-wip-us.apache.org/repos/asf/airavata/blob/0f06c3c5/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/US3Test.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/US3Test.java b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/US3Test.java index dadb4e5..16f9816 100644 --- a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/US3Test.java +++ b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/US3Test.java @@ -26,7 +26,7 @@ import java.util.UUID; import org.apache.airavata.commons.gfac.type.ActualParameter; import org.apache.airavata.commons.gfac.type.ApplicationDescription; -import org.apache.airavata.gfac.GFacAPI; +import org.apache.airavata.gfac.cpi.GFacAPI; import org.apache.airavata.gfac.context.ApplicationContext; import org.apache.airavata.gfac.context.MessageContext; import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType; http://git-wip-us.apache.org/repos/asf/airavata/blob/0f06c3c5/modules/gfac/gfac-ec2/src/test/java/org/apache/airavata/gfac/ec2/EC2ProviderTest.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ec2/src/test/java/org/apache/airavata/gfac/ec2/EC2ProviderTest.java b/modules/gfac/gfac-ec2/src/test/java/org/apache/airavata/gfac/ec2/EC2ProviderTest.java index 5ee3783..75637e8 100644 --- a/modules/gfac/gfac-ec2/src/test/java/org/apache/airavata/gfac/ec2/EC2ProviderTest.java +++ b/modules/gfac/gfac-ec2/src/test/java/org/apache/airavata/gfac/ec2/EC2ProviderTest.java @@ -22,7 +22,7 @@ package org.apache.airavata.gfac.ec2; import org.apache.airavata.commons.gfac.type.*; -import org.apache.airavata.gfac.GFacAPI; +import org.apache.airavata.gfac.cpi.GFacAPI; import org.apache.airavata.gfac.GFacConfiguration; import org.apache.airavata.gfac.GFacException; import org.apache.airavata.gfac.context.ApplicationContext; http://git-wip-us.apache.org/repos/asf/airavata/blob/0f06c3c5/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/EmbeddedGFACJobSubmitter.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/EmbeddedGFACJobSubmitter.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/EmbeddedGFACJobSubmitter.java index 7ab2617..5c91c7d 100644 --- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/EmbeddedGFACJobSubmitter.java +++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/EmbeddedGFACJobSubmitter.java @@ -36,7 +36,7 @@ import org.apache.airavata.commons.gfac.type.ApplicationDescription; import org.apache.airavata.commons.gfac.type.HostDescription; import org.apache.airavata.commons.gfac.type.ServiceDescription; import org.apache.airavata.gfac.Constants; -import org.apache.airavata.gfac.GFacAPI; +import org.apache.airavata.gfac.cpi.GFacAPI; import org.apache.airavata.gfac.GFacConfiguration; import org.apache.airavata.gfac.context.ApplicationContext; import org.apache.airavata.gfac.context.JobExecutionContext; http://git-wip-us.apache.org/repos/asf/airavata/blob/0f06c3c5/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java index a9cdff1..82826ef 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java @@ -41,7 +41,7 @@ import org.apache.airavata.commons.gfac.type.HostDescription; import org.apache.airavata.commons.gfac.type.ServiceDescription; import org.apache.airavata.credential.store.store.CredentialReaderFactory; import org.apache.airavata.gfac.Constants; -import org.apache.airavata.gfac.GFacAPI; +import org.apache.airavata.gfac.cpi.GFacAPI; import org.apache.airavata.gfac.GFacConfiguration; import org.apache.airavata.gfac.RequestData; import org.apache.airavata.gfac.context.ApplicationContext;