http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/LSFJobConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/LSFJobConfiguration.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/LSFJobConfiguration.java index f9c7f33..26941cd 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/LSFJobConfiguration.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/LSFJobConfiguration.java @@ -18,9 +18,11 @@ * under the License. * */ -package org.apache.airavata.gfac.ssh.api.job; +package org.apache.airavata.gfac.gsi.ssh.api.job; -import org.apache.airavata.gfac.ssh.impl.RawCommandInfo; +import org.apache.airavata.gfac.core.JobManagerConfiguration; +import org.apache.airavata.gfac.core.cluster.OutputParser; +import org.apache.airavata.gfac.core.cluster.RawCommandInfo; import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/LSFOutputParser.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/LSFOutputParser.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/LSFOutputParser.java index c6dea17..76012d6 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/LSFOutputParser.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/LSFOutputParser.java @@ -18,10 +18,12 @@ * under the License. * */ -package org.apache.airavata.gfac.ssh.api.job; +package org.apache.airavata.gfac.gsi.ssh.api.job; -import org.apache.airavata.gfac.ssh.api.SSHApiException; -import org.apache.airavata.gfac.ssh.impl.JobStatus; +import org.apache.airavata.gfac.core.JobDescriptor; +import org.apache.airavata.gfac.core.cluster.JobStatus; +import org.apache.airavata.gfac.core.cluster.OutputParser; +import org.apache.airavata.gfac.core.SSHApiException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/OutputParser.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/OutputParser.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/OutputParser.java deleted file mode 100644 index 9730c33..0000000 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/OutputParser.java +++ /dev/null @@ -1,67 +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.ssh.api.job; - -import org.apache.airavata.gfac.ssh.api.SSHApiException; -import org.apache.airavata.gfac.ssh.impl.JobStatus; - -import java.util.Map; - -public interface OutputParser { - - /** - * Tihs can be used to fill a jobdescriptor based on the output - * @param descriptor - * @return - */ - public void parseSingleJob(JobDescriptor descriptor, String rawOutput)throws SSHApiException; - - /** - * This can be used to parseSingleJob the result of a job submission to get the JobID - * @param rawOutput - * @return - */ - public String parseJobSubmission(String rawOutput)throws SSHApiException; - - - /** - * This can be used to get the job status from the output - * @param jobID - * @param rawOutput - */ - public JobStatus parseJobStatus(String jobID, String rawOutput)throws SSHApiException; - - /** - * This can be used to parseSingleJob a big output and get multipleJob statuses - * @param statusMap list of status map will return and key will be the job ID - * @param rawOutput - */ - public void parseJobStatuses(String userName, Map<String, JobStatus> statusMap, String rawOutput)throws SSHApiException; - - /** - * filter the jobId value of given JobName from rawOutput - * @param jobName - * @param rawOutput - * @return - * @throws SSHApiException - */ - public String parseJobId(String jobName, String rawOutput) throws SSHApiException; -} http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/PBSJobConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/PBSJobConfiguration.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/PBSJobConfiguration.java index 0179e01..d3f6c9c 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/PBSJobConfiguration.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/PBSJobConfiguration.java @@ -18,9 +18,11 @@ * under the License. * */ -package org.apache.airavata.gfac.ssh.api.job; +package org.apache.airavata.gfac.gsi.ssh.api.job; -import org.apache.airavata.gfac.ssh.impl.RawCommandInfo; +import org.apache.airavata.gfac.core.JobManagerConfiguration; +import org.apache.airavata.gfac.core.cluster.OutputParser; +import org.apache.airavata.gfac.core.cluster.RawCommandInfo; import org.apache.commons.io.FilenameUtils; import java.io.File; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/PBSOutputParser.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/PBSOutputParser.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/PBSOutputParser.java index 2f17787..a86d7f0 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/PBSOutputParser.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/PBSOutputParser.java @@ -18,10 +18,12 @@ * under the License. * */ -package org.apache.airavata.gfac.ssh.api.job; +package org.apache.airavata.gfac.gsi.ssh.api.job; -import org.apache.airavata.gfac.ssh.api.SSHApiException; -import org.apache.airavata.gfac.ssh.impl.JobStatus; +import org.apache.airavata.gfac.core.JobDescriptor; +import org.apache.airavata.gfac.core.cluster.JobStatus; +import org.apache.airavata.gfac.core.cluster.OutputParser; +import org.apache.airavata.gfac.core.SSHApiException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/SlurmJobConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/SlurmJobConfiguration.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/SlurmJobConfiguration.java index 54d8f40..48ba48e 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/SlurmJobConfiguration.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/SlurmJobConfiguration.java @@ -18,14 +18,16 @@ * under the License. * */ -package org.apache.airavata.gfac.ssh.api.job; +package org.apache.airavata.gfac.gsi.ssh.api.job; -import org.apache.airavata.gfac.ssh.impl.RawCommandInfo; +import org.apache.airavata.gfac.core.JobManagerConfiguration; +import org.apache.airavata.gfac.core.cluster.OutputParser; +import org.apache.airavata.gfac.core.cluster.RawCommandInfo; import org.apache.commons.io.FilenameUtils; import java.io.File; -public class SlurmJobConfiguration implements JobManagerConfiguration{ +public class SlurmJobConfiguration implements JobManagerConfiguration { private String jobDescriptionTemplateName; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/SlurmOutputParser.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/SlurmOutputParser.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/SlurmOutputParser.java index 11fb4ce..3d2dc48 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/SlurmOutputParser.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/SlurmOutputParser.java @@ -18,10 +18,12 @@ * under the License. * */ -package org.apache.airavata.gfac.ssh.api.job; +package org.apache.airavata.gfac.gsi.ssh.api.job; -import org.apache.airavata.gfac.ssh.api.SSHApiException; -import org.apache.airavata.gfac.ssh.impl.JobStatus; +import org.apache.airavata.gfac.core.JobDescriptor; +import org.apache.airavata.gfac.core.cluster.JobStatus; +import org.apache.airavata.gfac.core.cluster.OutputParser; +import org.apache.airavata.gfac.core.SSHApiException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/UGEJobConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/UGEJobConfiguration.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/UGEJobConfiguration.java index 4fbbe30..fddf210 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/UGEJobConfiguration.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/UGEJobConfiguration.java @@ -18,9 +18,11 @@ * under the License. * */ -package org.apache.airavata.gfac.ssh.api.job; +package org.apache.airavata.gfac.gsi.ssh.api.job; -import org.apache.airavata.gfac.ssh.impl.RawCommandInfo; +import org.apache.airavata.gfac.core.JobManagerConfiguration; +import org.apache.airavata.gfac.core.cluster.OutputParser; +import org.apache.airavata.gfac.core.cluster.RawCommandInfo; import org.apache.commons.io.FilenameUtils; import java.io.File; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/UGEOutputParser.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/UGEOutputParser.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/UGEOutputParser.java index a6cc3ed..3419b3a 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/UGEOutputParser.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/api/job/UGEOutputParser.java @@ -18,10 +18,12 @@ * under the License. * */ -package org.apache.airavata.gfac.ssh.api.job; +package org.apache.airavata.gfac.gsi.ssh.api.job; -import org.apache.airavata.gfac.ssh.api.SSHApiException; -import org.apache.airavata.gfac.ssh.impl.JobStatus; +import org.apache.airavata.gfac.core.JobDescriptor; +import org.apache.airavata.gfac.core.cluster.JobStatus; +import org.apache.airavata.gfac.core.cluster.OutputParser; +import org.apache.airavata.gfac.core.SSHApiException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +33,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class UGEOutputParser implements OutputParser{ +public class UGEOutputParser implements OutputParser { private static final Logger log = LoggerFactory.getLogger(PBSOutputParser.class); public static final String JOB_ID = "jobId"; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/config/ConfigReader.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/config/ConfigReader.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/config/ConfigReader.java index 9658fba..c40059e 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/config/ConfigReader.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/config/ConfigReader.java @@ -19,7 +19,7 @@ * */ -package org.apache.airavata.gfac.ssh.config; +package org.apache.airavata.gfac.gsi.ssh.config; import java.io.FileNotFoundException; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/DefaultJobSubmissionListener.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/DefaultJobSubmissionListener.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/DefaultJobSubmissionListener.java index d60ea32..18371b1 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/DefaultJobSubmissionListener.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/DefaultJobSubmissionListener.java @@ -18,11 +18,12 @@ * under the License. * */ -package org.apache.airavata.gfac.ssh.impl; +package org.apache.airavata.gfac.gsi.ssh.impl; -import org.apache.airavata.gfac.ssh.api.SSHApiException; -import org.apache.airavata.gfac.ssh.api.job.JobDescriptor; -import org.apache.airavata.gfac.ssh.listener.JobSubmissionListener; +import org.apache.airavata.gfac.core.JobDescriptor; +import org.apache.airavata.gfac.core.SSHApiException; +import org.apache.airavata.gfac.core.cluster.JobStatus; +import org.apache.airavata.gfac.gsi.ssh.listener.JobSubmissionListener; public class DefaultJobSubmissionListener extends JobSubmissionListener { http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/GSISSHAbstractCluster.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/GSISSHAbstractCluster.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/GSISSHAbstractCluster.java index 814a7e1..f89cb98 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/GSISSHAbstractCluster.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/GSISSHAbstractCluster.java @@ -18,56 +18,56 @@ * under the License. * */ -package org.apache.airavata.gfac.ssh.impl; +package org.apache.airavata.gfac.gsi.ssh.impl; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.StringWriter; -import java.net.URL; -import java.security.SecureRandom; -import java.util.List; -import java.util.Map; - -import javax.xml.transform.Source; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerConfigurationException; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; - -import org.apache.airavata.gfac.ssh.api.Cluster; -import org.apache.airavata.gfac.ssh.api.CommandExecutor; -import org.apache.airavata.gfac.ssh.api.SSHApiException; -import org.apache.airavata.gfac.ssh.api.ServerInfo; +import com.jcraft.jsch.ExtendedSession; +import com.jcraft.jsch.GSISSHIdentityFile; +import com.jcraft.jsch.GSISSHIdentityRepository; +import com.jcraft.jsch.Identity; +import com.jcraft.jsch.JSch; +import com.jcraft.jsch.JSchException; +import com.jcraft.jsch.Session; +import org.apache.airavata.gfac.core.JobDescriptor; +import org.apache.airavata.gfac.core.JobManagerConfiguration; +import org.apache.airavata.gfac.core.SSHApiException; import org.apache.airavata.gfac.core.authentication.AuthenticationInfo; import org.apache.airavata.gfac.core.authentication.GSIAuthenticationInfo; import org.apache.airavata.gfac.core.authentication.SSHKeyAuthentication; import org.apache.airavata.gfac.core.authentication.SSHPasswordAuthentication; import org.apache.airavata.gfac.core.authentication.SSHPublicKeyAuthentication; import org.apache.airavata.gfac.core.authentication.SSHPublicKeyFileAuthentication; -import org.apache.airavata.gfac.ssh.api.job.JobDescriptor; -import org.apache.airavata.gfac.ssh.api.job.JobManagerConfiguration; -import org.apache.airavata.gfac.ssh.api.job.OutputParser; -import org.apache.airavata.gfac.ssh.config.ConfigReader; -import org.apache.airavata.gfac.ssh.jsch.ExtendedJSch; -import org.apache.airavata.gfac.ssh.util.SSHAPIUIKeyboardInteractive; -import org.apache.airavata.gfac.ssh.util.SSHKeyPasswordHandler; -import org.apache.airavata.gfac.ssh.util.SSHUtils; +import org.apache.airavata.gfac.core.cluster.Cluster; +import org.apache.airavata.gfac.core.cluster.JobStatus; +import org.apache.airavata.gfac.core.cluster.OutputParser; +import org.apache.airavata.gfac.core.cluster.RawCommandInfo; +import org.apache.airavata.gfac.core.cluster.ServerInfo; +import org.apache.airavata.gfac.gsi.ssh.api.CommandExecutor; +import org.apache.airavata.gfac.gsi.ssh.config.ConfigReader; +import org.apache.airavata.gfac.gsi.ssh.jsch.ExtendedJSch; +import org.apache.airavata.gfac.gsi.ssh.util.SSHAPIUIKeyboardInteractive; +import org.apache.airavata.gfac.gsi.ssh.util.SSHKeyPasswordHandler; +import org.apache.airavata.gfac.gsi.ssh.util.SSHUtils; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.jcraft.jsch.ExtendedSession; -import com.jcraft.jsch.GSISSHIdentityFile; -import com.jcraft.jsch.GSISSHIdentityRepository; -import com.jcraft.jsch.Identity; -import com.jcraft.jsch.JSch; -import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.Session; +import javax.xml.transform.Source; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.StringWriter; +import java.net.URL; +import java.security.SecureRandom; +import java.util.List; +import java.util.Map; public class GSISSHAbstractCluster implements Cluster { @@ -278,6 +278,8 @@ public class GSISSHAbstractCluster implements Cluster { return outputParser.parseJobSubmission(outputifAvailable); } + + @Override public synchronized String submitBatchJob(JobDescriptor jobDescriptor) throws SSHApiException { TransformerFactory factory = TransformerFactory.newInstance(); URL resource = this.getClass().getClassLoader().getResource(jobManagerConfiguration.getJobDescriptionTemplateName()); http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/JobStatus.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/JobStatus.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/JobStatus.java deleted file mode 100644 index 648d955..0000000 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/JobStatus.java +++ /dev/null @@ -1,110 +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.ssh.impl; - - /** - * This will contains all the PBS specific job statuses. - * C - Job is completed after having run/ - * E - Job is exiting after having run. - * H - Job is held. - * Q - job is queued, eligible to run or routed. - * R - job is running. - * T - job is being moved to new location. - * W - job is waiting for its execution time - * (-a option) to be reached. - * S - (Unicos only) job is suspend. - */ - public enum JobStatus { - C, E, H, Q, R, T, W, S,U,F,CA,CD,CF,CG,NF,PD,PR,TO,qw,t,r,h,Er,Eqw,PEND,RUN,PSUSP,USUSP,SSUSP,DONE,EXIT,UNKWN,ZOMBI; - - public static JobStatus fromString(String status){ - if(status != null){ - if("C".equals(status)){ - return JobStatus.C; - }else if("E".equals(status)){ - return JobStatus.E; - }else if("H".equals(status)){ - return JobStatus.H; - }else if("Q".equals(status)){ - return JobStatus.Q; - }else if("R".equals(status)){ - return JobStatus.R; - }else if("T".equals(status)){ - return JobStatus.T; - }else if("W".equals(status)){ - return JobStatus.W; - }else if("S".equals(status)){ - return JobStatus.S; - }else if("F".equals(status)){ - return JobStatus.F; - }else if("S".equals(status)){ - return JobStatus.S; - }else if("CA".equals(status)){ - return JobStatus.CA; - }else if("CF".equals(status)){ - return JobStatus.CF; - }else if("CD".equals(status)){ - return JobStatus.CD; - }else if("CG".equals(status)){ - return JobStatus.CG; - }else if("NF".equals(status)){ - return JobStatus.NF; - }else if("PD".equals(status)){ - return JobStatus.PD; - }else if("PR".equals(status)){ - return JobStatus.PR; - }else if("TO".equals(status)){ - return JobStatus.TO; - }else if("U".equals(status)){ - return JobStatus.U; - }else if("qw".equals(status)){ - return JobStatus.qw; - }else if("t".equals(status)){ - return JobStatus.t; - }else if("r".equals(status)){ - return JobStatus.r; - }else if("h".equals(status)){ - return JobStatus.h; - }else if("Er".equals(status)){ - return JobStatus.Er; - }else if("Eqw".equals(status)){ - return JobStatus.Er; - }else if("RUN".equals(status)){ // LSF starts here - return JobStatus.RUN; - }else if("PEND".equals(status)){ - return JobStatus.PEND; - }else if("DONE".equals(status)){ - return JobStatus.DONE; - }else if("PSUSP".equals(status)){ - return JobStatus.PSUSP; - }else if("USUSP".equals(status)){ - return JobStatus.USUSP; - }else if("SSUSP".equals(status)){ - return JobStatus.SSUSP; - }else if("EXIT".equals(status)){ - return JobStatus.EXIT; - }else if("ZOMBI".equals(status)){ - return JobStatus.ZOMBI; - } - } - return JobStatus.U; - } - } http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/PBSCluster.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/PBSCluster.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/PBSCluster.java index def84d5..1d514f8 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/PBSCluster.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/PBSCluster.java @@ -18,11 +18,12 @@ * under the License. * */ -package org.apache.airavata.gfac.ssh.impl; +package org.apache.airavata.gfac.gsi.ssh.impl; -import org.apache.airavata.gfac.ssh.api.*; -import org.apache.airavata.gfac.ssh.api.authentication.*; -import org.apache.airavata.gfac.ssh.api.job.JobManagerConfiguration; +import org.apache.airavata.gfac.core.authentication.AuthenticationInfo; +import org.apache.airavata.gfac.core.SSHApiException; +import org.apache.airavata.gfac.core.cluster.ServerInfo; +import org.apache.airavata.gfac.core.JobManagerConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/RawCommandInfo.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/RawCommandInfo.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/RawCommandInfo.java deleted file mode 100644 index 9ac2ba0..0000000 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/RawCommandInfo.java +++ /dev/null @@ -1,55 +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.ssh.impl; - -import org.apache.airavata.gfac.ssh.api.CommandInfo; - -/** - * User: AmilaJ ([email protected]) - * Date: 8/14/13 - * Time: 5:18 PM - */ - -/** - * The raw command information. String returned by getCommand is directly executed in SSH - * shell. E.g :- getCommand return string set for rawCommand - "/opt/torque/bin/qsub /home/ogce/test.pbs". - */ -public class RawCommandInfo implements CommandInfo { - - private String rawCommand; - - public RawCommandInfo(String cmd) { - this.rawCommand = cmd; - } - - public String getCommand() { - return this.rawCommand; - } - - public String getRawCommand() { - return rawCommand; - } - - public void setRawCommand(String rawCommand) { - this.rawCommand = rawCommand; - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/SSHUserInfo.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/SSHUserInfo.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/SSHUserInfo.java index e878dff..ee630cf 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/SSHUserInfo.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/SSHUserInfo.java @@ -19,7 +19,7 @@ * */ -package org.apache.airavata.gfac.ssh.impl; +package org.apache.airavata.gfac.gsi.ssh.impl; import com.jcraft.jsch.UserInfo; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/StandardOutReader.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/StandardOutReader.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/StandardOutReader.java index 265a57d..6a2d11a 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/StandardOutReader.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/StandardOutReader.java @@ -18,11 +18,11 @@ * under the License. * */ -package org.apache.airavata.gfac.ssh.impl; +package org.apache.airavata.gfac.gsi.ssh.impl; import com.jcraft.jsch.Channel; -import org.apache.airavata.gfac.ssh.api.CommandOutput; +import org.apache.airavata.gfac.core.cluster.CommandOutput; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/SystemCommandOutput.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/SystemCommandOutput.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/SystemCommandOutput.java index 24d218b..e2bfd84 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/SystemCommandOutput.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/SystemCommandOutput.java @@ -19,10 +19,10 @@ * */ -package org.apache.airavata.gfac.ssh.impl; +package org.apache.airavata.gfac.gsi.ssh.impl; import com.jcraft.jsch.Channel; -import org.apache.airavata.gfac.ssh.api.CommandOutput; +import org.apache.airavata.gfac.core.cluster.CommandOutput; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/authentication/DefaultPasswordAuthenticationInfo.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/authentication/DefaultPasswordAuthenticationInfo.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/authentication/DefaultPasswordAuthenticationInfo.java index 29cd154..e56cae3 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/authentication/DefaultPasswordAuthenticationInfo.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/authentication/DefaultPasswordAuthenticationInfo.java @@ -19,7 +19,7 @@ * */ -package org.apache.airavata.gfac.ssh.impl.authentication; +package org.apache.airavata.gfac.gsi.ssh.impl.authentication; /** * User: AmilaJ ([email protected]) http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/authentication/DefaultPublicKeyAuthentication.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/authentication/DefaultPublicKeyAuthentication.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/authentication/DefaultPublicKeyAuthentication.java index 35595ed..529cccc 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/authentication/DefaultPublicKeyAuthentication.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/authentication/DefaultPublicKeyAuthentication.java @@ -19,7 +19,7 @@ * */ -package org.apache.airavata.gfac.ssh.impl.authentication; +package org.apache.airavata.gfac.gsi.ssh.impl.authentication; import org.apache.airavata.gfac.core.authentication.SSHPublicKeyAuthentication; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/authentication/DefaultPublicKeyFileAuthentication.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/authentication/DefaultPublicKeyFileAuthentication.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/authentication/DefaultPublicKeyFileAuthentication.java index 480213c..67c56cd 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/authentication/DefaultPublicKeyFileAuthentication.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/authentication/DefaultPublicKeyFileAuthentication.java @@ -19,7 +19,7 @@ * */ -package org.apache.airavata.gfac.ssh.impl.authentication; +package org.apache.airavata.gfac.gsi.ssh.impl.authentication; import org.apache.airavata.gfac.core.authentication.SSHPublicKeyFileAuthentication; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/authentication/MyProxyAuthenticationInfo.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/authentication/MyProxyAuthenticationInfo.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/authentication/MyProxyAuthenticationInfo.java index 23fb06b..a2e2f42 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/authentication/MyProxyAuthenticationInfo.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/impl/authentication/MyProxyAuthenticationInfo.java @@ -19,7 +19,7 @@ * */ -package org.apache.airavata.gfac.ssh.impl.authentication; +package org.apache.airavata.gfac.gsi.ssh.impl.authentication; import org.apache.airavata.gfac.core.authentication.GSIAuthenticationInfo; import org.globus.myproxy.MyProxy; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/jsch/ExtendedJSch.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/jsch/ExtendedJSch.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/jsch/ExtendedJSch.java index de99b24..617d7cd 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/jsch/ExtendedJSch.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/jsch/ExtendedJSch.java @@ -19,7 +19,7 @@ * */ -package org.apache.airavata.gfac.ssh.jsch; +package org.apache.airavata.gfac.gsi.ssh.jsch; import com.jcraft.jsch.ExtendedSession; import com.jcraft.jsch.JSch; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/listener/JobSubmissionListener.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/listener/JobSubmissionListener.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/listener/JobSubmissionListener.java index 21aa1e3..dd492ad 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/listener/JobSubmissionListener.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/listener/JobSubmissionListener.java @@ -18,11 +18,11 @@ * under the License. * */ -package org.apache.airavata.gfac.ssh.listener; +package org.apache.airavata.gfac.gsi.ssh.listener; -import org.apache.airavata.gfac.ssh.api.SSHApiException; -import org.apache.airavata.gfac.ssh.api.job.JobDescriptor; -import org.apache.airavata.gfac.ssh.impl.JobStatus; +import org.apache.airavata.gfac.core.JobDescriptor; +import org.apache.airavata.gfac.core.SSHApiException; +import org.apache.airavata.gfac.core.cluster.JobStatus; /** * This interface can be implemented by the end user of the API http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/util/CommonUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/util/CommonUtils.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/util/CommonUtils.java index 6ff4fa6..216459e 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/util/CommonUtils.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/util/CommonUtils.java @@ -18,10 +18,12 @@ * under the License. * */ -package org.apache.airavata.gfac.ssh.util; +package org.apache.airavata.gfac.gsi.ssh.util; -import org.apache.airavata.gfac.ssh.api.job.*; -import org.apache.airavata.gfac.ssh.impl.JobStatus; +import org.apache.airavata.gfac.core.JobDescriptor; +import org.apache.airavata.gfac.core.JobManagerConfiguration; +import org.apache.airavata.gfac.gsi.ssh.api.job.*; +import org.apache.airavata.gfac.core.cluster.JobStatus; public class CommonUtils { /** http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/util/SSHAPIUIKeyboardInteractive.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/util/SSHAPIUIKeyboardInteractive.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/util/SSHAPIUIKeyboardInteractive.java index bd700e9..3f60a59 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/util/SSHAPIUIKeyboardInteractive.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/util/SSHAPIUIKeyboardInteractive.java @@ -19,7 +19,7 @@ * */ -package org.apache.airavata.gfac.ssh.util; +package org.apache.airavata.gfac.gsi.ssh.util; import com.jcraft.jsch.UIKeyboardInteractive; import com.jcraft.jsch.UserInfo; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/util/SSHKeyPasswordHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/util/SSHKeyPasswordHandler.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/util/SSHKeyPasswordHandler.java index 1def97c..ad9a5d5 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/util/SSHKeyPasswordHandler.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/util/SSHKeyPasswordHandler.java @@ -19,7 +19,7 @@ * */ -package org.apache.airavata.gfac.ssh.util; +package org.apache.airavata.gfac.gsi.ssh.util; import com.jcraft.jsch.UserInfo; import org.apache.airavata.gfac.core.authentication.SSHKeyAuthentication; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/util/SSHUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/util/SSHUtils.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/util/SSHUtils.java index b278767..3271744 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/util/SSHUtils.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsi/ssh/util/SSHUtils.java @@ -18,18 +18,22 @@ * under the License. * */ -package org.apache.airavata.gfac.ssh.util; +package org.apache.airavata.gfac.gsi.ssh.util; import com.jcraft.jsch.*; - import org.apache.airavata.gfac.core.authentication.GSIAuthenticationInfo; -import org.apache.airavata.gfac.ssh.api.SSHApiException; -import org.apache.airavata.gfac.ssh.api.ServerInfo; -import org.apache.airavata.gfac.ssh.config.ConfigReader; -import org.apache.airavata.gfac.ssh.impl.StandardOutReader; -import org.slf4j.*; - -import java.io.*; +import org.apache.airavata.gfac.core.SSHApiException; +import org.apache.airavata.gfac.core.cluster.ServerInfo; +import org.apache.airavata.gfac.gsi.ssh.config.ConfigReader; +import org.apache.airavata.gfac.gsi.ssh.impl.StandardOutReader; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.util.Arrays; import java.util.List; @@ -87,8 +91,7 @@ public class SSHUtils { * @param lFile local file path to use in scp * @throws IOException * @throws JSchException - * @throws org.apache.airavata.gfac.ssh.api.SSHApiException - * + * @throws SSHApiException */ public void scpTo(String rFile, String lFile) throws IOException, JSchException, SSHApiException { FileInputStream fis = null; @@ -161,9 +164,9 @@ public class SSHUtils { out.write(command.getBytes()); out.flush(); if (checkAck(in) != 0) { - String error = "Error Reading input Stream"; - log.error(error); - throw new SSHApiException(error); + String error = "Error Reading input Stream"; + log.error(error); + throw new SSHApiException(error); } } @@ -199,7 +202,7 @@ public class SSHUtils { out.write(buf, 0, 1); out.flush(); if (checkAck(in) != 0) { - String error = "Error Reading input Stream"; + String error = "Error Reading input Stream"; log.error(error); throw new SSHApiException(error); } @@ -250,7 +253,7 @@ public class SSHUtils { channel.connect(); if (checkAck(in) != 0) { - String error = "Error Reading input Stream"; + String error = "Error Reading input Stream"; log.error(error); throw new SSHApiException(error); } @@ -265,9 +268,9 @@ public class SSHUtils { out.write(command.getBytes()); out.flush(); if (checkAck(in) != 0) { - String error = "Error Reading input Stream"; - log.error(error); - throw new SSHApiException(error); + String error = "Error Reading input Stream"; + log.error(error); + throw new SSHApiException(error); } } @@ -421,8 +424,8 @@ public class SSHUtils { } stdOutReader.onOutput(channel); if (stdOutReader.getStdErrorString().contains("scp:")) { - throw new SSHApiException(stdOutReader.getStdErrorString()); - } + throw new SSHApiException(stdOutReader.getStdErrorString()); + } } catch (Exception e) { log.error(e.getMessage(), e); @@ -593,7 +596,7 @@ public class SSHUtils { FileOutputStream fos = null; try { String prefix = null; - + // exec 'scp -f remotefile' remotely String command = "scp -3 " + remoteFileSource + " " + remoteFileTarget; Channel channel = session.openChannel("exec"); @@ -634,14 +637,14 @@ public class SSHUtils { } int foo; while (true) { - if (buf.length < filesize) foo = buf.length; - else foo = (int) filesize; - + if (buf.length < filesize) foo = buf.length; + else foo = (int) filesize; + int len = in.read(buf, 0, foo); if (len <= 0) break; - out.write(buf, 0, len); + out.write(buf, 0, len); } - // send '\0' + // send '\0' buf[0] = 0; out.write(buf, 0, 1); out.flush(); @@ -656,8 +659,8 @@ public class SSHUtils { stdOutReader.onOutput(channel); if (stdOutReader.getStdErrorString().contains("scp:")) { - throw new SSHApiException(stdOutReader.getStdErrorString()); - } + throw new SSHApiException(stdOutReader.getStdErrorString()); + } } catch (Exception e) { log.error(e.getMessage(), e); http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java index 2d82278..8151647 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java @@ -27,7 +27,7 @@ import org.apache.airavata.gfac.core.handler.GFacHandlerException; import org.apache.airavata.gfac.core.GFacUtils; import org.apache.airavata.gfac.gsissh.security.GSISecurityContext; import org.apache.airavata.gfac.gsissh.util.GFACGSISSHUtils; -import org.apache.airavata.gfac.ssh.api.Cluster; +import org.apache.airavata.gfac.core.cluster.Cluster; import org.apache.airavata.model.workspace.experiment.*; import org.apache.airavata.registry.cpi.ChildDataType; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java index 3031bac..72f738f 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java @@ -29,7 +29,7 @@ import org.apache.airavata.gfac.core.handler.GFacHandlerException; import org.apache.airavata.gfac.core.GFacUtils; import org.apache.airavata.gfac.gsissh.security.GSISecurityContext; import org.apache.airavata.gfac.gsissh.util.GFACGSISSHUtils; -import org.apache.airavata.gfac.ssh.api.Cluster; +import org.apache.airavata.gfac.core.cluster.Cluster; import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType; import org.apache.airavata.model.workspace.experiment.CorrectiveAction; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java index b052a28..4ad4ae5 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java @@ -31,7 +31,7 @@ import org.apache.airavata.gfac.core.GFacUtils; import org.apache.airavata.gfac.impl.OutputUtils; import org.apache.airavata.gfac.gsissh.security.GSISecurityContext; import org.apache.airavata.gfac.gsissh.util.GFACGSISSHUtils; -import org.apache.airavata.gfac.ssh.api.Cluster; +import org.apache.airavata.gfac.core.cluster.Cluster; import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType; import org.apache.airavata.model.workspace.experiment.CorrectiveAction; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/handler/NewGSISSHOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/handler/NewGSISSHOutputHandler.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/handler/NewGSISSHOutputHandler.java index 864e487..03ebb94 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/handler/NewGSISSHOutputHandler.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/handler/NewGSISSHOutputHandler.java @@ -12,7 +12,7 @@ import org.apache.airavata.gfac.core.GFacUtils; import org.apache.airavata.gfac.gsissh.security.GSISecurityContext; import org.apache.airavata.gfac.gsissh.util.GFACGSISSHUtils; import org.apache.airavata.gfac.ssh.util.HandleOutputs; -import org.apache.airavata.gfac.ssh.api.Cluster; +import org.apache.airavata.gfac.core.cluster.Cluster; import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType; import org.apache.airavata.model.workspace.experiment.CorrectiveAction; import org.apache.airavata.model.workspace.experiment.ErrorCategory; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/provider/impl/GSISSHProvider.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/provider/impl/GSISSHProvider.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/provider/impl/GSISSHProvider.java index 9f369b1..1578b9d 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/provider/impl/GSISSHProvider.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/provider/impl/GSISSHProvider.java @@ -26,7 +26,6 @@ import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.gfac.GFacException; import org.apache.airavata.gfac.core.context.JobExecutionContext; 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.GFacUtils; @@ -34,9 +33,9 @@ import org.apache.airavata.gfac.gsissh.security.GSISecurityContext; import org.apache.airavata.gfac.gsissh.util.GFACGSISSHUtils; import org.apache.airavata.gfac.monitor.email.EmailBasedMonitor; import org.apache.airavata.gfac.monitor.email.EmailMonitorFactory; -import org.apache.airavata.gfac.ssh.api.Cluster; -import org.apache.airavata.gfac.ssh.api.SSHApiException; -import org.apache.airavata.gfac.ssh.api.job.JobDescriptor; +import org.apache.airavata.gfac.core.cluster.Cluster; +import org.apache.airavata.gfac.core.SSHApiException; +import org.apache.airavata.gfac.core.JobDescriptor; import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription; import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription; import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol; @@ -80,7 +79,6 @@ public class GSISSHProvider extends AbstractProvider { public void execute(JobExecutionContext jobExecutionContext) throws GFacProviderException, GFacException { log.info("Invoking GSISSH Provider Invoke ..."); StringBuffer data = new StringBuffer(); - jobExecutionContext.getNotifier().publish(new StartExecutionEvent()); ComputeResourceDescription computeResourceDescription = jobExecutionContext.getApplicationContext() .getComputeResourceDescription(); ApplicationDeploymentDescription appDeployDesc = jobExecutionContext.getApplicationContext() http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/security/GSISecurityContext.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/security/GSISecurityContext.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/security/GSISecurityContext.java index 85e9e29..2f3956c 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/security/GSISecurityContext.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/security/GSISecurityContext.java @@ -23,14 +23,7 @@ package org.apache.airavata.gfac.gsissh.security; import org.apache.airavata.credential.store.store.CredentialReader; import org.apache.airavata.gfac.AbstractSecurityContext; import org.apache.airavata.gfac.RequestData; -import org.apache.airavata.gfac.ssh.api.Cluster; -import org.globus.gsi.X509Credential; -import org.globus.gsi.gssapi.GlobusGSSCredentialImpl; -import org.globus.gsi.provider.GlobusProvider; -import org.globus.myproxy.GetParams; -import org.globus.myproxy.MyProxy; -import org.globus.myproxy.MyProxyException; -import org.gridforum.jgss.ExtendedGSSCredential; +import org.apache.airavata.gfac.core.cluster.Cluster; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java index c3978b1..3a9e83e 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java @@ -30,15 +30,15 @@ import org.apache.airavata.gfac.RequestData; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.gfac.core.context.MessageContext; import org.apache.airavata.gfac.core.GFacUtils; +import org.apache.airavata.gfac.gsi.ssh.impl.PBSCluster; import org.apache.airavata.gfac.gsissh.security.GSISecurityContext; import org.apache.airavata.gfac.gsissh.security.TokenizedMyProxyAuthInfo; -import org.apache.airavata.gfac.ssh.api.Cluster; -import org.apache.airavata.gfac.ssh.api.ServerInfo; -import org.apache.airavata.gfac.ssh.api.job.JobDescriptor; -import org.apache.airavata.gfac.ssh.api.job.JobManagerConfiguration; -import org.apache.airavata.gfac.ssh.impl.GSISSHAbstractCluster; -import org.apache.airavata.gfac.ssh.impl.PBSCluster; -import org.apache.airavata.gfac.ssh.util.CommonUtils; +import org.apache.airavata.gfac.core.cluster.Cluster; +import org.apache.airavata.gfac.core.cluster.ServerInfo; +import org.apache.airavata.gfac.core.JobDescriptor; +import org.apache.airavata.gfac.core.JobManagerConfiguration; +import org.apache.airavata.gfac.gsi.ssh.impl.GSISSHAbstractCluster; +import org.apache.airavata.gfac.gsi.ssh.util.CommonUtils; import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription; import org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType; import org.apache.airavata.model.appcatalog.appinterface.DataType; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java index 5519ee0..f00e62a 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java @@ -32,7 +32,6 @@ import java.util.TreeSet; import org.apache.airavata.gfac.Constants; import org.apache.airavata.gfac.GFacException; import org.apache.airavata.gfac.core.context.JobExecutionContext; -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.GFacUtils; @@ -128,7 +127,6 @@ public class LocalProvider extends AbstractProvider { } public void execute(JobExecutionContext jobExecutionContext) throws GFacProviderException { - jobExecutionContext.getNotifier().publish(new StartExecutionEvent()); JobDetails jobDetails = new JobDetails(); try { jobId = jobExecutionContext.getTaskData().getTaskID(); http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/HPCMonitorID.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/HPCMonitorID.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/HPCMonitorID.java index 8eba250..a1a5bd2 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/HPCMonitorID.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/HPCMonitorID.java @@ -21,13 +21,13 @@ package org.apache.airavata.gfac.monitor;/* import org.apache.airavata.gfac.GFacException; import org.apache.airavata.gfac.SecurityContext; +import org.apache.airavata.gfac.core.authentication.AuthenticationInfo; +import org.apache.airavata.gfac.core.cluster.ServerInfo; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.gfac.core.monitor.MonitorID; +import org.apache.airavata.gfac.gsi.ssh.impl.authentication.MyProxyAuthenticationInfo; import org.apache.airavata.gfac.gsissh.security.GSISecurityContext; import org.apache.airavata.gfac.ssh.security.SSHSecurityContext; -import org.apache.airavata.gfac.ssh.api.ServerInfo; -import org.apache.airavata.gfac.ssh.api.authentication.AuthenticationInfo; -import org.apache.airavata.gfac.ssh.impl.authentication.MyProxyAuthenticationInfo; import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java index e31458d..58c0946 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java @@ -24,16 +24,16 @@ import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.logger.AiravataLogger; import org.apache.airavata.common.logger.AiravataLoggerFactory; import org.apache.airavata.common.utils.ServerSettings; +import org.apache.airavata.gfac.core.authentication.AuthenticationInfo; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.gfac.core.handler.GFacHandlerException; import org.apache.airavata.gfac.core.handler.ThreadedHandler; import org.apache.airavata.gfac.core.monitor.MonitorID; +import org.apache.airavata.gfac.gsi.ssh.impl.authentication.MyProxyAuthenticationInfo; import org.apache.airavata.gfac.monitor.HPCMonitorID; import org.apache.airavata.gfac.monitor.exception.AiravataMonitorException; import org.apache.airavata.gfac.monitor.impl.pull.qstat.HPCPullMonitor; import org.apache.airavata.gfac.monitor.util.CommonUtils; -import org.apache.airavata.gfac.ssh.api.authentication.AuthenticationInfo; -import org.apache.airavata.gfac.ssh.impl.authentication.MyProxyAuthenticationInfo; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPushMonitorHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPushMonitorHandler.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPushMonitorHandler.java index 6db7da5..d6da22a 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPushMonitorHandler.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPushMonitorHandler.java @@ -27,14 +27,14 @@ import java.util.concurrent.LinkedBlockingQueue; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.utils.ServerSettings; +import org.apache.airavata.gfac.core.authentication.AuthenticationInfo; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.gfac.core.handler.GFacHandlerException; import org.apache.airavata.gfac.core.handler.ThreadedHandler; import org.apache.airavata.gfac.core.monitor.MonitorID; +import org.apache.airavata.gfac.gsi.ssh.impl.authentication.MyProxyAuthenticationInfo; import org.apache.airavata.gfac.monitor.HPCMonitorID; import org.apache.airavata.gfac.monitor.impl.push.amqp.AMQPMonitor; -import org.apache.airavata.gfac.ssh.api.authentication.AuthenticationInfo; -import org.apache.airavata.gfac.ssh.impl.authentication.MyProxyAuthenticationInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java index 553ded9..54dd8e3 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java @@ -25,18 +25,18 @@ import org.apache.airavata.common.logger.AiravataLogger; import org.apache.airavata.common.logger.AiravataLoggerFactory; import org.apache.airavata.common.utils.MonitorPublisher; import org.apache.airavata.common.utils.ServerSettings; +import org.apache.airavata.gfac.core.authentication.AuthenticationInfo; +import org.apache.airavata.gfac.core.SSHApiException; +import org.apache.airavata.gfac.impl.OutHandlerWorker; import org.apache.airavata.gfac.monitor.util.CommonUtils; import org.apache.airavata.gfac.core.GFac; import org.apache.airavata.gfac.core.monitor.MonitorID; import org.apache.airavata.gfac.core.GFacThreadPoolExecutor; -import org.apache.airavata.gfac.core.utils.OutHandlerWorker; import org.apache.airavata.gfac.monitor.HostMonitorData; import org.apache.airavata.gfac.monitor.UserMonitorData; import org.apache.airavata.gfac.monitor.core.PullMonitor; import org.apache.airavata.gfac.monitor.exception.AiravataMonitorException; import org.apache.airavata.gfac.monitor.impl.push.amqp.SimpleJobFinishConsumer; -import org.apache.airavata.gfac.ssh.api.SSHApiException; -import org.apache.airavata.gfac.ssh.api.authentication.AuthenticationInfo; import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol; import org.apache.airavata.model.messaging.event.JobIdentifier; import org.apache.airavata.model.messaging.event.JobStatusChangeRequestEvent; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/ResourceConnection.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/ResourceConnection.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/ResourceConnection.java index 41e9bd2..a159fdf 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/ResourceConnection.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/ResourceConnection.java @@ -22,14 +22,14 @@ package org.apache.airavata.gfac.monitor.impl.pull.qstat; import org.apache.airavata.gfac.GFacException; import org.apache.airavata.gfac.SecurityContext; +import org.apache.airavata.gfac.core.authentication.AuthenticationInfo; import org.apache.airavata.gfac.core.monitor.MonitorID; +import org.apache.airavata.gfac.gsi.ssh.impl.PBSCluster; import org.apache.airavata.gfac.gsissh.security.GSISecurityContext; import org.apache.airavata.gfac.monitor.HostMonitorData; import org.apache.airavata.gfac.ssh.security.SSHSecurityContext; -import org.apache.airavata.gfac.ssh.api.SSHApiException; -import org.apache.airavata.gfac.ssh.api.authentication.AuthenticationInfo; -import org.apache.airavata.gfac.ssh.impl.JobStatus; -import org.apache.airavata.gfac.ssh.impl.PBSCluster; +import org.apache.airavata.gfac.core.SSHApiException; +import org.apache.airavata.gfac.core.cluster.JobStatus; import org.apache.airavata.model.workspace.experiment.JobState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/impl/push/amqp/ComputingActivity.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/impl/push/amqp/ComputingActivity.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/impl/push/amqp/ComputingActivity.java new file mode 100644 index 0000000..5a36b4a --- /dev/null +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/impl/push/amqp/ComputingActivity.java @@ -0,0 +1,19 @@ +package org.apache.airavata.gfac.monitor.impl.push.amqp; + +import java.util.List; + +/** + * Created by syodage on 6/3/15. + */ +public class ComputingActivity { + String idFromEndpoint; + private List<String> state; + + public String getIDFromEndpoint() { + return idFromEndpoint; + } + + public List<String> getState() { + return state; + } +} http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/impl/push/amqp/JSONMessageParser.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/impl/push/amqp/JSONMessageParser.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/impl/push/amqp/JSONMessageParser.java index 72c77d5..15cdf4f 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/impl/push/amqp/JSONMessageParser.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/impl/push/amqp/JSONMessageParser.java @@ -21,7 +21,6 @@ package org.apache.airavata.gfac.monitor.impl.push.amqp; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.airavata.ComputingActivity; import org.apache.airavata.gfac.monitor.core.MessageParser; import org.apache.airavata.gfac.monitor.exception.AiravataMonitorException; import org.apache.airavata.model.workspace.experiment.JobState; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/context/SSHAuthWrapper.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/context/SSHAuthWrapper.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/context/SSHAuthWrapper.java index 74642dc..59c5cf0 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/context/SSHAuthWrapper.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/context/SSHAuthWrapper.java @@ -20,8 +20,8 @@ */ package org.apache.airavata.gfac.ssh.context; -import org.apache.airavata.gfac.ssh.api.ServerInfo; import org.apache.airavata.gfac.core.authentication.AuthenticationInfo; +import org.apache.airavata.gfac.core.cluster.ServerInfo; public class SSHAuthWrapper { private ServerInfo serverInfo; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPInputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPInputHandler.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPInputHandler.java index 9481188..db9522e 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPInputHandler.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPInputHandler.java @@ -21,18 +21,18 @@ package org.apache.airavata.gfac.ssh.handler; import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.core.SSHApiException; +import org.apache.airavata.gfac.core.cluster.Cluster; 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.GFacUtils; +import org.apache.airavata.gfac.gsi.ssh.impl.authentication.DefaultPasswordAuthenticationInfo; +import org.apache.airavata.gfac.gsi.ssh.impl.authentication.DefaultPublicKeyFileAuthentication; import org.apache.airavata.gfac.ssh.security.SSHSecurityContext; import org.apache.airavata.gfac.ssh.util.GFACSSHUtils; -import org.apache.airavata.gfac.ssh.api.Cluster; -import org.apache.airavata.gfac.ssh.api.SSHApiException; import org.apache.airavata.gfac.core.authentication.AuthenticationInfo; -import org.apache.airavata.gfac.ssh.impl.authentication.DefaultPasswordAuthenticationInfo; -import org.apache.airavata.gfac.ssh.impl.authentication.DefaultPublicKeyFileAuthentication; import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType; import org.apache.airavata.model.workspace.experiment.*; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java index 320f236..ad7df41 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java @@ -22,17 +22,17 @@ 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.core.SSHApiException; +import org.apache.airavata.gfac.core.cluster.Cluster; 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.GFacUtils; +import org.apache.airavata.gfac.gsi.ssh.impl.authentication.DefaultPasswordAuthenticationInfo; +import org.apache.airavata.gfac.gsi.ssh.impl.authentication.DefaultPublicKeyFileAuthentication; import org.apache.airavata.gfac.ssh.security.SSHSecurityContext; import org.apache.airavata.gfac.ssh.util.GFACSSHUtils; -import org.apache.airavata.gfac.ssh.api.Cluster; -import org.apache.airavata.gfac.ssh.api.SSHApiException; import org.apache.airavata.gfac.core.authentication.AuthenticationInfo; -import org.apache.airavata.gfac.ssh.impl.authentication.DefaultPasswordAuthenticationInfo; -import org.apache.airavata.gfac.ssh.impl.authentication.DefaultPublicKeyFileAuthentication; import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType; import org.apache.airavata.model.workspace.experiment.CorrectiveAction; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/NewSSHOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/NewSSHOutputHandler.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/NewSSHOutputHandler.java index 61a1805..0df9eab 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/NewSSHOutputHandler.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/NewSSHOutputHandler.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Properties; import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.core.cluster.Cluster; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.gfac.core.handler.AbstractHandler; import org.apache.airavata.gfac.core.handler.GFacHandlerException; @@ -14,7 +15,6 @@ import org.apache.airavata.gfac.core.GFacUtils; import org.apache.airavata.gfac.ssh.security.SSHSecurityContext; import org.apache.airavata.gfac.ssh.util.GFACSSHUtils; import org.apache.airavata.gfac.ssh.util.HandleOutputs; -import org.apache.airavata.gfac.ssh.api.Cluster; import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType; import org.apache.airavata.model.workspace.experiment.CorrectiveAction; import org.apache.airavata.model.workspace.experiment.ErrorCategory; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java index fb86dd3..c96e5d9 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java @@ -21,13 +21,13 @@ package org.apache.airavata.gfac.ssh.handler; import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.core.cluster.Cluster; 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.GFacUtils; import org.apache.airavata.gfac.ssh.security.SSHSecurityContext; import org.apache.airavata.gfac.ssh.util.GFACSSHUtils; -import org.apache.airavata.gfac.ssh.api.Cluster; import org.apache.airavata.model.workspace.experiment.*; import org.apache.airavata.registry.cpi.ChildDataType; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java index 277ff0e..1c83e88 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java @@ -22,6 +22,7 @@ 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.core.cluster.Cluster; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.gfac.core.context.MessageContext; import org.apache.airavata.gfac.core.handler.AbstractHandler; @@ -29,7 +30,6 @@ import org.apache.airavata.gfac.core.handler.GFacHandlerException; import org.apache.airavata.gfac.core.GFacUtils; import org.apache.airavata.gfac.ssh.security.SSHSecurityContext; import org.apache.airavata.gfac.ssh.util.GFACSSHUtils; -import org.apache.airavata.gfac.ssh.api.Cluster; import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType; import org.apache.airavata.model.workspace.experiment.*; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java index 7c5538a..17a48e7 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java @@ -23,6 +23,7 @@ package org.apache.airavata.gfac.ssh.handler; import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.gfac.Constants; import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.core.cluster.Cluster; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.gfac.core.handler.AbstractHandler; import org.apache.airavata.gfac.core.handler.GFacHandlerException; @@ -31,7 +32,6 @@ import org.apache.airavata.gfac.core.GFacUtils; import org.apache.airavata.gfac.impl.OutputUtils; import org.apache.airavata.gfac.ssh.security.SSHSecurityContext; import org.apache.airavata.gfac.ssh.util.GFACSSHUtils; -import org.apache.airavata.gfac.ssh.api.Cluster; import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType; import org.apache.airavata.model.workspace.experiment.CorrectiveAction; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java index 5162e36..44f24fa 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java @@ -27,27 +27,26 @@ import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.utils.MonitorPublisher; import org.apache.airavata.gfac.Constants; import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.core.JobDescriptor; +import org.apache.airavata.gfac.core.SSHApiException; +import org.apache.airavata.gfac.core.cluster.Cluster; +import org.apache.airavata.gfac.core.cluster.JobStatus; 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.monitor.MonitorID; import org.apache.airavata.gfac.core.monitor.state.GfacExperimentStateChangeRequest; -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.states.GfacExperimentState; import org.apache.airavata.gfac.core.GFacUtils; +import org.apache.airavata.gfac.gsi.ssh.api.CommandExecutor; +import org.apache.airavata.gfac.gsi.ssh.impl.StandardOutReader; import org.apache.airavata.gfac.monitor.email.EmailBasedMonitor; import org.apache.airavata.gfac.monitor.email.EmailMonitorFactory; import org.apache.airavata.gfac.ssh.security.SSHSecurityContext; import org.apache.airavata.gfac.ssh.util.GFACSSHUtils; -import org.apache.airavata.gfac.ssh.api.Cluster; -import org.apache.airavata.gfac.ssh.api.CommandExecutor; -import org.apache.airavata.gfac.ssh.api.SSHApiException; -import org.apache.airavata.gfac.ssh.api.job.JobDescriptor; -import org.apache.airavata.gfac.ssh.impl.JobStatus; -import org.apache.airavata.gfac.ssh.impl.RawCommandInfo; -import org.apache.airavata.gfac.ssh.impl.StandardOutReader; +import org.apache.airavata.gfac.core.cluster.RawCommandInfo; import org.apache.airavata.model.appcatalog.appdeployment.SetEnvPaths; import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType; @@ -140,7 +139,6 @@ public class SSHProvider extends AbstractProvider { } else { try { StringBuffer data = new StringBuffer(); - jobExecutionContext.getNotifier().publish(new StartExecutionEvent()); JobDetails jobDetails = new JobDetails(); String hostAddress = jobExecutionContext.getHostName(); MonitorPublisher monitorPublisher = jobExecutionContext.getMonitorPublisher(); http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/security/SSHSecurityContext.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/security/SSHSecurityContext.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/security/SSHSecurityContext.java index c6cac79..4b41d9c 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/security/SSHSecurityContext.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/security/SSHSecurityContext.java @@ -27,7 +27,7 @@ import net.schmizz.sshj.connection.channel.direct.Session; import net.schmizz.sshj.userauth.keyprovider.KeyProvider; import org.apache.airavata.gfac.SecurityContext; -import org.apache.airavata.gfac.ssh.api.Cluster; +import org.apache.airavata.gfac.core.cluster.Cluster; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java index f2afedc..307d8c3 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java @@ -28,21 +28,22 @@ import org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential; import org.apache.airavata.gfac.Constants; import org.apache.airavata.gfac.GFacException; import org.apache.airavata.gfac.RequestData; +import org.apache.airavata.gfac.core.JobDescriptor; +import org.apache.airavata.gfac.core.JobManagerConfiguration; +import org.apache.airavata.gfac.core.cluster.Cluster; +import org.apache.airavata.gfac.core.cluster.ServerInfo; 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.GFacUtils; +import org.apache.airavata.gfac.gsi.ssh.impl.GSISSHAbstractCluster; +import org.apache.airavata.gfac.gsi.ssh.impl.PBSCluster; +import org.apache.airavata.gfac.gsi.ssh.impl.authentication.DefaultPasswordAuthenticationInfo; +import org.apache.airavata.gfac.gsi.ssh.util.CommonUtils; import org.apache.airavata.gfac.ssh.context.SSHAuthWrapper; import org.apache.airavata.gfac.ssh.security.SSHSecurityContext; import org.apache.airavata.gfac.ssh.security.TokenizedSSHAuthInfo; -import org.apache.airavata.gfac.ssh.api.Cluster; -import org.apache.airavata.gfac.ssh.api.ServerInfo; import org.apache.airavata.gfac.core.authentication.AuthenticationInfo; -import org.apache.airavata.gfac.ssh.api.job.JobDescriptor; -import org.apache.airavata.gfac.ssh.api.job.JobManagerConfiguration; -import org.apache.airavata.gfac.ssh.impl.GSISSHAbstractCluster; -import org.apache.airavata.gfac.ssh.impl.PBSCluster; -import org.apache.airavata.gfac.ssh.impl.authentication.DefaultPasswordAuthenticationInfo; import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription; import org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType; import org.apache.airavata.model.appcatalog.appinterface.DataType;
