You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2011/10/28 20:17:45 UTC
svn commit: r1190484 - in /incubator/airavata/trunk/modules:
commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/
xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/
xbaya-gui/src/main/java/org/apache/airavata/xbaya/...
Author: lahiru
Date: Fri Oct 28 18:17:44 2011
New Revision: 1190484
URL: http://svn.apache.org/viewvc?rev=1190484&view=rev
Log:
getWSDL function to use getServiceDescription instead
reg browser parameter type
Modified:
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameters.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiments.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowService.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParametersNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentsNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowServiceNode.java
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java?rev=1190484&r1=1190483&r2=1190484&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java Fri Oct 28 18:17:44 2011
@@ -595,9 +595,9 @@ public class JCRRegistry extends Observa
// }
public String getWSDL(String serviceName) throws RegistryException {
- List<ServiceDescription> searchServiceDescription = searchServiceDescription(serviceName);
- if (searchServiceDescription.size()>0){
- return getWSDL(searchServiceDescription.get(0));
+ ServiceDescription serviceDescription = getServiceDescription(serviceName);
+ if (serviceDescription!=null){
+ return getWSDL(serviceDescription);
}
throw new ServiceDescriptionRetrieveException(new Exception("No service description from the name "+serviceName));
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java?rev=1190484&r1=1190483&r2=1190484&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java Fri Oct 28 18:17:44 2011
@@ -78,7 +78,6 @@ public class JCRBrowserPanel extends JPa
addPopup(tree, popupMenu);
AbstractBrowserActionItem actionRefresh = new RefreshAction();
- browserActions.add(actionRefresh);
actionRefresh.getMenuItem().setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0));
actionRefresh.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@ -87,31 +86,33 @@ public class JCRBrowserPanel extends JPa
});
actionDelete = new DeleteAction();
- browserActions.add(actionDelete);
actionDelete.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
triggerNodeAction(DeleteAction.ID);
}
});
AddAction actionAdd = new AddAction();
- browserActions.add(actionAdd);
actionAdd.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
triggerNodeAction(AddAction.ID);
}
});
- AddAction actionEdit = new AddAction();
- browserActions.add(actionEdit);
+ EditAction actionEdit = new EditAction();
actionEdit.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
triggerNodeAction(EditAction.ID);
}
});
- popupMenu.add(actionAdd.getMenuItem());
- popupMenu.add(actionDelete.getMenuItem());
- popupMenu.add(actionRefresh.getMenuItem());
+ browserActions.add(actionRefresh);
+ browserActions.add(actionAdd);
+ browserActions.add(actionDelete);
+ browserActions.add(actionEdit);
+
+// popupMenu.add(actionAdd.getMenuItem());
+// popupMenu.add(actionDelete.getMenuItem());
+// popupMenu.add(actionRefresh.getMenuItem());
}
}
}
@@ -182,6 +183,7 @@ public class JCRBrowserPanel extends JPa
if (selRow != -1 && e.isPopupTrigger()) {
tree.setSelectionRow(selRow);
Object o = tree.getLastSelectedPathComponent();
+ popup.removeAll();
if (o instanceof AbstractAiravataTreeNode) {
AbstractAiravataTreeNode node = ((AbstractAiravataTreeNode) o);
for (AbstractBrowserActionItem action : browserActions) {
@@ -191,11 +193,14 @@ public class JCRBrowserPanel extends JPa
action.setCaption(node.getActionCaption(action));
action.setIcon(node.getActionIcon(action));
action.setDescription(node.getActionDescription(action));
+ popup.add(action.getMenuItem());
}
}
}
-
- popup.show(e.getComponent(), e.getX(), e.getY());
+
+ if (popup.getSubElements().length>0) {
+ popup.show(e.getComponent(), e.getX(), e.getY());
+ }
}
}
});
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameters.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameters.java?rev=1190484&r1=1190483&r2=1190484&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameters.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceParameters.java Fri Oct 28 18:17:44 2011
@@ -1,28 +1,36 @@
package org.apache.airavata.xbaya.registrybrowser.model;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.apache.airavata.schemas.gfac.Parameter;
public class ServiceParameters {
- private ServiceParameter[] parameters;
+ private List<ServiceParameter> parameters;
public ServiceParameters(Parameter[] parameters) {
- List<ServiceParameter> serviceParaList=new ArrayList<ServiceParameter>();
- for (Parameter parameter : parameters) {
- serviceParaList.add(new ServiceParameter(parameter));
+ if (parameters!=null) {
+ List<ServiceParameter> serviceParaList = new ArrayList<ServiceParameter>();
+ for (Parameter parameter : parameters) {
+ serviceParaList.add(new ServiceParameter(parameter));
+ }
+ setParameters(serviceParaList);
}
- setParameters(serviceParaList.toArray(new ServiceParameter[]{}));
}
public ServiceParameters(ServiceParameter[] parameters) {
- setParameters(parameters);
+ if (parameters!=null) {
+ setParameters(Arrays.asList(parameters));
+ }
}
- public ServiceParameter[] getParameters() {
+ public List<ServiceParameter> getParameters() {
+ if (parameters==null){
+ parameters=new ArrayList<ServiceParameter>();
+ }
return parameters;
}
- public void setParameters(ServiceParameter[] parameters) {
+ public void setParameters(List<ServiceParameter> parameters) {
this.parameters = parameters;
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiments.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiments.java?rev=1190484&r1=1190483&r2=1190484&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiments.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiments.java Fri Oct 28 18:17:44 2011
@@ -1,12 +1,22 @@
package org.apache.airavata.xbaya.registrybrowser.model;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.xml.parsers.ParserConfigurationException;
+
import org.apache.airavata.registry.api.Registry;
import org.apache.airavata.registry.api.workflow.WorkflowIOData;
+import org.apache.airavata.schemas.gfac.Parameter;
+import org.apache.axis2.util.XMLUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
public class XBayaWorkflowExperiments {
private Registry registry;
@@ -55,6 +65,26 @@ public class XBayaWorkflowExperiments {
workflowService=new XBayaWorkflowService(workflowIOData.getNodeId(),null,null);
xbayaWorkflow.add(workflowService);
}
+ try {
+ Document parameterDocument = XMLUtils.newDocument(new ByteArrayInputStream(workflowIOData.getData().getBytes()));
+ NodeList childNodes = parameterDocument.getDocumentElement().getChildNodes();
+ for(int i=0;i<childNodes.getLength();i++){
+ Node parameterNode = childNodes.item(i);
+ Parameter parameter = Parameter.Factory.newInstance();
+ parameter.setParameterName(parameterNode.getLocalName());
+ workflowService.getInputParameters().getParameters().add(new ServiceParameter(parameter, parameterNode.getTextContent()));
+ }
+ } catch (ParserConfigurationException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (SAXException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
//TODO setup parameters
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowService.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowService.java?rev=1190484&r1=1190483&r2=1190484&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowService.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowService.java Fri Oct 28 18:17:44 2011
@@ -12,6 +12,9 @@ public class XBayaWorkflowService {
}
public OutputParameters getOutputParameters() {
+ if (outputParameters==null){
+ outputParameters=new OutputParameters((ServiceParameter[])null);
+ }
return outputParameters;
}
@@ -20,6 +23,9 @@ public class XBayaWorkflowService {
}
public InputParameters getInputParameters() {
+ if (inputParameters==null){
+ inputParameters=new InputParameters((ServiceParameter[])null);
+ }
return inputParameters;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParametersNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParametersNode.java?rev=1190484&r1=1190483&r2=1190484&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParametersNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParametersNode.java Fri Oct 28 18:17:44 2011
@@ -20,7 +20,7 @@ public class ParametersNode extends Abst
@Override
protected List<TreeNode> getChildren() {
- return getTreeNodeList(getParametersList().getParameters(), this);
+ return getTreeNodeList(getParametersList().getParameters().toArray(), this);
}
@Override
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java?rev=1190484&r1=1190483&r2=1190484&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java Fri Oct 28 18:17:44 2011
@@ -34,7 +34,7 @@ public class ServiceDescriptionNode exte
parameterTypeList.add(new InputParameters(getServiceDescription().getType().getInputParametersArray()));
}
if (getServiceDescription().getType().getOutputParametersArray().length>0){
- parameterTypeList.add(new OutputParameters(getServiceDescription().getType().getInputParametersArray()));
+ parameterTypeList.add(new OutputParameters(getServiceDescription().getType().getOutputParametersArray()));
}
return getTreeNodeList(parameterTypeList.toArray(), this);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentsNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentsNode.java?rev=1190484&r1=1190483&r2=1190484&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentsNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentsNode.java Fri Oct 28 18:17:44 2011
@@ -9,6 +9,7 @@ import javax.swing.tree.TreeNode;
import org.apache.airavata.common.utils.SwingUtil;
import org.apache.airavata.xbaya.registrybrowser.menu.AbstractBrowserActionItem;
+import org.apache.airavata.xbaya.registrybrowser.menu.RefreshAction;
import org.apache.airavata.xbaya.registrybrowser.model.XBayaWorkflowExperiments;
public class XBayaWorkflowExperimentsNode extends AbstractAiravataTreeNode {
@@ -36,7 +37,7 @@ public class XBayaWorkflowExperimentsNod
@Override
public List<String> getSupportedActions() {
- return Arrays.asList();
+ return Arrays.asList(RefreshAction.ID);
}
public boolean triggerAction(JTree tree, String action) throws Exception {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNode.java?rev=1190484&r1=1190483&r2=1190484&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNode.java Fri Oct 28 18:17:44 2011
@@ -21,7 +21,7 @@ public class XBayaWorkflowNode extends A
@Override
protected List<TreeNode> getChildren() {
- return emptyList();
+ return getTreeNodeList(getXbayaWorkflow().getWorkflowServices().toArray(),this);
}
@Override
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowServiceNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowServiceNode.java?rev=1190484&r1=1190483&r2=1190484&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowServiceNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowServiceNode.java Fri Oct 28 18:17:44 2011
@@ -24,10 +24,10 @@ public class XBayaWorkflowServiceNode ex
@Override
protected List<TreeNode> getChildren() {
List<ServiceParameters> parameterTypeList=new ArrayList<ServiceParameters>();
- if (getXbayaWorkflowService().getInputParameters().getParameters().length>0){
+ if (getXbayaWorkflowService().getInputParameters()!=null && getXbayaWorkflowService().getInputParameters().getParameters().size()>0){
parameterTypeList.add(getXbayaWorkflowService().getInputParameters());
}
- if (getXbayaWorkflowService().getOutputParameters().getParameters().length>0){
+ if (getXbayaWorkflowService().getOutputParameters()!=null && getXbayaWorkflowService().getOutputParameters().getParameters().size()>0){
parameterTypeList.add(getXbayaWorkflowService().getOutputParameters());
}
return getTreeNodeList(parameterTypeList.toArray(), this);