You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2012/11/21 20:39:59 UTC
svn commit: r1412246 [1/4] - in /airavata/trunk: ./ modules/airavata-client/
modules/airavata-client/src/main/java/org/apache/airavata/client/
modules/airavata-client/src/main/java/org/apache/airavata/client/impl/
modules/distribution/ modules/distribu...
Author: chathuri
Date: Wed Nov 21 19:39:38 2012
New Revision: 1412246
URL: http://svn.apache.org/viewvc?rev=1412246&view=rev
Log:
changing xbaya to use airavata client
Added:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/PasswordCallback.java
- copied, changed from r1412228, airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/Callback.java
airavata/trunk/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/PasswordCallBackImpl.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/PasswordCallbackImpl.java
Removed:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AbstractRegistryUpdaterThread.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/Callback.java
airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-server.properties
Modified:
airavata/trunk/modules/airavata-client/pom.xml
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/AiravataClientUtils.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/PasswordCallBackImpl.java
airavata/trunk/modules/distribution/pom.xml
airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java
airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
airavata/trunk/modules/gfac-core/pom.xml
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/GFacConfiguration.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/ExecutionContext.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/impl/DefaultExecutionContext.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/OutputRegister.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry2.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistryFactory.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataSubRegistry.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryConstants.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/BasicRegistryResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java
airavata/trunk/modules/workflow-model/workflow-model-component/pom.xml
airavata/trunk/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml
airavata/trunk/modules/ws-messenger/message-monitor/pom.xml
airavata/trunk/modules/ws-messenger/messagebox/pom.xml
airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java
airavata/trunk/modules/ws-messenger/messagebroker/pom.xml
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java
airavata/trunk/modules/xbaya-gui/pom.xml
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.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/WorkflowInterpreterConfiguration.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/AiravataConfigurations.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/EventingServiceURL.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/GFacURL.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/InterpreterServiceURL.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/MessageBoxURL.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/ProvenanceReader.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/AbstractAiravataTreeNode.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/ApplicationDescriptionAdvancedOptionDialog.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/ApplicationDescriptionHostAdvancedOptionDialog.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/JCRRegistryWindow.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/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
airavata/trunk/pom.xml
Modified: airavata/trunk/modules/airavata-client/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/pom.xml?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/pom.xml (original)
+++ airavata/trunk/modules/airavata-client/pom.xml Wed Nov 21 19:39:38 2012
@@ -48,11 +48,6 @@
<artifactId>airavata-workflow-model-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-rest-client</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</project>
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=1412246&r1=1412245&r2=1412246&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 Wed Nov 21 19:39:38 2012
@@ -67,11 +67,7 @@ import org.apache.airavata.common.except
import org.apache.airavata.common.utils.Version;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
-import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.AiravataRegistryFactory;
-import org.apache.airavata.registry.api.AiravataUser;
-import org.apache.airavata.registry.api.Callback;
-import org.apache.airavata.registry.api.Gateway;
+import org.apache.airavata.registry.api.*;
import org.apache.airavata.registry.api.exception.RegistryAccessorInstantiateException;
import org.apache.airavata.registry.api.exception.RegistryAccessorInvalidException;
import org.apache.airavata.registry.api.exception.RegistryAccessorNotFoundException;
@@ -119,7 +115,7 @@ public class AiravataClient implements A
private String currentUser;
private String password;
private URI regitryURI;
- private Callback callBack;
+ private PasswordCallback callBack;
private AiravataRegistry2 registry;
@@ -650,7 +646,7 @@ public class AiravataClient implements A
WorkflowContextHeaderBuilder builder) throws AiravataAPIInvocationException{
try {
String workflowString = XMLUtil.xmlElementToString(workflowObj
- .toXML());
+ .toXML());
List<WSComponentPort> ports = getWSComponentPortInputs(workflowObj);
for (WorkflowInput input : inputs) {
WSComponentPort port = getWSComponentPort(input.getName(),
@@ -691,7 +687,7 @@ public class AiravataClient implements A
try {
Workflow workflowObj = getWorkflow(workflowName);
String workflowString = XMLUtil.xmlElementToString(workflowObj
- .toXML());
+ .toXML());
List<WSComponentPort> ports;
ports = getWSComponentPortInputs(workflowObj);
for (WorkflowInput input : inputs) {
@@ -1008,11 +1004,11 @@ public class AiravataClient implements A
return regitryURI;
}
- public Callback getCallBack() {
+ public PasswordCallback getCallBack() {
return callBack;
}
- public void setCallBack(Callback callBack) {
+ public void setCallBack(PasswordCallback callBack) {
this.callBack = callBack;
}
Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java (original)
+++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java Wed Nov 21 19:39:38 2012
@@ -30,16 +30,16 @@ import javax.jcr.RepositoryException;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.client.impl.PasswordCallBackImpl;
+import org.apache.airavata.registry.api.PasswordCallback;
import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.Callback;
public class AiravataClientUtils {
- public static AiravataAPI getAPI(URI registryURL, String gateway, String username, Callback callback) throws MalformedURLException, RepositoryException, RegistryException{
+ public static AiravataAPI getAPI(URI registryURL, String gateway, String username, PasswordCallback callback) throws MalformedURLException, RepositoryException, RegistryException{
return getAPI(registryURL, gateway, username, username, callback);
}
- public static AiravataAPI getAPI(URI registryURL, String gateway, String username, String alternateUsername, Callback callback) throws MalformedURLException, RepositoryException, RegistryException{
+ public static AiravataAPI getAPI(URI registryURL, String gateway, String username, String alternateUsername, PasswordCallback callback) throws MalformedURLException, RepositoryException, RegistryException{
AiravataClient apiObj = new AiravataClient();
apiObj.setCurrentUser(alternateUsername);
apiObj.setCallBack(callback);
@@ -55,7 +55,7 @@ public class AiravataClientUtils {
}
@Deprecated
- public static AiravataAPI getAPI(URI registryURL, String username, Callback callback) throws MalformedURLException, RepositoryException, RegistryException{
+ public static AiravataAPI getAPI(URI registryURL, String username, PasswordCallback callback) throws MalformedURLException, RepositoryException, RegistryException{
return getAPI(registryURL, username, username, callback);
}
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=1412246&r1=1412245&r2=1412246&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 Wed Nov 21 19:39:38 2012
@@ -30,8 +30,13 @@ 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.common.exception.AiravataConfigurationException;
import org.apache.airavata.registry.api.AiravataUser;
import org.apache.airavata.registry.api.Gateway;
+import org.apache.airavata.registry.api.exception.RegistryAccessorInstantiateException;
+import org.apache.airavata.registry.api.exception.RegistryAccessorInvalidException;
+import org.apache.airavata.registry.api.exception.RegistryAccessorNotFoundException;
+import org.apache.airavata.registry.api.exception.RegistryAccessorUndefinedException;
public class AiravataManagerImpl implements AiravataManager {
private AiravataClient client;
@@ -124,8 +129,8 @@ public class AiravataManagerImpl impleme
@Override
public URI getMessageBoxServiceURL() throws AiravataAPIInvocationException {
try {
- return getClient().getClientConfiguration().getMessageboxURL().toURI();
- } catch (URISyntaxException e) {
+ return getClient().getRegistryClient().getMessageBoxURI();
+ } catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
}
@@ -153,11 +158,11 @@ public class AiravataManagerImpl impleme
@Override
public URI getEventingServiceURL() throws AiravataAPIInvocationException {
try {
- return getClient().getClientConfiguration().getMessagebrokerURL().toURI();
- } catch (URISyntaxException e) {
+ return getClient().getRegistryClient().getEventingServiceURI();
+ } catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
- }
+ }
@Override
public URI getEventingServiceURL(URI defaultURL)
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=1412246&r1=1412245&r2=1412246&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 Wed Nov 21 19:39:38 2012
@@ -49,10 +49,11 @@ public class ApplicationManagerImpl impl
if(desc!=null){
return desc;
}
- throw new AiravataAPIInvocationException(new Exception("Service Description not found in registry."));
+// throw new AiravataAPIInvocationException(new Exception("Service Description not found in registry."));
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
+ return null;
}
@Override
Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/PasswordCallBackImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/PasswordCallBackImpl.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/PasswordCallBackImpl.java (original)
+++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/PasswordCallBackImpl.java Wed Nov 21 19:39:38 2012
@@ -21,9 +21,9 @@
package org.apache.airavata.client.impl;
-import org.apache.airavata.registry.api.Callback;
+import org.apache.airavata.registry.api.PasswordCallback;
-public class PasswordCallBackImpl implements Callback {
+public class PasswordCallBackImpl implements PasswordCallback {
private String username;
private String password;
Modified: airavata/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/pom.xml?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/pom.xml (original)
+++ airavata/trunk/modules/distribution/pom.xml Wed Nov 21 19:39:38 2012
@@ -354,6 +354,17 @@
<artifactId>airavata-jpa-registry</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-rest-mappings</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-rest-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-registry-service</artifactId>
@@ -374,6 +385,11 @@
<artifactId>cryptix-asn1</artifactId>
<version>versionless</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
</dependencies>
<properties>
Modified: airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml Wed Nov 21 19:39:38 2012
@@ -241,7 +241,10 @@
<include>org.apache.airavata:airavata-message-monitor:jar</include>
<include>org.apache.airavata:airavata-client-api:jar</include>
<include>org.apache.airavata:airavata-jpa-registry:jar</include>
+ <include>org.apache.airavata:airavata-rest-mappings:jar</include>
+ <include>org.apache.airavata:airavata-rest-client:jar</include>
<include>org.apache.openjpa:openjpa-all:jar</include>
+ <include>com.sun.jersey:jersey-client:jar</include>
<include>edu.berkeley:yfilter</include>
<include>edu.berkeley:yfilter</include>
<include>javax.servlet:servlet-api</include>
Modified: airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java (original)
+++ airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java Wed Nov 21 19:39:38 2012
@@ -26,17 +26,17 @@ import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Properties;
-import org.apache.airavata.common.exception.AiravataConfigurationException;
+import org.apache.airavata.client.AiravataClientUtils;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
+import org.apache.airavata.client.tools.PeriodicExecutorThread;
import org.apache.airavata.common.utils.ServiceUtils;
import org.apache.airavata.core.gfac.context.GFacConfiguration;
import org.apache.airavata.registry.api.*;
-import org.apache.airavata.registry.api.util.RegistryUtils;
import org.apache.airavata.services.gfac.axis2.dispatchers.GFacURIBasedDispatcher;
import org.apache.airavata.services.gfac.axis2.handlers.AmazonSecurityHandler;
import org.apache.airavata.services.gfac.axis2.handlers.MyProxySecurityHandler;
@@ -52,15 +52,12 @@ public class GFacService implements Serv
private static final Logger log = LoggerFactory.getLogger(GFacService.class);
- public static final String CONFIGURATION_CONTEXT_REGISTRY = "registry";
public static final String GFAC_URL = "GFacURL";
public static final String SECURITY_CONTEXT = "security_context";
public static final String REPOSITORY_PROPERTIES = "airavata-server.properties";
- public static final int GFAC_URL_UPDATE_INTERVAL = 1000 * 60 * 60 * 3;
-
public static final int JCR_AVAIALABILITY_WAIT_INTERVAL = 1000 * 10;
public static final String REGISTRY_USER = "registry.user";
@@ -70,10 +67,6 @@ public class GFacService implements Serv
/*
* Properties for JCR
*/
- public static final String JCR_CLASS = "jcr.class";
- public static final String JCR_USER = "jcr.user";
- public static final String JCR_PASS = "jcr.pass";
- public static final String ORG_APACHE_JACKRABBIT_REPOSITORY_URI = "org.apache.jackrabbit.repository.uri";
public static final String TRUSTED_CERT_LOCATION = "trusted.cert.location";
public static final String MYPROXY_SERVER = "myproxy.server";
public static final String MYPROXY_USER = "myproxy.user";
@@ -81,6 +74,8 @@ public class GFacService implements Serv
public static final String MYPROXY_LIFE = "myproxy.life";
public static final String GFAC_CONFIGURATION = "gfacConfiguration";
public static final String GATEWAY_ID = "gateway.id";
+ public static final String REGISTRY_PASSWORD = "registry.password";
+ public static final String REGISTRY_URL = "registry.jdbc.url";
/*
* Heart beat thread
@@ -117,7 +112,8 @@ public class GFacService implements Serv
public void run() {
String port = null;
String username = null;
- AiravataRegistry2 registry = null;
+ String password = null;
+ AiravataAPI airavataAPI = null;
try {
URL url = this.getClass().getClassLoader().getResource(REPOSITORY_PROPERTIES);
try {
@@ -131,21 +127,25 @@ public class GFacService implements Serv
if (properties.get(REGISTRY_USER) != null) {
username = (String) properties.get(REGISTRY_USER);
}
+ if (properties.get(REGISTRY_PASSWORD) != null) {
+ password = (String) properties.get(REGISTRY_PASSWORD);
+ }
} catch (MalformedURLException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
- registry = RegistryUtils.getRegistryFromConfig(url);
+ URI baseUri = new URI(properties.getProperty(REGISTRY_URL));
+ airavataAPI = AiravataClientUtils.getAPI(baseUri, username, password);
context.setProperty(GFAC_URL, ServiceUtils.generateServiceURLFromConfigurationContext(context,SERVICE_NAME));
GFacConfiguration gfacConfig = new GFacConfiguration(properties.getProperty(MYPROXY_SERVER),properties.getProperty(MYPROXY_USER),
- properties.getProperty(MYPROXY_PASS),Integer.parseInt(properties.getProperty(MYPROXY_LIFE)),registry,properties.getProperty(TRUSTED_CERT_LOCATION));
+ properties.getProperty(MYPROXY_PASS),Integer.parseInt(properties.getProperty(MYPROXY_LIFE)),airavataAPI,properties.getProperty(TRUSTED_CERT_LOCATION));
context.setProperty(GFAC_CONFIGURATION,
gfacConfig);
/*
* Heart beat message to registry
*/
- thread = new GFacThread(registry, context);
+ thread = new GFacThread(airavataAPI, context);
thread.start();
} catch (Exception e) {
log.error(e.getMessage(), e);
@@ -157,12 +157,14 @@ public class GFacService implements Serv
public void shutDown(ConfigurationContext configctx, AxisService service) {
//following nullchecks will avoid the exceptions when user press Ctrl-C before the server start properly
if (configctx.getProperty(GFAC_CONFIGURATION) != null) {
- AiravataRegistry2 registry = ((GFacConfiguration) configctx.getProperty(GFAC_CONFIGURATION)).getRegistry();
+ AiravataAPI airavataAPI = ((GFacConfiguration) configctx.getProperty(GFAC_CONFIGURATION)).getAiravataAPI();
String gfacURL = (String) configctx.getProperty(GFAC_URL);
try {
- registry.removeGFacURI(new URI(gfacURL));
+ airavataAPI.getAiravataManager().removeGFacURI(new URI(gfacURL));
+ } catch (AiravataAPIInvocationException e) {
+ e.printStackTrace();
} catch (URISyntaxException e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ e.printStackTrace();
}
}
if (thread != null) {
@@ -175,18 +177,18 @@ public class GFacService implements Serv
}
}
- class GFacThread extends AbstractRegistryUpdaterThread {
+ class GFacThread extends PeriodicExecutorThread {
private ConfigurationContext context = null;
- GFacThread(AiravataRegistry2 registry, ConfigurationContext context) {
- super(registry);
+ GFacThread(AiravataAPI airavataAPI, ConfigurationContext context) {
+ super(airavataAPI);
this.context = context;
}
@Override
- protected void updateRegistry(AiravataRegistry2 registry) throws Exception {
+ protected void updateRegistry(AiravataAPI airavataAPI) throws Exception {
URI localAddress = new URI((String) this.context.getProperty(GFAC_URL));
- registry.addGFacURI(localAddress);
+ airavataAPI.getAiravataManager().addGFacURI(localAddress);
log.info("Updated Workflow Interpreter service URL in to Repository");
}
}
Modified: airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java (original)
+++ airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java Wed Nov 21 19:39:38 2012
@@ -83,7 +83,7 @@ public class GFacMessageReciever impleme
public static final String REPOSITORY_PROPERTIES = "airavata-server.properties";
private GFacConfiguration gfacContext;
private GenericService service;
- private AiravataRegistry2 registry;
+// private AiravataRegistry2 registry;
private GfacAPI gfacAPI;
public void receive(org.apache.axis2.context.MessageContext axisRequestMsgCtx) throws AxisFault {
Modified: airavata/trunk/modules/gfac-core/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/pom.xml?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/pom.xml (original)
+++ airavata/trunk/modules/gfac-core/pom.xml Wed Nov 21 19:39:38 2012
@@ -82,7 +82,7 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-api</artifactId>
+ <artifactId>airavata-client-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -140,11 +140,11 @@
<version>0.2.9</version>
<type>jar</type>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-jpa-registry</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency-->
</dependencies>
</project>
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java Wed Nov 21 19:39:38 2012
@@ -55,7 +55,7 @@ public class GfacAPI {
DefaultInvocationContext invocationContext = new DefaultInvocationContext();
invocationContext.setExecutionContext(new DefaultExecutionContext());
invocationContext.setServiceName(jobContext.getServiceName());
- invocationContext.getExecutionContext().setRegistryService(gfacConfig.getRegistry());
+ invocationContext.getExecutionContext().setRegistryService(gfacConfig.getAiravataAPI());
invocationContext.getExecutionContext().addNotifiable(workflowNotification);
invocationContext.getExecutionContext().addNotifiable(loggingNotification);
@@ -78,7 +78,7 @@ public class GfacAPI {
/*
* Add workflow context
*/
- ServiceDescription serviceDescription = gfacConfig.getRegistry().getServiceDescriptor(jobContext.getServiceName());
+ ServiceDescription serviceDescription = gfacConfig.getAiravataAPI().getApplicationManager().getServiceDescription(jobContext.getServiceName());
if(serviceDescription==null){
throw new RegistryException(new Exception("Service Description not found in registry."));
}
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/GFacConfiguration.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/GFacConfiguration.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/GFacConfiguration.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/GFacConfiguration.java Wed Nov 21 19:39:38 2012
@@ -20,6 +20,7 @@
*/
package org.apache.airavata.core.gfac.context;
+import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.registry.api.AiravataRegistry2;
@@ -34,7 +35,7 @@ public class GFacConfiguration {
private int myProxyLifeCycle;
- private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
private String trustedCertLocation;
@@ -42,13 +43,13 @@ public class GFacConfiguration {
String myProxyUser,
String myProxyPassphrase,
int myProxyLifeCycle,
- AiravataRegistry2 axis2Registry,
+ AiravataAPI airavataAPI,
String trustedCertLocation) {
this.myProxyServer = myProxyServer;
this.myProxyUser = myProxyUser;
this.myProxyPassphrase = myProxyPassphrase;
this.myProxyLifeCycle = myProxyLifeCycle;
- this.registry = axis2Registry;
+ this.airavataAPI = airavataAPI;
this.trustedCertLocation = trustedCertLocation;
}
@@ -68,8 +69,8 @@ public class GFacConfiguration {
return myProxyLifeCycle;
}
- public AiravataRegistry2 getRegistry() {
- return registry;
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
}
public String getTrustedCertLocation() {
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/ExecutionContext.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/ExecutionContext.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/ExecutionContext.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/ExecutionContext.java Wed Nov 21 19:39:38 2012
@@ -21,6 +21,7 @@
package org.apache.airavata.core.gfac.context.invocation;
+import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.core.gfac.notification.GFacNotifiable;
import org.apache.airavata.core.gfac.notification.GFacNotifier;
import org.apache.airavata.registry.api.AiravataRegistry2;
@@ -53,15 +54,15 @@ public interface ExecutionContext {
*
* @return Registry object
*/
- AiravataRegistry2 getRegistryService();
+ AiravataAPI getRegistryService();
/**
* Set Registry object.
*
- * @param AiravataRegistry2
+ * @param airavataAPI
* object to used.
*/
- void setRegistryService(AiravataRegistry2 value);
+ void setRegistryService(AiravataAPI airavataAPI);
public OMElement getSecurityContextHeader();
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/impl/DefaultExecutionContext.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/impl/DefaultExecutionContext.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/impl/DefaultExecutionContext.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/impl/DefaultExecutionContext.java Wed Nov 21 19:39:38 2012
@@ -21,6 +21,7 @@
package org.apache.airavata.core.gfac.context.invocation.impl;
+import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.core.gfac.context.invocation.ExecutionContext;
import org.apache.airavata.core.gfac.notification.GFacNotifiable;
import org.apache.airavata.core.gfac.notification.GFacNotifier;
@@ -35,7 +36,7 @@ import org.apache.axiom.om.OMElement;
public class DefaultExecutionContext implements ExecutionContext {
private GFacNotifier notificationService = new DefaultNotifier();
- private AiravataRegistry2 registryService;
+ private AiravataAPI airavataAPI;
private OMElement header;
public GFacNotifier getNotifier() {
@@ -46,12 +47,12 @@ public class DefaultExecutionContext imp
this.notificationService.addNotifiable(service);
}
- public AiravataRegistry2 getRegistryService() {
- return this.registryService;
+ public AiravataAPI getRegistryService() {
+ return this.airavataAPI;
}
- public void setRegistryService(AiravataRegistry2 registryService) {
- this.registryService = registryService;
+ public void setRegistryService(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
}
public OMElement getSecurityContextHeader() {
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/OutputRegister.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/OutputRegister.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/OutputRegister.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/OutputRegister.java Wed Nov 21 19:39:38 2012
@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.commons.gfac.type.ActualParameter;
import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
@@ -52,7 +53,7 @@ public class OutputRegister extends Post
MessageContext<String> workflowContext = context.getMessageContext(WorkflowContextImpl.WORKFLOW_CONTEXT_NAME);
// registry
- AiravataRegistry2 registry = context.getExecutionContext().getRegistryService();
+ AiravataAPI airavataAPI = context.getExecutionContext().getRegistryService();
if (outputContext != null && workflowContext != null) {
@@ -64,14 +65,14 @@ public class OutputRegister extends Post
outputs.add(outputContext.getValue(key));
}
- if (registry != null && DataRegistry.class.isAssignableFrom(registry.getClass())) {
+ if (airavataAPI != null && DataRegistry.class.isAssignableFrom(airavataAPI.getClass())) {
try {
- ((DataRegistry) registry).saveOutput(workflowId, outputs);
+ ((DataRegistry) airavataAPI).saveOutput(workflowId, outputs);
} catch (RegistryException e) {
log.error(e.getLocalizedMessage(), e);
}
} else {
- log.debug("Registry does not support for Data Catalog, CLass: " + registry.getClass());
+ log.debug("Registry does not support for Data Catalog, CLass: " + airavataAPI.getClass());
}
} else {
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java Wed Nov 21 19:39:38 2012
@@ -27,6 +27,8 @@ import java.util.Map;
import javax.xml.stream.XMLStreamException;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
@@ -61,15 +63,15 @@ public class SchedulerImpl implements Sc
public Provider schedule(InvocationContext context) throws SchedulerException {
- AiravataRegistry2 registryService = context.getExecutionContext().getRegistryService();
+ AiravataAPI registryService = context.getExecutionContext().getRegistryService();
/*
* Load Service
*/
ServiceDescription serviceDesc = null;
try {
- serviceDesc = registryService.getServiceDescriptor(context.getServiceName());
- } catch (RegistryException e2) {
+ serviceDesc = registryService.getApplicationManager().getServiceDescription(context.getServiceName());
+ } catch (AiravataAPIInvocationException e2) {
e2.printStackTrace();
}
@@ -91,9 +93,9 @@ public class SchedulerImpl implements Sc
*/
ApplicationDeploymentDescription app = null;
try {
- app = registryService.getApplicationDescriptors(context.getServiceName(),
+ app = registryService.getApplicationManager().getDeploymentDescription(context.getServiceName(),
getRegisteredHost(registryService,context.getServiceName()).getType().getHostName());
- } catch (RegistryException e2) {
+ } catch (AiravataAPIInvocationException e2) {
e2.printStackTrace();
}
@@ -159,7 +161,7 @@ public class SchedulerImpl implements Sc
return null;
}
- private HostDescription scheduleToHost(AiravataRegistry2 regService, String serviceName) {
+ private HostDescription scheduleToHost(AiravataAPI regService, String serviceName) {
// Since xbaya removes the other scheduling configuration here we only have pick the 0th element of the array
String hostName = null;
ContextHeaderDocument.ContextHeader currentContextHeader = WorkflowContextHeaderBuilder.getCurrentContextHeader();
@@ -177,8 +179,8 @@ public class SchedulerImpl implements Sc
if(hostName != null){
HostDescription hostDescription = null;
try {
- hostDescription = regService.getHostDescriptor(hostName);
- } catch (RegistryException e) {
+ hostDescription = regService.getApplicationManager().getHostDescription(hostName);
+ } catch (AiravataAPIInvocationException e) {
e.printStackTrace();
log.warn("Wrong host Name provided in WorkflowContext Header");
}
@@ -205,16 +207,16 @@ public class SchedulerImpl implements Sc
// }
}
- private HostDescription getRegisteredHost(AiravataRegistry2 regService, String serviceName) {
+ private HostDescription getRegisteredHost(AiravataAPI regService, String serviceName) {
HostDescription result = null;
try {
- Map<String, ApplicationDeploymentDescription> applicationDescriptors = regService.getApplicationDescriptors(serviceName);
+ Map<String, ApplicationDeploymentDescription> applicationDescriptors = regService.getApplicationManager().getApplicationDescriptors(serviceName);
for (String hostDescName : applicationDescriptors.keySet()) {
- HostDescription hostDescriptor = regService.getHostDescriptor(hostDescName);
+ HostDescription hostDescriptor = regService.getApplicationManager().getHostDescription(hostDescName);
result = hostDescriptor;
log.info("Found service on: " + result.getType().getHostAddress());
}
- } catch (RegistryException e) {
+ } catch (AiravataAPIInvocationException e) {
e.printStackTrace();
}
return result;
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java Wed Nov 21 19:39:38 2012
@@ -21,12 +21,8 @@
package org.apache.airavata.core.gfac.services.impl;
-import java.lang.reflect.Array;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
+import org.apache.airavata.client.AiravataClientUtils;
+import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.context.invocation.impl.DefaultExecutionContext;
@@ -39,15 +35,23 @@ import org.apache.airavata.core.gfac.ext
import org.apache.airavata.core.gfac.extension.PostExecuteChain;
import org.apache.airavata.core.gfac.extension.PreExecuteChain;
import org.apache.airavata.core.gfac.scheduler.Scheduler;
-import org.apache.airavata.core.gfac.utils.LogUtils;
-import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.util.RegistryUtils;
+import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.jcr.RepositoryException;
+import java.lang.reflect.Array;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
/**
* This generic service implementation will load Registry service and Data Catalog from property file using (Apache
* Commons-Configuration). It selects provider and execute it base on execution context.
@@ -101,11 +105,15 @@ public class PropertiesBasedServiceImpl
public static final String MYPROXY_PASS = "myproxy.pass";
public static final String MYPROXY_LIFE = "myproxy.life";
+ public static final String REGISTRY_PASSWORD = "registry.password";
+ public static final String REGISTRY_USER = "registry.user";
+ public static final String REGISTRY_URL = "registry.jdbc.url";
+
private Scheduler scheduler;
private PreExecuteChain[] preChain;
private PostExecuteChain[] postChain;
private DataServiceChain[] dataChain;
- private AiravataRegistry2 registryService;
+ private AiravataAPI airavataAPI;
private String fileName = DEFAULT_FILENAME;
private Configuration config;
@@ -202,7 +210,7 @@ public class PropertiesBasedServiceImpl
*/
if (context.getExecutionContext() == null || context.getExecutionContext().getRegistryService() == null) {
- if (this.registryService == null) {
+ if (this.airavataAPI == null) {
log.info("try to create default registry service (JCR Implementation)");
// JCR
@@ -235,7 +243,22 @@ public class PropertiesBasedServiceImpl
if (map.size() == 0)
map = null;
- this.registryService = RegistryUtils.getRegistryFromConfig(this.getClass().getClassLoader().getResource(REPOSITORY_PROPERTIES));
+ URI baseUri = null;
+ try {
+ baseUri = new URI(loadFromProperty(REGISTRY_URL, true));
+ String regUser = loadFromProperty(REGISTRY_USER, true);
+ String regUserPW = loadFromProperty(REGISTRY_PASSWORD, true);
+ airavataAPI = AiravataClientUtils.getAPI(baseUri, regUser, regUserPW);
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
+ } catch (RepositoryException e) {
+ e.printStackTrace();
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ } catch (RegistryException e) {
+ e.printStackTrace();
+ }
+
log.info("Default registry service is created");
}
@@ -243,7 +266,7 @@ public class PropertiesBasedServiceImpl
/*
* If there is no specific registry service, use the default one.
*/
- ((DefaultExecutionContext) context.getExecutionContext()).setRegistryService(this.registryService);
+ ((DefaultExecutionContext) context.getExecutionContext()).setRegistryService(this.airavataAPI);
}
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java Wed Nov 21 19:39:38 2012
@@ -53,13 +53,7 @@ import org.apache.airavata.persistance.r
import org.apache.airavata.persistance.registry.jpa.resources.UserWorkflowResource;
import org.apache.airavata.persistance.registry.jpa.resources.WorkerResource;
import org.apache.airavata.persistance.registry.jpa.resources.WorkflowDataResource;
-import org.apache.airavata.registry.api.AiravataExperiment;
-import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.AiravataUser;
-import org.apache.airavata.registry.api.Callback;
-import org.apache.airavata.registry.api.Gateway;
-import org.apache.airavata.registry.api.ResourceMetadata;
-import org.apache.airavata.registry.api.WorkspaceProject;
+import org.apache.airavata.registry.api.*;
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;
@@ -101,7 +95,7 @@ public class AiravataJPARegistry extends
private static final Version API_VERSION=new Version("Airavata Registry API",0,5,null,null,null);
private URI registryConnectionURI;
- private Callback callback;
+ private PasswordCallback callback;
@Override
protected void initialize() {
@@ -197,7 +191,7 @@ public class AiravataJPARegistry extends
}
public void addGFacURI(URI uri) {
- addConfigurationURL(GFAC_URL,uri);
+ addConfigurationURL(GFAC_URL, uri);
}
private void addConfigurationURL(String urlType,URI uri) {
@@ -244,7 +238,7 @@ public class AiravataJPARegistry extends
}
public void removeWorkflowInterpreterURI(URI uri) {
- removeConfiguration(INTERPRETER_URL,uri.toString());
+ removeConfiguration(INTERPRETER_URL, uri.toString());
}
public void removeAllGFacURI() {
@@ -418,7 +412,7 @@ public class AiravataJPARegistry extends
}
public void addApplicationDescriptor(ServiceDescription serviceDescription, HostDescription hostDescriptor, ApplicationDeploymentDescription descriptor) throws RegistryException {
- addApplicationDescriptor(serviceDescription.getType().getName(),hostDescriptor.getType().getHostName(),descriptor);
+ addApplicationDescriptor(serviceDescription.getType().getName(), hostDescriptor.getType().getHostName(), descriptor);
}
public void addApplicationDescriptor(String serviceName, String hostName, ApplicationDeploymentDescription descriptor) throws RegistryException {
@@ -1315,7 +1309,7 @@ public class AiravataJPARegistry extends
@Override
public WorkflowInstanceNodeData getWorkflowInstanceNodeData(
String workflowInstanceId, String nodeId) throws RegistryException {
- if (!isWorkflowInstanceNodePresent(workflowInstanceId,nodeId)){
+ if (!isWorkflowInstanceNodePresent(workflowInstanceId, nodeId)){
throw new WorkflowInstanceNodeDoesNotExistsException(workflowInstanceId,nodeId);
}
NodeDataResource nodeData = jpa.getWorker().getWorkflowInstance(workflowInstanceId).getNodeData(nodeId);
@@ -1448,13 +1442,13 @@ public class AiravataJPARegistry extends
@Override
- public void setCallback(Callback callback) {
+ public void setCallback(PasswordCallback callback) {
this.callback=callback;
}
@Override
- public Callback getCallback() {
+ public PasswordCallback getCallback() {
return callback;
}
Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry2.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry2.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry2.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry2.java Wed Nov 21 19:39:38 2012
@@ -36,7 +36,7 @@ public abstract class AiravataRegistry2
setUser(user);
}
- protected void preInitialize(URI connectionURI, Gateway gateway, AiravataUser user, Callback callback) {
+ protected void preInitialize(URI connectionURI, Gateway gateway, AiravataUser user, PasswordCallback callback) {
setConnectionURI(connectionURI);
setGateway(gateway);
setUser(user);
Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistryFactory.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistryFactory.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistryFactory.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistryFactory.java Wed Nov 21 19:39:38 2012
@@ -80,7 +80,7 @@ public class AiravataRegistryFactory {
* @throws RegistryAccessorInvalidException
*/
public static AiravataRegistry2 getRegistry(URI connectionURI, Gateway gateway,
- AiravataUser user, Callback callback) throws RegistryAccessorNotFoundException,
+ AiravataUser user, PasswordCallback callback) throws RegistryAccessorNotFoundException,
RegistryAccessorUndefinedException,
RegistryAccessorInstantiateException,
AiravataConfigurationException, RegistryAccessorInvalidException {
Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataSubRegistry.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataSubRegistry.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataSubRegistry.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataSubRegistry.java Wed Nov 21 19:39:38 2012
@@ -54,8 +54,8 @@ public interface AiravataSubRegistry {
public URI getConnectionURI();
- public void setCallback(Callback callback);
+ public void setCallback(PasswordCallback callback);
- public Callback getCallback();
+ public PasswordCallback getCallback();
}
\ No newline at end of file
Copied: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/PasswordCallback.java (from r1412228, airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/Callback.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/PasswordCallback.java?p2=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/PasswordCallback.java&p1=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/Callback.java&r1=1412228&r2=1412246&rev=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/Callback.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/PasswordCallback.java Wed Nov 21 19:39:38 2012
@@ -19,7 +19,7 @@ package org.apache.airavata.registry.api
*
*/
-public interface Callback {
+public interface PasswordCallback {
public String getPassword (String username);
}
Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryConstants.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryConstants.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryConstants.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryConstants.java Wed Nov 21 19:39:38 2012
@@ -24,4 +24,6 @@ package org.apache.airavata.registry.api
public class RegistryConstants {
public static final String KEY_DEFAULT_GATEWAY_ID = "gateway.id";
public static final String KEY_DEFAULT_REGISTRY_USER = "registry.user";
+ public static final String KEY_DEFAULT_REGISTRY_URL = "registry.jdbc.url";
+
}
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/BasicRegistryResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/BasicRegistryResourceClient.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/BasicRegistryResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/BasicRegistryResourceClient.java Wed Nov 21 19:39:38 2012
@@ -30,9 +30,9 @@ import com.sun.jersey.api.json.JSONConfi
import org.apache.airavata.common.utils.Version;
import org.apache.airavata.registry.api.AiravataUser;
import org.apache.airavata.registry.api.Gateway;
+import org.apache.airavata.registry.api.PasswordCallback;
import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
import org.apache.airavata.rest.utils.BasicAuthHeaderUtil;
-import org.apache.airavata.registry.api.Callback;
import org.apache.airavata.rest.utils.ClientConstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,9 +45,9 @@ public class BasicRegistryResourceClient
private WebResource webResource;
private final static Logger logger = LoggerFactory.getLogger(BasicRegistryResourceClient.class);
private String userName;
- private Callback callback;
+ private PasswordCallback callback;
- public BasicRegistryResourceClient(String userName, Callback callback) {
+ public BasicRegistryResourceClient(String userName, PasswordCallback callback) {
this.userName = userName;
this.callback = callback;
}
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java Wed Nov 21 19:39:38 2012
@@ -28,11 +28,11 @@ import com.sun.jersey.api.client.config.
import com.sun.jersey.api.client.config.DefaultClientConfig;
import com.sun.jersey.api.json.JSONConfiguration;
import com.sun.jersey.core.util.MultivaluedMapImpl;
+import org.apache.airavata.registry.api.PasswordCallback;
import org.apache.airavata.rest.mappings.resourcemappings.ConfigurationList;
import org.apache.airavata.rest.mappings.resourcemappings.URLList;
import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
import org.apache.airavata.rest.utils.BasicAuthHeaderUtil;
-import org.apache.airavata.registry.api.Callback;
import org.apache.airavata.rest.utils.ClientConstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,9 +52,9 @@ public class ConfigurationResourceClient
private WebResource webResource;
private final static Logger logger = LoggerFactory.getLogger(ConfigurationResourceClient.class);
private String userName;
- private Callback callback;
+ private PasswordCallback callback;
- public ConfigurationResourceClient(String userName, Callback callback) {
+ public ConfigurationResourceClient(String userName, PasswordCallback callback) {
this.userName = userName;
this.callback = callback;
}
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java Wed Nov 21 19:39:38 2012
@@ -31,11 +31,11 @@ import com.sun.jersey.core.util.Multival
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
+import org.apache.airavata.registry.api.PasswordCallback;
import org.apache.airavata.rest.mappings.resourcemappings.*;
import org.apache.airavata.rest.mappings.utils.DescriptorUtil;
import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
import org.apache.airavata.rest.utils.BasicAuthHeaderUtil;
-import org.apache.airavata.registry.api.Callback;
import org.apache.airavata.rest.utils.ClientConstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,9 +53,9 @@ public class DescriptorResourceClient {
private WebResource webResource;
private final static Logger logger = LoggerFactory.getLogger(DescriptorResourceClient.class);
private String userName;
- private Callback callback;
+ private PasswordCallback callback;
- public DescriptorResourceClient(String userName, Callback callback) {
+ public DescriptorResourceClient(String userName, PasswordCallback callback) {
this.userName = userName;
this.callback = callback;
}
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java Wed Nov 21 19:39:38 2012
@@ -29,10 +29,10 @@ import com.sun.jersey.api.client.config.
import com.sun.jersey.api.json.JSONConfiguration;
import com.sun.jersey.core.util.MultivaluedMapImpl;
import org.apache.airavata.registry.api.AiravataExperiment;
+import org.apache.airavata.registry.api.PasswordCallback;
import org.apache.airavata.rest.mappings.resourcemappings.ExperimentList;
import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
import org.apache.airavata.rest.utils.BasicAuthHeaderUtil;
-import org.apache.airavata.registry.api.Callback;
import org.apache.airavata.rest.utils.ClientConstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,9 +51,9 @@ public class ExperimentResourceClient {
private WebResource webResource;
private final static Logger logger = LoggerFactory.getLogger(ExperimentResourceClient.class);
private String userName;
- private Callback callback;
+ private PasswordCallback callback;
- public ExperimentResourceClient(String userName, Callback callback) {
+ public ExperimentResourceClient(String userName, PasswordCallback callback) {
this.userName = userName;
this.callback = callback;
}
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java Wed Nov 21 19:39:38 2012
@@ -28,11 +28,11 @@ import com.sun.jersey.api.client.config.
import com.sun.jersey.api.client.config.DefaultClientConfig;
import com.sun.jersey.api.json.JSONConfiguration;
import com.sun.jersey.core.util.MultivaluedMapImpl;
+import org.apache.airavata.registry.api.PasswordCallback;
import org.apache.airavata.registry.api.WorkspaceProject;
import org.apache.airavata.rest.mappings.resourcemappings.WorkspaceProjectList;
import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
import org.apache.airavata.rest.utils.BasicAuthHeaderUtil;
-import org.apache.airavata.registry.api.Callback;
import org.apache.airavata.rest.utils.ClientConstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,9 +48,9 @@ public class ProjectResourceClient {
private WebResource webResource;
private final static Logger logger = LoggerFactory.getLogger(ProjectResourceClient.class);
private String userName;
- private Callback callback;
+ private PasswordCallback callback;
- public ProjectResourceClient(String userName, Callback callback) {
+ public ProjectResourceClient(String userName, PasswordCallback callback) {
this.callback = callback;
this.userName = userName;
}
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java Wed Nov 21 19:39:38 2012
@@ -28,6 +28,7 @@ import com.sun.jersey.api.client.config.
import com.sun.jersey.api.client.config.DefaultClientConfig;
import com.sun.jersey.api.json.JSONConfiguration;
import com.sun.jersey.core.util.MultivaluedMapImpl;
+import org.apache.airavata.registry.api.PasswordCallback;
import org.apache.airavata.registry.api.impl.ExperimentDataImpl;
import org.apache.airavata.registry.api.workflow.*;
import org.apache.airavata.rest.mappings.resourcemappings.ExperimentDataList;
@@ -35,7 +36,6 @@ import org.apache.airavata.rest.mappings
import org.apache.airavata.rest.mappings.resourcemappings.WorkflowInstancesList;
import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
import org.apache.airavata.rest.utils.BasicAuthHeaderUtil;
-import org.apache.airavata.registry.api.Callback;
import org.apache.airavata.rest.utils.ClientConstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,9 +55,9 @@ public class ProvenanceResourceClient {
private WebResource webResource;
private final static Logger logger = LoggerFactory.getLogger(ProvenanceResourceClient.class);
private String userName;
- private Callback callback;
+ private PasswordCallback callback;
- public ProvenanceResourceClient(String userName, Callback callback) {
+ public ProvenanceResourceClient(String userName, PasswordCallback callback) {
this.userName = userName;
this.callback = callback;
}
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java Wed Nov 21 19:39:38 2012
@@ -28,13 +28,13 @@ import com.sun.jersey.api.client.config.
import com.sun.jersey.api.client.config.DefaultClientConfig;
import com.sun.jersey.api.json.JSONConfiguration;
import com.sun.jersey.core.util.MultivaluedMapImpl;
+import org.apache.airavata.registry.api.PasswordCallback;
import org.apache.airavata.registry.api.ResourceMetadata;
import org.apache.airavata.rest.mappings.resourcemappings.PublishWorkflowNamesList;
import org.apache.airavata.rest.mappings.resourcemappings.Workflow;
import org.apache.airavata.rest.mappings.resourcemappings.WorkflowList;
import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
import org.apache.airavata.rest.utils.BasicAuthHeaderUtil;
-import org.apache.airavata.registry.api.Callback;
import org.apache.airavata.rest.utils.ClientConstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,9 +51,9 @@ public class PublishedWorkflowResourceCl
private WebResource webResource;
private final static Logger logger = LoggerFactory.getLogger(PublishedWorkflowResourceClient.class);
private String userName;
- private Callback callback;
+ private PasswordCallback callback;
- public PublishedWorkflowResourceClient(String userName, Callback callback) {
+ public PublishedWorkflowResourceClient(String userName, PasswordCallback callback) {
this.userName = userName;
this.callback = callback;
}
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java Wed Nov 21 19:39:38 2012
@@ -30,7 +30,7 @@ import org.apache.airavata.registry.api.
import org.apache.airavata.registry.api.exception.gateway.*;
import org.apache.airavata.registry.api.exception.worker.*;
import org.apache.airavata.registry.api.workflow.*;
-import org.apache.airavata.registry.api.Callback;
+import org.apache.airavata.registry.api.PasswordCallback;
import java.net.URI;
import java.util.Date;
@@ -40,7 +40,7 @@ import java.util.Map;
public class RegistryClient extends AiravataRegistry2 {
private URI connectionURI;
- private Callback callback;
+ private PasswordCallback callback;
private BasicRegistryResourceClient basicRegistryResourceClient;
private ConfigurationResourceClient configurationResourceClient;
@@ -51,7 +51,7 @@ public class RegistryClient extends Aira
private PublishedWorkflowResourceClient publishedWorkflowResourceClient;
private UserWorkflowResourceClient userWorkflowResourceClient;
- public RegistryClient(String userName, Callback callback) {
+ public RegistryClient(String userName, PasswordCallback callback) {
basicRegistryResourceClient = new BasicRegistryResourceClient(userName, callback);
configurationResourceClient = new ConfigurationResourceClient(userName, callback);
descriptorResourceClient = new DescriptorResourceClient(userName, callback);
@@ -796,12 +796,12 @@ public class RegistryClient extends Aira
}
@Override
- public void setCallback(Callback callback) {
+ public void setCallback(PasswordCallback callback) {
this.callback=callback;
}
@Override
- public Callback getCallback() {
+ public PasswordCallback getCallback() {
return callback;
}
}
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java Wed Nov 21 19:39:38 2012
@@ -28,12 +28,12 @@ import com.sun.jersey.api.client.config.
import com.sun.jersey.api.client.config.DefaultClientConfig;
import com.sun.jersey.api.json.JSONConfiguration;
import com.sun.jersey.core.util.MultivaluedMapImpl;
+import org.apache.airavata.registry.api.PasswordCallback;
import org.apache.airavata.registry.api.ResourceMetadata;
import org.apache.airavata.rest.mappings.resourcemappings.Workflow;
import org.apache.airavata.rest.mappings.resourcemappings.WorkflowList;
import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
import org.apache.airavata.rest.utils.BasicAuthHeaderUtil;
-import org.apache.airavata.registry.api.Callback;
import org.apache.airavata.rest.utils.ClientConstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,9 +50,9 @@ public class UserWorkflowResourceClient
private WebResource webResource;
private final static Logger logger = LoggerFactory.getLogger(UserWorkflowResourceClient.class);
private String userName;
- private Callback callback;
+ private PasswordCallback callback;
- public UserWorkflowResourceClient(String userName, Callback callback) {
+ public UserWorkflowResourceClient(String userName, PasswordCallback callback) {
this.userName = userName;
this.callback = callback;
}
Modified: airavata/trunk/modules/workflow-model/workflow-model-component/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-component/pom.xml?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-component/pom.xml (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-component/pom.xml Wed Nov 21 19:39:38 2012
@@ -229,6 +229,11 @@
<artifactId>airavata-workflow-tracking</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-client-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- JCR Support -->
<!-- TODO need clean up -->