airavata-commits mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	samin...@apache.org
Subject	svn commit: r1485661 [1/2] - in /airavata/trunk: modules/airavata-client/src/main/java/org/apache/airavata/client/ modules/airavata-client/src/main/java/org/apache/airavata/client/api/ modules/airavata-client/src/main/java/org/apache/airavata/client/ap...
Date	Thu, 23 May 2013 12:29:47 GMT
Author: samindaw Date: Thu May 23 12:29:45 2013 New Revision: 1485661 URL: http://svn.apache.org/r1485661 Log: refactoring exception classes for the API Added: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPIInvocationException.java (with props) airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/DescriptorRecordAlreadyExistsException.java (with props) airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/AiravataAPIInvocationException.java - copied, changed from r1485653, airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPIInvocationException.java airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/AiravataAPIUnimplementedException.java (contents, props changed) - copied, changed from r1485653, airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPIUnimplementedException.java airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/DescriptorAlreadyExistsException.java - copied, changed from r1485653, airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/DescriptorRecordAlreadyExistsException.java airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/WorkflowAlreadyExistsException.java (with props) Removed: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPIUnimplementedException.java Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataAPIFactory.java airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPI.java airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataManager.java airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ApplicationManager.java airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExperimentAdvanceOptions.java airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/SecuritySettings.java airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/WorkflowManager.java airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/builder/DescriptorBuilder.java airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/SecuritySettingsImpl.java airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowManagerImpl.java airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/Scheduler.java airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GramProvider.java airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/WorkflowInput.java airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptionWrap.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/EventingServiceURLs.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURLs.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURLs.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/EventingServiceURLsNode.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/GFacURLsNode.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/InterpreterServiceURLsNode.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/MessageBoxURLsNode.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplateNode.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorListDialog.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/RegistryWindow.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/ExperimentMenu.java airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java airavata/trunk/samples/airavata-client/create-application/src/main/java/org/apache/airavata/api/samples/CreateApplication.java airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/MonitorWorkflow.java airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/RunWorkflow.java Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataAPIFactory.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataAPIFactory.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataAPIFactory.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataAPIFactory.java Thu May 23 12:29:45 2013 @@ -24,7 +24,7 @@ package org.apache.airavata.client; import java.net.URI; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.client.impl.PasswordCallBackImpl; import org.apache.airavata.common.utils.SecurityUtil; import org.apache.airavata.registry.api.PasswordCallback; Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java Thu May 23 12:29:45 2013 @@ -31,7 +31,6 @@ import java.util.Observable; import javax.jcr.RepositoryException; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; import org.apache.airavata.client.api.AiravataManager; import org.apache.airavata.client.api.ApplicationManager; import org.apache.airavata.client.api.ExecutionManager; @@ -39,6 +38,7 @@ import org.apache.airavata.client.api.Pr import org.apache.airavata.client.api.UserManager; import org.apache.airavata.client.api.WorkflowManager; import org.apache.airavata.client.api.builder.DescriptorBuilder; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.client.impl.AiravataManagerImpl; import org.apache.airavata.client.impl.ApplicationManagerImpl; import org.apache.airavata.client.impl.ExecutionManagerImpl; Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPI.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPI.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPI.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPI.java Thu May 23 12:29:45 2013 @@ -24,6 +24,7 @@ package org.apache.airavata.client.api; import java.net.URI; import org.apache.airavata.client.api.builder.DescriptorBuilder; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.common.utils.Version; import org.apache.airavata.registry.api.PasswordCallback; Added: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPIInvocationException.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPIInvocationException.java?rev=1485661&view=auto ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPIInvocationException.java (added) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPIInvocationException.java Thu May 23 12:29:45 2013 @@ -0,0 +1,49 @@ +/* + * + * 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.client.api; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/* + * @deprecated - {@use #org.apache.airavata.client.api.exception.AiravataAPIInvocationException} + / +public class AiravataAPIInvocationException extends org.apache.airavata.client.api.exception.AiravataAPIInvocationException { + private static final Logger log = LoggerFactory.getLogger(AiravataAPIInvocationException.class); + + private static final long serialVersionUID = 1L; + + public AiravataAPIInvocationException(Throwable e) { + super(e.getLocalizedMessage(), e); + log.error(e.getLocalizedMessage(),e); + } + public AiravataAPIInvocationException(String message) { + super(message, null); + log.error(message); + } + + public AiravataAPIInvocationException(String message, Throwable e) { + super(message, e); + log.error(message,e); + } + +} Propchange: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPIInvocationException.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataManager.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataManager.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataManager.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataManager.java Thu May 23 12:29:45 2013 @@ -21,6 +21,7 @@ package org.apache.airavata.client.api; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.registry.api.AiravataUser; import org.apache.airavata.registry.api.Gateway; Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ApplicationManager.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ApplicationManager.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ApplicationManager.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ApplicationManager.java Thu May 23 12:29:45 2013 @@ -24,6 +24,8 @@ package org.apache.airavata.client.api; import java.util.List; import java.util.Map; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.DescriptorAlreadyExistsException; import org.apache.airavata.commons.gfac.type.ApplicationDescription; import org.apache.airavata.commons.gfac.type.HostDescription; import org.apache.airavata.commons.gfac.type.ServiceDescription; @@ -63,10 +65,10 @@ public interface ApplicationManager { service descriptor use {@see #updateServiceDescription}. * @param serviceDescription The service descriptor. * @throws AiravataAPIInvocationException If an error occurred while adding service description. - * @throws DescriptorRecordAlreadyExistsException If service descriptor already exists in the system. + * @throws DescriptorAlreadyExistsException If service descriptor already exists in the system. / public void addServiceDescription(ServiceDescription serviceDescription)throws AiravataAPIInvocationException, - DescriptorRecordAlreadyExistsException; + DescriptorAlreadyExistsException; /* * Updates the service descriptor. @@ -125,11 +127,11 @@ public interface ApplicationManager { * @param hostDescription The host description to associate, should have been saved before calling this method. * @param applicationDeploymentDescription The application descriptor to save. * @throws AiravataAPIInvocationException If an error occurred while saving application descriptor. - * @throws DescriptorRecordAlreadyExistsException If deployment descriptor already exists in the system. + * @throws DescriptorAlreadyExistsException If deployment descriptor already exists in the system. / public void addApplicationDescription(ServiceDescription serviceDescription, HostDescription hostDescription, ApplicationDescription applicationDeploymentDescription) - throws AiravataAPIInvocationException, DescriptorRecordAlreadyExistsException; + throws AiravataAPIInvocationException, DescriptorAlreadyExistsException; /* * Adds a new deployment description associating with given service description and given host description. If @@ -219,10 +221,10 @@ public interface ApplicationManager { * {@see #updateHostDescription(HostDescription host)} method. * @param host The host descriptor object to save in the database. * @throws AiravataAPIInvocationException If an error occurred while saving the host description. - * @throws DescriptorRecordAlreadyExistsException If host descriptor object already exists in the system. + * @throws DescriptorAlreadyExistsException If host descriptor object already exists in the system. / public void addHostDescription (HostDescription host) throws AiravataAPIInvocationException, - DescriptorRecordAlreadyExistsException; + DescriptorAlreadyExistsException; /* Added: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/DescriptorRecordAlreadyExistsException.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/DescriptorRecordAlreadyExistsException.java?rev=1485661&view=auto ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/DescriptorRecordAlreadyExistsException.java (added) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/DescriptorRecordAlreadyExistsException.java Thu May 23 12:29:45 2013 @@ -0,0 +1,45 @@ +/* + * + * 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.client.api; + + +/* + * @deprecated - {@use #org.apache.airavata.client.api.exception.DescriptorAlreadyExistsException} + * If a saving descriptor already found in the system this exception will be thrown. + / +public class DescriptorRecordAlreadyExistsException extends org.apache.airavata.client.api.exception.DescriptorAlreadyExistsException { + + private static final long serialVersionUID = 1231L; + + public DescriptorRecordAlreadyExistsException(Throwable e) { + super(e); + } + + public DescriptorRecordAlreadyExistsException(String message) { + super(message, null); + } + + public DescriptorRecordAlreadyExistsException(String message, Throwable e) { + super(message, e); + } + +} Propchange: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/DescriptorRecordAlreadyExistsException.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java Thu May 23 12:29:45 2013 @@ -23,6 +23,7 @@ package org.apache.airavata.client.api; import java.util.List; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder; import org.apache.airavata.registry.api.ExecutionErrors; import org.apache.airavata.registry.api.workflow.ExecutionError; Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExperimentAdvanceOptions.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExperimentAdvanceOptions.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExperimentAdvanceOptions.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExperimentAdvanceOptions.java Thu May 23 12:29:45 2013 @@ -21,6 +21,7 @@ package org.apache.airavata.client.api; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.client.impl.SecuritySettingsImpl; import org.apache.airavata.client.impl.WorkflowOutputDataSettingsImpl; import org.apache.airavata.client.impl.WorkflowSchedulingSettingsImpl; Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java Thu May 23 12:29:45 2013 @@ -25,6 +25,7 @@ import java.util.Date; import java.util.List; import java.util.Map; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.registry.api.exception.RegistryException; import org.apache.airavata.registry.api.workflow.ExperimentData; import org.apache.airavata.registry.api.workflow.ExperimentMetadata; Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/SecuritySettings.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/SecuritySettings.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/SecuritySettings.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/SecuritySettings.java Thu May 23 12:29:45 2013 @@ -21,6 +21,8 @@ package org.apache.airavata.client.api; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; + public interface SecuritySettings { public AmazonWebServicesSettings getAmazonWSSettings() throws AiravataAPIInvocationException; public CredentialStoreSecuritySettings getCredentialStoreSecuritySettings() throws AiravataAPIInvocationException; Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/WorkflowManager.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/WorkflowManager.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/WorkflowManager.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/WorkflowManager.java Thu May 23 12:29:45 2013 @@ -25,6 +25,8 @@ import java.net.URI; import java.util.List; import java.util.Map; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.DescriptorAlreadyExistsException; import org.apache.airavata.workflow.model.wf.Workflow; import org.apache.airavata.workflow.model.wf.WorkflowData; import org.apache.airavata.workflow.model.wf.WorkflowInput; @@ -53,10 +55,10 @@ public interface WorkflowManager { @param owner Under which user workflow should be added. This is a privileged method and usually * only admin calls this. * @throws AiravataAPIInvocationException If an error occurred while adding a new workflow. - * @throws DescriptorRecordAlreadyExistsException If adding workflow already exists for the given owner. + * @throws DescriptorAlreadyExistsException If adding workflow already exists for the given owner. / public void addOwnerWorkflow (String workflowAsString, String owner) throws AiravataAPIInvocationException, - DescriptorRecordAlreadyExistsException; + DescriptorAlreadyExistsException; /* * Adds a new workflow. Workflow is added to users private space. i.e. only user who added the @@ -65,10 +67,10 @@ public interface WorkflowManager { * @param owner Under which user workflow should be added. This is a privileged method and usually * only admin calls this. * @throws AiravataAPIInvocationException If an error occurred while adding a new workflow. - * @throws DescriptorRecordAlreadyExistsException If adding workflow already exists for the given owner. + * @throws DescriptorAlreadyExistsException If adding workflow already exists for the given owner. / public void addOwnerWorkflow (URI workflowPath, String owner) throws AiravataAPIInvocationException, - DescriptorRecordAlreadyExistsException; + DescriptorAlreadyExistsException; /* * Adds a new workflow. Workflow is added to users private space. i.e. only user who added the @@ -77,10 +79,10 @@ public interface WorkflowManager { * @param owner Under which user workflow should be added. This is a privileged method and usually * only admin calls this. * @throws AiravataAPIInvocationException If an error occurred while adding a new workflow. - * @throws DescriptorRecordAlreadyExistsException If adding workflow already exists for the given owner. + * @throws DescriptorAlreadyExistsException If adding workflow already exists for the given owner. / public void addOwnerWorkflow (Workflow workflow, String owner) throws AiravataAPIInvocationException, - DescriptorRecordAlreadyExistsException; + DescriptorAlreadyExistsException; /* * Updates a given workflow. Only user who added the workflow will be able to update it. @@ -206,7 +208,7 @@ public interface WorkflowManager { * @throws AiravataAPIInvocationException If an error occurred while adding a new workflow. / public void addWorkflowAsPublic (String workflowAsString) throws AiravataAPIInvocationException, - DescriptorRecordAlreadyExistsException; + DescriptorAlreadyExistsException; /* * Updates a given workflow. Only user who added the workflow will be able to update it. @@ -222,7 +224,7 @@ public interface WorkflowManager { * @throws AiravataAPIInvocationException If an error occurred while adding a new workflow. / public void addWorkflowAsPublic (URI workflowUri) throws AiravataAPIInvocationException, - DescriptorRecordAlreadyExistsException; + DescriptorAlreadyExistsException; /* * Updates a given workflow. Only user who added the workflow will be able to update it. @@ -240,7 +242,7 @@ public interface WorkflowManager { * @throws AiravataAPIInvocationException If an error occurred while adding a new workflow. / public void addWorkflow (String workflowAsString) throws AiravataAPIInvocationException, - DescriptorRecordAlreadyExistsException; + DescriptorAlreadyExistsException; /* * Updates a given workflow. Only user who added the workflow will be able to update it. @@ -257,7 +259,7 @@ public interface WorkflowManager { * @throws AiravataAPIInvocationException If an error occurred while adding a new workflow. / public void addWorkflow (Workflow workflow) throws AiravataAPIInvocationException, - DescriptorRecordAlreadyExistsException; + DescriptorAlreadyExistsException; /* * Updates a given workflow. Only user who added the workflow will be able to update it. @@ -274,7 +276,7 @@ public interface WorkflowManager { * @throws AiravataAPIInvocationException If an error occurred while adding a new workflow. / public void addWorkflow (URI workflowUri) throws AiravataAPIInvocationException, - DescriptorRecordAlreadyExistsException; + DescriptorAlreadyExistsException; /* * Updates a given workflow. Only user who added the workflow will be able to update it. Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/builder/DescriptorBuilder.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/builder/DescriptorBuilder.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/builder/DescriptorBuilder.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/builder/DescriptorBuilder.java Thu May 23 12:29:45 2013 @@ -21,7 +21,7 @@ package org.apache.airavata.client.api.builder; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.commons.gfac.type.ApplicationDescription; import org.apache.airavata.commons.gfac.type.HostDescription; import org.apache.airavata.commons.gfac.type.ServiceDescription; Copied: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/AiravataAPIInvocationException.java (from r1485653, airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPIInvocationException.java) URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/AiravataAPIInvocationException.java?p2=airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/AiravataAPIInvocationException.java&p1=airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPIInvocationException.java&r1=1485653&r2=1485661&rev=1485661&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPIInvocationException.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/AiravataAPIInvocationException.java Thu May 23 12:29:45 2013 @@ -19,7 +19,7 @@ * / -package org.apache.airavata.client.api; +package org.apache.airavata.client.api.exception; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Copied: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/AiravataAPIUnimplementedException.java (from r1485653, airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPIUnimplementedException.java) URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/AiravataAPIUnimplementedException.java?p2=airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/AiravataAPIUnimplementedException.java&p1=airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPIUnimplementedException.java&r1=1485653&r2=1485661&rev=1485661&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPIUnimplementedException.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/AiravataAPIUnimplementedException.java Thu May 23 12:29:45 2013 @@ -19,7 +19,7 @@ / -package org.apache.airavata.client.api; +package org.apache.airavata.client.api.exception; public class AiravataAPIUnimplementedException extends AiravataAPIInvocationException { Propchange: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/AiravataAPIUnimplementedException.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/DescriptorAlreadyExistsException.java (from r1485653, airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/DescriptorRecordAlreadyExistsException.java) URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/DescriptorAlreadyExistsException.java?p2=airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/DescriptorAlreadyExistsException.java&p1=airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/DescriptorRecordAlreadyExistsException.java&r1=1485653&r2=1485661&rev=1485661&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/DescriptorRecordAlreadyExistsException.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/DescriptorAlreadyExistsException.java Thu May 23 12:29:45 2013 @@ -19,24 +19,25 @@ / -package org.apache.airavata.client.api; +package org.apache.airavata.client.api.exception; + /* * If a saving descriptor already found in the system this exception will be thrown. / -public class DescriptorRecordAlreadyExistsException extends Exception { +public class DescriptorAlreadyExistsException extends AiravataAPIInvocationException { private static final long serialVersionUID = 1231L; - public DescriptorRecordAlreadyExistsException(Throwable e) { + public DescriptorAlreadyExistsException(Throwable e) { super(e); } - public DescriptorRecordAlreadyExistsException(String message) { + public DescriptorAlreadyExistsException(String message) { super(message, null); } - public DescriptorRecordAlreadyExistsException(String message, Throwable e) { + public DescriptorAlreadyExistsException(String message, Throwable e) { super(message, e); } Added: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/WorkflowAlreadyExistsException.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/WorkflowAlreadyExistsException.java?rev=1485661&view=auto ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/WorkflowAlreadyExistsException.java (added) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/WorkflowAlreadyExistsException.java Thu May 23 12:29:45 2013 @@ -0,0 +1,43 @@ +/ + * + * 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.client.api.exception; + +/* + * If a saving descriptor already found in the system this exception will be thrown. + / +public class WorkflowAlreadyExistsException extends AiravataAPIInvocationException { + + private static final long serialVersionUID = 1231L; + + public WorkflowAlreadyExistsException(Throwable e) { + super(e); + } + + public WorkflowAlreadyExistsException(String message) { + super(message, null); + } + + public WorkflowAlreadyExistsException(String message, Throwable e) { + super(message, e); + } + +} Propchange: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/exception/WorkflowAlreadyExistsException.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java Thu May 23 12:29:45 2013 @@ -28,8 +28,8 @@ import java.util.Date; import java.util.List; import org.apache.airavata.client.AiravataClient; -import org.apache.airavata.client.api.AiravataAPIInvocationException; import org.apache.airavata.client.api.AiravataManager; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.registry.api.AiravataUser; import org.apache.airavata.registry.api.Gateway; Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java Thu May 23 12:29:45 2013 @@ -27,16 +27,15 @@ import java.util.List; import java.util.Map; import org.apache.airavata.client.AiravataClient; -import org.apache.airavata.client.api.AiravataAPIInvocationException; import org.apache.airavata.client.api.ApplicationManager; -import org.apache.airavata.client.api.DescriptorRecordAlreadyExistsException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.DescriptorAlreadyExistsException; import org.apache.airavata.common.exception.AiravataConfigurationException; 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.registry.api.exception.RegistryException; import org.apache.airavata.registry.api.exception.UnimplementedRegistryOperationException; -import org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException; public class ApplicationManagerImpl implements ApplicationManager { private AiravataClient client; @@ -87,11 +86,11 @@ public class ApplicationManagerImpl impl @Override public void addServiceDescription(ServiceDescription serviceDescription) throws AiravataAPIInvocationException, - DescriptorRecordAlreadyExistsException { + DescriptorAlreadyExistsException { try { getClient().getRegistryClient().addServiceDescriptor(serviceDescription); - } catch (DescriptorAlreadyExistsException e) { - throw new DescriptorRecordAlreadyExistsException("Service descriptor " + } catch (org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException e) { + throw new DescriptorAlreadyExistsException("Service descriptor " + serviceDescription.getType().getName() + " already exists.", e); } catch (RegistryException e) { @@ -169,13 +168,13 @@ public class ApplicationManagerImpl impl @Override public void addApplicationDescription(ServiceDescription serviceDescription, HostDescription hostDescription, ApplicationDescription applicationDeploymentDescription) - throws AiravataAPIInvocationException, DescriptorRecordAlreadyExistsException { + throws AiravataAPIInvocationException, DescriptorAlreadyExistsException { try { getClient().getRegistryClient().addApplicationDescriptor(serviceDescription.getType().getName(), hostDescription.getType().getHostName(), applicationDeploymentDescription); - } catch (DescriptorAlreadyExistsException e) { - throw new DescriptorRecordAlreadyExistsException("Application descriptor " + + } catch (org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException e) { + throw new DescriptorAlreadyExistsException("Application descriptor " + applicationDeploymentDescription.getType().getApplicationName().getStringValue() + " already associated to host " + hostDescription.getType().getHostName() + " and service " + serviceDescription.getType().getName(), e); @@ -313,12 +312,12 @@ public class ApplicationManagerImpl impl @Override public void addHostDescription(HostDescription host) throws AiravataAPIInvocationException, - DescriptorRecordAlreadyExistsException { + DescriptorAlreadyExistsException { try { getClient().getRegistryClient().addHostDescriptor(host); - } catch (DescriptorAlreadyExistsException e) { - throw new DescriptorRecordAlreadyExistsException("Host descriptor " + host.getType().getHostName() + } catch (org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException e) { + throw new DescriptorAlreadyExistsException("Host descriptor " + host.getType().getHostName() + " already exists.", e); } catch (RegistryException e) { throw new AiravataAPIInvocationException("An internal error occurred while trying to add host descriptor" Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java Thu May 23 12:29:45 2013 @@ -31,11 +31,11 @@ import java.util.UUID; import javax.xml.stream.XMLStreamException; import org.apache.airavata.client.AiravataClient; -import org.apache.airavata.client.api.AiravataAPIInvocationException; import org.apache.airavata.client.api.ExecutionManager; import org.apache.airavata.client.api.ExperimentAdvanceOptions; import org.apache.airavata.client.api.NodeSettings; import org.apache.airavata.client.api.OutputDataSettings; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.client.stub.interpretor.NameValue; import org.apache.airavata.client.stub.interpretor.WorkflowInterpretorStub; import org.apache.airavata.client.tools.NameValuePairType; Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java Thu May 23 12:29:45 2013 @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; import org.apache.airavata.client.AiravataClient; -import org.apache.airavata.client.api.AiravataAPIInvocationException; import org.apache.airavata.client.api.ProvenanceManager; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.common.exception.AiravataConfigurationException; import org.apache.airavata.registry.api.AiravataExperiment; import org.apache.airavata.registry.api.exception.RegistryException; Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/SecuritySettingsImpl.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/SecuritySettingsImpl.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/SecuritySettingsImpl.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/SecuritySettingsImpl.java Thu May 23 12:29:45 2013 @@ -22,6 +22,7 @@ package org.apache.airavata.client.impl; import org.apache.airavata.client.api.; +import org.apache.airavata.client.api.exception.AiravataAPIUnimplementedException; public class SecuritySettingsImpl implements SecuritySettings { private AmazonWebServicesSettings amazonWebServicesSettings = new AmazonWebServicesSettingsImpl(); Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowManagerImpl.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowManagerImpl.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowManagerImpl.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowManagerImpl.java Thu May 23 12:29:45 2013 @@ -28,9 +28,9 @@ import java.util.List; import java.util.Map; import org.apache.airavata.client.AiravataClient; -import org.apache.airavata.client.api.AiravataAPIInvocationException; -import org.apache.airavata.client.api.DescriptorRecordAlreadyExistsException; import org.apache.airavata.client.api.WorkflowManager; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.DescriptorAlreadyExistsException; import org.apache.airavata.common.exception.AiravataConfigurationException; import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.registry.api.exception.RegistryException; @@ -62,7 +62,7 @@ public class WorkflowManagerImpl impleme @Override public void addOwnerWorkflow (String workflowAsString, String owner) - throws AiravataAPIInvocationException, DescriptorRecordAlreadyExistsException { + throws AiravataAPIInvocationException, DescriptorAlreadyExistsException { addWorkflow(getWorkflowFromString(workflowAsString), workflowAsString, owner); } @@ -74,7 +74,7 @@ public class WorkflowManagerImpl impleme @Override public void addOwnerWorkflow (URI workflowPath, String owner) - throws AiravataAPIInvocationException, DescriptorRecordAlreadyExistsException { + throws AiravataAPIInvocationException, DescriptorAlreadyExistsException { Workflow workflow = getWorkflowFromURI(workflowPath); addWorkflow(workflow, XMLUtil.xmlElementToString(workflow.toXML()), owner); } @@ -94,7 +94,7 @@ public class WorkflowManagerImpl impleme @Override public void addOwnerWorkflow (Workflow workflow, String owner) throws AiravataAPIInvocationException, - DescriptorRecordAlreadyExistsException { + DescriptorAlreadyExistsException { addWorkflow(workflow, XMLUtil.xmlElementToString(workflow.toXML()), owner); } @@ -104,11 +104,11 @@ public class WorkflowManagerImpl impleme } private void addWorkflow(Workflow workflow, String workflowAsString, String owner) - throws AiravataAPIInvocationException, DescriptorRecordAlreadyExistsException { + throws AiravataAPIInvocationException, DescriptorAlreadyExistsException { try { getClient().getRegistryClient().addWorkflow(workflow.getName(), workflowAsString); } catch (UserWorkflowAlreadyExistsException e) { - throw new DescriptorRecordAlreadyExistsException("Workflow " + + throw new DescriptorAlreadyExistsException("Workflow " + workflow.getName() + " already exists in the system.", e); } catch (RegistryException e) { @@ -242,7 +242,7 @@ public class WorkflowManagerImpl impleme } @Override - public void addWorkflow (String workflowAsString) throws DescriptorRecordAlreadyExistsException, + public void addWorkflow (String workflowAsString) throws DescriptorAlreadyExistsException, AiravataAPIInvocationException { addOwnerWorkflow(workflowAsString, getCurrentUser()); } @@ -260,7 +260,7 @@ public class WorkflowManagerImpl impleme @Override public void addWorkflowAsPublic (String workflowAsString) throws AiravataAPIInvocationException, - DescriptorRecordAlreadyExistsException { + DescriptorAlreadyExistsException { addOwnerWorkflow (workflowAsString, null); } @@ -271,7 +271,7 @@ public class WorkflowManagerImpl impleme @Override public void addWorkflowAsPublic (URI workflowPath) throws AiravataAPIInvocationException, - DescriptorRecordAlreadyExistsException { + DescriptorAlreadyExistsException { addOwnerWorkflow (getWorkflowFromURI(workflowPath), null); } @@ -288,7 +288,7 @@ public class WorkflowManagerImpl impleme @Override public void addWorkflow (Workflow workflow) throws AiravataAPIInvocationException, - DescriptorRecordAlreadyExistsException{ + DescriptorAlreadyExistsException{ addOwnerWorkflow(workflow, getCurrentUser()); } @@ -299,7 +299,7 @@ public class WorkflowManagerImpl impleme @Override public void addWorkflow (URI workflowPath) throws AiravataAPIInvocationException, - DescriptorRecordAlreadyExistsException { + DescriptorAlreadyExistsException { addOwnerWorkflow(getWorkflowFromURI(workflowPath), getCurrentUser()); } Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/Scheduler.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/Scheduler.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/Scheduler.java (original) +++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/Scheduler.java Thu May 23 12:29:45 2013 @@ -28,7 +28,7 @@ import java.util.Map; import javax.xml.xpath.XPathExpressionException; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.commons.gfac.type.ApplicationDescription; import org.apache.airavata.commons.gfac.type.HostDescription; import org.apache.airavata.gfac.context.JobExecutionContext; Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GramProvider.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GramProvider.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GramProvider.java (original) +++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GramProvider.java Thu May 23 12:29:45 2013 @@ -20,7 +20,7 @@ */ package org.apache.airavata.gfac.provider.impl; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.gfac.Constants; import org.apache.airavata.gfac.GFacException; import org.apache.airavata.gfac.JobSubmissionFault; Modified: airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java (original) +++ airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java Thu May 23 12:29:45 2013 @@ -34,10 +34,10 @@ import junit.framework.Assert; import org.apache.airavata.client.AiravataAPIFactory; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; -import org.apache.airavata.client.api.DescriptorRecordAlreadyExistsException; import org.apache.airavata.client.api.ExperimentAdvanceOptions; import org.apache.airavata.client.api.builder.DescriptorBuilder; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.DescriptorAlreadyExistsException; import org.apache.airavata.common.utils.Version; import org.apache.airavata.commons.gfac.type.ApplicationDescription; import org.apache.airavata.commons.gfac.type.HostDescription; @@ -308,7 +308,7 @@ public class BaseCaseIT { try { airavataAPI.getApplicationManager().addHostDescription(hostDescription); Assert.fail("Host Descriptor should already exists and should go to update."); - } catch (DescriptorRecordAlreadyExistsException e) { + } catch (DescriptorAlreadyExistsException e) { log("Updating host description ...."); airavataAPI.getApplicationManager().updateHostDescription(hostDescription); @@ -330,7 +330,7 @@ public class BaseCaseIT { try { airavataAPI.getApplicationManager().addServiceDescription(serviceDescription); Assert.fail("Service Descriptor should already exists and should go to update."); - } catch (DescriptorRecordAlreadyExistsException e) { + } catch (DescriptorAlreadyExistsException e) { log("Updating service description ...."); airavataAPI.getApplicationManager().updateServiceDescription(serviceDescription); @@ -348,7 +348,7 @@ public class BaseCaseIT { airavataAPI.getApplicationManager().addApplicationDescription(serviceDescription, hostDescription, applicationDeploymentDescription); Assert.fail("Application Descriptor should already exists and should go to update."); - } catch (DescriptorRecordAlreadyExistsException e) { + } catch (DescriptorAlreadyExistsException e) { log("Updating application description ...."); airavataAPI.getApplicationManager().updateApplicationDescription(serviceDescription, hostDescription, @@ -365,7 +365,7 @@ public class BaseCaseIT { try { airavataAPI.getWorkflowManager().addWorkflow(workflow); Assert.fail("Workflow should already exists and should go to update."); - } catch (DescriptorRecordAlreadyExistsException e) { + } catch (DescriptorAlreadyExistsException e) { log("Updating workflow..."); airavataAPI.getWorkflowManager().updateWorkflow(workflow); Modified: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/WorkflowInput.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/WorkflowInput.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/WorkflowInput.java (original) +++ airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/WorkflowInput.java Thu May 23 12:29:45 2013 @@ -28,11 +28,11 @@ public class WorkflowInput { private Object value; private boolean optional; - public WorkflowInput(String name,Object value) { + public WorkflowInput(String name,Object value) throws InvalidDataFormatException { this(name, null, null, value, false); } - public WorkflowInput(String name,String type,Object defaultValue,Object value, boolean optional) { + public WorkflowInput(String name,String type,Object defaultValue,Object value, boolean optional) throws InvalidDataFormatException { setName(name); setType(type); setDefaultValue(defaultValue); @@ -68,7 +68,8 @@ public class WorkflowInput { return value; } - public void setValue(Object value) { + public void setValue(Object value) throws InvalidDataFormatException { + //TODO validate against type this.value = value; } Modified: airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java (original) +++ airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java Thu May 23 12:29:45 2013 @@ -25,7 +25,7 @@ import java.net.URI; import org.apache.airavata.client.AiravataAPIFactory; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.client.tools.PeriodicExecutorThread; import org.apache.airavata.common.utils.AiravataUtils; import org.apache.airavata.common.utils.ServerSettings; Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java (original) +++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java Thu May 23 12:29:45 2013 @@ -26,7 +26,7 @@ import java.net.URI; import org.apache.airavata.client.AiravataAPIFactory; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.client.tools.PeriodicExecutorThread; import org.apache.airavata.common.utils.AiravataUtils; import org.apache.airavata.common.utils.ServerSettings; Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Thu May 23 12:29:45 2013 @@ -21,7 +21,7 @@ package org.apache.airavata.xbaya.interpretor; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.common.utils.Pair; import org.apache.airavata.common.utils.WSDLUtil; import org.apache.airavata.common.utils.XMLUtil; Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java Thu May 23 12:29:45 2013 @@ -26,7 +26,7 @@ import java.net.URI; import java.util.LinkedList; import java.util.List; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.registry.api.workflow.NodeExecutionError; import org.apache.airavata.workflow.model.graph.EPRPort; Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java Thu May 23 12:29:45 2013 @@ -23,8 +23,8 @@ package org.apache.airavata.xbaya.interp import org.apache.airavata.client.AiravataAPIFactory; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; -import org.apache.airavata.client.api.DescriptorRecordAlreadyExistsException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.DescriptorAlreadyExistsException; import org.apache.airavata.client.stub.interpretor.NameValue; import org.apache.airavata.client.tools.PeriodicExecutorThread; import org.apache.airavata.common.exception.ApplicationSettingsException; @@ -161,10 +161,11 @@ public class WorkflowInterpretorSkeleton registry.getApplicationManager().addHostDescription(host); } } - } catch (AiravataAPIInvocationException e) { - e.printStackTrace(); - } catch (DescriptorRecordAlreadyExistsException e) { + } catch (DescriptorAlreadyExistsException e) { e.printStackTrace(); + } catch (AiravataAPIInvocationException e) { + e.printStackTrace(); + } }else{ provenance = false; Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java Thu May 23 12:29:45 2013 @@ -36,7 +36,7 @@ import javax.xml.stream.XMLStreamExcepti import javax.xml.stream.XMLStreamReader; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder; Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptionWrap.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptionWrap.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptionWrap.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptionWrap.java Thu May 23 12:29:45 2013 @@ -22,7 +22,7 @@ package org.apache.airavata.xbaya.model.registrybrowser; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.commons.gfac.type.ApplicationDescription; import org.apache.airavata.commons.gfac.type.HostDescription; import org.apache.airavata.commons.gfac.type.ServiceDescription; Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java Thu May 23 12:29:45 2013 @@ -26,8 +26,8 @@ import java.util.List; import java.util.Map; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; import org.apache.airavata.client.api.ApplicationManager; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.commons.gfac.type.ApplicationDescription; import org.apache.airavata.registry.api.exception.RegistryException; import org.apache.airavata.commons.gfac.type.ServiceDescription; Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/EventingServiceURLs.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/EventingServiceURLs.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/EventingServiceURLs.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/EventingServiceURLs.java Thu May 23 12:29:45 2013 @@ -22,7 +22,7 @@ package org.apache.airavata.xbaya.model.registrybrowser; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import java.net.URI; import java.util.ArrayList; Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java Thu May 23 12:29:45 2013 @@ -22,7 +22,7 @@ package org.apache.airavata.xbaya.model.registrybrowser; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import java.net.URI; import java.util.ArrayList; Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java Thu May 23 12:29:45 2013 @@ -24,7 +24,7 @@ package org.apache.airavata.xbaya.model. import java.util.List; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.registry.api.exception.RegistryException; import org.apache.airavata.commons.gfac.type.HostDescription; //import org.apache.airavata.registry.api.AiravataRegistry2; Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURLs.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURLs.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURLs.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURLs.java Thu May 23 12:29:45 2013 @@ -22,7 +22,7 @@ package org.apache.airavata.xbaya.model.registrybrowser; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import java.net.URI; import java.util.ArrayList; Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURLs.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURLs.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURLs.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURLs.java Thu May 23 12:29:45 2013 @@ -22,7 +22,7 @@ package org.apache.airavata.xbaya.model.registrybrowser; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import java.net.URI; import java.util.ArrayList; Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java Thu May 23 12:29:45 2013 @@ -24,7 +24,7 @@ package org.apache.airavata.xbaya.model. import java.util.List; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.registry.api.exception.RegistryException; import org.apache.airavata.commons.gfac.type.ServiceDescription; //import org.apache.airavata.registry.api.AiravataRegistry2; Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java Thu May 23 12:29:45 2013 @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; //import org.apache.airavata.registry.api.AiravataRegistry2; import org.apache.airavata.registry.api.exception.worker.ExperimentLazyLoadedException; import org.apache.airavata.registry.api.workflow.NodeExecutionData; Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java Thu May 23 12:29:45 2013 @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.registry.api.exception.RegistryException; //import org.apache.airavata.registry.api.AiravataRegistry2; import org.apache.airavata.registry.api.workflow.WorkflowExecution; Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java Thu May 23 12:29:45 2013 @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.registry.api.exception.RegistryException; //import org.apache.airavata.registry.api.AiravataRegistry2; Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java Thu May 23 12:29:45 2013 @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.registry.api.exception.RegistryException; import org.apache.airavata.workflow.model.wf.Workflow; //import org.apache.airavata.registry.api.AiravataRegistry2; Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java Thu May 23 12:29:45 2013 @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.registry.api.exception.RegistryException; import org.apache.airavata.common.utils.XMLUtil; //import org.apache.airavata.registry.api.AiravataRegistry2; Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java Thu May 23 12:29:45 2013 @@ -21,7 +21,7 @@ package org.apache.airavata.xbaya.provenance; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; //import org.apache.airavata.registry.api.AiravataRegistry2; import org.apache.airavata.registry.api.workflow.WorkflowExecution; import org.apache.airavata.registry.api.workflow.WorkflowInstanceNode; Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java Thu May 23 12:29:45 2013 @@ -23,7 +23,7 @@ package org.apache.airavata.xbaya.proven import java.sql.Timestamp; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.registry.api.exception.RegistryException; //import org.apache.airavata.registry.api.AiravataRegistry2; import org.apache.airavata.registry.api.workflow.WorkflowExecution; Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java?rev=1485661&r1=1485660&r2=1485661&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java Thu May 23 12:29:45 2013 @@ -30,7 +30,7 @@ import javax.jcr.RepositoryException; import javax.xml.namespace.QName; import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.AiravataAPIInvocationException; +import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; import org.apache.airavata.common.utils.StringUtil; import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.registry.api.exception.RegistryException;
Mime	Unnamed text/plain (inline, 7-Bit, 89841 bytes)
	View raw message