Repository: airavata Updated Branches: refs/heads/master 4045c0947 -> 2f3da0104
http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacException.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacException.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacException.java new file mode 100644 index 0000000..b5a846b --- /dev/null +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacException.java @@ -0,0 +1,48 @@ +/* + * + * 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.core; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class GFacException extends Exception { + private static final Logger log = LoggerFactory.getLogger(GFacException.class); + + /** + * + */ + private static final long serialVersionUID = 1L; + + public GFacException(String s) { + super(s); + } + + public GFacException(Exception e) { + super(e); + log.error(e.getMessage(),e); + } + + public GFacException(String s, Throwable throwable) { + super(s, throwable); + log.error(s,throwable); + } +} http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java index 16ffee9..fb20b64 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java @@ -30,10 +30,6 @@ import org.apache.airavata.common.utils.MonitorPublisher; import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.credential.store.store.CredentialReader; import org.apache.airavata.credential.store.store.impl.CredentialReaderImpl; -import org.apache.airavata.gfac.Constants; -import org.apache.airavata.gfac.ExecutionMode; -import org.apache.airavata.gfac.GFacConfiguration; -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.states.GfacExperimentState; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/JobSubmissionFault.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/JobSubmissionFault.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/JobSubmissionFault.java new file mode 100644 index 0000000..01784cd --- /dev/null +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/JobSubmissionFault.java @@ -0,0 +1,98 @@ +/* + * + * 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.core; + +import org.apache.airavata.gfac.core.context.JobExecutionContext; +import org.apache.airavata.gfac.core.provider.GFacProviderException; + +// TODO review this class - Not sure some of the attributes are actually +// needed +public class JobSubmissionFault extends GFacProviderException { + + // TODO why we need following ? + //public static final String JOB_CANCEL = "JOB_CANCEL"; + + //public static final String JOB_FAILED = "JOB_FAILED"; + + private String reason; + private String contact; + private int gramErrorCode; + private String rsl; + private String host; + + public JobSubmissionFault(Throwable cause, String submitHost, String contact, String rsl, + JobExecutionContext jobExecutionContext, String reason, int errorCode) { + super(cause.getMessage(), cause); + + this.host = submitHost; + this.contact = contact; + this.rsl = rsl; + this.reason = reason; + this.gramErrorCode = errorCode; + } + + public void setReason(String reason) { + this.reason = reason; + } + + // TODO why we need this ? + public void sendFaultNotification(String message, + JobExecutionContext jobExecutionContext, Exception e, + String... additionalExceptiondata) { + + } + + public String getReason() { + return reason; + } + + public String getContact() { + return contact; + } + + public void setContact(String contact) { + this.contact = contact; + } + + public int getGramErrorCode() { + return gramErrorCode; + } + + public void setGramErrorCode(int gramErrorCode) { + this.gramErrorCode = gramErrorCode; + } + + public String getRsl() { + return rsl; + } + + public void setRsl(String rsl) { + this.rsl = rsl; + } + + public String getHost() { + return host; + } + + public void setHost(String host) { + this.host = host; + } +} http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/RequestData.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/RequestData.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/RequestData.java new file mode 100644 index 0000000..0bf56d2 --- /dev/null +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/RequestData.java @@ -0,0 +1,151 @@ +/* + * + * 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.core; + +/** + * User: AmilaJ ([email protected]) + * Date: 6/28/13 + * Time: 3:28 PM + */ + +import org.apache.airavata.common.exception.ApplicationSettingsException; +import org.apache.airavata.common.utils.ServerSettings; +import org.apache.airavata.gfac.core.Constants; + +/** + * Encapsulates GFac specific data that are coming in the request. + */ +public class RequestData { + + private static final int DEFAULT_LIFE_TIME = 3600; + private static final int DEFAULT_MY_PROXY_PORT = 7512; + + private String tokenId; + private String requestUser; + private String gatewayId; + + private String myProxyServerUrl = null; + private int myProxyPort = 0; + private String myProxyUserName = null; + private String myProxyPassword = null; + private int myProxyLifeTime = DEFAULT_LIFE_TIME; + + + + + public RequestData() { + } + + public RequestData(String gatewayId) { + this.gatewayId = gatewayId; + } + + public RequestData(String tokenId, String requestUser, String gatewayId) { + this.tokenId = tokenId; + this.requestUser = requestUser; + this.gatewayId = gatewayId; + } + + public String getTokenId() { + return tokenId; + } + + public void setTokenId(String tokenId) { + this.tokenId = tokenId; + } + + public String getRequestUser() { + return requestUser; + } + + public void setRequestUser(String requestUser) { + this.requestUser = requestUser; + } + + public String getGatewayId() { + return gatewayId; + } + + public void setGatewayId(String gatewayId) { + this.gatewayId = gatewayId; + } + + public String getMyProxyServerUrl() throws ApplicationSettingsException { + if (myProxyServerUrl == null) { + myProxyServerUrl = ServerSettings.getSetting(Constants.MYPROXY_SERVER); + } + return myProxyServerUrl; + } + + public void setMyProxyServerUrl(String myProxyServerUrl) { + this.myProxyServerUrl = myProxyServerUrl; + } + + public int getMyProxyPort() { + + if (myProxyPort == 0) { + String sPort = ServerSettings.getSetting(Constants.MYPROXY_SERVER_PORT, Integer.toString(DEFAULT_MY_PROXY_PORT)); + myProxyPort = Integer.parseInt(sPort); + } + + return myProxyPort; + } + + public void setMyProxyPort(int myProxyPort) { + this.myProxyPort = myProxyPort; + } + + public String getMyProxyUserName() throws ApplicationSettingsException { + if (myProxyUserName == null) { + myProxyUserName = ServerSettings.getSetting(Constants.MYPROXY_USER); + } + + return myProxyUserName; + } + + public void setMyProxyUserName(String myProxyUserName) { + this.myProxyUserName = myProxyUserName; + } + + public String getMyProxyPassword() throws ApplicationSettingsException { + + if (myProxyPassword == null) { + myProxyPassword = ServerSettings.getSetting(Constants.MYPROXY_PASS); + } + + return myProxyPassword; + } + + public int getMyProxyLifeTime() { + String life = ServerSettings.getSetting(Constants.MYPROXY_LIFE,Integer.toString(myProxyLifeTime)); + myProxyLifeTime = Integer.parseInt(life); + return myProxyLifeTime; + } + + public void setMyProxyLifeTime(int myProxyLifeTime) { + this.myProxyLifeTime = myProxyLifeTime; + } + + public void setMyProxyPassword(String myProxyPassword) { + this.myProxyPassword = myProxyPassword; + } +} http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/Scheduler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/Scheduler.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/Scheduler.java new file mode 100644 index 0000000..dc5ede8 --- /dev/null +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/Scheduler.java @@ -0,0 +1,230 @@ +/* + * + * 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.core; + +import org.apache.airavata.registry.cpi.AppCatalog; +import org.apache.airavata.registry.cpi.AppCatalogException; +import org.apache.airavata.gfac.core.context.JobExecutionContext; +import org.apache.airavata.gfac.core.provider.GFacProvider; +import org.apache.airavata.gfac.core.provider.GFacProviderConfig; +import org.apache.airavata.gfac.core.provider.GFacProviderException; +import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface; +import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol; +import org.apache.airavata.model.appcatalog.computeresource.LOCALSubmission; +import org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission; +import org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.xml.sax.SAXException; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.xpath.XPathExpressionException; + +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.List; + + +/** + * Scheduler decides the execution order of handlers based on application description. In addition + * to that scheduler decides which provider to invoke at the end. Scheduler will set + * provider instance and in/out handler chains in JobExecutionContext. + */ +public class Scheduler { + private static Logger log = LoggerFactory.getLogger(Scheduler.class); + + /** + * Decide which provider to use and execution sequence of handlers based on job request and + * job configuration. + * @param jobExecutionContext containing job request as well as all the configurations. + */ + public static void schedule(JobExecutionContext jobExecutionContext) throws GFacException{ + // Current implementation only support static handler sequence. + jobExecutionContext.setProvider(getProvider(jobExecutionContext)); + // TODO: Selecting the provider based on application description. + jobExecutionContext.getGFacConfiguration().setInHandlers(jobExecutionContext.getProvider().getClass().getName(), + jobExecutionContext.getApplicationName()); + jobExecutionContext.getGFacConfiguration().setOutHandlers(jobExecutionContext.getProvider().getClass().getName(), + jobExecutionContext.getApplicationName()); + jobExecutionContext.getGFacConfiguration().setExecutionMode(getExecutionMode(jobExecutionContext)); + } + + /** + * Figure out which provider to use based on application configuration. + * @param jobExecutionContext containing all the required configurations. + * @return GFacProvider instance. + */ + private static GFacProvider getProvider(JobExecutionContext jobExecutionContext) throws GFacException { + String applicationName = jobExecutionContext.getApplicationName(); + + URL resource = Scheduler.class.getClassLoader().getResource(org.apache.airavata.common.utils.Constants.GFAC_CONFIG_XML); + DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance(); + DocumentBuilder docBuilder = null; + Document handlerDoc = null; + try { + docBuilder = docBuilderFactory.newDocumentBuilder(); + handlerDoc = docBuilder.parse(new File(resource.getPath())); + } catch (ParserConfigurationException e) { + throw new GFacException(e); + } catch (SAXException e) { + throw new GFacException(e); + } catch (IOException e) { + throw new GFacException(e); + } + GFacProviderConfig s = null; + GFacProvider provider = null; + List<GFacProviderConfig> aClass = null; + String providerClassName = null; + try { + aClass = GFacConfiguration.getProviderConfig(handlerDoc, + Constants.XPATH_EXPR_APPLICATION_HANDLERS_START + applicationName + "']", Constants.GFAC_CONFIG_APPLICATION_NAME_ATTRIBUTE); + // This should be have a single element only. + if (aClass != null && !aClass.isEmpty()) { + s = aClass.get(0); + Class<? extends GFacProvider> aClass1 = Class.forName(s.getClassName()).asSubclass(GFacProvider.class); + provider = aClass1.newInstance(); + //loading the provider properties + if(!aClass.isEmpty()){ + provider.initProperties(aClass.get(0).getProperties()); + } + } + // We give higher preference to applications specific provider if configured + if (provider == null) { + + List<JobSubmissionInterface> jobSubmissionInterfaces = jobExecutionContext.getApplicationContext().getComputeResourceDescription().getJobSubmissionInterfaces(); + JobSubmissionProtocol jobSubmissionProtocol = jobExecutionContext.getPreferredJobSubmissionProtocol(); + SSHJobSubmission sshJobSubmission; + LOCALSubmission localSubmission; + UnicoreJobSubmission unicoreSubmission; + String securityProtocol = null; + try { + AppCatalog appCatalog = jobExecutionContext.getAppCatalog(); + if (jobSubmissionProtocol == JobSubmissionProtocol.SSH) { + sshJobSubmission = appCatalog.getComputeResource().getSSHJobSubmission( + jobExecutionContext.getPreferredJobSubmissionInterface().getJobSubmissionInterfaceId()); + if (sshJobSubmission != null) { + securityProtocol = sshJobSubmission.getSecurityProtocol().toString(); + } + }else if (jobSubmissionProtocol == JobSubmissionProtocol.LOCAL) { + localSubmission = appCatalog.getComputeResource().getLocalJobSubmission(jobExecutionContext.getPreferredJobSubmissionInterface().getJobSubmissionInterfaceId()); + } + else if (jobSubmissionProtocol == JobSubmissionProtocol.UNICORE) { + unicoreSubmission = appCatalog.getComputeResource().getUNICOREJobSubmission(jobExecutionContext.getPreferredJobSubmissionInterface().getJobSubmissionInterfaceId()); + securityProtocol = unicoreSubmission.getSecurityProtocol().toString(); + } + List<Element> elements = GFacUtils.getElementList(GFacConfiguration.getHandlerDoc(), Constants.XPATH_EXPR_PROVIDER_ON_SUBMISSION + jobSubmissionProtocol + "']"); + for (Element element : elements) { + String security = element.getAttribute(Constants.GFAC_CONFIG_SECURITY_ATTRIBUTE); + if (security.equals("")) { + providerClassName = element.getAttribute(Constants.GFAC_CONFIG_CLASS_ATTRIBUTE); + }else if (securityProtocol != null && securityProtocol.equals(security)) { + providerClassName = element.getAttribute(Constants.GFAC_CONFIG_CLASS_ATTRIBUTE); + } + } + if (providerClassName == null) { + throw new GFacException("Couldn't find provider class"); + } + + Class<? extends GFacProvider> aClass1 = Class.forName(providerClassName).asSubclass(GFacProvider.class); + provider = aClass1.newInstance(); + //loading the provider properties + aClass = GFacConfiguration.getProviderConfig(GFacConfiguration.getHandlerDoc(), Constants.XPATH_EXPR_PROVIDER_HANDLERS_START + + providerClassName + "']", Constants.GFAC_CONFIG_APPLICATION_NAME_ATTRIBUTE); + if (!aClass.isEmpty()) { + provider.initProperties(aClass.get(0).getProperties()); + } + } catch (AppCatalogException e) { + throw new GFacException("Couldn't retrieve job submission protocol from app catalog "); + } + } + } catch (XPathExpressionException e) { + log.error("Error evaluating XPath expression"); //To change body of catch statement use File | Settings | File Templates. + throw new GFacException("Error evaluating XPath expression", e); + } catch (GFacProviderException e) { + log.error("Error During scheduling"); //To change body of catch statement use File | Settings | File Templates. + throw new GFacException("Error During scheduling", e); + }catch (ClassNotFoundException e) { + log.error("Application Provider class: " + s + "couldn't find"); + throw new GFacException("Error initializing application specific Handler: " +providerClassName , e); + } catch (InstantiationException e) { + log.error("Error initializing application specific Handler: " + providerClassName); + throw new GFacException("Error initializing Handler", e); + } catch (IllegalAccessException e) { + log.error("Error initializing application specific Handler: " + providerClassName); + throw new GFacException("Error initializing Handler", e); + } + return provider; + } + public static ExecutionMode getExecutionMode(JobExecutionContext jobExecutionContext)throws GFacException{ + String applicationName = jobExecutionContext.getApplicationContext().getApplicationInterfaceDescription().getApplicationName(); + URL resource = Scheduler.class.getClassLoader().getResource(org.apache.airavata.common.utils.Constants.GFAC_CONFIG_XML); + DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance(); + DocumentBuilder docBuilder = null; + Document handlerDoc = null; + String jobSubmissionProtocol = jobExecutionContext.getPreferredJobSubmissionProtocol().toString(); + try { + docBuilder = docBuilderFactory.newDocumentBuilder(); + handlerDoc = docBuilder.parse(new File(resource.getPath())); + } catch (ParserConfigurationException e) { + throw new GFacException(e); + } catch (SAXException e) { + throw new GFacException(e); + } catch (IOException e) { + throw new GFacException(e); + } + GFacProviderConfig s = null; + String executionMode = "sync"; + try { + executionMode = GFacConfiguration.getAttributeValue(handlerDoc, + Constants.XPATH_EXPR_APPLICATION_HANDLERS_START + applicationName + "']", Constants.GFAC_CONFIG_EXECUTION_MODE_ATTRIBUTE); + // This should be have a single element only. + + if (executionMode == null || "".equals(executionMode)) { + String hostClass = jobExecutionContext.getPreferredJobSubmissionProtocol().toString(); + executionMode = GFacConfiguration.getAttributeValue(GFacConfiguration.getHandlerDoc(), Constants.XPATH_EXPR_PROVIDER_ON_HOST + hostClass + "']", Constants.GFAC_CONFIG_EXECUTION_MODE_ATTRIBUTE); + } + + if (executionMode == null || "".equals(executionMode)) { + List<Element> elements = GFacUtils.getElementList(GFacConfiguration.getHandlerDoc(), Constants.XPATH_EXPR_PROVIDER_ON_SUBMISSION + jobSubmissionProtocol + "']"); + for (Element element : elements) { + executionMode = element.getAttribute(Constants.GFAC_CONFIG_EXECUTION_MODE_ATTRIBUTE); + } + } + + } catch (XPathExpressionException e) { + log.error("Error evaluating XPath expression"); //To change body of catch statement use File | Settings | File Templates. + throw new GFacException("Error evaluating XPath expression", e); + } + + return ExecutionMode.fromString(executionMode); + } + +// private static HostDescription scheduleHost(List<HostDescription> registeredHosts) { +// //todo implement an algorithm to pick a host among different hosts, ideally this could be configurable in an xml +// return registeredHosts.get(0); +// } +} http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/SecurityContext.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/SecurityContext.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/SecurityContext.java new file mode 100644 index 0000000..e22110c --- /dev/null +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/SecurityContext.java @@ -0,0 +1,26 @@ +/* + * + * 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.core; + +public interface SecurityContext { + +} http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/ToolsException.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/ToolsException.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/ToolsException.java new file mode 100644 index 0000000..3a8d90f --- /dev/null +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/ToolsException.java @@ -0,0 +1,35 @@ +/* + * + * 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.core; + + +/** + * Exception for all utilities + */ +public class ToolsException extends GFacException { + + public ToolsException(String message){ + super(message,new Throwable(message)); + } + public ToolsException(String message, Throwable cause) { + super(message, cause); + } +} http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java index 9b3f5da..88aaf72 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java @@ -31,9 +31,9 @@ import org.apache.airavata.registry.cpi.AppCatalog; import org.apache.airavata.registry.cpi.AppCatalogException; import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory; import org.apache.airavata.common.utils.MonitorPublisher; -import org.apache.airavata.gfac.GFacConfiguration; -import org.apache.airavata.gfac.GFacException; -import org.apache.airavata.gfac.SecurityContext; +import org.apache.airavata.gfac.core.GFacConfiguration; +import org.apache.airavata.gfac.core.GFacException; +import org.apache.airavata.gfac.core.SecurityContext; import org.apache.airavata.gfac.core.GFac; import org.apache.airavata.gfac.core.provider.GFacProvider; import org.apache.airavata.model.appcatalog.computeresource.*; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/GFacHandlerException.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/GFacHandlerException.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/GFacHandlerException.java index cb5439b..1464557 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/GFacHandlerException.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/GFacHandlerException.java @@ -21,7 +21,7 @@ package org.apache.airavata.gfac.core.handler; -import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.core.GFacException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/provider/AbstractProvider.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/provider/AbstractProvider.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/provider/AbstractProvider.java index 43cf08e..f1b368b 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/provider/AbstractProvider.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/provider/AbstractProvider.java @@ -21,7 +21,7 @@ package org.apache.airavata.gfac.core.provider; -import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.core.GFacException; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.model.workspace.experiment.JobDetails; import org.apache.airavata.model.workspace.experiment.JobStatus; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/provider/GFacProvider.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/provider/GFacProvider.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/provider/GFacProvider.java index f13f1b3..7b95928 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/provider/GFacProvider.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/provider/GFacProvider.java @@ -23,7 +23,7 @@ package org.apache.airavata.gfac.core.provider; import java.util.Map; -import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.core.GFacException; import org.apache.airavata.gfac.core.context.JobExecutionContext; public interface GFacProvider{ http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/GFacConfigXmlTest.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/GFacConfigXmlTest.java b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/GFacConfigXmlTest.java index 6164b2e..59f3a4f 100644 --- a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/GFacConfigXmlTest.java +++ b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/GFacConfigXmlTest.java @@ -21,7 +21,7 @@ package org.apache.airavata.job; import junit.framework.Assert; -import org.apache.airavata.gfac.GFacConfiguration; +import org.apache.airavata.gfac.core.GFacConfiguration; import org.apache.airavata.gfac.core.context.ApplicationContext; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestProvider.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestProvider.java b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestProvider.java index 8653e03..43ddb90 100644 --- a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestProvider.java +++ b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestProvider.java @@ -20,7 +20,7 @@ */ package org.apache.airavata.job; -import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.core.GFacException; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.gfac.core.provider.AbstractProvider; import org.apache.airavata.gfac.core.provider.GFacProviderException; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/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 df91310..eeae272 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 @@ -20,7 +20,7 @@ */ package org.apache.airavata.gfac.gsissh.handler; -import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.core.GFacException; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.gfac.core.handler.AbstractHandler; import org.apache.airavata.gfac.core.handler.GFacHandlerException; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/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 014ad65..958e04c 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 @@ -21,7 +21,7 @@ package org.apache.airavata.gfac.gsissh.handler; import org.apache.airavata.common.exception.ApplicationSettingsException; -import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.core.GFacException; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.gfac.core.context.MessageContext; import org.apache.airavata.gfac.core.handler.AbstractHandler; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/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 a7cb806..d93c2e3 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 @@ -22,7 +22,7 @@ package org.apache.airavata.gfac.gsissh.handler; //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.core.GFacException; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.gfac.core.handler.AbstractHandler; import org.apache.airavata.gfac.core.handler.GFacHandlerException; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/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 f8a6439..4c6d3bd 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 @@ -3,7 +3,7 @@ package org.apache.airavata.gfac.gsissh.handler; import java.util.List; import java.util.Properties; -import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.core.GFacException; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.gfac.core.handler.AbstractHandler; import org.apache.airavata.gfac.core.handler.GFacHandlerException; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/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 ce7fec8..a4418fc 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 @@ -23,7 +23,7 @@ package org.apache.airavata.gfac.gsissh.provider.impl; import org.apache.airavata.registry.cpi.AppCatalogException; import org.apache.airavata.common.exception.AiravataException; import org.apache.airavata.common.exception.ApplicationSettingsException; -import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.core.GFacException; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.gfac.core.handler.GFacHandlerException; import org.apache.airavata.gfac.core.provider.AbstractProvider; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/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 2f3956c..7059475 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 @@ -21,8 +21,8 @@ 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.core.AbstractSecurityContext; +import org.apache.airavata.gfac.core.RequestData; 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/2f3da010/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/security/TokenizedMyProxyAuthInfo.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/security/TokenizedMyProxyAuthInfo.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/security/TokenizedMyProxyAuthInfo.java index a3e0241..5b1e3a2 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/security/TokenizedMyProxyAuthInfo.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/gsissh/security/TokenizedMyProxyAuthInfo.java @@ -25,9 +25,9 @@ import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.credential.store.credential.Credential; import org.apache.airavata.credential.store.credential.impl.certificate.CertificateCredential; import org.apache.airavata.credential.store.store.CredentialReader; -import org.apache.airavata.gfac.Constants; -import org.apache.airavata.gfac.GFacException; -import org.apache.airavata.gfac.RequestData; +import org.apache.airavata.gfac.core.Constants; +import org.apache.airavata.gfac.core.GFacException; +import org.apache.airavata.gfac.core.RequestData; import org.apache.airavata.gfac.core.GFacUtils; import org.apache.airavata.gfac.core.authentication.GSIAuthenticationInfo; import org.globus.gsi.X509Credential; @@ -208,7 +208,7 @@ public class TokenizedMyProxyAuthInfo extends GSIAuthenticationInfo { * > myproxy-init -A --cert /tmp/x509up_u501 --key /tmp/x509up_u501 -l ogce -s myproxy.teragrid.org * * @return Renewed credentials. - * @throws org.apache.airavata.gfac.GFacException If an error occurred while renewing credentials. + * @throws GFacException If an error occurred while renewing credentials. * @throws org.apache.airavata.common.exception.ApplicationSettingsException */ public GSSCredential renewCredentialsAsATrustedHost() throws GFacException, ApplicationSettingsException { @@ -229,7 +229,7 @@ public class TokenizedMyProxyAuthInfo extends GSIAuthenticationInfo { * Gets the default proxy certificate. * * @return Default my proxy credentials. - * @throws org.apache.airavata.gfac.GFacException If an error occurred while retrieving credentials. + * @throws GFacException If an error occurred while retrieving credentials. * @throws org.apache.airavata.common.exception.ApplicationSettingsException */ public GSSCredential getDefaultCredentials() throws GFacException, ApplicationSettingsException { @@ -248,7 +248,7 @@ public class TokenizedMyProxyAuthInfo extends GSIAuthenticationInfo { * use user name and password to renew credentials. * * @return Renewed credentials. - * @throws org.apache.airavata.gfac.GFacException If an error occurred while renewing credentials. + * @throws GFacException If an error occurred while renewing credentials. * @throws org.apache.airavata.common.exception.ApplicationSettingsException */ public GSSCredential renewCredentials() throws GFacException, ApplicationSettingsException { @@ -268,7 +268,7 @@ public class TokenizedMyProxyAuthInfo extends GSIAuthenticationInfo { * Gets a new proxy certificate given current credentials. * * @return The short lived GSSCredentials - * @throws org.apache.airavata.gfac.GFacException If an error is occurred while retrieving credentials. + * @throws GFacException If an error is occurred while retrieving credentials. * @throws org.apache.airavata.common.exception.ApplicationSettingsException */ public GSSCredential getProxyCredentials() throws GFacException, ApplicationSettingsException { http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/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 622e660..aa0b60e 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 @@ -25,8 +25,8 @@ import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.credential.store.credential.impl.certificate.CertificateCredential; import org.apache.airavata.credential.store.store.CredentialReader; -import org.apache.airavata.gfac.GFacException; -import org.apache.airavata.gfac.RequestData; +import org.apache.airavata.gfac.core.GFacException; +import org.apache.airavata.gfac.core.RequestData; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.gfac.core.context.MessageContext; import org.apache.airavata.gfac.core.GFacUtils; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/BetterGfacImpl.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/BetterGfacImpl.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/BetterGfacImpl.java index 564fcb2..c7783f6 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/BetterGfacImpl.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/BetterGfacImpl.java @@ -26,10 +26,10 @@ import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory; import org.apache.airavata.common.utils.AiravataZKUtils; import org.apache.airavata.common.utils.MonitorPublisher; import org.apache.airavata.common.utils.ServerSettings; -import org.apache.airavata.gfac.Constants; -import org.apache.airavata.gfac.GFacConfiguration; -import org.apache.airavata.gfac.GFacException; -import org.apache.airavata.gfac.Scheduler; +import org.apache.airavata.gfac.core.Constants; +import org.apache.airavata.gfac.core.GFacConfiguration; +import org.apache.airavata.gfac.core.GFacException; +import org.apache.airavata.gfac.core.Scheduler; import org.apache.airavata.gfac.core.context.ApplicationContext; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.gfac.core.context.MessageContext; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/OutHandlerWorker.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/OutHandlerWorker.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/OutHandlerWorker.java index 5adaed6..048889a 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/OutHandlerWorker.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/OutHandlerWorker.java @@ -21,7 +21,7 @@ package org.apache.airavata.gfac.impl; import org.apache.airavata.common.utils.MonitorPublisher; -import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.core.GFacException; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.gfac.core.GFac; import org.apache.airavata.gfac.core.monitor.MonitorID; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/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 1bc5244..a0ace45 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 @@ -29,8 +29,8 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; -import org.apache.airavata.gfac.Constants; -import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.core.Constants; +import org.apache.airavata.gfac.core.GFacException; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.gfac.core.provider.AbstractProvider; import org.apache.airavata.gfac.core.provider.GFacProviderException; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/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 a1a5bd2..22c3a14 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 @@ -19,8 +19,8 @@ package org.apache.airavata.gfac.monitor;/* * */ -import org.apache.airavata.gfac.GFacException; -import org.apache.airavata.gfac.SecurityContext; +import org.apache.airavata.gfac.core.GFacException; +import org.apache.airavata.gfac.core.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; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/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 a159fdf..7429381 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 @@ -20,8 +20,8 @@ */ 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.GFacException; +import org.apache.airavata.gfac.core.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; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java index e53fe09..a0b922d 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java @@ -23,7 +23,7 @@ package org.apache.airavata.gfac.monitor.util; import org.apache.airavata.common.logger.AiravataLogger; import org.apache.airavata.common.logger.AiravataLoggerFactory; import org.apache.airavata.common.utils.Constants; -import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.core.GFacException; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.gfac.core.handler.GFacHandler; import org.apache.airavata.gfac.core.handler.GFacHandlerConfig; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/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 712678c..d19ccb5 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 @@ -20,7 +20,7 @@ */ package org.apache.airavata.gfac.ssh.handler; -import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.core.GFacException; import org.apache.airavata.gfac.core.SSHApiException; import org.apache.airavata.gfac.core.cluster.Cluster; import org.apache.airavata.gfac.core.context.JobExecutionContext; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/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 ddfff15..faef464 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 @@ -21,7 +21,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.GFacException; import org.apache.airavata.gfac.core.SSHApiException; import org.apache.airavata.gfac.core.cluster.Cluster; import org.apache.airavata.gfac.core.context.JobExecutionContext; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/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 0758a59..6c2a198 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 @@ -5,7 +5,7 @@ import java.io.StringWriter; import java.util.List; import java.util.Properties; -import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.core.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; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/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 e675680..e79903f 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 @@ -20,7 +20,7 @@ */ package org.apache.airavata.gfac.ssh.handler; -import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.core.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; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/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 4940c3f..f907cc6 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 @@ -21,7 +21,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.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; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/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 80b8069..3f9edae 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 @@ -21,8 +21,8 @@ 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.Constants; +import org.apache.airavata.gfac.core.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; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/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 58fe0e3..f162fd5 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 @@ -25,8 +25,8 @@ import org.apache.airavata.registry.cpi.AppCatalogException; import org.apache.airavata.common.exception.AiravataException; 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.Constants; +import org.apache.airavata.gfac.core.GFacException; import org.apache.airavata.gfac.core.JobDescriptor; import org.apache.airavata.gfac.core.SSHApiException; import org.apache.airavata.gfac.core.cluster.Cluster; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/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 4b41d9c..a624efc 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 @@ -26,7 +26,7 @@ import net.schmizz.sshj.SSHClient; 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.core.SecurityContext; 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/2f3da010/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/security/TokenizedSSHAuthInfo.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/security/TokenizedSSHAuthInfo.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/security/TokenizedSSHAuthInfo.java index 3b90b40..049af7f 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/security/TokenizedSSHAuthInfo.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/security/TokenizedSSHAuthInfo.java @@ -26,9 +26,9 @@ import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.credential.store.credential.Credential; import org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential; import org.apache.airavata.credential.store.store.CredentialReader; -import org.apache.airavata.gfac.Constants; -import org.apache.airavata.gfac.GFacException; -import org.apache.airavata.gfac.RequestData; +import org.apache.airavata.gfac.core.Constants; +import org.apache.airavata.gfac.core.GFacException; +import org.apache.airavata.gfac.core.RequestData; import org.apache.airavata.gfac.core.GFacUtils; import org.apache.airavata.gfac.core.authentication.SSHPublicKeyFileAuthentication; import org.slf4j.Logger; @@ -146,7 +146,7 @@ public class TokenizedSSHAuthInfo implements SSHPublicKeyFileAuthentication { * Gets the default proxy certificate. * * @return Default my proxy credentials. - * @throws org.apache.airavata.gfac.GFacException If an error occurred while retrieving credentials. + * @throws GFacException If an error occurred while retrieving credentials. * @throws org.apache.airavata.common.exception.ApplicationSettingsException */ public SSHCredential getDefaultCredentials() throws GFacException, ApplicationSettingsException, IOException { http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/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 ae4eaa5..2fba9a9 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 @@ -25,9 +25,9 @@ import org.apache.airavata.registry.cpi.AppCatalogException; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.utils.ServerSettings; 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.Constants; +import org.apache.airavata.gfac.core.GFacException; +import org.apache.airavata.gfac.core.RequestData; import org.apache.airavata.gfac.core.JobDescriptor; import org.apache.airavata.gfac.core.JobManagerConfiguration; import org.apache.airavata.gfac.core.cluster.Cluster; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2TestWithSSHAuth.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2TestWithSSHAuth.java b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2TestWithSSHAuth.java index 2c15c5e..c83bf6a 100644 --- a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2TestWithSSHAuth.java +++ b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2TestWithSSHAuth.java @@ -24,9 +24,9 @@ //import org.apache.airavata.commons.gfac.type.ApplicationDescription; //import org.apache.airavata.commons.gfac.type.HostDescription; //import org.apache.airavata.commons.gfac.type.ServiceDescription; -//import org.apache.airavata.gfac.GFacConfiguration; -//import org.apache.airavata.gfac.GFacException; -//import org.apache.airavata.gfac.SecurityContext; +//import org.apache.airavata.gfac.core.GFacConfiguration; +//import org.apache.airavata.gfac.core.GFacException; +//import org.apache.airavata.gfac.core.SecurityContext; //import org.apache.airavata.gfac.core.context.ApplicationContext; //import org.apache.airavata.gfac.core.context.JobExecutionContext; //import org.apache.airavata.gfac.core.context.MessageContext; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/CredentialStoreTest.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/CredentialStoreTest.java b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/CredentialStoreTest.java index 28b1047..babbaf7 100644 --- a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/CredentialStoreTest.java +++ b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/CredentialStoreTest.java @@ -32,8 +32,8 @@ //import org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential; //import org.apache.airavata.credential.store.store.CredentialReader; //import org.apache.airavata.credential.store.store.impl.CredentialReaderImpl; -//import org.apache.airavata.gfac.GFacException; -//import org.apache.airavata.gfac.RequestData; +//import org.apache.airavata.gfac.core.GFacException; +//import org.apache.airavata.gfac.core.RequestData; //import org.apache.airavata.gfac.ssh.security.TokenizedSSHAuthInfo; //import org.apache.airavata.gfac.ssh.api.SSHApiException; //import org.apache.airavata.gfac.ssh.api.ServerInfo; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/GSISSHProviderTestWithMyProxyAuth.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/GSISSHProviderTestWithMyProxyAuth.java b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/GSISSHProviderTestWithMyProxyAuth.java index 9b922dd..c1bc393 100644 --- a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/GSISSHProviderTestWithMyProxyAuth.java +++ b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/GSISSHProviderTestWithMyProxyAuth.java @@ -32,9 +32,9 @@ //import org.apache.airavata.commons.gfac.type.ApplicationDescription; //import org.apache.airavata.commons.gfac.type.HostDescription; //import org.apache.airavata.commons.gfac.type.ServiceDescription; -//import org.apache.airavata.gfac.GFacConfiguration; -//import org.apache.airavata.gfac.GFacException; -//import org.apache.airavata.gfac.SecurityContext; +//import org.apache.airavata.gfac.core.GFacConfiguration; +//import org.apache.airavata.gfac.core.GFacException; +//import org.apache.airavata.gfac.core.SecurityContext; //import org.apache.airavata.gfac.core.context.ApplicationContext; //import org.apache.airavata.gfac.core.context.JobExecutionContext; //import org.apache.airavata.gfac.core.context.MessageContext; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/LocalProviderTest.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/LocalProviderTest.java b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/LocalProviderTest.java index 0ff53fd..098b966 100644 --- a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/LocalProviderTest.java +++ b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/LocalProviderTest.java @@ -30,8 +30,8 @@ //import org.apache.airavata.commons.gfac.type.ApplicationDescription; //import org.apache.airavata.commons.gfac.type.HostDescription; //import org.apache.airavata.commons.gfac.type.ServiceDescription; -//import org.apache.airavata.gfac.GFacConfiguration; -//import org.apache.airavata.gfac.GFacException; +//import org.apache.airavata.gfac.core.GFacConfiguration; +//import org.apache.airavata.gfac.core.GFacException; //import org.apache.airavata.gfac.core.context.ApplicationContext; //import org.apache.airavata.gfac.core.context.JobExecutionContext; //import org.apache.airavata.gfac.core.context.MessageContext; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/SSHProviderTestWithSSHAuth.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/SSHProviderTestWithSSHAuth.java b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/SSHProviderTestWithSSHAuth.java index e16221c..4aa0df1 100644 --- a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/SSHProviderTestWithSSHAuth.java +++ b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/SSHProviderTestWithSSHAuth.java @@ -32,8 +32,8 @@ //import org.apache.airavata.commons.gfac.type.HostDescription; //import org.apache.airavata.commons.gfac.type.MappingFactory; //import org.apache.airavata.commons.gfac.type.ServiceDescription; -//import org.apache.airavata.gfac.GFacConfiguration; -//import org.apache.airavata.gfac.GFacException; +//import org.apache.airavata.gfac.core.GFacConfiguration; +//import org.apache.airavata.gfac.core.GFacException; //import org.apache.airavata.gfac.core.context.ApplicationContext; //import org.apache.airavata.gfac.core.context.JobExecutionContext; //import org.apache.airavata.gfac.core.context.MessageContext; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/security/GSISecurityContextTestWithMyProxyAuth.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/security/GSISecurityContextTestWithMyProxyAuth.java b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/security/GSISecurityContextTestWithMyProxyAuth.java index 9268d84..392e577 100644 --- a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/security/GSISecurityContextTestWithMyProxyAuth.java +++ b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/security/GSISecurityContextTestWithMyProxyAuth.java @@ -22,14 +22,12 @@ package org.apache.airavata.core.gfac.services.impl.security; import junit.framework.Assert; -import org.apache.airavata.common.utils.AiravataUtils; import org.apache.airavata.common.utils.DatabaseTestCases; import org.apache.airavata.common.utils.DerbyUtil; import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.credential.store.store.CredentialReader; import org.apache.airavata.credential.store.store.CredentialReaderFactory; -import org.apache.airavata.gfac.RequestData; -import org.apache.airavata.gfac.gsissh.security.GSISecurityContext; +import org.apache.airavata.gfac.core.RequestData; import org.apache.airavata.gfac.gsissh.security.TokenizedMyProxyAuthInfo; import org.apache.log4j.Logger; import org.ietf.jgss.GSSCredential; http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3da010/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java index c3abe78..080df26 100644 --- a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java +++ b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java @@ -34,8 +34,8 @@ import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.common.utils.ThriftUtils; import org.apache.airavata.common.utils.listener.AbstractActivityListener; import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; -import org.apache.airavata.gfac.GFacConfiguration; -import org.apache.airavata.gfac.GFacException; +import org.apache.airavata.gfac.core.GFacConfiguration; +import org.apache.airavata.gfac.core.GFacException; import org.apache.airavata.gfac.core.GFac; import org.apache.airavata.gfac.core.handler.GFacHandlerConfig; import org.apache.airavata.gfac.core.handler.GFacHandlerException;
