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/19 16:54:47 UTC
svn commit: r1186251 - in /incubator/airavata/trunk/modules/xbaya-gui/src:
main/java/org/apache/airavata/xbaya/
main/java/org/apache/airavata/xbaya/appwrapper/
main/java/org/apache/airavata/xbaya/component/registry/
main/java/org/apache/airavata/xbaya/...
Author: lahiru
Date: Wed Oct 19 14:54:46 2011
New Revision: 1186251
URL: http://svn.apache.org/viewvc?rev=1186251&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AIRAVATA-150 .. not yet completely fixed.
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/GpelWorkflowClient.java
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/XBayaConstants.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/RegisterApplicationsMenu.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistry.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryLoaderWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.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/interpretor/HeaderConstants.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterInvoker.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorStub.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/resources/services.xml
incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/GpelWorkflowClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/GpelWorkflowClient.java?rev=1186251&r1=1186250&r2=1186251&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/GpelWorkflowClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/GpelWorkflowClient.java Wed Oct 19 14:54:46 2011
@@ -62,181 +62,183 @@ import xsul.ws_addressing.WsaEndpointRef
import xsul5.wsdl.WsdlDefinitions;
-public class GpelWorkflowClient implements Callback {
-
- /**
- *
- * @param workflowFileName
- * @return
- * @throws FileNotFoundException
- * @throws IOException
- * @throws GraphException
- * @throws ComponentException
- * @throws WorkflowEngineException
- */
- public static Workflow getWorkflow(String workflowFileName) throws FileNotFoundException, IOException,
- GraphException, ComponentException, WorkflowEngineException {
- BufferedReader in = new BufferedReader(new FileReader(workflowFileName));
- String wf = "";
- String line = in.readLine();
- while (line != null) {
- wf += line;
- line = in.readLine();
- }
-
- Workflow workflow = new Workflow(wf);
- BPELScript bpel = new BPELScript(workflow);
- bpel.create(BPELScriptType.GPEL);
- workflow.setGpelProcess(bpel.getGpelProcess());
- workflow.setWorkflowWSDL(bpel.getWorkflowWSDL().getWsdlDefinitions());
- return workflow;
-
- }
-
- /**
- *
- * @param userName
- * @param password
- * @param topic
- * @param workflow
- * @param inputs
- * @throws WorkflowEngineException
- * @throws ComponentException
- * @throws GraphException
- */
-
- public static void invoke(String userName, String password, String topic, Workflow workflow,
- List<WSComponentPort> inputs) throws WorkflowEngineException, ComponentException, GraphException {
- invoke(userName, password, topic, workflow, inputs, null);
-
- }
-
- /**
- * @param userName
- * @param password
- * @param topic
- * @param workflow
- * @param inputs
- * @param leadContextHeader
- * @throws WorkflowEngineException
- * @throws ComponentException
- * @throws GraphException
- */
- public static void invoke(String userName, String password, String topic, Workflow workflow,
- List<WSComponentPort> inputs, LeadContextHeader leadContextHeader) throws WorkflowEngineException,
- ComponentException, GraphException {
-
- for (Iterator iterator = inputs.iterator(); iterator.hasNext();) {
- WSComponentPort componentPort = (WSComponentPort) iterator.next();
- Object value = parseValue(componentPort, componentPort.getDefaultValue());
- if (value == null) {
- return;
- }
- componentPort.setValue(value);
- }
-
- GSSCredential proxy = SecurityUtil.getGSSCredential(userName, password, XBayaConstants.DEFAULT_MYPROXY_SERVER);
- UserX509Credential credential = new UserX509Credential(proxy, XBayaSecurity.getTrustedCertificates());
-
- GPELClient client = new GPELClient(XBayaConstants.DEFAULT_GPEL_ENGINE_URL, credential);
- client.deploy(workflow, false);
- GcInstance instance = client.instantiate(workflow, XBayaConstants.DEFAULT_DSC_URL, topic);
- WsdlDefinitions wsdl = client.start(instance);
-
- LEADWorkflowInvoker invoker = null;
- try {
- if (leadContextHeader == null) {
- leadContextHeader = getLeadContextHeader(topic, workflow, proxy, instance);
- }
-
- URI messageBoxURL = XBayaConstants.DEFAULT_MESSAGE_BOX_URL;
-
- // create an invoker with LEAD Context
- GsiInvoker secureInvoker = new GsiInvoker(proxy, XBayaSecurity.getTrustedCertificates());
-
- invoker = new LEADWorkflowInvoker(wsdl, leadContextHeader, messageBoxURL, secureInvoker);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
-
- invoker.setInputs(inputs);
-
- final LEADWorkflowInvoker workflowInvoker = invoker;
-
- new Thread() {
- @Override
- public synchronized void run() {
- try {
- boolean success = workflowInvoker.invoke();
- if (success) {
- XmlConstants.BUILDER.serializeToString(workflowInvoker.getOutputMessage());
- } else {
- XmlConstants.BUILDER.serializeToString(workflowInvoker.getFaultMessage());
- }
- } catch (XBayaException e) {
- throw new RuntimeException(e);
- }
- }
- }.start();
-
- }
-
- /**
- * @param topic
- * @param workflow
- * @param proxy
- * @param instance
- * @return
- * @throws GSSException
- * @throws URISyntaxException
- */
- public static LeadContextHeader getLeadContextHeader(String topic, Workflow workflow, GSSCredential proxy,
- GcInstance instance) throws GSSException, URISyntaxException {
- LeadContextHeader leadContextHeader = new LeadContextHeader(topic, proxy.getName().toString());
-
- leadContextHeader.setXRegistryUrl(new URI(XBayaConstants.DEFAULT_XREGISTRY_URL.toString() + "?wsdl"));
- leadContextHeader.setGfacUrl(new URI(XBayaConstants.DEFAULT_GFAC_URL.toString() + "?wsdl"));
- leadContextHeader.setDscUrl(new URI("https://tyr09.cs.indiana.edu:25443/"));
- // The followings might overwrite some variables.
- leadContextHeader.setWorkflowTemplateId(new URI(workflow.getGPELTemplateID().toString()));
- leadContextHeader.setWorkflowInstanceId(new URI(instance.getInstanceId().toString()));
- leadContextHeader.setUserDn(proxy.getName().toString());
- EndpointReference eventSink = WseMsgBrokerClient.createEndpointReference(
- XBayaConstants.DEFAULT_BROKER_URL.toString(), topic);
- WsaEndpointReference eprReference = new WsaEndpointReference(URI.create(eventSink.getAddress()));
- leadContextHeader.setEventSink(eprReference);
- return leadContextHeader;
- }
-
- private static Object parseValue(WSComponentPort input, String valueString) {
- String name = input.getName();
- if (false) {
- // Some user wants to pass empty strings, so this check is disabled.
- if (valueString.length() == 0) {
- throw new RuntimeException("Input parameter, " + name + ", cannot be empty");
- }
- }
- QName type = input.getType();
- Object value;
- if (LEADTypes.isKnownType(type)) {
- // TODO check the type.
- value = valueString;
- } else {
- try {
- value = XMLUtil.stringToXmlElement3(valueString);
- } catch (RuntimeException e) {
- throw e;
- }
- }
- return value;
- }
-
- /**
- * @see edu.indiana.extreme.lead.workflow_tracking.client.Callback#deliverMessage(java.lang.String,
- * edu.indiana.extreme.lead.workflow_tracking.client.NotificationType, org.apache.xmlbeans.XmlObject)
- */
- public void deliverMessage(String arg0, NotificationType arg1, XmlObject arg2) {
- System.out.println(arg2.toString());
-
- }
+public class GpelWorkflowClient {
+// implements
+//} Callback {
+//
+// /**
+// *
+// * @param workflowFileName
+// * @return
+// * @throws FileNotFoundException
+// * @throws IOException
+// * @throws GraphException
+// * @throws ComponentException
+// * @throws WorkflowEngineException
+// */
+// public static Workflow getWorkflow(String workflowFileName) throws FileNotFoundException, IOException,
+// GraphException, ComponentException, WorkflowEngineException {
+// BufferedReader in = new BufferedReader(new FileReader(workflowFileName));
+// String wf = "";
+// String line = in.readLine();
+// while (line != null) {
+// wf += line;
+// line = in.readLine();
+// }
+//
+// Workflow workflow = new Workflow(wf);
+// BPELScript bpel = new BPELScript(workflow);
+// bpel.create(BPELScriptType.GPEL);
+// workflow.setGpelProcess(bpel.getGpelProcess());
+// workflow.setWorkflowWSDL(bpel.getWorkflowWSDL().getWsdlDefinitions());
+// return workflow;
+//
+// }
+//
+// /**
+// *
+// * @param userName
+// * @param password
+// * @param topic
+// * @param workflow
+// * @param inputs
+// * @throws WorkflowEngineException
+// * @throws ComponentException
+// * @throws GraphException
+// */
+//
+// public static void invoke(String userName, String password, String topic, Workflow workflow,
+// List<WSComponentPort> inputs) throws WorkflowEngineException, ComponentException, GraphException {
+// invoke(userName, password, topic, workflow, inputs, null);
+//
+// }
+//
+// /**
+// * @param userName
+// * @param password
+// * @param topic
+// * @param workflow
+// * @param inputs
+// * @param leadContextHeader
+// * @throws WorkflowEngineException
+// * @throws ComponentException
+// * @throws GraphException
+// */
+// public static void invoke(String userName, String password, String topic, Workflow workflow,
+// List<WSComponentPort> inputs, LeadContextHeader leadContextHeader) throws WorkflowEngineException,
+// ComponentException, GraphException {
+//
+// for (Iterator iterator = inputs.iterator(); iterator.hasNext();) {
+// WSComponentPort componentPort = (WSComponentPort) iterator.next();
+// Object value = parseValue(componentPort, componentPort.getDefaultValue());
+// if (value == null) {
+// return;
+// }
+// componentPort.setValue(value);
+// }
+//
+// GSSCredential proxy = SecurityUtil.getGSSCredential(userName, password, XBayaConstants.DEFAULT_MYPROXY_SERVER);
+// UserX509Credential credential = new UserX509Credential(proxy, XBayaSecurity.getTrustedCertificates());
+//
+// GPELClient client = new GPELClient(XBayaConstants.DEFAULT_GPEL_ENGINE_URL, credential);
+// client.deploy(workflow, false);
+// GcInstance instance = client.instantiate(workflow, XBayaConstants.DEFAULT_DSC_URL, topic);
+// WsdlDefinitions wsdl = client.start(instance);
+//
+// LEADWorkflowInvoker invoker = null;
+// try {
+// if (leadContextHeader == null) {
+// leadContextHeader = getLeadContextHeader(topic, workflow, proxy, instance);
+// }
+//
+// URI messageBoxURL = XBayaConstants.DEFAULT_MESSAGE_BOX_URL;
+//
+// // create an invoker with LEAD Context
+// GsiInvoker secureInvoker = new GsiInvoker(proxy, XBayaSecurity.getTrustedCertificates());
+//
+// invoker = new LEADWorkflowInvoker(wsdl, leadContextHeader, messageBoxURL, secureInvoker);
+// } catch (Exception e) {
+// throw new RuntimeException(e);
+// }
+//
+// invoker.setInputs(inputs);
+//
+// final LEADWorkflowInvoker workflowInvoker = invoker;
+//
+// new Thread() {
+// @Override
+// public synchronized void run() {
+// try {
+// boolean success = workflowInvoker.invoke();
+// if (success) {
+// XmlConstants.BUILDER.serializeToString(workflowInvoker.getOutputMessage());
+// } else {
+// XmlConstants.BUILDER.serializeToString(workflowInvoker.getFaultMessage());
+// }
+// } catch (XBayaException e) {
+// throw new RuntimeException(e);
+// }
+// }
+// }.start();
+//
+// }
+//
+// /**
+// * @param topic
+// * @param workflow
+// * @param proxy
+// * @param instance
+// * @return
+// * @throws GSSException
+// * @throws URISyntaxException
+// */
+// public static LeadContextHeader getLeadContextHeader(String topic, Workflow workflow, GSSCredential proxy,
+// GcInstance instance) throws GSSException, URISyntaxException {
+// LeadContextHeader leadContextHeader = new LeadContextHeader(topic, proxy.getName().toString());
+//
+// leadContextHeader.setXRegistryUrl(new URI(XBayaConstants.DEFAULT_XREGISTRY_URL.toString() + "?wsdl"));
+// leadContextHeader.setGfacUrl(new URI(XBayaConstants.DEFAULT_GFAC_URL.toString() + "?wsdl"));
+// leadContextHeader.setDscUrl(new URI("https://tyr09.cs.indiana.edu:25443/"));
+// // The followings might overwrite some variables.
+// leadContextHeader.setWorkflowTemplateId(new URI(workflow.getGPELTemplateID().toString()));
+// leadContextHeader.setWorkflowInstanceId(new URI(instance.getInstanceId().toString()));
+// leadContextHeader.setUserDn(proxy.getName().toString());
+// EndpointReference eventSink = WseMsgBrokerClient.createEndpointReference(
+// XBayaConstants.DEFAULT_BROKER_URL.toString(), topic);
+// WsaEndpointReference eprReference = new WsaEndpointReference(URI.create(eventSink.getAddress()));
+// leadContextHeader.setEventSink(eprReference);
+// return leadContextHeader;
+// }
+//
+// private static Object parseValue(WSComponentPort input, String valueString) {
+// String name = input.getName();
+// if (false) {
+// // Some user wants to pass empty strings, so this check is disabled.
+// if (valueString.length() == 0) {
+// throw new RuntimeException("Input parameter, " + name + ", cannot be empty");
+// }
+// }
+// QName type = input.getType();
+// Object value;
+// if (LEADTypes.isKnownType(type)) {
+// // TODO check the type.
+// value = valueString;
+// } else {
+// try {
+// value = XMLUtil.stringToXmlElement3(valueString);
+// } catch (RuntimeException e) {
+// throw e;
+// }
+// }
+// return value;
+// }
+//
+// /**
+// * @see edu.indiana.extreme.lead.workflow_tracking.client.Callback#deliverMessage(java.lang.String,
+// * edu.indiana.extreme.lead.workflow_tracking.client.NotificationType, org.apache.xmlbeans.XmlObject)
+// */
+// public void deliverMessage(String arg0, NotificationType arg1, XmlObject arg2) {
+// System.out.println(arg2.toString());
+//
+// }
}
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=1186251&r1=1186250&r2=1186251&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 Wed Oct 19 14:54:46 2011
@@ -771,6 +771,10 @@ public class XBayaConfiguration extends
}
}
+ public URI getRegistryURL() {
+ return registryURL;
+ }
+
public void setRegistryURL(URI registryURL) {
this.registryURL = registryURL;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java?rev=1186251&r1=1186250&r2=1186251&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java Wed Oct 19 14:54:46 2011
@@ -57,10 +57,6 @@ public class XBayaConstants {
*/
public static final URI DEFAULT_GFAC_URL = URI.create("http://localhost:8080/axis2/services/GFacService");
- /**
- * DEFAULT_XREGISTRY_URL
- */
- public static final URI DEFAULT_XREGISTRY_URL = URI.create("https://gw56.quarry.iu.teragrid.org:19443/xregistry");
/**
* DEFAULT_TOPIC
@@ -163,7 +159,7 @@ public class XBayaConstants {
* WorkflowInterpreter URL
*/
public static final URI DEFAULT_WORKFLOW_INTERPRETER_URL = URI
- .create("http://ogceportal.iu.teragrid.org:19444/axis2/services/WorkflowInterpretor?wsdl");
+ .create("http://localhost:8080/axis2/services/XBayaService?wsdl");
/**
*
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/RegisterApplicationsMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/RegisterApplicationsMenu.java?rev=1186251&r1=1186250&r2=1186251&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/RegisterApplicationsMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/RegisterApplicationsMenu.java Wed Oct 19 14:54:46 2011
@@ -28,9 +28,11 @@ import javax.swing.AbstractAction;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
+import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.component.gui.JCRRegistryWindow;
import org.apache.airavata.xbaya.myproxy.gui.MyProxyChecker;
+import org.apache.airavata.xbaya.util.XBayaUtil;
public class RegisterApplicationsMenu {
@@ -86,13 +88,7 @@ public class RegisterApplicationsMenu {
this.registerApplicationsMenu.add(this.searchAndEdit);
}
- private boolean acquireJCRRegistry(){
- if (engine.getConfiguration().getJcrComponentRegistry()==null){
- JCRRegistryWindow window = new JCRRegistryWindow(this.engine);
- window.show();
- }
- return engine.getConfiguration().getJcrComponentRegistry()!=null;
- }
+
private void createRegisterThroughFile() {
@@ -136,7 +132,7 @@ public class RegisterApplicationsMenu {
@Override
public void actionPerformed(ActionEvent e) {
- if (acquireJCRRegistry()) {
+ if (XBayaUtil.acquireJCRRegistry(engine)) {
try {
ServiceDescriptionDialog serviceDescriptionDialog = new ServiceDescriptionDialog(
RegisterApplicationsMenu.this.engine);
@@ -159,7 +155,7 @@ public class RegisterApplicationsMenu {
@Override
public void actionPerformed(ActionEvent e) {
- if (acquireJCRRegistry()) {
+ if (XBayaUtil.acquireJCRRegistry(engine)) {
try {
ApplicationDescriptionDialog applicationDescriptionDialog = new ApplicationDescriptionDialog(
RegisterApplicationsMenu.this.engine);
@@ -182,7 +178,7 @@ public class RegisterApplicationsMenu {
@Override
public void actionPerformed(ActionEvent e) {
- if (acquireJCRRegistry()) {
+ if (XBayaUtil.acquireJCRRegistry(engine)) {
try {
HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(
RegisterApplicationsMenu.this.engine);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistry.java?rev=1186251&r1=1186250&r2=1186251&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistry.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistry.java Wed Oct 19 14:54:46 2011
@@ -28,7 +28,7 @@ public abstract class ComponentRegistry
/**
* Returns a ComponentTree. This method should refresh the tree even if subclass uses the cache.
*
- * @return The ComponentTree
+ * @return The ComponentTreeR
* @throws ComponentRegistryException
*/
public abstract ComponentTreeNode getComponentTree() throws ComponentRegistryException;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryLoaderWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryLoaderWindow.java?rev=1186251&r1=1186250&r2=1186251&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryLoaderWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryLoaderWindow.java Wed Oct 19 14:54:46 2011
@@ -44,6 +44,7 @@ import org.apache.airavata.xbaya.gui.Err
import org.apache.airavata.xbaya.gui.GridPanel;
import org.apache.airavata.xbaya.gui.XBayaDialog;
import org.apache.airavata.xbaya.gui.XbayaEnhancedList;
+import org.apache.airavata.xbaya.util.XBayaUtil;
import org.apache.airavata.xbaya.wf.Workflow;
import org.apache.airavata.xbaya.registry.RegistryAccesser;
@@ -67,7 +68,9 @@ public class RegistryLoaderWindow {
*/
public RegistryLoaderWindow(XBayaEngine engine) {
this.engine = engine;
- initGUI();
+ if(XBayaUtil.acquireJCRRegistry(this.engine)){
+ initGUI();
+ }
}
/**
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java?rev=1186251&r1=1186250&r2=1186251&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java Wed Oct 19 14:54:46 2011
@@ -56,6 +56,7 @@ 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.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -82,7 +83,7 @@ public class WorkflowInterpreterLaunchWi
private XBayaTextField workflowInterpreterTextField;
- private XBayaTextField xRegistryTextField;
+ private XBayaTextField RegistryTextField;
private XBayaTextField gfacTextField;
@@ -96,7 +97,9 @@ public class WorkflowInterpreterLaunchWi
*/
public WorkflowInterpreterLaunchWindow(XBayaEngine engine) {
this.engine = engine;
- initGUI();
+ if (XBayaUtil.acquireJCRRegistry(engine)) {
+ initGUI();
+ }
}
/**
@@ -152,12 +155,12 @@ public class WorkflowInterpreterLaunchWi
this.workflowInterpreterTextField.setText(XBayaConstants.DEFAULT_WORKFLOW_INTERPRETER_URL);
}
-// URI registryURL = config.getXRegistryURL();
-// if (null != registryURL) {
-// this.xRegistryTextField.setText(registryURL.toString());
-// } else {
-// this.xRegistryTextField.setText(XBayaConstants.DEFAULT_XREGISTRY_URL);
-// }
+ org.apache.airavata.registry.api.Registry registryURL = config.getJcrComponentRegistry().getRegistry();
+ if (null != registryURL) {
+ this.RegistryTextField.setText(config.getRegistryURL());
+ } else {
+ this.RegistryTextField.setText(XBayaConstants.REGISTRY_URL.toASCIIString());
+ }
this.dialog.show();
}
@@ -180,8 +183,8 @@ public class WorkflowInterpreterLaunchWi
this.workflowInterpreterTextField = new XBayaTextField();
XBayaLabel workflowInterpreterLabel = new XBayaLabel("Workflow Interpreter URL",
this.workflowInterpreterTextField);
- this.xRegistryTextField = new XBayaTextField();
- XBayaLabel xRegistryLabel = new XBayaLabel("XRegistry URL", this.xRegistryTextField);
+ this.RegistryTextField = new XBayaTextField();
+ XBayaLabel RegistryLabel = new XBayaLabel("Registry URL", this.RegistryTextField);
this.gfacTextField = new XBayaTextField();
XBayaLabel gfacLabel = new XBayaLabel("GFac URL", this.gfacTextField);
@@ -190,8 +193,8 @@ public class WorkflowInterpreterLaunchWi
infoPanel.add(this.topicTextField);
infoPanel.add(workflowInterpreterLabel);
infoPanel.add(this.workflowInterpreterTextField);
- infoPanel.add(xRegistryLabel);
- infoPanel.add(this.xRegistryTextField);
+ infoPanel.add(RegistryLabel);
+ infoPanel.add(this.RegistryTextField);
infoPanel.add(gfacLabel);
infoPanel.add(this.gfacTextField);
@@ -269,15 +272,6 @@ public class WorkflowInterpreterLaunchWi
}
}
-// final String xregistryUrl = this.xRegistryTextField.getText();
-// if (null != xregistryUrl && !"".equals(xregistryUrl)) {
-// try {
-//// this.engine.getConfiguration().setXRegistryURL(new URI(xregistryUrl));
-// } catch (URISyntaxException e) {
-// this.engine.getErrorWindow().error(e);
-// }
-// }
-
final String gFacUrl = this.gfacTextField.getText();
if (null != gFacUrl && !"".equals(gFacUrl)) {
try {
@@ -312,12 +306,12 @@ public class WorkflowInterpreterLaunchWi
configurations[0].setName(HeaderConstants.HEADER_ELEMENT_GFAC);
configurations[0].setValue(engine.getConfiguration().getGFacURL().toString());
configurations[1] = new NameValue();
- configurations[1].setName(HeaderConstants.HEADER_ELEMENT_XREGISTRY);
-// if (null == engine.getConfiguration().getXRegistryURL()) {
-// configurations[1].setValue(XBayaConstants.DEFAULT_XREGISTRY_URL.toString());
-// } else {
-// configurations[1].setValue(engine.getConfiguration().getXRegistryURL().toString());
-// }
+ configurations[1].setName(HeaderConstants.HEADER_ELEMENT_REGISTRY);
+ if (null == engine.getConfiguration().getRegistryURL()) {
+ configurations[1].setValue(XBayaConstants.REGISTRY_URL.toString());
+ } else {
+ configurations[1].setValue(engine.getConfiguration().getRegistryURL().toString());
+ }
configurations[2] = new NameValue();
configurations[2].setName(HeaderConstants.HEADER_ELEMENT_PROXYSERVER);
configurations[2].setValue(engine.getConfiguration().getMyProxyServer());
@@ -344,8 +338,8 @@ public class WorkflowInterpreterLaunchWi
inputNameVals[i].setValue(value);
}
- String myProxyUsername = engine.getMyProxyClient().getUsername();
- String myProxyPass = engine.getMyProxyClient().getPassphrase();
+ String myProxyUsername = engine.getConfiguration().getRegigstryUserName();
+ String myProxyPass = engine.getConfiguration().getRegistryPassphrase();
stub.launchWorkflow(workflow.toXMLText(), topicString, myProxyPass, myProxyUsername, inputNameVals,
configurations);
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=1186251&r1=1186250&r2=1186251&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 Wed Oct 19 14:54:46 2011
@@ -109,7 +109,9 @@ public class DynamicWorkflowRunnerWindow
*/
public DynamicWorkflowRunnerWindow(XBayaEngine engine) {
this.engine = engine;
- initGUI();
+ if(XBayaUtil.acquireJCRRegistry(this.engine)){
+ initGUI();
+ }
}
/**
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/HeaderConstants.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/HeaderConstants.java?rev=1186251&r1=1186250&r2=1186251&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/HeaderConstants.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/HeaderConstants.java Wed Oct 19 14:54:46 2011
@@ -24,7 +24,7 @@ package org.apache.airavata.xbaya.interp
public interface HeaderConstants {
public static final String HEADER_ELEMENT_GFAC = "gfac";
- public static final String HEADER_ELEMENT_XREGISTRY = "xregistry";
+ public static final String HEADER_ELEMENT_REGISTRY = "registry";
public static final String HEADER_ELEMENT_PROXYSERVER = "proxyserver";
public static final String HEADER_ELEMENT_MSGBOX = "msgbox";
public static final String HEADER_ELEMENT_DSC = "dsc";
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterInvoker.java?rev=1186251&r1=1186250&r2=1186251&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterInvoker.java Wed Oct 19 14:54:46 2011
@@ -33,46 +33,47 @@ import org.apache.airavata.xbaya.ode.ODE
import org.apache.airavata.xbaya.wf.Workflow;
import org.apache.axis2.AxisFault;
-public class WorkflowInterpreterInvoker implements HeaderConstants {
-
- public void invoke(Workflow workflow, String serverURL, String userName, String password, String topic)
- throws AxisFault, RemoteException, ComponentException {
-
- String workflowAsString = workflow.toXMLText();
- NameValue[] configurations = new NameValue[6];
- configurations[0] = new NameValue();
- configurations[0].setName(HEADER_ELEMENT_GFAC);
- configurations[0].setValue(XBayaConstants.DEFAULT_GFAC_URL.toString());
- configurations[1] = new NameValue();
- configurations[1].setName(HEADER_ELEMENT_XREGISTRY);
- configurations[1].setValue(XBayaConstants.DEFAULT_XREGISTRY_URL.toString());
- configurations[2] = new NameValue();
- configurations[2].setName(HEADER_ELEMENT_PROXYSERVER);
- configurations[2].setValue(XBayaConstants.DEFAULT_MYPROXY_SERVER);
-
- configurations[3] = new NameValue();
- configurations[3].setName(HEADER_ELEMENT_MSGBOX);
- configurations[3].setValue(XBayaConstants.DEFAULT_MESSAGE_BOX_URL.toString());
-
- configurations[4] = new NameValue();
- configurations[4].setName(HEADER_ELEMENT_DSC);
- configurations[4].setValue(XBayaConstants.DEFAULT_DSC_URL.toString());
-
- configurations[5] = new NameValue();
- configurations[5].setName(HEADER_ELEMENT_BROKER);
- configurations[5].setValue(XBayaConstants.DEFAULT_BROKER_URL.toString());
-
- LinkedList<NameValue> nameValPairsList = new LinkedList<NameValue>();
- List<InputNode> wfInputs = new ODEClient().getInputNodes(workflow);
- for (InputNode node : wfInputs) {
- NameValue nameValue = new NameValue();
- nameValue.setName(node.getName());
- nameValue.setValue(node.getDefaultValue().toString());
- }
-
- new WorkflowInterpretorStub(serverURL).launchWorkflow(workflowAsString, topic, password, userName,
- nameValPairsList.toArray(new NameValue[0]), configurations);
-
- }
+public class WorkflowInterpreterInvoker{
+// implements HeaderConstants {
+//
+// public void invoke(Workflow workflow, String serverURL, String userName, String password, String topic)
+// throws AxisFault, RemoteException, ComponentException {
+//
+// String workflowAsString = workflow.toXMLText();
+// NameValue[] configurations = new NameValue[6];
+// configurations[0] = new NameValue();
+// configurations[0].setName(HEADER_ELEMENT_GFAC);
+// configurations[0].setValue(XBayaConstants.DEFAULT_GFAC_URL.toString());
+// configurations[1] = new NameValue();
+// configurations[1].setName(HEADER_ELEMENT_REGISTRY);
+// configurations[1].setValue(XBayaConstants.DEFAULT_XREGISTRY_URL.toString());
+// configurations[2] = new NameValue();
+// configurations[2].setName(HEADER_ELEMENT_PROXYSERVER);
+// configurations[2].setValue(XBayaConstants.DEFAULT_MYPROXY_SERVER);
+//
+// configurations[3] = new NameValue();
+// configurations[3].setName(HEADER_ELEMENT_MSGBOX);
+// configurations[3].setValue(XBayaConstants.DEFAULT_MESSAGE_BOX_URL.toString());
+//
+// configurations[4] = new NameValue();
+// configurations[4].setName(HEADER_ELEMENT_DSC);
+// configurations[4].setValue(XBayaConstants.DEFAULT_DSC_URL.toString());
+//
+// configurations[5] = new NameValue();
+// configurations[5].setName(HEADER_ELEMENT_BROKER);
+// configurations[5].setValue(XBayaConstants.DEFAULT_BROKER_URL.toString());
+//
+// LinkedList<NameValue> nameValPairsList = new LinkedList<NameValue>();
+// List<InputNode> wfInputs = new ODEClient().getInputNodes(workflow);
+// for (InputNode node : wfInputs) {
+// NameValue nameValue = new NameValue();
+// nameValue.setName(node.getName());
+// nameValue.setValue(node.getDefaultValue().toString());
+// }
+//
+// new WorkflowInterpretorStub(serverURL).launchWorkflow(workflowAsString, topic, password, userName,
+// nameValPairsList.toArray(new NameValue[0]), configurations);
+//
+// }
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorStub.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorStub.java?rev=1186251&r1=1186250&r2=1186251&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorStub.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorStub.java Wed Oct 19 14:54:46 2011
@@ -57,7 +57,7 @@ public class WorkflowInterpretorStub ext
__operation = new org.apache.axis2.description.OutInAxisOperation();
- __operation.setName(new javax.xml.namespace.QName("http://xbaya.extreme.indiana.edu", "launchWorkflow"));
+ __operation.setName(new javax.xml.namespace.QName("http://interpretor.xbaya.airavata.apache.org", "launchWorkflow"));
_service.addOperation(__operation);
_operations[0] = __operation;
@@ -163,7 +163,7 @@ public class WorkflowInterpretorStub ext
inputs5,
configurations6,
dummyWrappedType,
- optimizeContent(new javax.xml.namespace.QName("http://xbaya.extreme.indiana.edu", "launchWorkflow")));
+ optimizeContent(new javax.xml.namespace.QName("http://interpretor.xbaya.airavata.apache.org", "launchWorkflow")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -273,7 +273,7 @@ public class WorkflowInterpretorStub ext
WorkflowInterpretorStub.LaunchWorkflow dummyWrappedType = null;
env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), workflowAsString1, topic2,
password3, username4, inputs5, configurations6, dummyWrappedType,
- optimizeContent(new javax.xml.namespace.QName("http://xbaya.extreme.indiana.edu", "launchWorkflow")));
+ optimizeContent(new javax.xml.namespace.QName("http://interpretor.xbaya.airavata.apache.org", "launchWorkflow")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -417,11 +417,11 @@ public class WorkflowInterpretorStub ext
public static class NameValue implements org.apache.axis2.databinding.ADBBean {
/*
* This type was generated from the piece of schema that had name = NameValue Namespace URI =
- * http://xbaya.extreme.indiana.edu Namespace Prefix = ns1
+ * http://interpretor.xbaya.airavata.apache.org Namespace Prefix = ns1
*/
private static java.lang.String generatePrefix(java.lang.String namespace) {
- if (namespace.equals("http://xbaya.extreme.indiana.edu")) {
+ if (namespace.equals("http://interpretor.xbaya.airavata.apache.org")) {
return "ns1";
}
return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -582,7 +582,7 @@ public class WorkflowInterpretorStub ext
if (serializeType) {
- java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://xbaya.extreme.indiana.edu");
+ java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://interpretor.xbaya.airavata.apache.org");
if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) {
writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix
+ ":NameValue", xmlWriter);
@@ -961,7 +961,7 @@ public class WorkflowInterpretorStub ext
public static java.lang.Object getTypeObject(java.lang.String namespaceURI, java.lang.String typeName,
javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
- if ("http://xbaya.extreme.indiana.edu".equals(namespaceURI) && "NameValue".equals(typeName)) {
+ if ("http://interpretor.xbaya.airavata.apache.org".equals(namespaceURI) && "NameValue".equals(typeName)) {
return NameValue.Factory.parse(reader);
@@ -975,10 +975,10 @@ public class WorkflowInterpretorStub ext
public static class LaunchWorkflowResponse implements org.apache.axis2.databinding.ADBBean {
public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
- "http://xbaya.extreme.indiana.edu", "launchWorkflowResponse", "ns1");
+ "http://interpretor.xbaya.airavata.apache.org", "launchWorkflowResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
- if (namespace.equals("http://xbaya.extreme.indiana.edu")) {
+ if (namespace.equals("http://interpretor.xbaya.airavata.apache.org")) {
return "ns1";
}
return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -1097,7 +1097,7 @@ public class WorkflowInterpretorStub ext
if (serializeType) {
- java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://xbaya.extreme.indiana.edu");
+ java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://interpretor.xbaya.airavata.apache.org");
if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) {
writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix
+ ":launchWorkflowResponse", xmlWriter);
@@ -1411,10 +1411,10 @@ public class WorkflowInterpretorStub ext
public static class LaunchWorkflow implements org.apache.axis2.databinding.ADBBean {
public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName(
- "http://xbaya.extreme.indiana.edu", "launchWorkflow", "ns1");
+ "http://interpretor.xbaya.airavata.apache.org", "launchWorkflow", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
- if (namespace.equals("http://xbaya.extreme.indiana.edu")) {
+ if (namespace.equals("http://interpretor.xbaya.airavata.apache.org")) {
return "ns1";
}
return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
@@ -1794,7 +1794,7 @@ public class WorkflowInterpretorStub ext
if (serializeType) {
- java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://xbaya.extreme.indiana.edu");
+ java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://interpretor.xbaya.airavata.apache.org");
if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) {
writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix
+ ":launchWorkflow", xmlWriter);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java?rev=1186251&r1=1186250&r2=1186251&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java Wed Oct 19 14:54:46 2011
@@ -40,6 +40,7 @@ import org.apache.airavata.xbaya.experim
import org.apache.airavata.xbaya.graph.GraphException;
import org.apache.airavata.xbaya.jython.script.JythonScript;
import org.apache.airavata.common.utils.StringUtil;
+import org.apache.airavata.xbaya.util.XBayaUtil;
import org.apache.airavata.xbaya.wf.Workflow;
import org.ietf.jgss.GSSCredential;
import org.xmlpull.infoset.XmlElement;
@@ -105,7 +106,7 @@ public class RegistryAccesser {
* Save workflow in to Registry
*/
public void saveWorkflow() {
-
+ if(XBayaUtil.acquireJCRRegistry(this.engine)){
try {
Workflow workflow = this.engine.getWorkflow();
@@ -164,6 +165,7 @@ public class RegistryAccesser {
} catch (Exception e) {
this.engine.getErrorWindow().error(e.getMessage(), e);
}
+ }
}
/**
@@ -172,8 +174,10 @@ public class RegistryAccesser {
* @throws RepositoryException
*/
public void deleteOGCEWorkflow(QName workflowTemplateId) throws RepositoryException {
+ if(XBayaUtil.acquireJCRRegistry(this.engine)){
Registry registry = connectToRegistry();
registry.deleteWorkflow(workflowTemplateId,this.engine.getConfiguration().getRegigstryUserName());
+ }
}
/**
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=1186251&r1=1186250&r2=1186251&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 Wed Oct 19 14:54:46 2011
@@ -29,6 +29,7 @@ import java.net.URL;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.component.gui.JCRRegistryWindow;
import org.apache.airavata.xbaya.lead.LeadContextHeaderHelper;
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
import org.apache.airavata.xbaya.wf.Workflow;
@@ -114,4 +115,13 @@ public class XBayaUtil {
}
}
+ 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;
+ }
+
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/resources/services.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/resources/services.xml?rev=1186251&r1=1186250&r2=1186251&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/resources/services.xml (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/resources/services.xml Wed Oct 19 14:54:46 2011
@@ -15,6 +15,10 @@
<serviceGroup>
<service name="XBayaService">
<Description>XBaya Service</Description>
+ <messageReceivers>
+ <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only" class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver" />
+ <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
+ </messageReceivers>
<parameter locked="true" name="ServiceClass">org.apache.airavata.xbaya.interpretor.WorkflowInterpretorSkeleton</parameter>
</service>
</serviceGroup>
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java?rev=1186251&r1=1186250&r2=1186251&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java Wed Oct 19 14:54:46 2011
@@ -46,8 +46,8 @@ public class WorkflowTest implements Hea
configurations[0].setName(HEADER_ELEMENT_GFAC);
configurations[0].setValue(XBayaConstants.DEFAULT_GFAC_URL.toString());
configurations[1] = new NameValue();
- configurations[1].setName(HEADER_ELEMENT_XREGISTRY);
- configurations[1].setValue(XBayaConstants.DEFAULT_XREGISTRY_URL.toString());
+ configurations[1].setName(HEADER_ELEMENT_REGISTRY);
+ configurations[1].setValue(XBayaConstants.REGISTRY_URL.toASCIIString());
configurations[2] = new NameValue();
configurations[2].setName(HEADER_ELEMENT_PROXYSERVER);
configurations[2].setValue(XBayaConstants.DEFAULT_MYPROXY_SERVER);