You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/07/06 18:13:17 UTC
svn commit: r1358293 - in /incubator/airavata/trunk/modules:
airavata-client/src/main/java/org/apache/airavata/client/airavata/
airavata-client/src/main/java/org/apache/airavata/client/api/
xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/d...
Author: samindaw
Date: Fri Jul 6 16:13:17 2012
New Revision: 1358293
URL: http://svn.apache.org/viewvc?rev=1358293&view=rev
Log:
updating text labels + picking up interpreter service url from registry
Modified:
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClient.java
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPI.java
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RegistryMenuItem.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java
Modified: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClient.java?rev=1358293&r1=1358292&r2=1358293&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClient.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClient.java Fri Jul 6 16:13:17 2012
@@ -225,10 +225,6 @@ public class AiravataClient implements A
}
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#loadWorkflowFromaFile(java.lang.String)
- */
- @Override
public void loadWorkflowFromaFile(String workflowFile)
throws URISyntaxException, IOException {
File workflow = null;
@@ -255,10 +251,6 @@ public class AiravataClient implements A
}
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#loadWorkflowasaString(java.lang.String)
- */
- @Override
public void loadWorkflowasaString(String workflowAsaString) {
this.workflow = workflowAsaString;
}
@@ -277,10 +269,6 @@ public class AiravataClient implements A
}
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#setInputs(java.lang.String)
- */
- @Override
public NameValue[] setInputs(String fileName) throws IOException {
URL url = this.getClass().getClassLoader().getResource(fileName);
if (url == null) {
@@ -322,10 +310,6 @@ public class AiravataClient implements A
return null;
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#setInputs(java.util.Properties)
- */
- @Override
public void setInputs(Properties inputList) {
try {
Workflow workflow = new Workflow(this.workflow);
@@ -342,26 +326,14 @@ public class AiravataClient implements A
}
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#runWorkflow(java.lang.String)
- */
- @Override
public String runWorkflow(String topic) {
return runWorkflow(topic, (String) null);
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#runWorkflow(java.lang.String, java.lang.String)
- */
- @Override
public String runWorkflow(String topic, String user) {
return runWorkflow(topic, user, null, topic);
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#runWorkflow(java.lang.String, java.lang.String, java.lang.String)
- */
- @Override
public String runWorkflow(String topic, String user, String metadata, String workflowInstanceName) {
return runWorkflow(topic, user, metadata, workflowInstanceName, builder);
}
@@ -388,18 +360,10 @@ public class AiravataClient implements A
return worflowoutput;
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#getWorkflowExecutionMonitor(java.lang.String)
- */
- @Override
public Monitor getWorkflowExecutionMonitor(String topic) {
return getWorkflowExecutionMonitor(topic, null);
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#getWorkflowExecutionMonitor(java.lang.String, org.apache.airavata.xbaya.monitor.MonitorEventListener)
- */
- @Override
public Monitor getWorkflowExecutionMonitor(String topic,
MonitorEventListener listener) {
final String fTopic = topic;
@@ -440,26 +404,14 @@ public class AiravataClient implements A
getRegistry().saveWorkflowExecutionName(topic, workflowInstanceName);
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#runWorkflow(java.lang.String, org.apache.airavata.xbaya.interpretor.NameValue[])
- */
- @Override
- public String runWorkflow(String topic, NameValue[] inputs) throws Exception {
+ public String runWorkflow(String topic, NameValue[] inputs) throws Exception {
return runWorkflow(topic, inputs, null);
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#runWorkflow(java.lang.String, org.apache.airavata.xbaya.interpretor.NameValue[], java.lang.String)
- */
- @Override
public String runWorkflow(String topic, NameValue[] inputs, String user) throws Exception {
return runWorkflow(topic, inputs, user, null,topic);
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#runWorkflow(java.lang.String, org.apache.airavata.xbaya.interpretor.NameValue[], java.lang.String, java.lang.String)
- */
- @Override
public String runWorkflow(final String topic, final NameValue[] inputs, final String user,
final String metadata, final String workflowInstanceName) throws Exception{
return runWorkflow(topic, inputs, user, metadata, workflowInstanceName, builder);
@@ -493,28 +445,16 @@ public class AiravataClient implements A
return topic;
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#getWorkflowExecutionDataByUser(java.lang.String)
- */
- @Override
public List<WorkflowExecution> getWorkflowExecutionDataByUser(String user)
throws RegistryException {
return getRegistry().getWorkflowExecutionByUser(user);
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#getWorkflowExecutionData(java.lang.String)
- */
- @Override
public WorkflowExecution getWorkflowExecutionData(String topic)
throws RegistryException {
return getRegistry().getWorkflowExecution(topic);
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#getWorkflowExecutionData(java.lang.String, int, int)
- */
- @Override
public List<WorkflowExecution> getWorkflowExecutionData(String user,
int pageSize, int PageNo) throws RegistryException {
return getRegistry().getWorkflowExecutionByUser(user, pageSize, PageNo);
@@ -528,10 +468,6 @@ public class AiravataClient implements A
AiravataClient.workflow = workflow;
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#getRegistry()
- */
- @Override
public AiravataRegistry getRegistry() {
if (registry == null) {
try {
@@ -564,10 +500,6 @@ public class AiravataClient implements A
}
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#getClientConfiguration()
- */
- @Override
public AiravataClientConfiguration getClientConfiguration() {
if (clientConfiguration == null) {
clientConfiguration = new AiravataClientConfiguration();
@@ -614,10 +546,6 @@ public class AiravataClient implements A
return urlString;
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#getWorkflowTemplateIds()
- */
- @Override
public List<String> getWorkflowTemplateIds() {
List<String> workflowList = new ArrayList<String>();
Map<QName, Node> workflows;
@@ -638,18 +566,10 @@ public class AiravataClient implements A
return runWorkflow(workflowTemplateId,inputs,getRegistry().getUsername(),null,workflowTemplateId+"_"+Calendar.getInstance().getTime().toString());
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#runWorkflow(java.lang.String, java.util.List)
- */
- @Override
public String runWorkflow(String workflowTemplateId,List<WorkflowInput> inputs,String workflowInstanceName) throws Exception{
return runWorkflow(workflowTemplateId,inputs,getRegistry().getUsername(),null,workflowInstanceName);
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#runWorkflow(java.lang.String, java.util.List, java.lang.String, java.lang.String)
- */
- @Override
public String runWorkflow(String workflowTemplateId,List<WorkflowInput> inputs, String user, String metadata, String workflowInstanceName) throws Exception{
Workflow workflowObj = getWorkflow(workflowTemplateId);
return runWorkflow(workflowObj, inputs, user, metadata,workflowInstanceName,builder);
@@ -710,10 +630,6 @@ public class AiravataClient implements A
return null;
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#getWorkflowInputs(java.lang.String)
- */
- @Override
public List<WorkflowInput> getWorkflowInputs(String workflowTemplateId) throws Exception{
try {
Workflow workflowTemplate = getWorkflow(workflowTemplateId);
@@ -739,10 +655,6 @@ public class AiravataClient implements A
return null;
}
- /* (non-Javadoc)
- * @see org.apache.airavata.client.airavata.AiravataAPI#getWorkflowAsString(java.lang.String)
- */
- @Override
public Property getWorkflowAsString(String workflowTemplateId)
throws RegistryException, PathNotFoundException,
RepositoryException {
@@ -805,7 +717,7 @@ public class AiravataClient implements A
public static void main(String[] args) throws Exception {
HashMap<String, String> config = new HashMap<String,String>();
- AiravataAPI airavataClient = new AiravataClient(config);
+ AiravataClient airavataClient = new AiravataClient(config);
String workflowName = "Workflow1";
List<WorkflowInput> workflowInputs = airavataClient.getWorkflowInputs(workflowName);
workflowInputs.get(0).setValue("hi");
Modified: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPI.java?rev=1358293&r1=1358292&r2=1358293&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPI.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPI.java Fri Jul 6 16:13:17 2012
@@ -21,23 +21,6 @@
package org.apache.airavata.client.api;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.List;
-import java.util.Properties;
-
-import javax.jcr.PathNotFoundException;
-import javax.jcr.Property;
-import javax.jcr.RepositoryException;
-
-import org.apache.airavata.client.airavata.AiravataClientConfiguration;
-import org.apache.airavata.common.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.AiravataRegistry;
-import org.apache.airavata.registry.api.workflow.WorkflowExecution;
-import org.apache.airavata.workflow.model.wf.WorkflowInput;
-import org.apache.airavata.xbaya.interpretor.NameValue;
-import org.apache.airavata.xbaya.monitor.Monitor;
-import org.apache.airavata.xbaya.monitor.MonitorEventListener;
/**
* This is the base interface for AiravataAPI which contains all the base methods for Airavata API
@@ -45,219 +28,6 @@ import org.apache.airavata.xbaya.monitor
public interface AiravataAPI {
/**
- * Set the workflow object in to Client from the given file path
- * @param workflowFile
- * @throws URISyntaxException
- * @throws IOException
- */
- public abstract void loadWorkflowFromaFile(String workflowFile)
- throws URISyntaxException, IOException;
-
- /**
- * Set the workflow object in to Client from the given workflow String (Workflow.xwf context as a string)
- * @param workflowAsaString
- */
- public abstract void loadWorkflowasaString(String workflowAsaString);
-
- /**
- * This file has to be a properties file with properly setup the inputName values
- * @param fileName Path of the properties file
- * @return
- * @throws IOException
- */
- public abstract NameValue[] setInputs(String fileName) throws IOException;
-
- /**
- * Provide input list as a Properties object with properly setup input Name values
- * @param inputList
- */
- public abstract void setInputs(Properties inputList);
-
- /**
- * run the workflow with given topic ID and user will be null
- * @param topic
- * @return
- */
- public abstract String runWorkflow(String topic);
-
- /**
- * run the workflow with given topic ID and user
- * @param topic
- * @param user
- * @return
- */
- public abstract String runWorkflow(String topic, String user);
-
- /**
- * run the workflow with given topic,user, metadata and workflowInstanceName
- * @param topic
- * @param user
- * @param metadata
- * @return
- */
- public abstract String runWorkflow(String topic, String user,
- String metadata, String workflowInstanceName);
-
- /**
- * Returns the Monitor object for given experiment
- * @param topic
- * @return Monitor handler, so that user can use this object to extract notification
- * for this particular experiment
- */
- public abstract Monitor getWorkflowExecutionMonitor(String topic);
-
- /**
- * Returns a Monitor object with given listener
- * @param topic
- * @param listener
- * @return
- */
- public abstract Monitor getWorkflowExecutionMonitor(String topic,
- MonitorEventListener listener);
-
- /**
- * launch the workflow with given topic and given input Values
- * @param topic
- * @param inputs
- * @return
- * @throws Exception
- */
- public abstract String runWorkflow(String topic, NameValue[] inputs)
- throws Exception;
-
- /**
- * launch the workflow with given topic,input values and user
- * @param topic
- * @param inputs
- * @param user
- * @return
- * @throws Exception
- */
- public abstract String runWorkflow(String topic, NameValue[] inputs,
- String user) throws Exception;
-
- /**
- * This could be considered as mostly recommended workflow launch method which required all the parameters.
- * This accept topic,input values in NameValue array,username,metadata, and workflowInstanceName
- * @param topic
- * @param inputs
- * @param user
- * @param metadata
- * @return
- * @throws Exception
- */
- public abstract String runWorkflow(final String topic,
- final NameValue[] inputs, final String user, final String metadata, String workflowInstanceName)
- throws Exception;
-
- /**
- * Extract WorkflowExecution data based on the given user
- * @param user
- * @return
- * @throws RegistryException
- */
- public abstract List<WorkflowExecution> getWorkflowExecutionDataByUser(
- String user) throws RegistryException;
-
- /**
- * Extract WorkflowExecution data based on the given topic, we do exact match for the topic
- * @param topic
- * @return
- * @throws RegistryException
- */
- public abstract WorkflowExecution getWorkflowExecutionData(String topic)
- throws RegistryException;
-
- /**
- * Extract WorkflowExecution data based on the given user, but return the data in given size
- * @param user
- * @param pageSize
- * - number of executions to return (page size)
- * @param PageNo
- * - which page to return to (>=0)
- * @return
- * @throws RegistryException
- */
- public abstract List<WorkflowExecution> getWorkflowExecutionData(
- String user, int pageSize, int PageNo) throws RegistryException;
-
- /**
- * Gives the registry handler to do registry related operations
- * @return
- */
- public abstract AiravataRegistry getRegistry();
-
- /**
- * Returns configuration object of AiravataClient API
- * @return
- */
- public abstract AiravataClientConfiguration getClientConfiguration();
-
- /**
- * Retrieve the names of the workflow templates saved in the registry
- * @return
- */
- public abstract List<String> getWorkflowTemplateIds();
-
- /**
- * Execute the given workflow template with the given inputs and return the topic id
- * @param workflowTemplateId
- * @param inputs
- * @return
- */
- public String runWorkflow(String workflowTemplateId,List<WorkflowInput> inputs) throws Exception;
-
- /**
- * Execute the given workflow template with the given inputs and return the topic id and workflow instance
- * @param workflowTemplateId
- * @param inputs
- * @return
- */
- public abstract String runWorkflow(String workflowTemplateId,
- List<WorkflowInput> inputs, String workflowInstanceName) throws Exception;
-
- /**
- * Execute the given workflow template with the given inputs, user, metadata and return the topic id
- * @param workflowTemplateId
- * @param inputs
- * @param user
- * @param metadata
- * @return
- * @throws Exception
- */
- public abstract String runWorkflow(String workflowTemplateId,
- List<WorkflowInput> inputs, String user, String metadata, String workflowInstanceName)
- throws Exception;
-
- /**
- * Retrieve the inputs for the given workflow template
- * @param workflowTemplateId
- * @return
- */
- public abstract List<WorkflowInput> getWorkflowInputs(
- String workflowTemplateId) throws Exception;
-
- /**
- * Returns the workflow file as a string
- * @param workflowTemplateId
- * @return
- * @throws RegistryException
- * @throws PathNotFoundException
- * @throws RepositoryException
- */
- public abstract Property getWorkflowAsString(String workflowTemplateId)
- throws RegistryException, PathNotFoundException,
- RepositoryException;
-
- /**
- * Gives the service Node IDs for the given template ID, this will be useful when you want to know the service ID to
- * Configure each node with different WorkflowContextHeaders
- * @param templateID
- * @return
- */
- public List<String> getWorkflowServiceNodeIDs(String templateID);
-
- /**
* Returns the AiravataManager
* @return
*/
Modified: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java?rev=1358293&r1=1358292&r2=1358293&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java Fri Jul 6 16:13:17 2012
@@ -92,12 +92,12 @@ public interface ProvenanceManager {
/**
*
- * @param workflowName
+ * @param workflowTemplateId
* @param nodeId
* @return
* @throws AiravataAPIInvocationException
*/
- public Map<WorkflowInstanceNode,List<WorkflowInstanceNodePortData>> getWorkflowInstanceNodeInputData(String workflowName, String nodeId) throws AiravataAPIInvocationException;
+ public Map<WorkflowInstanceNode,List<WorkflowInstanceNodePortData>> getWorkflowInstanceNodeInputData(String workflowTemplateId, String nodeId) throws AiravataAPIInvocationException;
/**
*
@@ -284,9 +284,9 @@ public interface ProvenanceManager {
/**
*
- * @param exeperimentId
+ * @param experimentId
* @return
* @throws AiravataAPIInvocationException
*/
- public String[] getWorkflowExecutionOutputNames(String exeperimentId) throws AiravataAPIInvocationException;
+ public String[] getWorkflowExecutionOutputNames(String experimentId) throws AiravataAPIInvocationException;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java?rev=1358293&r1=1358292&r2=1358293&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java Fri Jul 6 16:13:17 2012
@@ -88,7 +88,7 @@ public class ApplicationDescriptionHostA
}
private void initGUI() {
- setTitle("Host Description Advance Options");
+ setTitle("HPC Configuration Options");
setModal(true);
setBounds(100, 100, 500, 500);
setLocationRelativeTo(null);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java?rev=1358293&r1=1358292&r2=1358293&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java Fri Jul 6 16:13:17 2012
@@ -30,7 +30,6 @@ import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
-import java.io.File;
import java.util.List;
import javax.swing.BorderFactory;
@@ -415,16 +414,16 @@ public class HostDeploymentDialog extend
}
private void updateTempDirWithExecPath(String executablePath) {
- if (!executablePath.trim().equals("") && (!txtExecPath.getSwingComponent().isFocusOwner()) &&
- (getApplicationDescriptionType().getScratchWorkingDirectory()==null || getApplicationDescriptionType().getScratchWorkingDirectory().trim().equalsIgnoreCase(""))){
- String temp_location = "workflow_runs";
- String tempDir = new File(new File(executablePath).getParentFile(),temp_location).toString();
- txtTempDir.setText(tempDir);
- txtTempDir.getSwingComponent().setSelectionStart(tempDir.length()-temp_location.length());
- txtTempDir.getSwingComponent().setSelectionEnd(tempDir.length());
- setTempDir(txtTempDir.getText());
- txtTempDir.getSwingComponent().requestFocus();
- }
+// if (!executablePath.trim().equals("") && (!txtExecPath.getSwingComponent().isFocusOwner()) &&
+// (getApplicationDescriptionType().getScratchWorkingDirectory()==null || getApplicationDescriptionType().getScratchWorkingDirectory().trim().equalsIgnoreCase(""))){
+// String temp_location = "workflow_runs";
+// String tempDir = new File(new File(executablePath).getParentFile(),temp_location).toString();
+// txtTempDir.setText(tempDir);
+// txtTempDir.getSwingComponent().setSelectionStart(tempDir.length()-temp_location.length());
+// txtTempDir.getSwingComponent().setSelectionEnd(tempDir.length());
+// setTempDir(txtTempDir.getText());
+// txtTempDir.getSwingComponent().requestFocus();
+// }
}
public String getTempDir() {
@@ -586,6 +585,7 @@ public class HostDeploymentDialog extend
public void setExistingHostList(List<String> existingHostList) {
this.existingHostList = existingHostList;
}
+
public static class HostDeployment{
private HostDescription hostDescription;
private ApplicationDeploymentDescription applicationDescription;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java?rev=1358293&r1=1358292&r2=1358293&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java Fri Jul 6 16:13:17 2012
@@ -52,7 +52,6 @@ import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.ListSelectionModel;
-import javax.swing.SwingConstants;
import javax.swing.WindowConstants;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java?rev=1358293&r1=1358292&r2=1358293&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java Fri Jul 6 16:13:17 2012
@@ -51,8 +51,6 @@ public class JCRRegistryWindow {
private XBayaEngine engine;
- private ComponentRegistryLoader loader;
-
private XBayaDialog dialog;
private XBayaTextField urlTextField;
@@ -70,7 +68,7 @@ public class JCRRegistryWindow {
*/
public JCRRegistryWindow(XBayaEngine engine) {
this.engine = engine;
- this.loader = ComponentRegistryLoader.getLoader(this.engine, RegistryConstants.REGISTRY_TYPE_JCR);
+ ComponentRegistryLoader.getLoader(this.engine, RegistryConstants.REGISTRY_TYPE_JCR);
initGUI();
}
@@ -127,6 +125,19 @@ public class JCRRegistryWindow {
.setMessageBoxURL(
messageBoxServiceURLList.get(0));
}
+ List<URI> interpreterServiceURLList = registry.getRegistry().getInterpreterServiceURLList();
+ if (interpreterServiceURLList.size()>0) {
+ this.engine.getConfiguration()
+ .setWorkflowInterpreterURL(interpreterServiceURLList.get(0));
+ }
+ List<String> gfacURLList = registry.getRegistry().getGFacDescriptorList();
+ if (gfacURLList.size()>0) {
+ try {
+ this.engine.getConfiguration().setGFacURL(new URI(gfacURLList.get(0)));
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
+ }
+ }
} catch (RegistryException e) {
this.engine.getGUI().getErrorWindow().error(ErrorMessages.URL_WRONG, e);
return;
@@ -217,7 +228,7 @@ public class JCRRegistryWindow {
buttonPanel.add(cancelButton);
buttonPanel.getSwingComponent().setBorder(BorderFactory.createEtchedBorder());
- this.dialog = new XBayaDialog(this.engine.getGUI(), "JCR Registry", infoPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "Airavata Registry", infoPanel, buttonPanel);
this.dialog.setDefaultButton(okButton);
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RegistryMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RegistryMenuItem.java?rev=1358293&r1=1358292&r2=1358293&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RegistryMenuItem.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RegistryMenuItem.java Fri Jul 6 16:13:17 2012
@@ -89,7 +89,7 @@ public class RegistryMenuItem implements
}
private JMenuItem createJCRRegistryItem() {
- JMenuItem item = new JMenuItem("Setup JCR Registry...",MenuIcons.JCR_ICON);
+ JMenuItem item = new JMenuItem("Setup Airavata Registry...",MenuIcons.JCR_ICON);
item.setMnemonic(KeyEvent.VK_J);
AbstractAction action = new AbstractAction() {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java?rev=1358293&r1=1358292&r2=1358293&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java Fri Jul 6 16:13:17 2012
@@ -271,7 +271,7 @@ public class XBayaMenuItem implements XB
}
private void createSaveWorkflowtoRegistryItem() {
- this.saveWorkflowtoRegistryItem = new JMenuItem("To Registry...");
+ this.saveWorkflowtoRegistryItem = new JMenuItem("Workflow To Registry...");
this.saveWorkflowtoRegistryItem.setMnemonic(KeyEvent.VK_C);
this.saveWorkflowtoRegistryItem.addActionListener(new AbstractAction() {
private static final long serialVersionUID = 1L;
@@ -286,7 +286,7 @@ public class XBayaMenuItem implements XB
}
private JMenuItem createURLRegistryItem() {
- JMenuItem item = new JMenuItem("WSDL from URL...");
+ JMenuItem item = new JMenuItem("WSDL From URL...");
item.setMnemonic(KeyEvent.VK_U);
item.addActionListener(new AbstractAction() {
private static final long serialVersionUID = 1L;
@@ -394,7 +394,7 @@ public class XBayaMenuItem implements XB
}
private JMenuItem createCloseWorkflowTabItem() {
- JMenuItem menuItem = new JMenuItem("Close");
+ JMenuItem menuItem = new JMenuItem("Close Tab");
menuItem.setMnemonic(KeyEvent.VK_C);
menuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F4, ActionEvent.CTRL_MASK));
menuItem.addActionListener(new AbstractAction() {
@@ -407,7 +407,7 @@ public class XBayaMenuItem implements XB
}
private JMenuItem createCloseAllWorkflowTabItem() {
- JMenuItem menuItem = new JMenuItem("Close All");
+ JMenuItem menuItem = new JMenuItem("Close All Tabs");
menuItem.addActionListener(new AbstractAction() {
private static final long serialVersionUID = 1L;
public void actionPerformed(ActionEvent e) {
@@ -498,7 +498,7 @@ public class XBayaMenuItem implements XB
}
private void createImportWorkflowItemFromFileSystem() {
- importWorkflowItemFromFileSystem = new JMenuItem("From file system...");
+ importWorkflowItemFromFileSystem = new JMenuItem("Workflow From File System...");
importWorkflowItemFromFileSystem.addActionListener(new AbstractAction() {
private static final long serialVersionUID = 1L;
public void actionPerformed(ActionEvent e) {
@@ -508,7 +508,7 @@ public class XBayaMenuItem implements XB
}
private void createImportWorkflowItemFromRegistry() {
- importWorkflowItemFromRegistry = new JMenuItem("From registry...");
+ importWorkflowItemFromRegistry = new JMenuItem("Workflow From Registry...");
importWorkflowItemFromRegistry.addActionListener(new AbstractAction() {
private static final long serialVersionUID = 1L;
public void actionPerformed(ActionEvent e) {
@@ -518,7 +518,7 @@ public class XBayaMenuItem implements XB
}
private void createExportJythonScriptItem() {
- this.exportJythonItem = new JMenuItem("Jython Script...");
+ this.exportJythonItem = new JMenuItem("Workflow To Jython Script...");
this.exportJythonItem.setMnemonic(KeyEvent.VK_J);
this.exportJythonItem.addActionListener(new AbstractAction() {
private static final long serialVersionUID = 1L;
@@ -529,7 +529,7 @@ public class XBayaMenuItem implements XB
}
private void createExportBpelScriptItem() {
- this.exportBpelItem = new JMenuItem("BPEL2 Script...");
+ this.exportBpelItem = new JMenuItem("Workflow To BPEL2 Script...");
this.exportBpelItem.setMnemonic(KeyEvent.VK_B);
this.exportBpelItem.addActionListener(new AbstractAction() {
private static final long serialVersionUID = 1L;
@@ -540,7 +540,7 @@ public class XBayaMenuItem implements XB
}
private void createSaveWorkflowImageItem() {
- this.saveImageItem = new JMenuItem("Image...");
+ this.saveImageItem = new JMenuItem("Workflow To Image...");
this.saveImageItem.setMnemonic(KeyEvent.VK_I);
this.saveImageItem.addActionListener(new AbstractAction() {
private static final long serialVersionUID = 1L;
@@ -551,7 +551,7 @@ public class XBayaMenuItem implements XB
}
private void createExportODEScriptsItem() {
- this.exportODEScriptsItem = new JMenuItem("ODE Scripts...");
+ this.exportODEScriptsItem = new JMenuItem("Workflow To ODE Scripts...");
this.exportODEScriptsItem.addActionListener(new AbstractAction() {
private static final long serialVersionUID = 1L;
public void actionPerformed(ActionEvent e) {