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/09/22 20:04:41 UTC
svn commit: r1174293 - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
./ component/gui/ component/registry/ graph/dynamic/gui/ util/
Author: lahiru
Date: Thu Sep 22 18:04:41 2011
New Revision: 1174293
URL: http://svn.apache.org/viewvc?rev=1174293&view=rev
Log:
related work for https://issues.apache.org/jira/browse/AIRAVATA-117.
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/JCRRegistryWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/NewJCRRegistryUserDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java?rev=1174293&r1=1174292&r2=1174293&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java Thu Sep 22 18:04:41 2011
@@ -26,6 +26,7 @@ import java.net.URI;
import java.util.ArrayList;
import java.util.List;
+import org.apache.airavata.xbaya.component.registry.JCRComponentRegistry;
import org.apache.airavata.xbaya.file.XBayaPathConstants;
import xsul.lead.LeadDeploymentConfig;
@@ -51,6 +52,7 @@ public class XBayaConfiguration {
private URI gpelInstanceID = null;
+ private JCRComponentRegistry jcrComponentRegistry = null;
// ODE
private String odeURL = XBayaConstants.DEFAULT_ODE_URL;
@@ -745,4 +747,11 @@ public class XBayaConfiguration {
return this.closeOnExit;
}
+ public JCRComponentRegistry getJcrComponentRegistry() {
+ return jcrComponentRegistry;
+ }
+
+ public void setJcrComponentRegistry(JCRComponentRegistry jcrComponentRegistry) {
+ this.jcrComponentRegistry = jcrComponentRegistry;
+ }
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/JCRRegistryWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/JCRRegistryWindow.java?rev=1174293&r1=1174292&r2=1174293&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/JCRRegistryWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/JCRRegistryWindow.java Thu Sep 22 18:04:41 2011
@@ -95,7 +95,7 @@ public class JCRRegistryWindow {
}
JCRComponentRegistry registry = new JCRComponentRegistry(url, username, password);
-
+ this.engine.getConfiguration().setJcrComponentRegistry(registry);
hide();
this.loader.load(registry);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/NewJCRRegistryUserDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/NewJCRRegistryUserDialog.java?rev=1174293&r1=1174292&r2=1174293&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/NewJCRRegistryUserDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/NewJCRRegistryUserDialog.java Thu Sep 22 18:04:41 2011
@@ -89,7 +89,7 @@ public class NewJCRRegistryUserDialog {
}
JCRComponentRegistry registry = new JCRComponentRegistry(url, username, password);
-
+ this.engine.getConfiguration().setJcrComponentRegistry(registry);
hide();
this.loader.load(registry);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java?rev=1174293&r1=1174292&r2=1174293&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java Thu Sep 22 18:04:41 2011
@@ -40,7 +40,7 @@ public class JCRComponentRegistry extend
map.put("org.apache.jackrabbit.repository.uri", url.toString());
registerUserManagers();
this.registry = new JCRRegistry("org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory", username,
- password, map);
+ password, map);
}
/**
@@ -78,4 +78,8 @@ public class JCRComponentRegistry extend
return NAME;
}
+ public List<String> getGFacURLList(){
+ return this.registry.getGFacDescriptorList();
+ }
+
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java?rev=1174293&r1=1174292&r2=1174293&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java Thu Sep 22 18:04:41 2011
@@ -31,12 +31,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.UUID;
-import javax.swing.AbstractAction;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
+import javax.swing.*;
import javax.xml.namespace.QName;
import org.apache.airavata.common.utils.StringUtil;
@@ -61,8 +56,10 @@ import org.apache.airavata.xbaya.jython.
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
import org.apache.airavata.xbaya.monitor.MonitorException;
import org.apache.airavata.xbaya.ode.ODEClient;
+import org.apache.airavata.xbaya.util.XBayaUtil;
import org.apache.airavata.xbaya.wf.Workflow;
import org.apache.airavata.xbaya.xregistry.XRegistryAccesser;
+import org.jcp.xml.dsig.internal.dom.Utils;
import org.ogce.schemas.gfac.beans.HostBean;
import org.xmlpull.infoset.XmlElement;
import org.xmlpull.v1.builder.XmlInfosetBuilder;
@@ -94,7 +91,7 @@ public class DynamicWorkflowRunnerWindow
private XBayaTextField xRegistryTextField;
- private XBayaTextField gfacTextField;
+ private JComboBox gfacUrlListField;
private JCheckBox interactChkBox;
@@ -116,7 +113,15 @@ public class DynamicWorkflowRunnerWindow
*/
public void show() {
this.workflow = this.engine.getWorkflow();
-
+ List<String> urlList = this.engine.getConfiguration().getJcrComponentRegistry().getGFacURLList();
+ //When run xbaya continously urls can be repeating, so first remove everything and then add
+ this.gfacUrlListField.removeAllItems();
+ for(String gfacUrl:urlList){
+ if(XBayaUtil.isURLExists(gfacUrl + "?wsdl")){
+ this.gfacUrlListField.addItem(gfacUrl);
+ }
+ }
+ this.gfacUrlListField.setEditable(true);
MonitorConfiguration notifConfig = this.engine.getMonitor().getConfiguration();
if (notifConfig.getBrokerURL() == null) {
this.engine.getErrorWindow().error(ErrorMessages.BROKER_URL_NOT_SET_ERROR);
@@ -166,7 +171,7 @@ public class DynamicWorkflowRunnerWindow
this.topicTextField.setText(UUID.randomUUID().toString());
XBayaConfiguration config = this.engine.getConfiguration();
- this.gfacTextField.setText(config.getGFacURL().toString());
+// this.gfacTextField.setText(config.getGFacURL().toString());
URI registryURL = config.getXRegistryURL();
if (null != registryURL) {
this.xRegistryTextField.setText(registryURL.toString());
@@ -218,9 +223,8 @@ public class DynamicWorkflowRunnerWindow
XBayaLabel topicLabel = new XBayaLabel("Notification topic", this.topicTextField);
this.xRegistryTextField = new XBayaTextField();
XBayaLabel xRegistryLabel = new XBayaLabel("XRegistry URL", this.xRegistryTextField);
- this.gfacTextField = new XBayaTextField();
- XBayaLabel gfacLabel = new XBayaLabel("GFac URL", this.gfacTextField);
-
+ this.gfacUrlListField = new JComboBox();
+ XBayaLabel gfacURLLabel = new XBayaLabel("GFac URL", this.gfacUrlListField);
this.interactChkBox = new JCheckBox();
this.interactChkBox.setSelected(false);
XBayaLabel interactLabel = new XBayaLabel("Enable Service Interactions", this.interactChkBox);
@@ -232,8 +236,10 @@ public class DynamicWorkflowRunnerWindow
infoPanel.add(this.topicTextField);
infoPanel.add(xRegistryLabel);
infoPanel.add(this.xRegistryTextField);
- infoPanel.add(gfacLabel);
- infoPanel.add(this.gfacTextField);
+// infoPanel.add(gfacLabel);
+// infoPanel.add(this.gfacTextField);
+ infoPanel.add(gfacURLLabel);
+ infoPanel.add(this.gfacUrlListField);
infoPanel.add(interactLabel);
infoPanel.add(this.interactChkBox);
@@ -321,7 +327,7 @@ public class DynamicWorkflowRunnerWindow
}
}
- final String gFacUrl = this.gfacTextField.getText();
+ final String gFacUrl = (String)this.gfacUrlListField.getSelectedItem();
if (null != gFacUrl && !"".equals(gFacUrl)) {
try {
this.engine.getConfiguration().setGFacURL(new URI(gFacUrl));
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=1174293&r1=1174292&r2=1174293&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 Thu Sep 22 18:04:41 2011
@@ -21,8 +21,8 @@
package org.apache.airavata.xbaya.util;
-import java.net.URI;
-import java.net.URISyntaxException;
+import java.io.InputStream;
+import java.net.*;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaEngine;
@@ -84,7 +84,30 @@ public class XBayaUtil {
leadContext.setResourceMapping(resourceMapping);
}
return leadContext;
+
+
}
+ public static boolean isURLExists(String URLName) {
+ try {
+ if (!URLName.toUpperCase().contains("HTTP"))
+ URLName = "http://" + URLName;
+ URL url = new URL(URLName);
+ System.setProperty("java.net.useSystemProxies", "true");
+ HttpURLConnection urlConn = (HttpURLConnection) url.openConnection();
+ urlConn.setConnectTimeout(9000);
+ urlConn.setReadTimeout(9000);
+ urlConn.connect();
+ if (HttpURLConnection.HTTP_OK == urlConn.getResponseCode())
+ return true;
+ else
+ return false;
+ } catch (SocketTimeoutException e) {
+ return false;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
+ }
}
\ No newline at end of file