Repository: airavata Updated Branches: refs/heads/master 6209ee096 -> 39370c526
http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/state/impl/GridJobStatusInfo.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/state/impl/GridJobStatusInfo.java b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/state/impl/GridJobStatusInfo.java deleted file mode 100644 index 4612c3c..0000000 --- a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/state/impl/GridJobStatusInfo.java +++ /dev/null @@ -1,40 +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.monitor.state.impl; - -import org.apache.airavata.gfac.monitor.state.JobStatusInfo; -import org.apache.airavata.gsi.ssh.impl.JobStatus; - - -/** - * This can be used to keep information about a Grid job - * which we can get from qstat polling or from amqp based - * monitoring in Grid machines - */ -public class GridJobStatusInfo implements JobStatusInfo { - public void setJobStatus(JobStatus jobState) { - //To change body of implemented methods use File | Settings | File Templates. - } - - public JobStatus getJobStatus() { - return null; //To change body of implemented methods use File | Settings | File Templates. - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java index 17d7925..a9f1520 100644 --- a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java +++ b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java @@ -21,13 +21,12 @@ package org.apache.airavata.gfac.monitor.util; import org.apache.airavata.commons.gfac.type.HostDescription; -import org.apache.airavata.gfac.GFacConfiguration; import org.apache.airavata.gfac.GFacException; -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.core.context.JobExecutionContext; +import org.apache.airavata.gfac.core.handler.GFacHandler; +import org.apache.airavata.gfac.core.handler.GFacHandlerConfig; +import org.apache.airavata.gfac.core.monitor.MonitorID; import org.apache.airavata.gfac.monitor.HostMonitorData; -import org.apache.airavata.gfac.monitor.MonitorID; import org.apache.airavata.gfac.monitor.UserMonitorData; import org.apache.airavata.gfac.monitor.exception.AiravataMonitorException; import org.apache.airavata.schemas.gfac.GsisshHostType; http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java b/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java index 9e1eadd..2c34df9 100644 --- a/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java +++ b/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java @@ -23,6 +23,9 @@ package org.apache.airavata.job; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; import org.apache.airavata.commons.gfac.type.HostDescription; +import org.apache.airavata.gfac.core.monitor.MonitorID; +import org.apache.airavata.gfac.core.monitor.state.JobStatusChangeRequest; +import org.apache.airavata.gfac.core.notification.MonitorPublisher; import org.apache.airavata.gsi.ssh.api.Cluster; import org.apache.airavata.gsi.ssh.api.SSHApiException; import org.apache.airavata.gsi.ssh.api.ServerInfo; @@ -30,10 +33,7 @@ import org.apache.airavata.gsi.ssh.api.authentication.GSIAuthenticationInfo; import org.apache.airavata.gsi.ssh.api.job.JobDescriptor; import org.apache.airavata.gsi.ssh.impl.PBSCluster; import org.apache.airavata.gsi.ssh.impl.authentication.MyProxyAuthenticationInfo; -import org.apache.airavata.gfac.monitor.MonitorID; -import org.apache.airavata.gfac.monitor.event.MonitorPublisher; import org.apache.airavata.gfac.monitor.impl.push.amqp.AMQPMonitor; -import org.apache.airavata.gfac.monitor.state.JobStatusChangeRequest; import org.apache.airavata.schemas.gfac.GsisshHostType; import org.junit.Assert; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java b/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java index 54562ba..bb797b3 100644 --- a/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java +++ b/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java @@ -23,6 +23,10 @@ package org.apache.airavata.job; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; import org.apache.airavata.commons.gfac.type.HostDescription; +import org.apache.airavata.gfac.core.monitor.MonitorID; +import org.apache.airavata.gfac.core.monitor.state.JobStatusChangeRequest; +import org.apache.airavata.gfac.core.notification.MonitorPublisher; +import org.apache.airavata.gfac.monitor.HPCMonitorID; import org.apache.airavata.gsi.ssh.api.Cluster; import org.apache.airavata.gsi.ssh.api.SSHApiException; import org.apache.airavata.gsi.ssh.api.ServerInfo; @@ -31,11 +35,8 @@ import org.apache.airavata.gsi.ssh.api.job.JobDescriptor; import org.apache.airavata.gsi.ssh.impl.PBSCluster; import org.apache.airavata.gsi.ssh.impl.authentication.MyProxyAuthenticationInfo; import org.apache.airavata.gsi.ssh.util.CommonUtils; -import org.apache.airavata.gfac.monitor.MonitorID; import org.apache.airavata.gfac.monitor.UserMonitorData; -import org.apache.airavata.gfac.monitor.event.MonitorPublisher; import org.apache.airavata.gfac.monitor.impl.pull.qstat.HPCPullMonitor; -import org.apache.airavata.gfac.monitor.state.JobStatusChangeRequest; import org.apache.airavata.schemas.gfac.GsisshHostType; import org.junit.Assert; import org.testng.annotations.Test; @@ -146,8 +147,8 @@ public class QstatMonitorTestWithMyProxyAuth { for (int i = 0; i < 1; i++) { String jobID = pbsCluster.submitBatchJob(jobDescriptor); System.out.println("Job submitted successfully, Job ID: " + jobID); - MonitorID monitorID = new MonitorID(hostDescription, jobID,null,null,null, "ogce"); - monitorID.setAuthenticationInfo(authenticationInfo); + MonitorID monitorID = new HPCMonitorID(hostDescription, jobID,null,null,null, "ogce"); + ((HPCMonitorID)monitorID).setAuthenticationInfo(authenticationInfo); try { org.apache.airavata.gfac.monitor.util.CommonUtils.addMonitortoQueue(pullQueue, monitorID); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPInputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPInputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPInputHandler.java index cba476e..19fc9ef 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPInputHandler.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPInputHandler.java @@ -25,11 +25,11 @@ import org.apache.airavata.common.utils.StringUtil; import org.apache.airavata.commons.gfac.type.ActualParameter; import org.apache.airavata.commons.gfac.type.MappingFactory; import org.apache.airavata.gfac.GFacException; -import org.apache.airavata.gfac.context.JobExecutionContext; -import org.apache.airavata.gfac.context.MessageContext; +import org.apache.airavata.gfac.core.context.JobExecutionContext; +import org.apache.airavata.gfac.core.context.MessageContext; +import org.apache.airavata.gfac.core.handler.AbstractHandler; +import org.apache.airavata.gfac.core.handler.GFacHandlerException; import org.apache.airavata.gfac.ssh.security.SSHSecurityContext; -import org.apache.airavata.gfac.handler.AbstractHandler; -import org.apache.airavata.gfac.handler.GFacHandlerException; import org.apache.airavata.gfac.ssh.util.GFACSSHUtils; import org.apache.airavata.gsi.ssh.api.Cluster; import org.apache.airavata.gsi.ssh.api.SSHApiException; http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java index 79ad49a..03e430b 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java @@ -22,10 +22,10 @@ package org.apache.airavata.gfac.ssh.handler; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.gfac.GFacException; -import org.apache.airavata.gfac.context.JobExecutionContext; +import org.apache.airavata.gfac.core.context.JobExecutionContext; +import org.apache.airavata.gfac.core.handler.AbstractHandler; +import org.apache.airavata.gfac.core.handler.GFacHandlerException; import org.apache.airavata.gfac.ssh.security.SSHSecurityContext; -import org.apache.airavata.gfac.handler.AbstractHandler; -import org.apache.airavata.gfac.handler.GFacHandlerException; import org.apache.airavata.gfac.ssh.util.GFACSSHUtils; import org.apache.airavata.gsi.ssh.api.Cluster; import org.apache.airavata.gsi.ssh.api.SSHApiException; http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java index 0040de0..abedc8f 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java @@ -24,12 +24,12 @@ import java.util.Map; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.gfac.GFacException; -import org.apache.airavata.gfac.context.JobExecutionContext; +import org.apache.airavata.gfac.core.context.JobExecutionContext; +import org.apache.airavata.gfac.core.handler.AbstractHandler; +import org.apache.airavata.gfac.core.handler.GFacHandlerException; +import org.apache.airavata.gfac.core.utils.GFacUtils; import org.apache.airavata.gfac.ssh.security.SSHSecurityContext; -import org.apache.airavata.gfac.handler.AbstractHandler; -import org.apache.airavata.gfac.handler.GFacHandlerException; import org.apache.airavata.gfac.ssh.util.GFACSSHUtils; -import org.apache.airavata.gfac.utils.GFacUtils; import org.apache.airavata.gsi.ssh.api.Cluster; import org.apache.airavata.gsi.ssh.api.SSHApiException; import org.apache.airavata.model.workspace.experiment.CorrectiveAction; http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java index 3d445e0..c2b7aa3 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java @@ -33,13 +33,13 @@ import org.apache.airavata.common.utils.StringUtil; import org.apache.airavata.commons.gfac.type.ActualParameter; import org.apache.airavata.commons.gfac.type.MappingFactory; import org.apache.airavata.gfac.GFacException; -import org.apache.airavata.gfac.context.JobExecutionContext; -import org.apache.airavata.gfac.context.MessageContext; +import org.apache.airavata.gfac.core.context.JobExecutionContext; +import org.apache.airavata.gfac.core.context.MessageContext; +import org.apache.airavata.gfac.core.handler.AbstractHandler; +import org.apache.airavata.gfac.core.handler.GFacHandlerException; +import org.apache.airavata.gfac.core.utils.GFacUtils; import org.apache.airavata.gfac.ssh.security.SSHSecurityContext; -import org.apache.airavata.gfac.handler.AbstractHandler; -import org.apache.airavata.gfac.handler.GFacHandlerException; import org.apache.airavata.gfac.ssh.util.GFACSSHUtils; -import org.apache.airavata.gfac.utils.GFacUtils; import org.apache.airavata.gsi.ssh.api.Cluster; import org.apache.airavata.gsi.ssh.api.SSHApiException; import org.apache.airavata.model.workspace.experiment.CorrectiveAction; http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java index 84b41e9..902c09f 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java @@ -35,14 +35,14 @@ import org.apache.airavata.common.utils.Constants; import org.apache.airavata.commons.gfac.type.ActualParameter; import org.apache.airavata.commons.gfac.type.ApplicationDescription; import org.apache.airavata.gfac.GFacException; -import org.apache.airavata.gfac.context.JobExecutionContext; +import org.apache.airavata.gfac.core.context.JobExecutionContext; +import org.apache.airavata.gfac.core.handler.AbstractHandler; +import org.apache.airavata.gfac.core.handler.GFacHandlerException; +import org.apache.airavata.gfac.core.provider.GFacProviderException; +import org.apache.airavata.gfac.core.utils.GFacUtils; +import org.apache.airavata.gfac.core.utils.OutputUtils; import org.apache.airavata.gfac.ssh.security.SSHSecurityContext; -import org.apache.airavata.gfac.handler.AbstractHandler; -import org.apache.airavata.gfac.handler.GFacHandlerException; -import org.apache.airavata.gfac.provider.GFacProviderException; import org.apache.airavata.gfac.ssh.util.GFACSSHUtils; -import org.apache.airavata.gfac.utils.GFacUtils; -import org.apache.airavata.gfac.utils.OutputUtils; import org.apache.airavata.gsi.ssh.api.Cluster; import org.apache.airavata.gsi.ssh.api.job.JobDescriptor; import org.apache.airavata.model.workspace.experiment.*; http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java index b0fd9eb..fd6ce15 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java @@ -37,15 +37,15 @@ import org.apache.airavata.commons.gfac.type.ActualParameter; import org.apache.airavata.commons.gfac.type.MappingFactory; import org.apache.airavata.gfac.Constants; import org.apache.airavata.gfac.GFacException; -import org.apache.airavata.gfac.context.JobExecutionContext; -import org.apache.airavata.gfac.context.MessageContext; +import org.apache.airavata.gfac.core.context.JobExecutionContext; +import org.apache.airavata.gfac.core.context.MessageContext; +import org.apache.airavata.gfac.core.handler.GFacHandlerException; +import org.apache.airavata.gfac.core.notification.events.StartExecutionEvent; +import org.apache.airavata.gfac.core.provider.AbstractProvider; +import org.apache.airavata.gfac.core.provider.GFacProviderException; +import org.apache.airavata.gfac.core.utils.GFacUtils; import org.apache.airavata.gfac.ssh.security.SSHSecurityContext; -import org.apache.airavata.gfac.handler.GFacHandlerException; -import org.apache.airavata.gfac.notification.events.StartExecutionEvent; -import org.apache.airavata.gfac.provider.AbstractProvider; -import org.apache.airavata.gfac.provider.GFacProviderException; import org.apache.airavata.gfac.ssh.util.GFACSSHUtils; -import org.apache.airavata.gfac.utils.GFacUtils; import org.apache.airavata.gsi.ssh.api.Cluster; import org.apache.airavata.gsi.ssh.api.CommandExecutor; import org.apache.airavata.gsi.ssh.api.SSHApiException; http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java index 03f1770..0dcfbb7 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java @@ -28,8 +28,8 @@ import org.apache.airavata.commons.gfac.type.HostDescription; import org.apache.airavata.commons.gfac.type.MappingFactory; import org.apache.airavata.gfac.Constants; import org.apache.airavata.gfac.GFacException; -import org.apache.airavata.gfac.context.JobExecutionContext; -import org.apache.airavata.gfac.context.MessageContext; +import org.apache.airavata.gfac.core.context.JobExecutionContext; +import org.apache.airavata.gfac.core.context.MessageContext; import org.apache.airavata.gfac.ssh.security.SSHSecurityContext; import org.apache.airavata.gsi.ssh.api.Cluster; import org.apache.airavata.gsi.ssh.api.SSHApiException; http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2TestWithSSHAuth.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2TestWithSSHAuth.java b/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2TestWithSSHAuth.java index 8c42869..7d83461 100644 --- a/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2TestWithSSHAuth.java +++ b/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2TestWithSSHAuth.java @@ -27,11 +27,11 @@ import org.apache.airavata.commons.gfac.type.ServiceDescription; import org.apache.airavata.gfac.GFacConfiguration; import org.apache.airavata.gfac.GFacException; import org.apache.airavata.gfac.SecurityContext; -import org.apache.airavata.gfac.context.ApplicationContext; -import org.apache.airavata.gfac.context.JobExecutionContext; -import org.apache.airavata.gfac.context.MessageContext; +import org.apache.airavata.gfac.core.context.ApplicationContext; +import org.apache.airavata.gfac.core.context.JobExecutionContext; +import org.apache.airavata.gfac.core.context.MessageContext; +import org.apache.airavata.gfac.core.cpi.GFacImpl; import org.apache.airavata.gfac.ssh.security.SSHSecurityContext; -import org.apache.airavata.gfac.cpi.GFacImpl; import org.apache.airavata.gsi.ssh.api.Cluster; import org.apache.airavata.gsi.ssh.api.SSHApiException; import org.apache.airavata.gsi.ssh.api.ServerInfo; http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/SSHProviderTestWithSSHAuth.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/SSHProviderTestWithSSHAuth.java b/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/SSHProviderTestWithSSHAuth.java index 74a79e0..574ad07 100644 --- a/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/SSHProviderTestWithSSHAuth.java +++ b/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/SSHProviderTestWithSSHAuth.java @@ -34,11 +34,11 @@ import org.apache.airavata.commons.gfac.type.MappingFactory; import org.apache.airavata.commons.gfac.type.ServiceDescription; import org.apache.airavata.gfac.GFacConfiguration; import org.apache.airavata.gfac.GFacException; -import org.apache.airavata.gfac.context.ApplicationContext; -import org.apache.airavata.gfac.context.JobExecutionContext; -import org.apache.airavata.gfac.context.MessageContext; +import org.apache.airavata.gfac.core.context.ApplicationContext; +import org.apache.airavata.gfac.core.context.JobExecutionContext; +import org.apache.airavata.gfac.core.context.MessageContext; +import org.apache.airavata.gfac.core.cpi.GFacImpl; import org.apache.airavata.gfac.ssh.security.SSHSecurityContext; -import org.apache.airavata.gfac.cpi.GFacImpl; import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType; import org.apache.airavata.schemas.gfac.InputParameterType; import org.apache.airavata.schemas.gfac.OutputParameterType; http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/modules/gfac/gfac-ssh/src/test/resources/gfac-config.xml ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/test/resources/gfac-config.xml b/modules/gfac/gfac-ssh/src/test/resources/gfac-config.xml index 2388f64..1701dcc 100644 --- a/modules/gfac/gfac-ssh/src/test/resources/gfac-config.xml +++ b/modules/gfac/gfac-ssh/src/test/resources/gfac-config.xml @@ -13,7 +13,7 @@ <GFac> <GlobalHandlers> <InHandlers> - <Handler class="org.apache.airavata.gfac.handler.AppDescriptorCheckHandler"> + <Handler class="org.apache.airavata.gfac.core.handler.AppDescriptorCheckHandler"> <property name="name" value="value"/> </Handler> </InHandlers> http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/modules/integration-tests/src/test/resources/gfac-config.xml ---------------------------------------------------------------------- diff --git a/modules/integration-tests/src/test/resources/gfac-config.xml b/modules/integration-tests/src/test/resources/gfac-config.xml index 9ebee37..d7bb032 100644 --- a/modules/integration-tests/src/test/resources/gfac-config.xml +++ b/modules/integration-tests/src/test/resources/gfac-config.xml @@ -13,12 +13,12 @@ <GFac> <DaemonHandlers> <Handler class="org.apache.airavata.gfac.monitor.handlers.GridPullMonitorHandler"> - <property name="listeners" value="org.apache.airavata.gfac.monitor.AiravataJobStatusUpdator"/> + <property name="listeners" value="org.apache.airavata.gfac.core.monitor.AiravataJobStatusUpdator"/> </Handler> </DaemonHandlers> <GlobalHandlers> <InHandlers> - <Handler class="org.apache.airavata.gfac.handler.AppDescriptorCheckHandler"> + <Handler class="org.apache.airavata.gfac.core.handler.AppDescriptorCheckHandler"> <property name="name" value="value"/> </Handler> </InHandlers> http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/modules/orchestrator/airavata-orchestrator-service/src/main/resources/gfac-config.xml ---------------------------------------------------------------------- diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/resources/gfac-config.xml b/modules/orchestrator/airavata-orchestrator-service/src/main/resources/gfac-config.xml index 9ebee37..d7bb032 100644 --- a/modules/orchestrator/airavata-orchestrator-service/src/main/resources/gfac-config.xml +++ b/modules/orchestrator/airavata-orchestrator-service/src/main/resources/gfac-config.xml @@ -13,12 +13,12 @@ <GFac> <DaemonHandlers> <Handler class="org.apache.airavata.gfac.monitor.handlers.GridPullMonitorHandler"> - <property name="listeners" value="org.apache.airavata.gfac.monitor.AiravataJobStatusUpdator"/> + <property name="listeners" value="org.apache.airavata.gfac.core.monitor.AiravataJobStatusUpdator"/> </Handler> </DaemonHandlers> <GlobalHandlers> <InHandlers> - <Handler class="org.apache.airavata.gfac.handler.AppDescriptorCheckHandler"> + <Handler class="org.apache.airavata.gfac.core.handler.AppDescriptorCheckHandler"> <property name="name" value="value"/> </Handler> </InHandlers> http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/modules/orchestrator/airavata-orchestrator-service/src/test/resources/gfac-config.xml ---------------------------------------------------------------------- diff --git a/modules/orchestrator/airavata-orchestrator-service/src/test/resources/gfac-config.xml b/modules/orchestrator/airavata-orchestrator-service/src/test/resources/gfac-config.xml index 901f72e..47cad27 100644 --- a/modules/orchestrator/airavata-orchestrator-service/src/test/resources/gfac-config.xml +++ b/modules/orchestrator/airavata-orchestrator-service/src/test/resources/gfac-config.xml @@ -13,7 +13,7 @@ <GFac> <GlobalHandlers> <InHandlers> - <Handler class="org.apache.airavata.gfac.handler.AppDescriptorCheckHandler"> + <Handler class="org.apache.airavata.gfac.core.handler.AppDescriptorCheckHandler"> <property name="name" value="value"/> </Handler> </InHandlers> http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/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 2c41ef7..cbc564d 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 @@ -22,9 +22,9 @@ package org.apache.airavata.orchestrator.core.impl; import org.apache.airavata.gfac.GFacException; -import org.apache.airavata.gfac.context.JobExecutionContext; -import org.apache.airavata.gfac.cpi.GFac; -import org.apache.airavata.gfac.cpi.GFacImpl; +import org.apache.airavata.gfac.core.context.JobExecutionContext; +import org.apache.airavata.gfac.core.cpi.GFac; +import org.apache.airavata.gfac.core.cpi.GFacImpl; import org.apache.airavata.orchestrator.core.context.OrchestratorContext; import org.apache.airavata.orchestrator.core.exception.OrchestratorException; import org.apache.airavata.orchestrator.core.gfac.GFACInstance; http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/job/JobSubmitter.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/job/JobSubmitter.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/job/JobSubmitter.java index cf8642f..b1787a3 100644 --- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/job/JobSubmitter.java +++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/job/JobSubmitter.java @@ -20,9 +20,7 @@ */ package org.apache.airavata.orchestrator.core.job; -import java.util.List; - -import org.apache.airavata.gfac.context.JobExecutionContext; +import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.orchestrator.core.context.OrchestratorContext; import org.apache.airavata.orchestrator.core.exception.OrchestratorException; import org.apache.airavata.orchestrator.core.gfac.GFACInstance; http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java index 91a6e47..e614a9e 100644 --- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java +++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.concurrent.ExecutorService; -import org.apache.airavata.gfac.context.JobExecutionContext; +import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.model.util.ExperimentModelUtil; import org.apache.airavata.model.workspace.experiment.Experiment; import org.apache.airavata.model.workspace.experiment.TaskDetails; http://git-wip-us.apache.org/repos/asf/airavata/blob/39370c52/modules/orchestrator/orchestrator-core/src/test/resources/gfac-config.xml ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/test/resources/gfac-config.xml b/modules/orchestrator/orchestrator-core/src/test/resources/gfac-config.xml index 9ebee37..d7bb032 100644 --- a/modules/orchestrator/orchestrator-core/src/test/resources/gfac-config.xml +++ b/modules/orchestrator/orchestrator-core/src/test/resources/gfac-config.xml @@ -13,12 +13,12 @@ <GFac> <DaemonHandlers> <Handler class="org.apache.airavata.gfac.monitor.handlers.GridPullMonitorHandler"> - <property name="listeners" value="org.apache.airavata.gfac.monitor.AiravataJobStatusUpdator"/> + <property name="listeners" value="org.apache.airavata.gfac.core.monitor.AiravataJobStatusUpdator"/> </Handler> </DaemonHandlers> <GlobalHandlers> <InHandlers> - <Handler class="org.apache.airavata.gfac.handler.AppDescriptorCheckHandler"> + <Handler class="org.apache.airavata.gfac.core.handler.AppDescriptorCheckHandler"> <property name="name" value="value"/> </Handler> </InHandlers>
