You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2011/10/22 21:30:07 UTC
svn commit: r1187758 [14/15] - in /incubator/airavata/trunk: ./
modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/app/
modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/
modules/commons/registry-a...
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java Sat Oct 22 19:29:52 2011
@@ -19,94 +19,92 @@ import org.apache.airavata.xbaya.registr
import org.apache.airavata.xbaya.registrybrowser.model.HostDescriptions;
public class HostDescriptionsNode extends AbstractAiravataTreeNode {
- private HostDescriptions hostDescriptions;
-
- public HostDescriptionsNode(HostDescriptions hostDescriptions,TreeNode parent) {
- super(parent);
- setHostDescriptions(hostDescriptions);
- }
-
- @Override
- protected List<TreeNode> getChildren() {
- try {
- return getTreeNodeList(getHostDescriptions().getDescriptions().toArray(), this);
- } catch (HostDescriptionRetrieveException e) {
- e.printStackTrace();
- return emptyList();
- }
- }
-
- @Override
- public String getCaption(boolean selected, boolean expanded, boolean leaf,
- boolean hasFocus) {
- return "Hosts";
- }
-
- @Override
- public Icon getIcon(boolean selected, boolean expanded, boolean leaf,
- boolean hasFocus) {
- return SwingUtil.createImageIcon("cloud.png");
- }
-
- public HostDescriptions getHostDescriptions() {
- return hostDescriptions;
- }
-
- public void setHostDescriptions(HostDescriptions hostDescriptions) {
- this.hostDescriptions = hostDescriptions;
- }
-
- @Override
- public List<String> getSupportedActions() {
- return Arrays.asList(AddAction.ID, RefreshAction.ID, DeleteAction.ID);
- }
-
- public boolean triggerAction(JTree tree,String action) throws Exception{
- if (action.equals(DeleteAction.ID)){
- deleteHostDescription(tree);
- return true;
- }else if (action.equals(AddAction.ID)){
- HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getRegistry());
- hostDescriptionDialog.open();
- if (hostDescriptionDialog.isHostCreated()) {
- refresh();
- reloadTreeNode(tree, this);
- }
- return true;
- }
- return super.triggerAction(tree, action);
- }
-
- private void deleteHostDescription(JTree tree)
- throws Exception {
- if (askQuestion("Host descriptions", "Are you sure that you want to remove all host descriptions in this registry?")) {
- Registry registry = getRegistry();
- List<HostDescription> descriptions = getHostDescriptions().getDescriptions();
- for (HostDescription descriptionWrap : descriptions) {
- registry.deleteHostDescription(descriptionWrap.getId());
- }
- refresh();
- reloadTreeNode(tree, this);
- }
- }
-
- @Override
- public String getActionCaption(AbstractBrowserActionItem action) {
- if (action.getID().equals(DeleteAction.ID)){
- return "Remove all hosts";
- }else if (action.getID().equals(AddAction.ID)){
- return "New host...";
- }
- return action.getDefaultCaption();
- }
-
- @Override
- public Icon getActionIcon(AbstractBrowserActionItem action) {
- return null;
- }
-
- @Override
- public String getActionDescription(AbstractBrowserActionItem action) {
- return null;
- }
+ private HostDescriptions hostDescriptions;
+
+ public HostDescriptionsNode(HostDescriptions hostDescriptions, TreeNode parent) {
+ super(parent);
+ setHostDescriptions(hostDescriptions);
+ }
+
+ @Override
+ protected List<TreeNode> getChildren() {
+ try {
+ return getTreeNodeList(getHostDescriptions().getDescriptions().toArray(), this);
+ } catch (HostDescriptionRetrieveException e) {
+ e.printStackTrace();
+ return emptyList();
+ }
+ }
+
+ @Override
+ public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
+ return "Hosts";
+ }
+
+ @Override
+ public Icon getIcon(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
+ return SwingUtil.createImageIcon("cloud.png");
+ }
+
+ public HostDescriptions getHostDescriptions() {
+ return hostDescriptions;
+ }
+
+ public void setHostDescriptions(HostDescriptions hostDescriptions) {
+ this.hostDescriptions = hostDescriptions;
+ }
+
+ @Override
+ public List<String> getSupportedActions() {
+ return Arrays.asList(AddAction.ID, RefreshAction.ID, DeleteAction.ID);
+ }
+
+ public boolean triggerAction(JTree tree, String action) throws Exception {
+ if (action.equals(DeleteAction.ID)) {
+ deleteHostDescription(tree);
+ return true;
+ } else if (action.equals(AddAction.ID)) {
+ HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getRegistry());
+ hostDescriptionDialog.open();
+ if (hostDescriptionDialog.isHostCreated()) {
+ refresh();
+ reloadTreeNode(tree, this);
+ }
+ return true;
+ }
+ return super.triggerAction(tree, action);
+ }
+
+ private void deleteHostDescription(JTree tree) throws Exception {
+ if (askQuestion("Host descriptions",
+ "Are you sure that you want to remove all host descriptions in this registry?")) {
+ Registry registry = getRegistry();
+ List<HostDescription> descriptions = getHostDescriptions().getDescriptions();
+ for (HostDescription descriptionWrap : descriptions) {
+ registry.deleteHostDescription(descriptionWrap.getId());
+ }
+ refresh();
+ reloadTreeNode(tree, this);
+ }
+ }
+
+ @Override
+ public String getActionCaption(AbstractBrowserActionItem action) {
+ if (action.getID().equals(DeleteAction.ID)) {
+ return "Remove all hosts";
+ } else if (action.getID().equals(AddAction.ID)) {
+ return "New host...";
+ }
+ return action.getDefaultCaption();
+ }
+
+ @Override
+ public Icon getActionIcon(AbstractBrowserActionItem action) {
+ return null;
+ }
+
+ @Override
+ public String getActionDescription(AbstractBrowserActionItem action) {
+ return null;
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java Sat Oct 22 19:29:52 2011
@@ -17,75 +17,75 @@ import org.apache.airavata.xbaya.registr
import org.apache.airavata.xbaya.registrybrowser.model.ServiceDescriptions;
import org.apache.airavata.xbaya.registrybrowser.model.XBayaWorkflows;
-public class RegistryNode extends AbstractAiravataTreeNode{
- private Registry registry;
-
- public RegistryNode(Registry registry, TreeNode parent) {
- super(parent);
- setRegistry(registry);
- }
-
- protected List<TreeNode> getChildren() {
- List<Object> children = new ArrayList<Object>();
- GFacURLs gFacURLs = new GFacURLs(getRegistry());
- children.add(gFacURLs);
- HostDescriptions hostDescriptions = new HostDescriptions(getRegistry());
- children.add(hostDescriptions);
- ServiceDescriptions serviceDescriptions = new ServiceDescriptions(getRegistry());
- children.add(serviceDescriptions);
- ApplicationDeploymentDescriptions applicationDeploymentDescriptions = new ApplicationDeploymentDescriptions(getRegistry());
- children.add(applicationDeploymentDescriptions);
- XBayaWorkflows xBayaWorkflows = new XBayaWorkflows(getRegistry());
- children.add(xBayaWorkflows);
- return getTreeNodeList(children.toArray(), this);
- }
-
- public Registry getRegistry() {
- return registry;
- }
-
- public void setRegistry(Registry registry) {
- this.registry = registry;
- }
-
- @Override
- public String getCaption(boolean selected, boolean expanded, boolean leaf,
- boolean hasFocus) {
- return getRegistry().getName()+" - "+getRegistry().getUsername()+"@"+getRegistry().getRepositoryURI().toString();
- }
-
- @Override
- public Icon getIcon(boolean selected, boolean expanded, boolean leaf,
- boolean hasFocus) {
- return SwingUtil.createImageIcon("registry.png");
- }
-
-// @Override
-// public void refresh() {
-// List<TreeNode> children = getChildren();
-// for (TreeNode node : children) {
-// if (node instanceof AbstractAiravataTreeNode){
-// ((AbstractAiravataTreeNode)node).refresh();
-// }
-// }
-// }
- @Override
- public List<String> getSupportedActions() {
- return Arrays.asList(RefreshAction.ID);
- }
-
- @Override
- public String getActionCaption(AbstractBrowserActionItem action) {
- return action.getDefaultCaption();
- }
-
- @Override
- public Icon getActionIcon(AbstractBrowserActionItem action) {
- return null;
- }
-
- @Override
- public String getActionDescription(AbstractBrowserActionItem action) {
- return null;
- }
+public class RegistryNode extends AbstractAiravataTreeNode {
+ private Registry registry;
+
+ public RegistryNode(Registry registry, TreeNode parent) {
+ super(parent);
+ setRegistry(registry);
+ }
+
+ protected List<TreeNode> getChildren() {
+ List<Object> children = new ArrayList<Object>();
+ GFacURLs gFacURLs = new GFacURLs(getRegistry());
+ children.add(gFacURLs);
+ HostDescriptions hostDescriptions = new HostDescriptions(getRegistry());
+ children.add(hostDescriptions);
+ ServiceDescriptions serviceDescriptions = new ServiceDescriptions(getRegistry());
+ children.add(serviceDescriptions);
+ ApplicationDeploymentDescriptions applicationDeploymentDescriptions = new ApplicationDeploymentDescriptions(
+ getRegistry());
+ children.add(applicationDeploymentDescriptions);
+ XBayaWorkflows xBayaWorkflows = new XBayaWorkflows(getRegistry());
+ children.add(xBayaWorkflows);
+ return getTreeNodeList(children.toArray(), this);
+ }
+
+ public Registry getRegistry() {
+ return registry;
+ }
+
+ public void setRegistry(Registry registry) {
+ this.registry = registry;
+ }
+
+ @Override
+ public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
+ return getRegistry().getName() + " - " + getRegistry().getUsername() + "@"
+ + getRegistry().getRepositoryURI().toString();
+ }
+
+ @Override
+ public Icon getIcon(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
+ return SwingUtil.createImageIcon("registry.png");
+ }
+
+ // @Override
+ // public void refresh() {
+ // List<TreeNode> children = getChildren();
+ // for (TreeNode node : children) {
+ // if (node instanceof AbstractAiravataTreeNode){
+ // ((AbstractAiravataTreeNode)node).refresh();
+ // }
+ // }
+ // }
+ @Override
+ public List<String> getSupportedActions() {
+ return Arrays.asList(RefreshAction.ID);
+ }
+
+ @Override
+ public String getActionCaption(AbstractBrowserActionItem action) {
+ return action.getDefaultCaption();
+ }
+
+ @Override
+ public Icon getActionIcon(AbstractBrowserActionItem action) {
+ return null;
+ }
+
+ @Override
+ public String getActionDescription(AbstractBrowserActionItem action) {
+ return null;
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryTreeCellRenderer.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryTreeCellRenderer.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryTreeCellRenderer.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryTreeCellRenderer.java Sat Oct 22 19:29:52 2011
@@ -8,14 +8,15 @@ import javax.swing.tree.TreeCellRenderer
public class RegistryTreeCellRenderer implements TreeCellRenderer {
- @Override
- public Component getTreeCellRendererComponent(JTree tree, Object value,
- boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) {
- if (value instanceof AbstractAiravataTreeNode){
- AbstractAiravataTreeNode node=(AbstractAiravataTreeNode)value;
- return node.getNodeComponent(tree, value, selected, expanded, leaf, row, hasFocus);
- }
- return new DefaultTreeCellRenderer().getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
- }
+ @Override
+ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded,
+ boolean leaf, int row, boolean hasFocus) {
+ if (value instanceof AbstractAiravataTreeNode) {
+ AbstractAiravataTreeNode node = (AbstractAiravataTreeNode) value;
+ return node.getNodeComponent(tree, value, selected, expanded, leaf, row, hasFocus);
+ }
+ return new DefaultTreeCellRenderer().getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row,
+ hasFocus);
+ }
}
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=1187758&r1=1187757&r2=1187758&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 Sat Oct 22 19:29:52 2011
@@ -17,80 +17,79 @@ import org.apache.airavata.xbaya.registr
import org.apache.airavata.xbaya.registrybrowser.menu.EditAction;
public class ServiceDescriptionNode extends AbstractAiravataTreeNode {
- private ServiceDescription serviceDescription;
- public ServiceDescriptionNode(ServiceDescription serviceDescription,TreeNode parent) {
- super(parent);
- setServiceDescription(serviceDescription);
- }
-
- @Override
- protected List<TreeNode> getChildren() {
- //TODO perhaps we should show the parameters as children
- return emptyList();
- }
-
- @Override
- public String getCaption(boolean selected, boolean expanded, boolean leaf,
- boolean hasFocus) {
- return getServiceDescription().getId();
- }
-
- @Override
- public Icon getIcon(boolean selected, boolean expanded, boolean leaf,
- boolean hasFocus) {
- return SwingUtil.createImageIcon("service.png");
- }
-
- public ServiceDescription getServiceDescription() {
- return serviceDescription;
- }
-
- public void setServiceDescription(ServiceDescription serviceDescription) {
- this.serviceDescription = serviceDescription;
- }
-
- @Override
- public List<String> getSupportedActions() {
- return Arrays.asList(EditAction.ID, DeleteAction.ID);
- }
-
- public boolean triggerAction(JTree tree,String action) throws Exception{
- if (action.equals(DeleteAction.ID)){
- deleteHostDescription(tree);
- return true;
- }else if (action.equals(EditAction.ID)){
- JOptionPane.showMessageDialog(null, "TODO");
- return true;
- }
- return super.triggerAction(tree, action);
- }
-
- private void deleteHostDescription(JTree tree)
- throws PathNotFoundException, ServiceDescriptionRetrieveException {
- if (askQuestion("Service description", "Are you sure that you want to remove the service description \""+getServiceDescription().getId()+"\"?")) {
- getRegistry().deleteServiceDescription(getServiceDescription().getId());
- ((AbstractAiravataTreeNode)getParent()).refresh();
- reloadTreeNode(tree, getParent());
- }
- }
-
- @Override
- public String getActionCaption(AbstractBrowserActionItem action) {
- if (action.getID().equals(DeleteAction.ID)){
- return "Remove";
- }else if (action.getID().equals(EditAction.ID)){
- return "Edit";
- }
- return action.getDefaultCaption();
- }
-
- @Override
- public Icon getActionIcon(AbstractBrowserActionItem action) {
- return null;
- }
-
- @Override
- public String getActionDescription(AbstractBrowserActionItem action) {
- return null;
- }
+ private ServiceDescription serviceDescription;
+
+ public ServiceDescriptionNode(ServiceDescription serviceDescription, TreeNode parent) {
+ super(parent);
+ setServiceDescription(serviceDescription);
+ }
+
+ @Override
+ protected List<TreeNode> getChildren() {
+ // TODO perhaps we should show the parameters as children
+ return emptyList();
+ }
+
+ @Override
+ public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
+ return getServiceDescription().getId();
+ }
+
+ @Override
+ public Icon getIcon(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
+ return SwingUtil.createImageIcon("service.png");
+ }
+
+ public ServiceDescription getServiceDescription() {
+ return serviceDescription;
+ }
+
+ public void setServiceDescription(ServiceDescription serviceDescription) {
+ this.serviceDescription = serviceDescription;
+ }
+
+ @Override
+ public List<String> getSupportedActions() {
+ return Arrays.asList(EditAction.ID, DeleteAction.ID);
+ }
+
+ public boolean triggerAction(JTree tree, String action) throws Exception {
+ if (action.equals(DeleteAction.ID)) {
+ deleteHostDescription(tree);
+ return true;
+ } else if (action.equals(EditAction.ID)) {
+ JOptionPane.showMessageDialog(null, "TODO");
+ return true;
+ }
+ return super.triggerAction(tree, action);
+ }
+
+ private void deleteHostDescription(JTree tree) throws PathNotFoundException, ServiceDescriptionRetrieveException {
+ if (askQuestion("Service description", "Are you sure that you want to remove the service description \""
+ + getServiceDescription().getId() + "\"?")) {
+ getRegistry().deleteServiceDescription(getServiceDescription().getId());
+ ((AbstractAiravataTreeNode) getParent()).refresh();
+ reloadTreeNode(tree, getParent());
+ }
+ }
+
+ @Override
+ public String getActionCaption(AbstractBrowserActionItem action) {
+ if (action.getID().equals(DeleteAction.ID)) {
+ return "Remove";
+ } else if (action.getID().equals(EditAction.ID)) {
+ return "Edit";
+ }
+ return action.getDefaultCaption();
+ }
+
+ @Override
+ public Icon getActionIcon(AbstractBrowserActionItem action) {
+ return null;
+ }
+
+ @Override
+ public String getActionDescription(AbstractBrowserActionItem action) {
+ return null;
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java Sat Oct 22 19:29:52 2011
@@ -19,93 +19,92 @@ import org.apache.airavata.xbaya.registr
import org.apache.airavata.xbaya.registrybrowser.model.ServiceDescriptions;
public class ServiceDescriptionsNode extends AbstractAiravataTreeNode {
- private ServiceDescriptions serviceDescriptions;
- public ServiceDescriptionsNode(ServiceDescriptions serviceDescriptions,TreeNode parent) {
- super(parent);
- setServiceDescriptions(serviceDescriptions);
- }
-
- @Override
- protected List<TreeNode> getChildren() {
- try {
- return getTreeNodeList(getServiceDescriptions().getDescriptions().toArray(), this);
- } catch (ServiceDescriptionRetrieveException e) {
- e.printStackTrace();
- return emptyList();
- }
- }
-
- @Override
- public String getCaption(boolean selected, boolean expanded, boolean leaf,
- boolean hasFocus) {
- return "Services";
- }
-
- @Override
- public Icon getIcon(boolean selected, boolean expanded, boolean leaf,
- boolean hasFocus) {
- return SwingUtil.createImageIcon("services.png");
- }
-
- public ServiceDescriptions getServiceDescriptions() {
- return serviceDescriptions;
- }
-
- public void setServiceDescriptions(ServiceDescriptions serviceDescriptions) {
- this.serviceDescriptions = serviceDescriptions;
- }
-
- @Override
- public List<String> getSupportedActions() {
- return Arrays.asList(AddAction.ID, RefreshAction.ID, DeleteAction.ID);
- }
-
- public boolean triggerAction(JTree tree,String action) throws Exception{
- if (action.equals(DeleteAction.ID)){
- deleteServiceDescription(tree);
- return true;
- }else if (action.equals(AddAction.ID)){
- ServiceDescriptionDialog serviceDescriptionDialog = new ServiceDescriptionDialog(getRegistry());
- serviceDescriptionDialog.open();
- if (serviceDescriptionDialog.isServiceCreated()) {
- refresh();
- reloadTreeNode(tree, this);
- }
- return true;
- }
- return super.triggerAction(tree, action);
- }
-
- private void deleteServiceDescription(JTree tree)
- throws Exception {
- if (askQuestion("Service descriptions", "Are you sure that you want to remove all service descriptions in this registry?")) {
- Registry registry = getRegistry();
- List<ServiceDescription> descriptions = getServiceDescriptions().getDescriptions();
- for (ServiceDescription descriptionWrap : descriptions) {
- registry.deleteServiceDescription(descriptionWrap.getId());
- }
- refresh();
- reloadTreeNode(tree, this);
- }
- }
-
- @Override
- public String getActionCaption(AbstractBrowserActionItem action) {
- if (action.getID().equals(DeleteAction.ID)){
- return "Remove all services";
- }else if (action.getID().equals(AddAction.ID)){
- return "New service...";
- }
- return action.getDefaultCaption();
- }
-
- @Override
- public Icon getActionIcon(AbstractBrowserActionItem action) {
- return null;
- }
-
- @Override
- public String getActionDescription(AbstractBrowserActionItem action) {
- return null;
- }
+ private ServiceDescriptions serviceDescriptions;
+
+ public ServiceDescriptionsNode(ServiceDescriptions serviceDescriptions, TreeNode parent) {
+ super(parent);
+ setServiceDescriptions(serviceDescriptions);
+ }
+
+ @Override
+ protected List<TreeNode> getChildren() {
+ try {
+ return getTreeNodeList(getServiceDescriptions().getDescriptions().toArray(), this);
+ } catch (ServiceDescriptionRetrieveException e) {
+ e.printStackTrace();
+ return emptyList();
+ }
+ }
+
+ @Override
+ public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
+ return "Services";
+ }
+
+ @Override
+ public Icon getIcon(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
+ return SwingUtil.createImageIcon("services.png");
+ }
+
+ public ServiceDescriptions getServiceDescriptions() {
+ return serviceDescriptions;
+ }
+
+ public void setServiceDescriptions(ServiceDescriptions serviceDescriptions) {
+ this.serviceDescriptions = serviceDescriptions;
+ }
+
+ @Override
+ public List<String> getSupportedActions() {
+ return Arrays.asList(AddAction.ID, RefreshAction.ID, DeleteAction.ID);
+ }
+
+ public boolean triggerAction(JTree tree, String action) throws Exception {
+ if (action.equals(DeleteAction.ID)) {
+ deleteServiceDescription(tree);
+ return true;
+ } else if (action.equals(AddAction.ID)) {
+ ServiceDescriptionDialog serviceDescriptionDialog = new ServiceDescriptionDialog(getRegistry());
+ serviceDescriptionDialog.open();
+ if (serviceDescriptionDialog.isServiceCreated()) {
+ refresh();
+ reloadTreeNode(tree, this);
+ }
+ return true;
+ }
+ return super.triggerAction(tree, action);
+ }
+
+ private void deleteServiceDescription(JTree tree) throws Exception {
+ if (askQuestion("Service descriptions",
+ "Are you sure that you want to remove all service descriptions in this registry?")) {
+ Registry registry = getRegistry();
+ List<ServiceDescription> descriptions = getServiceDescriptions().getDescriptions();
+ for (ServiceDescription descriptionWrap : descriptions) {
+ registry.deleteServiceDescription(descriptionWrap.getId());
+ }
+ refresh();
+ reloadTreeNode(tree, this);
+ }
+ }
+
+ @Override
+ public String getActionCaption(AbstractBrowserActionItem action) {
+ if (action.getID().equals(DeleteAction.ID)) {
+ return "Remove all services";
+ } else if (action.getID().equals(AddAction.ID)) {
+ return "New service...";
+ }
+ return action.getDefaultCaption();
+ }
+
+ @Override
+ public Icon getActionIcon(AbstractBrowserActionItem action) {
+ return null;
+ }
+
+ @Override
+ public String getActionDescription(AbstractBrowserActionItem action) {
+ return null;
+ }
}
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=1187758&r1=1187757&r2=1187758&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 Sat Oct 22 19:29:52 2011
@@ -18,81 +18,79 @@ import org.apache.airavata.xbaya.registr
import org.apache.airavata.xbaya.registrybrowser.model.XBayaWorkflow;
public class XBayaWorkflowNode extends AbstractAiravataTreeNode {
- private XBayaWorkflow xbayaWorkflow;
-
- public XBayaWorkflowNode(XBayaWorkflow xbayaWorkflow,TreeNode parent) {
- super(parent);
- setXbayaWorkflow(xbayaWorkflow);
- }
-
- @Override
- protected List<TreeNode> getChildren() {
- return emptyList();
- }
-
- @Override
- public String getCaption(boolean selected, boolean expanded, boolean leaf,
- boolean hasFocus) {
- return getXbayaWorkflow().getWorkflowName();
- }
-
- @Override
- public Icon getIcon(boolean selected, boolean expanded, boolean leaf,
- boolean hasFocus) {
- return SwingUtil.createImageIcon("workflow.png");
- }
-
- public XBayaWorkflow getXbayaWorkflow() {
- return xbayaWorkflow;
- }
-
- public void setXbayaWorkflow(XBayaWorkflow xbayaWorkflow) {
- this.xbayaWorkflow = xbayaWorkflow;
- }
-
- @Override
- public List<String> getSupportedActions() {
- return Arrays.asList(DeleteAction.ID);
- }
-
- public boolean triggerAction(JTree tree,String action) throws Exception{
- if (action.equals(DeleteAction.ID)){
- deleteHostDescription(tree);
- return true;
- }else if (action.equals(EditAction.ID)){
- JOptionPane.showMessageDialog(null, "TODO");
- //TODO
- return true;
- }
- return super.triggerAction(tree, action);
- }
-
- private void deleteHostDescription(JTree tree)
- throws PathNotFoundException, ServiceDescriptionRetrieveException {
- if (askQuestion("XBaya Workflow", "Are you sure that you want to remove the workflow \""+getXbayaWorkflow().getWorkflowName()+"\"?")) {
- getRegistry().deleteWorkflow(new QName(getXbayaWorkflow().getWorkflowName()), getRegistry().getUsername());
- ((AbstractAiravataTreeNode)getParent()).refresh();
- reloadTreeNode(tree, getParent());
- }
- }
-
- @Override
- public String getActionCaption(AbstractBrowserActionItem action) {
- if (action.getID().equals(DeleteAction.ID)){
- return "Remove";
- }else if (action.getID().equals(EditAction.ID)){
- return "Edit";
- }
- return action.getDefaultCaption();
- }
-
- @Override
- public Icon getActionIcon(AbstractBrowserActionItem action) {
- return null;
- }
-
- @Override
- public String getActionDescription(AbstractBrowserActionItem action) {
- return null;
- }
+ private XBayaWorkflow xbayaWorkflow;
+
+ public XBayaWorkflowNode(XBayaWorkflow xbayaWorkflow, TreeNode parent) {
+ super(parent);
+ setXbayaWorkflow(xbayaWorkflow);
+ }
+
+ @Override
+ protected List<TreeNode> getChildren() {
+ return emptyList();
+ }
+
+ @Override
+ public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
+ return getXbayaWorkflow().getWorkflowName();
+ }
+
+ @Override
+ public Icon getIcon(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
+ return SwingUtil.createImageIcon("workflow.png");
+ }
+
+ public XBayaWorkflow getXbayaWorkflow() {
+ return xbayaWorkflow;
+ }
+
+ public void setXbayaWorkflow(XBayaWorkflow xbayaWorkflow) {
+ this.xbayaWorkflow = xbayaWorkflow;
+ }
+
+ @Override
+ public List<String> getSupportedActions() {
+ return Arrays.asList(DeleteAction.ID);
+ }
+
+ public boolean triggerAction(JTree tree, String action) throws Exception {
+ if (action.equals(DeleteAction.ID)) {
+ deleteHostDescription(tree);
+ return true;
+ } else if (action.equals(EditAction.ID)) {
+ JOptionPane.showMessageDialog(null, "TODO");
+ // TODO
+ return true;
+ }
+ return super.triggerAction(tree, action);
+ }
+
+ private void deleteHostDescription(JTree tree) throws PathNotFoundException, ServiceDescriptionRetrieveException {
+ if (askQuestion("XBaya Workflow", "Are you sure that you want to remove the workflow \""
+ + getXbayaWorkflow().getWorkflowName() + "\"?")) {
+ getRegistry().deleteWorkflow(new QName(getXbayaWorkflow().getWorkflowName()), getRegistry().getUsername());
+ ((AbstractAiravataTreeNode) getParent()).refresh();
+ reloadTreeNode(tree, getParent());
+ }
+ }
+
+ @Override
+ public String getActionCaption(AbstractBrowserActionItem action) {
+ if (action.getID().equals(DeleteAction.ID)) {
+ return "Remove";
+ } else if (action.getID().equals(EditAction.ID)) {
+ return "Edit";
+ }
+ return action.getDefaultCaption();
+ }
+
+ @Override
+ public Icon getActionIcon(AbstractBrowserActionItem action) {
+ return null;
+ }
+
+ @Override
+ public String getActionDescription(AbstractBrowserActionItem action) {
+ return null;
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowsNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowsNode.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowsNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowsNode.java Sat Oct 22 19:29:52 2011
@@ -15,66 +15,65 @@ import org.apache.airavata.xbaya.registr
import org.apache.airavata.xbaya.registrybrowser.model.XBayaWorkflows;
public class XBayaWorkflowsNode extends AbstractAiravataTreeNode {
- private XBayaWorkflows xbayaWorkflows;
- public XBayaWorkflowsNode(XBayaWorkflows xbayaWorkflows,TreeNode parent) {
- super(parent);
- setXbayaWorkflows(xbayaWorkflows);
- }
-
- @Override
- protected List<TreeNode> getChildren() {
- return getTreeNodeList(getXbayaWorkflows().getWorkflows().toArray(), this);
- }
-
- @Override
- public String getCaption(boolean selected, boolean expanded, boolean leaf,
- boolean hasFocus) {
- return "Workflows";
- }
-
- @Override
- public Icon getIcon(boolean selected, boolean expanded, boolean leaf,
- boolean hasFocus) {
- return SwingUtil.createImageIcon("workflows.png");
- }
-
- public XBayaWorkflows getXbayaWorkflows() {
- return xbayaWorkflows;
- }
-
- public void setXbayaWorkflows(XBayaWorkflows xbayaWorkflows) {
- this.xbayaWorkflows = xbayaWorkflows;
- }
-
- @Override
- public List<String> getSupportedActions() {
- return Arrays.asList(AddAction.ID, RefreshAction.ID);
- }
-
- public boolean triggerAction(JTree tree,String action) throws Exception{
- if (action.equals(AddAction.ID)){
- JOptionPane.showMessageDialog(null, "TODO");
- //TODO
- return true;
- }
- return super.triggerAction(tree, action);
- }
-
- @Override
- public String getActionCaption(AbstractBrowserActionItem action) {
- if (action.getID().equals(AddAction.ID)){
- return "New workflow...";
- }
- return action.getDefaultCaption();
- }
-
- @Override
- public Icon getActionIcon(AbstractBrowserActionItem action) {
- return null;
- }
-
- @Override
- public String getActionDescription(AbstractBrowserActionItem action) {
- return null;
- }
+ private XBayaWorkflows xbayaWorkflows;
+
+ public XBayaWorkflowsNode(XBayaWorkflows xbayaWorkflows, TreeNode parent) {
+ super(parent);
+ setXbayaWorkflows(xbayaWorkflows);
+ }
+
+ @Override
+ protected List<TreeNode> getChildren() {
+ return getTreeNodeList(getXbayaWorkflows().getWorkflows().toArray(), this);
+ }
+
+ @Override
+ public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
+ return "Workflows";
+ }
+
+ @Override
+ public Icon getIcon(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
+ return SwingUtil.createImageIcon("workflows.png");
+ }
+
+ public XBayaWorkflows getXbayaWorkflows() {
+ return xbayaWorkflows;
+ }
+
+ public void setXbayaWorkflows(XBayaWorkflows xbayaWorkflows) {
+ this.xbayaWorkflows = xbayaWorkflows;
+ }
+
+ @Override
+ public List<String> getSupportedActions() {
+ return Arrays.asList(AddAction.ID, RefreshAction.ID);
+ }
+
+ public boolean triggerAction(JTree tree, String action) throws Exception {
+ if (action.equals(AddAction.ID)) {
+ JOptionPane.showMessageDialog(null, "TODO");
+ // TODO
+ return true;
+ }
+ return super.triggerAction(tree, action);
+ }
+
+ @Override
+ public String getActionCaption(AbstractBrowserActionItem action) {
+ if (action.getID().equals(AddAction.ID)) {
+ return "New workflow...";
+ }
+ return action.getDefaultCaption();
+ }
+
+ @Override
+ public Icon getActionIcon(AbstractBrowserActionItem action) {
+ return null;
+ }
+
+ @Override
+ public String getActionDescription(AbstractBrowserActionItem action) {
+ return null;
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java Sat Oct 22 19:29:52 2011
@@ -273,7 +273,6 @@ public class TavernaRunnerWindow {
}
}.start();
-
hide();
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELInvokeSetupForTesting.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELInvokeSetupForTesting.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELInvokeSetupForTesting.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELInvokeSetupForTesting.java Sat Oct 22 19:29:52 2011
@@ -207,7 +207,7 @@ public class GPELInvokeSetupForTesting e
this.dscTextField.setText(configuration.getDSCURL());
// XRegistry
-// this.xRegistryTextField.setText(configuration.getXRegistryURL());
+ // this.xRegistryTextField.setText(configuration.getXRegistryURL());
// GFac URL
this.gfacTextField.setText(configuration.getGFacURL());
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/HierarchicalWorkflowTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/HierarchicalWorkflowTestCase.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/HierarchicalWorkflowTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/HierarchicalWorkflowTestCase.java Sat Oct 22 19:29:52 2011
@@ -81,18 +81,18 @@ public class HierarchicalWorkflowTestCas
this.workflowCreator = new WorkflowCreator();
// GPEL Setup
-// X509Certificate[] trustedCertificates = XBayaSecurity.getTrustedCertificates();
-// MyProxyClient client = new MyProxyClient(this.configuration.getMyProxyServer(),
-// this.configuration.getMyProxyPort(), this.configuration.getMyProxyUsername(),
-// this.configuration.getMyProxyPassphrase(), this.configuration.getMyProxyLifetime());
-// client.load();
-// GSSCredential proxy = client.getProxy();
-// UserX509Credential credential = new UserX509Credential(proxy, trustedCertificates);
-// this.workflowClient = WorkflowEngineManager.getWorkflowClient(XBayaConstants.DEFAULT_GPEL_ENGINE_URL,
-// credential);
-//
-// this.gpelComponentRegistry = new GPELRegistry(null, WorkflowClient.WorkflowType.TEMPLATE, 100);
-// this.componentRegistry = new LocalComponentRegistry(XBayaPathConstants.WSDL_DIRECTORY);
+ // X509Certificate[] trustedCertificates = XBayaSecurity.getTrustedCertificates();
+ // MyProxyClient client = new MyProxyClient(this.configuration.getMyProxyServer(),
+ // this.configuration.getMyProxyPort(), this.configuration.getMyProxyUsername(),
+ // this.configuration.getMyProxyPassphrase(), this.configuration.getMyProxyLifetime());
+ // client.load();
+ // GSSCredential proxy = client.getProxy();
+ // UserX509Credential credential = new UserX509Credential(proxy, trustedCertificates);
+ // this.workflowClient = WorkflowEngineManager.getWorkflowClient(XBayaConstants.DEFAULT_GPEL_ENGINE_URL,
+ // credential);
+ //
+ // this.gpelComponentRegistry = new GPELRegistry(null, WorkflowClient.WorkflowType.TEMPLATE, 100);
+ // this.componentRegistry = new LocalComponentRegistry(XBayaPathConstants.WSDL_DIRECTORY);
}
/**
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MonitorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MonitorTestCase.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MonitorTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MonitorTestCase.java Sat Oct 22 19:29:52 2011
@@ -33,7 +33,6 @@ import org.apache.airavata.workflow.trac
import org.apache.airavata.wsmg.client.WseMsgBrokerClient;
import org.apache.axis2.addressing.EndpointReference;
-
public class MonitorTestCase extends XBayaTestCase {
private final static URI WORKFLOW_INSTANCE_ID = URI
@@ -51,7 +50,7 @@ public class MonitorTestCase extends XBa
URI.create("workflowID"), URI.create("serviceID"), "workflowNodeID", new Integer(1));
notifier.publishURL(context, "title", "http://www.google.com", "descriptionAndAnnotation");
- notifier.workflowInitialized(context,WORKFLOW_INSTANCE_ID);
+ notifier.workflowInitialized(context, WORKFLOW_INSTANCE_ID);
DataObjImpl dataObj = new DataObjImpl(URI.create("test"), new ArrayList<URI>());
notifier.dataConsumed(context, dataObj, "description");
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/ResourceNotifierTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/ResourceNotifierTestCase.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/ResourceNotifierTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/ResourceNotifierTestCase.java Sat Oct 22 19:29:52 2011
@@ -24,7 +24,6 @@ package org.apache.airavata.xbaya.test;
import java.net.URI;
import java.util.Properties;
-
import org.apache.airavata.workflow.tracking.Notifier;
import org.apache.airavata.workflow.tracking.NotifierFactory;
import org.apache.airavata.workflow.tracking.common.WorkflowTrackingContext;
@@ -46,15 +45,15 @@ public class ResourceNotifierTestCase ex
URI initiatorServiceID = URI.create("Adder_add");
String initiatorWorkflowNodeID1 = "Adder_add";
Integer workflowTimeStep = new Integer(0);
- WorkflowTrackingContext context = notifier.createTrackingContext(new Properties(),brokerEPR.toString(),
- initiatorWorkflowID,initiatorServiceID,initiatorWorkflowNodeID1,workflowTimeStep);
- notifier.resourceMapping(context, "resource1.example.com", 1,null);
+ WorkflowTrackingContext context = notifier.createTrackingContext(new Properties(), brokerEPR.toString(),
+ initiatorWorkflowID, initiatorServiceID, initiatorWorkflowNodeID1, workflowTimeStep);
+ notifier.resourceMapping(context, "resource1.example.com", 1, null);
notifier.resourceMapping(context, "resource2.example.com", 2);
notifier.resourceMapping(context, "resource3.example.com", 3);
String initiatorWorkflowNodeID2 = "Adder_add_2";
- context = notifier.createTrackingContext(new Properties(),brokerEPR.toString(),
- initiatorWorkflowID,initiatorServiceID,initiatorWorkflowNodeID2,workflowTimeStep);
+ context = notifier.createTrackingContext(new Properties(), brokerEPR.toString(), initiatorWorkflowID,
+ initiatorServiceID, initiatorWorkflowNodeID2, workflowTimeStep);
notifier.resourceMapping(context, "resource.example.com", 0);
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java Sat Oct 22 19:29:52 2011
@@ -86,8 +86,6 @@ import xsul.xwsif_runtime.WSIFRuntime;
import xsul5.wsdl.WsdlDefinitions;
import xsul5.wsdl.WsdlResolver;
-
-
public class WorkflowModificationTestCase extends XBayaTestCase {
private static final Logger logger = LoggerFactory.getLogger(WorkflowModificationTestCase.class);
@@ -302,7 +300,8 @@ public class WorkflowModificationTestCas
InvocationEntity serviceEntity = notifier.createEntity(serviceWorkflowID, serviceServiceID, serviceNodeID,
serviceTimestep);
EndpointReference epr = new EndpointReference(this.configuration.getBrokerURL().toASCIIString());
- WorkflowTrackingContext workflowContext = notifier.createTrackingContext(new Properties(),this.configuration.getBrokerURL().toASCIIString(),myWorkflowID,myServiceID,myNodeID,myTimestep);
+ WorkflowTrackingContext workflowContext = notifier.createTrackingContext(new Properties(), this.configuration
+ .getBrokerURL().toASCIIString(), myWorkflowID, myServiceID, myNodeID, myTimestep);
XmlElement inputBody = (XmlElement) ((XmlElement) inputMessage).getParent();
XmlObject inputBodyObject = XBeansUtil.xmlElementToXmlObject(inputBody);
@@ -319,7 +318,7 @@ public class WorkflowModificationTestCas
XmlElement outputBody = (XmlElement) ((XmlElement) outputMessage).getParent();
XmlObject outputBodyObject = XBeansUtil.xmlElementToXmlObject(outputBody);
- notifier.receivedResult(workflowContext,context, null, outputBodyObject);
+ notifier.receivedResult(workflowContext, context, null, outputBodyObject);
}
}
@@ -360,7 +359,7 @@ public class WorkflowModificationTestCas
}
/**
- *
+ *
* @param topic
* the topic to which this message was sent. This can also be retrieved from the messageObj XMlObject
* directly after typecasting.
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/jython/JythonLibraryTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/jython/JythonLibraryTest.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/jython/JythonLibraryTest.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/jython/JythonLibraryTest.java Sat Oct 22 19:29:52 2011
@@ -99,8 +99,7 @@ public class JythonLibraryTest extends T
Object output2 = adderInvoker2.getOutput("z");
logger.info("output2 = " + output2);
- Invoker multiplierInvoker = new GenericInvoker(null, multiplierWSDLLoc, "multiplier", null, null,
- notifier);
+ Invoker multiplierInvoker = new GenericInvoker(null, multiplierWSDLLoc, "multiplier", null, null, notifier);
multiplierInvoker.setup();
multiplierInvoker.setOperation("multiply");
multiplierInvoker.setInput("x", output1);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/ServiceNotificationSender.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/ServiceNotificationSender.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/ServiceNotificationSender.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/ServiceNotificationSender.java Sat Oct 22 19:29:52 2011
@@ -44,8 +44,6 @@ import xsul.soap11_util.Soap11Util;
import xsul.soap12_util.Soap12Util;
import xsul.xbeans_util.XBeansUtil;
-
-
public class ServiceNotificationSender {
private final static Logger logger = LoggerFactory.getLogger(ServiceNotificationSender.class);
@@ -123,7 +121,8 @@ public class ServiceNotificationSender {
this.initiator = this.notifier.createEntity(workflowID, serviceID, nodeID, timeStep);
this.receiver = this.notifier.createEntity(workflowID, serviceID, nodeID, timeStep);
EndpointReference epr = new EndpointReference(leadContext.getEventSink().getAddress().toString());
- this.context = this.notifier.createTrackingContext(new Properties(),epr.toString(),workflowID,serviceID,nodeID,timeStep);
+ this.context = this.notifier.createTrackingContext(new Properties(), epr.toString(), workflowID, serviceID,
+ nodeID, timeStep);
}
/**
@@ -135,7 +134,7 @@ public class ServiceNotificationSender {
XmlElement soapHeader = soapEnvelope.element(null, XmlConstants.S_HEADER);
XmlObject headerObject = XBeansUtil.xmlElementToXmlObject(soapHeader);
XmlObject bodyObject = XBeansUtil.xmlElementToXmlObject(soapBody);
- this.invocationContext = this.notifier.serviceInvoked(this.context,this.initiator, headerObject, bodyObject,
+ this.invocationContext = this.notifier.serviceInvoked(this.context, this.initiator, headerObject, bodyObject,
INVOKED_MESSAGE);
}
@@ -153,7 +152,8 @@ public class ServiceNotificationSender {
headerObject = XBeansUtil.xmlElementToXmlObject(soapHeader);
}
XmlObject bodyObject = XBeansUtil.xmlElementToXmlObject(soapBody);
- this.notifier.sendingResult(this.context,this.invocationContext, headerObject, bodyObject, SENDING_RESULT_MESSAGE);
+ this.notifier.sendingResult(this.context, this.invocationContext, headerObject, bodyObject,
+ SENDING_RESULT_MESSAGE);
} catch (RuntimeException e) {
logger.error(e.getMessage(), e);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java Sat Oct 22 19:29:52 2011
@@ -50,15 +50,15 @@ public class XBayaUtil {
XBayaConfiguration configuration = engine.getConfiguration();
Workflow workflow = engine.getWorkflow();
- LeadContextHeader leadContext = buildLeadContextHeader(workflow, configuration,
- monitorConfiguration, nodeId, resourceMapping);
+ LeadContextHeader leadContext = buildLeadContextHeader(workflow, configuration, monitorConfiguration, nodeId,
+ resourceMapping);
return leadContext;
}
/**
- *
+ *
* @param workflow
* @param configuration
* @param monitorConfiguration
@@ -83,14 +83,13 @@ public class XBayaUtil {
leadContext.setNodeId(nodeId);
leadContext.setTimeStep("1");
-// leadContext.setXRegistryUrl(new URI(configuration.getXRegistryURL().toString() + "?wsdl"));
+ // leadContext.setXRegistryUrl(new URI(configuration.getXRegistryURL().toString() + "?wsdl"));
if (resourceMapping != null) {
leadContext.setResourceMapping(resourceMapping);
}
return leadContext;
-
}
public static boolean isURLExists(String URLName) {
@@ -115,13 +114,13 @@ public class XBayaUtil {
}
}
- public static boolean acquireJCRRegistry(XBayaEngine engine){
+ public static boolean acquireJCRRegistry(XBayaEngine engine) {
XBayaConfiguration configuration = engine.getConfiguration();
- if (configuration.getJcrComponentRegistry()==null){
- JCRRegistryWindow window = new JCRRegistryWindow(engine);
- window.show();
- }
- return engine.getConfiguration().getJcrComponentRegistry()!=null;
+ if (configuration.getJcrComponentRegistry() == null) {
+ JCRRegistryWindow window = new JCRRegistryWindow(engine);
+ window.show();
+ }
+ return engine.getConfiguration().getJcrComponentRegistry() != null;
}
}
\ No newline at end of file