You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2012/11/21 20:39:59 UTC
svn commit: r1412246 [2/4] - in /airavata/trunk: ./ modules/airavata-client/
modules/airavata-client/src/main/java/org/apache/airavata/client/
modules/airavata-client/src/main/java/org/apache/airavata/client/impl/
modules/distribution/ modules/distribu...
Modified: airavata/trunk/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java Wed Nov 21 19:39:38 2012
@@ -21,20 +21,11 @@
package org.apache.airavata.workflow.model.component.registry;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.airavata.common.exception.AiravataConfigurationException;
+import org.apache.airavata.client.AiravataClientUtils;
+import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.registry.api.AiravataRegistryConnectionDataProvider;
import org.apache.airavata.registry.api.AiravataRegistryFactory;
-import org.apache.airavata.registry.api.AiravataUser;
-import org.apache.airavata.registry.api.Gateway;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.registry.api.util.RegistryConstants;
import org.apache.airavata.registry.api.util.WebServiceUtil;
@@ -43,16 +34,27 @@ import org.apache.airavata.workflow.mode
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.jcr.RepositoryException;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
public class JCRComponentRegistry extends ComponentRegistry {
private static final Logger log = LoggerFactory.getLogger(JCRComponentRegistry.class);
private static final String NAME = "Application Services";
public static final String REPOSITORY_PROPERTIES = "airavata-server.properties";
- private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
public JCRComponentRegistry(String username, String password) throws RegistryException {
String gatewayName=null;
+ String registryURL = null;
AiravataRegistryConnectionDataProvider provider = AiravataRegistryFactory.getRegistryConnectionDataProvider();
if (provider==null){
URL configURL = this.getClass().getClassLoader().getResource(REPOSITORY_PROPERTIES);
@@ -66,6 +68,7 @@ public class JCRComponentRegistry extend
}
}
gatewayName = (String)properties.get(RegistryConstants.KEY_DEFAULT_GATEWAY_ID);
+ registryURL = properties.getProperty(RegistryConstants.KEY_DEFAULT_REGISTRY_URL);
} catch (MalformedURLException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
} catch (IOException e) {
@@ -78,6 +81,7 @@ public class JCRComponentRegistry extend
username=provider.getValue(RegistryConstants.KEY_DEFAULT_REGISTRY_USER).toString();
}
gatewayName = provider.getValue(RegistryConstants.KEY_DEFAULT_GATEWAY_ID).toString();
+ registryURL = provider.getValue(RegistryConstants.KEY_DEFAULT_REGISTRY_URL).toString();
} catch (Exception e) {
log.warn(e.getMessage());
}
@@ -89,10 +93,16 @@ public class JCRComponentRegistry extend
gatewayName="default";
}
try {
- this.registry = AiravataRegistryFactory.getRegistry(new Gateway(gatewayName),
- new AiravataUser(username));
- } catch (AiravataConfigurationException e) {
- log.error("Error initializing AiravataRegistry2");
+ URI baseUri = new URI(registryURL);
+ //TODO callback class
+ PasswordCallBackImpl passwordCallBack = new PasswordCallBackImpl(username, password);
+ this.airavataAPI = AiravataClientUtils.getAPI(baseUri, gatewayName, username, passwordCallBack);
+ } catch (URISyntaxException e) {
+ log.error("Error initializing Airavata Client");
+ } catch (RepositoryException e) {
+ log.error("Error initializing Airavata Client");
+ } catch (MalformedURLException e) {
+ log.error("Error initializing Airavata Client");
}
}
@@ -119,7 +129,7 @@ public class JCRComponentRegistry extend
public List<ComponentReference> getComponentReferenceList() {
List<ComponentReference> tree = new ArrayList<ComponentReference>();
try {
- List<ServiceDescription> services = this.registry.getServiceDescriptors();
+ List<ServiceDescription> services = this.airavataAPI.getApplicationManager().getAllServiceDescriptions();
for (ServiceDescription serviceDescription : services) {
String serviceName = serviceDescription.getType().getName();
JCRComponentReference jcr = new JCRComponentReference(serviceName,
@@ -151,7 +161,7 @@ public class JCRComponentRegistry extend
// return registry.saveDeploymentDescription(service, host, app);
// }
- public AiravataRegistry2 getRegistry() {
- return registry;
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
}
}
\ No newline at end of file
Added: airavata/trunk/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/PasswordCallBackImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/PasswordCallBackImpl.java?rev=1412246&view=auto
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/PasswordCallBackImpl.java (added)
+++ airavata/trunk/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/PasswordCallBackImpl.java Wed Nov 21 19:39:38 2012
@@ -0,0 +1,40 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.workflow.model.component.registry;
+
+import org.apache.airavata.registry.api.PasswordCallback;
+
+public class PasswordCallBackImpl implements PasswordCallback {
+
+ private String userName;
+ private String password;
+
+ public PasswordCallBackImpl(String userName, String password) {
+ this.userName = userName;
+ this.password = password;
+ }
+
+ @Override
+ public String getPassword(String s) {
+ return password;
+ }
+}
Modified: airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml Wed Nov 21 19:39:38 2012
@@ -203,11 +203,11 @@
</dependency>
<!-- AIRAVATA modules -->
- <dependency>
+ <!--dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-message-broker</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency-->
<!--dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-registry-api</artifactId>
@@ -232,11 +232,11 @@
<artifactId>airavata-gfac-schema-utils</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-gfac-core</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Modified: airavata/trunk/modules/ws-messenger/message-monitor/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/message-monitor/pom.xml?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/message-monitor/pom.xml (original)
+++ airavata/trunk/modules/ws-messenger/message-monitor/pom.xml Wed Nov 21 19:39:38 2012
@@ -34,11 +34,11 @@
<artifactId>airavata-messenger-commons</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-registry-api</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-common-utils</artifactId>
Modified: airavata/trunk/modules/ws-messenger/messagebox/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/pom.xml?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/pom.xml (original)
+++ airavata/trunk/modules/ws-messenger/messagebox/pom.xml Wed Nov 21 19:39:38 2012
@@ -30,7 +30,7 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-api</artifactId>
+ <artifactId>airavata-client-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java Wed Nov 21 19:39:38 2012
@@ -21,17 +21,19 @@
package org.apache.airavata.wsmg.msgbox;
-import java.io.File;
import java.net.URI;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+import org.apache.airavata.client.AiravataClientUtils;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.common.utils.ServiceUtils;
-import org.apache.airavata.registry.api.AbstractRegistryUpdaterThread;
-import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.util.RegistryUtils;
+import org.apache.airavata.client.tools.PeriodicExecutorThread;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.util.RegistryUtils;
import org.apache.airavata.wsmg.commons.config.ConfigurationManager;
import org.apache.airavata.wsmg.commons.util.Axis2Utils;
import org.apache.airavata.wsmg.msgbox.Storage.MsgBoxStorage;
@@ -69,9 +71,13 @@ public class MsgBoxServiceLifeCycle impl
public void shutDown(ConfigurationContext configurationcontext, AxisService axisservice) {
logger.info("Message box shutting down");
- AiravataRegistry2 registry = (AiravataRegistry2) configurationcontext.getProperty(JCR_REGISTRY);
+ AiravataAPI registry = (AiravataAPI) configurationcontext.getProperty(JCR_REGISTRY);
if (registry != null && thread != null) {
- registry.unsetMessageBoxURI();
+ try {
+ registry.getAiravataManager().unsetMessageBoxURI();
+ } catch (AiravataAPIInvocationException e) {
+ e.printStackTrace();
+ }
thread.interrupt();
try {
thread.join();
@@ -108,15 +114,21 @@ public class MsgBoxServiceLifeCycle impl
} catch (InterruptedException e1) {
e1.printStackTrace();
}
- AiravataRegistry2 registry = RegistryUtils.getRegistryFromConfig(url);
+
+ String userName = properties.getProperty("registry.user");
+ String password = properties.getProperty("registry.password");
+ String regURL = properties.getProperty("registry.jdbc.url");
+ URI baseUri = new URI(regURL);
+
+ AiravataAPI airavataAPI = AiravataClientUtils.getAPI(baseUri, userName, password);
String localAddress = ServiceUtils.generateServiceURLFromConfigurationContext(context, MESSAGE_BOX_SERVICE_NAME);
logger.debug("MESSAGE BOX SERVICE_ADDRESS:" + localAddress);
context.setProperty(SERVICE_URL,new URI(localAddress));
- context.setProperty(JCR_REGISTRY,registry);
+ context.setProperty(JCR_REGISTRY,airavataAPI);
/*
* Heart beat message to registry
*/
- thread = new MsgBoxURLRegisterThread(registry, context);
+ thread = new MsgBoxURLRegisterThread(airavataAPI, context);
thread.start();
} catch (Exception e) {
logger.error(e.getMessage(), e);
@@ -167,18 +179,18 @@ public class MsgBoxServiceLifeCycle impl
return interval;
}
- class MsgBoxURLRegisterThread extends AbstractRegistryUpdaterThread {
+ class MsgBoxURLRegisterThread extends PeriodicExecutorThread {
private ConfigurationContext context = null;
- MsgBoxURLRegisterThread(AiravataRegistry2 registry, ConfigurationContext context) {
+ MsgBoxURLRegisterThread(AiravataAPI registry, ConfigurationContext context) {
super(registry);
this.context = context;
}
@Override
- protected void updateRegistry(AiravataRegistry2 registry) throws Exception {
+ protected void updateRegistry(AiravataAPI registry) throws Exception {
URI localAddress = (URI) this.context.getProperty(SERVICE_URL);
- registry.setMessageBoxURI(localAddress);
+ registry.getAiravataManager().setMessageBoxURI(localAddress);
logger.info("Updated Workflow Interpreter service URL in to Repository");
}
}
Modified: airavata/trunk/modules/ws-messenger/messagebroker/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/pom.xml?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/pom.xml (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/pom.xml Wed Nov 21 19:39:38 2012
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-api</artifactId>
+ <artifactId>airavata-client-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java Wed Nov 21 19:39:38 2012
@@ -29,10 +29,13 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+import org.apache.airavata.client.AiravataClientUtils;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
+import org.apache.airavata.client.tools.PeriodicExecutorThread;
import org.apache.airavata.common.utils.ServiceUtils;
-import org.apache.airavata.registry.api.AbstractRegistryUpdaterThread;
-import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.util.RegistryUtils;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.util.RegistryUtils;
import org.apache.airavata.wsmg.broker.handler.PublishedMessageHandler;
import org.apache.airavata.wsmg.broker.subscription.SubscriptionManager;
import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
@@ -96,11 +99,14 @@ public class BrokerServiceLifeCycle impl
synchronized (initialized) {
if (initialized) {
initialized = false;
- AiravataRegistry2 registry = (AiravataRegistry2) configurationcontext
- .getProperty(JCR_REGISTRY);
+ AiravataAPI registry = (AiravataAPI) configurationcontext.getProperty(JCR_REGISTRY);
if(registry != null && thread != null){
- registry.unsetEventingURI();
- thread.interrupt();
+ try {
+ registry.getAiravataManager().unsetEventingURI();
+ } catch (AiravataAPIInvocationException e) {
+ e.printStackTrace();
+ }
+ thread.interrupt();
try {
thread.join();
} catch (InterruptedException e) {
@@ -148,7 +154,13 @@ public class BrokerServiceLifeCycle impl
} catch (InterruptedException e1) {
e1.printStackTrace();
}
- AiravataRegistry2 registry = RegistryUtils.getRegistryFromConfig(url);
+
+ String userName = properties.getProperty("registry.user");
+ String password = properties.getProperty("registry.password");
+ String regURL = properties.getProperty("registry.jdbc.url");
+ URI baseUri = new URI(regURL);
+
+ AiravataAPI airavataAPI = AiravataClientUtils.getAPI(baseUri, userName, password);
String localAddress = ServiceUtils
.generateServiceURLFromConfigurationContext(
context,
@@ -157,11 +169,11 @@ public class BrokerServiceLifeCycle impl
+ localAddress);
context.setProperty(SERVICE_URL, new URI(
localAddress));
- context.setProperty(JCR_REGISTRY, registry);
+ context.setProperty(JCR_REGISTRY, airavataAPI);
/*
* Heart beat message to registry
*/
- thread = new MsgBrokerURLRegisterThread(registry, context);
+ thread = new MsgBrokerURLRegisterThread(airavataAPI, context);
thread.start();
} catch (Exception e) {
log.error(e.getMessage(), e);
@@ -300,19 +312,23 @@ public class BrokerServiceLifeCycle impl
log.info(initedmethod + " sending method inited");
}
- class MsgBrokerURLRegisterThread extends AbstractRegistryUpdaterThread {
+ class MsgBrokerURLRegisterThread extends PeriodicExecutorThread {
private ConfigurationContext context = null;
- public MsgBrokerURLRegisterThread(AiravataRegistry2 registry, ConfigurationContext context) {
+ public MsgBrokerURLRegisterThread(AiravataAPI registry, ConfigurationContext context) {
super(registry);
this.context = context;
}
- protected void updateRegistry(AiravataRegistry2 registry) {
- URI localAddress = (URI) this.context.getProperty(SERVICE_URL);
- registry.setEventingURI(localAddress);
+ protected void updateRegistry(AiravataAPI registry) {
+ try {
+ URI localAddress = (URI) this.context.getProperty(SERVICE_URL);
+ registry.getAiravataManager().setEventingURI(localAddress);
+ } catch (AiravataAPIInvocationException e) {
+ e.printStackTrace();
+ }
log.info("Updated Workflow Interpreter service URL in to Repository");
}
Modified: airavata/trunk/modules/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/xbaya-gui/pom.xml Wed Nov 21 19:39:38 2012
@@ -324,12 +324,6 @@
<artifactId>airavata-message-broker</artifactId>
<version>${project.version}</version>
</dependency>
- <!--dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-client-api</artifactId>
- <version>${project.version}</version>
- </dependency-->
-
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-common-utils</artifactId>
@@ -340,6 +334,11 @@
<artifactId>airavata-workflow-tracking</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-jpa-registry</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- JCR Support -->
<!-- TODO need clean up -->
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java Wed Nov 21 19:39:38 2012
@@ -22,20 +22,29 @@
package org.apache.airavata.xbaya;
import java.io.File;
+import java.net.MalformedURLException;
import java.net.URI;
+import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
import java.util.Observable;
import java.util.Observer;
+import org.apache.airavata.client.AiravataClientUtils;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.workflow.model.component.registry.JCRComponentRegistry;
import org.apache.airavata.xbaya.core.ide.XBayaExecutionModeListener;
import org.apache.airavata.xbaya.file.XBayaPathConstants;
+import org.apache.airavata.xbaya.registry.PasswordCallbackImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import xsul.lead.LeadDeploymentConfig;
+import javax.jcr.RepositoryException;
+import javax.security.auth.callback.PasswordCallback;
+
public class XBayaConfiguration extends Observable implements Observer {
private static final Logger logger = LoggerFactory.getLogger(XBayaConfiguration.class);
@@ -135,6 +144,8 @@ public class XBayaConfiguration extends
private String trustedCertLocation = "";
+ private AiravataAPI airavataAPI;
+
private XBayaExecutionMode xbayaExecutionMode=XBayaExecutionMode.IDE;
private List<XBayaExecutionModeListener> xbayaExecutionModeChangeListners=new ArrayList<XBayaExecutionModeListener>();
@@ -479,7 +490,7 @@ public class XBayaConfiguration extends
/**
* Sets kermaWorkflowInstanceID.
*
- * @param kermaWorkflowInstanceID
+ * @param karmaWorkflowInstanceID
* The kermaWorkflowInstanceID to set.
*/
public void setKarmaWorkflowInstanceID(URI karmaWorkflowInstanceID) {
@@ -761,13 +772,13 @@ public class XBayaConfiguration extends
}
public void setJcrComponentRegistry(JCRComponentRegistry jcrComponentRegistry) {
- if (this.jcrComponentRegistry != null && this.jcrComponentRegistry.getRegistry() instanceof Observable) {
- ((Observable) this.jcrComponentRegistry.getRegistry()).deleteObserver(this);
+ if (this.jcrComponentRegistry != null && this.jcrComponentRegistry.getAiravataAPI() instanceof Observable) {
+ ((Observable) this.jcrComponentRegistry.getAiravataAPI()).deleteObserver(this);
}
this.jcrComponentRegistry = jcrComponentRegistry;
triggerObservers(jcrComponentRegistry);
- if (jcrComponentRegistry != null && jcrComponentRegistry.getRegistry() instanceof Observable) {
- ((Observable) jcrComponentRegistry.getRegistry()).addObserver(this);
+ if (jcrComponentRegistry != null && jcrComponentRegistry.getAiravataAPI() instanceof Observable) {
+ ((Observable) jcrComponentRegistry.getAiravataAPI()).addObserver(this);
}
}
@@ -880,4 +891,30 @@ public class XBayaConfiguration extends
public void setY(int y) {
this.y = y;
}
+
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
+ }
+
+ public void setAiravataAPI(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
+ }
+
+// public AiravataAPI setAiravataAPI() {
+// try{
+// URI baseUri = new URI(ResourcePathConstants.BASE_URL);
+// PasswordCallbackImpl passwordCallback = new PasswordCallbackImpl(getRegistryUserName(), getRegistryPassphrase());
+// airavataAPI = AiravataClientUtils.getAPI(baseUri,
+// getRegistryUserName(), passwordCallback);
+// } catch (RepositoryException e) {
+// e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+// } catch (MalformedURLException e) {
+// e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+// } catch (RegistryException e) {
+// e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+// } catch (URISyntaxException e) {
+// e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+// }
+// return airavataAPI;
+// }
}
\ No newline at end of file
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java Wed Nov 21 19:39:38 2012
@@ -24,7 +24,10 @@ package org.apache.airavata.xbaya;
import java.net.URI;
import java.util.List;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.client.AiravataClientUtils;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataManager;
import org.apache.airavata.workflow.model.component.ComponentRegistryException;
import org.apache.airavata.workflow.model.component.amazon.AmazonComponentRegistry;
import org.apache.airavata.workflow.model.component.local.LocalComponentRegistry;
@@ -234,16 +237,18 @@ public class XBayaEngine {
public void updateXBayaConfigurationServiceURLs() {
try {
- if (this.getConfiguration().getJcrComponentRegistry()!=null && this.getConfiguration().getJcrComponentRegistry().getRegistry()!=null){
- AiravataRegistry2 registry=this.getConfiguration().getJcrComponentRegistry().getRegistry();
- URI eventingServiceURL = registry.getEventingServiceURI();
+ if (this.getConfiguration().getJcrComponentRegistry()!=null && this.getConfiguration().getJcrComponentRegistry().getAiravataAPI()!=null){
+ AiravataAPI airavataAPI = getConfiguration().getAiravataAPI();
+ AiravataManager airavataManager = airavataAPI.getAiravataManager();
+// AiravataRegistry2 registry=this.getConfiguration().getJcrComponentRegistry().getRegistry();
+ URI eventingServiceURL = airavataManager.getEventingServiceURL();
if (eventingServiceURL!=null) {
this.getConfiguration().setBrokerURL(eventingServiceURL);
this.getMonitor()
.getConfiguration()
.setBrokerURL(eventingServiceURL);
}
- URI messageBoxServiceURL = registry.getMessageBoxURI();
+ URI messageBoxServiceURL = airavataManager.getMessageBoxServiceURL();
if (messageBoxServiceURL!=null) {
this.getConfiguration()
.setMessageBoxURL(messageBoxServiceURL);
@@ -251,12 +256,12 @@ public class XBayaEngine {
.getConfiguration()
.setMessageBoxURL(messageBoxServiceURL);
}
- List<URI> interpreterServiceURLList = registry.getWorkflowInterpreterURIs();
+ List<URI> interpreterServiceURLList = airavataManager.getWorkflowInterpreterServiceURLs();
if (interpreterServiceURLList.size()>0) {
this.getConfiguration()
.setWorkflowInterpreterURL(interpreterServiceURLList.get(0));
}
- List<URI> gfacURLList = registry.getGFacURIs();
+ List<URI> gfacURLList = airavataManager.getGFaCURLs();
if (gfacURLList.size()>0) {
this.getConfiguration().setGFacURL(gfacURLList.get(0));
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java Wed Nov 21 19:39:38 2012
@@ -26,7 +26,8 @@ import java.util.Map;
import java.util.Observable;
import java.util.Observer;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.workflow.model.component.ComponentRegistry;
import org.apache.airavata.workflow.model.component.ComponentRegistryException;
import org.apache.airavata.workflow.model.component.registry.JCRComponentRegistry;
@@ -147,13 +148,13 @@ public class ComponentRegistryLoader imp
observableRegistry.deleteObserver(this);
}
if (componentRegistry instanceof JCRComponentRegistry){
- AiravataRegistry2 registry = ((JCRComponentRegistry)componentRegistry).getRegistry();
+ AiravataAPI registry = ((JCRComponentRegistry)componentRegistry).getAiravataAPI();
if (registry!=null && registry instanceof Observable){
(observableRegistry=(Observable)registry).addObserver(this);
}
}
load(componentRegistry);
- }else if (observable instanceof AiravataRegistry2){
+ }else if (observable instanceof AiravataAPI){
load(getEngine().getConfiguration().getJcrComponentRegistry());
}
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Wed Nov 21 19:39:38 2012
@@ -42,6 +42,7 @@ import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.common.utils.Pair;
import org.apache.airavata.common.utils.WSDLUtil;
import org.apache.airavata.common.utils.XMLUtil;
@@ -134,15 +135,11 @@ public class WorkflowInterpreter {
public static ThreadLocal<WorkflowInterpreterConfiguration> workflowInterpreterConfigurationThreadLocal =
new ThreadLocal<WorkflowInterpreterConfiguration>();
- /**
- *
- * Constructs a WorkflowInterpreter.
- *
- * @param engine
- * @param topic
- * @param workflow
- * @param subWorkflow
- */
+ /**
+ *
+ * @param config
+ * @param interactor
+ */
public WorkflowInterpreter(WorkflowInterpreterConfiguration config, WorkflowInterpreterInteractor interactor) {
this.setConfig(config);
config.validateNotifier();
@@ -244,24 +241,22 @@ public class WorkflowInterpreter {
if (InterpreterUtil.getFailedNodeCountDynamically(this.getGraph()) == 0) {
if (this.config.isActOnProvenance()) {
- try {
- try {
- this.getConfig().getConfiguration().getJcrComponentRegistry().getRegistry()
- .updateWorkflowInstanceStatus(this.config.getTopic(), ExecutionStatus.FINISHED);
- } catch (Exception e) {
- throw new WorkflowException(e);
- }
- } catch (Exception e) {
- throw new WorkflowException(e);
- }
+
+ try {
+ this.getConfig().getConfiguration().getJcrComponentRegistry().getAiravataAPI().getProvenanceManager().setWorkflowInstanceStatus(
+ this.config.getTopic(), this.config.getTopic(), ExecutionStatus.FINISHED);
+ } catch (Exception e) {
+ throw new WorkflowException(e);
+ }
+
// System.out.println(this.config.getConfiguration().getJcrComponentRegistry().getRegistry().getWorkflowStatus(this.topic));
}
} else {
if (this.config.isActOnProvenance()) {
try {
- this.getConfig().getConfiguration().getJcrComponentRegistry().getRegistry()
- .updateWorkflowInstanceStatus(this.config.getTopic(), ExecutionStatus.FAILED);
- } catch (RegistryException e) {
+ this.getConfig().getConfiguration().getJcrComponentRegistry().getAiravataAPI().getProvenanceManager().
+ setWorkflowInstanceStatus(this.config.getTopic(),this.config.getTopic(), ExecutionStatus.FAILED);
+ } catch (AiravataAPIInvocationException e) {
throw new WorkflowException(e);
}
}
@@ -320,7 +315,7 @@ public class WorkflowInterpreter {
}
}
- String output = ((String) new ProvenanceReader(node, this.config.getTopic(), this.config.getRegistry()).read());
+ String output = ((String) new ProvenanceReader(node, this.config.getTopic(), this.config.getAiravataAPI()).read());
if (output != null) {
XmlElement result = XMLUtil.stringToXmlElement(output);
SystemComponentInvoker invoker = new SystemComponentInvoker();
@@ -363,7 +358,7 @@ public class WorkflowInterpreter {
this.provenanceWriter = new PredicatedTaskRunner(1);
}
this.provenanceWriter.scedule(new ProvenanceWrite(node, this.getWorkflow().getName(), invokerMap, this.config.getTopic(), this.getConfig()
- .getConfiguration().getJcrComponentRegistry().getRegistry()));
+ .getConfiguration().getJcrComponentRegistry().getAiravataAPI()));
}
/**
@@ -421,17 +416,17 @@ public class WorkflowInterpreter {
if (this.config.isActOnProvenance()) {
try {
if (val instanceof String) {
- this.getConfig().getConfiguration().getJcrComponentRegistry().getRegistry()
+ this.getConfig().getConfiguration().getJcrComponentRegistry().getAiravataAPI().getProvenanceManager()
.saveWorkflowExecutionOutput(this.config.getTopic(), node.getName(), val.toString());
} else if (val instanceof org.xmlpull.v1.builder.XmlElement) {
this.getConfig()
.getConfiguration()
.getJcrComponentRegistry()
- .getRegistry()
+ .getAiravataAPI().getProvenanceManager()
.saveWorkflowExecutionOutput(this.config.getTopic(), node.getName(),
XMLUtil.xmlElementToString((org.xmlpull.v1.builder.XmlElement) val));
}
- } catch (RegistryException e) {
+ } catch (AiravataAPIInvocationException e) {
e.printStackTrace(); // To change body of catch
// statement use File |
// Settings | File
@@ -478,18 +473,22 @@ public class WorkflowInterpreter {
if (this.config.isActOnProvenance()) {
try {
if (val instanceof String) {
- this.getConfig().getConfiguration().getJcrComponentRegistry().getRegistry()
+ /**
+ TODO : saveWorkflowExecutionOutput() is not implemented in Registry
+ API or Airavata API at the moment
+ **/
+ this.getConfig().getConfiguration().getJcrComponentRegistry().getAiravataAPI().getProvenanceManager()
.saveWorkflowExecutionOutput(this.config.getTopic(), node.getName(), val.toString());
} else if (val instanceof org.xmlpull.v1.builder.XmlElement) {
this.getConfig()
.getConfiguration()
.getJcrComponentRegistry()
- .getRegistry()
+ .getAiravataAPI().getProvenanceManager()
.saveWorkflowExecutionOutput(this.config.getTopic(), node.getName(),
XMLUtil.xmlElementToString((org.xmlpull.v1.builder.XmlElement) val));
}
- } catch (RegistryException e) {
+ } catch (AiravataAPIInvocationException e) {
e.printStackTrace(); // To change body of catch
// statement use File |
// Settings | File
@@ -686,7 +685,7 @@ public class WorkflowInterpreter {
if (this.config.isGfacEmbeddedMode()) {
invoker = new EmbeddedGFacInvoker(portTypeQName, WSDLUtil.wsdlDefinitions5ToWsdlDefintions3(wsNode.getComponent().getWSDL()), node.getID(),
this.config.getMessageBoxURL().toASCIIString(), this.config.getMessageBrokerURL().toASCIIString(), this.config.getNotifier(),
- this.config.getTopic(), this.config.getRegistry(), portTypeQName.getLocalPart(), this.config.getConfiguration());
+ this.config.getTopic(), this.config.getAiravataAPI(), portTypeQName.getLocalPart(), this.config.getConfiguration());
} else {
invoker = new GenericInvoker(portTypeQName, WSDLUtil.wsdlDefinitions5ToWsdlDefintions3(wsNode.getComponent().getWSDL()), node.getID(),
this.config.getMessageBoxURL().toASCIIString(), gfacURLString, this.config.getNotifier());
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java Wed Nov 21 19:39:38 2012
@@ -23,7 +23,8 @@ package org.apache.airavata.xbaya.interp
import java.net.URI;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.client.api.AiravataAPI;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.ws.monitor.Monitor;
import org.apache.airavata.xbaya.XBayaConfiguration;
@@ -37,7 +38,7 @@ public class WorkflowInterpreterConfigur
//
private URI messageBoxURL;
private URI messageBrokerURL;
- private AiravataRegistry2 registry;
+ private AiravataAPI registry;
private XBayaConfiguration configuration;
private XBayaGUI gui;
private Monitor monitor;
@@ -50,22 +51,37 @@ public class WorkflowInterpreterConfigur
private Boolean actOnProvenance = null;
private boolean subWorkflow;
private boolean testMode=false;
+ private AiravataAPI airavataAPI;
- public WorkflowInterpreterConfiguration(Workflow workflow, String topic, URI messageBoxURL,URI messageBrokerURL,AiravataRegistry2 registry,XBayaConfiguration configuration,XBayaGUI gui,Monitor monitor) {
+ public WorkflowInterpreterConfiguration(Workflow workflow,
+ String topic,
+ URI messageBoxURL,
+ URI messageBrokerURL,
+ AiravataAPI registry,
+ XBayaConfiguration configuration,
+ XBayaGUI gui,Monitor monitor) {
this(workflow, topic, messageBoxURL,messageBrokerURL,registry,configuration,gui,monitor, true);
}
- public WorkflowInterpreterConfiguration(Workflow workflow, String topic, URI messageBoxURL,URI messageBrokerURL,AiravataRegistry2 registry,XBayaConfiguration configuration,XBayaGUI gui,Monitor monitor, boolean offline) {
- this.messageBoxURL = messageBoxURL;
- this.messageBrokerURL = messageBrokerURL;
- this.registry = registry;
- this.configuration = configuration;
- this.gui = gui;
- this.monitor = monitor;
- this.offline = offline;
- this.workflow = workflow;
- this.topic = topic;
- }
+ public WorkflowInterpreterConfiguration(Workflow workflow,
+ String topic,
+ URI messageBoxURL,
+ URI messageBrokerURL,
+ AiravataAPI airavataAPI,
+ XBayaConfiguration configuration,
+ XBayaGUI gui,
+ Monitor monitor,
+ boolean offline) {
+ this.messageBoxURL = messageBoxURL;
+ this.messageBrokerURL = messageBrokerURL;
+ this.airavataAPI = airavataAPI;
+ this.configuration = configuration;
+ this.gui = gui;
+ this.monitor = monitor;
+ this.offline = offline;
+ this.workflow = workflow;
+ this.topic = topic;
+ }
public URI getMessageBoxURL() {
return messageBoxURL;
@@ -79,10 +95,10 @@ public class WorkflowInterpreterConfigur
public void setMessageBrokerURL(URI messageBrokerURL) {
this.messageBrokerURL = messageBrokerURL;
}
- public AiravataRegistry2 getRegistry() {
+ public AiravataAPI getRegistry() {
return registry;
}
- public void setRegistry(AiravataRegistry2 registry) {
+ public void setRegistry(AiravataAPI registry) {
this.registry = registry;
}
public XBayaConfiguration getConfiguration() {
@@ -187,4 +203,12 @@ public class WorkflowInterpreterConfigur
private void setTestMode(boolean testMode) {
this.testMode = testMode;
}
+
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
+ }
+
+ public void setAiravataAPI(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
+ }
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java Wed Nov 21 19:39:38 2012
@@ -83,8 +83,8 @@ public class WorkflowInterpretorEventLis
this.wseClient = new WseMsgBrokerClient();
this.wseClient.init(this.brokerURL.toString());
this.workflowInterpreterConfiguration = WorkflowInterpreter.getWorkflowInterpreterConfiguration();
- this.workflowNodeStatusUpdater = new WorkflowNodeStatusUpdater(this.workflowInterpreterConfiguration.getRegistry());
- this.workflowStatusUpdater = new WorkflowStatusUpdater(this.workflowInterpreterConfiguration.getRegistry());
+ this.workflowNodeStatusUpdater = new WorkflowNodeStatusUpdater(this.workflowInterpreterConfiguration.getAiravataAPI());
+ this.workflowStatusUpdater = new WorkflowStatusUpdater(this.workflowInterpreterConfiguration.getAiravataAPI());
}
public void start() throws MonitorException {
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java Wed Nov 21 19:39:38 2012
@@ -40,13 +40,15 @@ import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.airavata.registry.api.AbstractRegistryUpdaterThread;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
+import org.apache.airavata.client.tools.PeriodicExecutorThread;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.client.stub.interpretor.NameValue;
import org.apache.airavata.common.utils.ServiceUtils;
import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
import org.apache.airavata.commons.gfac.type.HostDescription;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.schemas.gfac.GlobusHostType;
import org.apache.airavata.schemas.gfac.HostDescriptionType;
import org.apache.airavata.schemas.wec.ContextHeaderDocument;
@@ -117,7 +119,7 @@ public class WorkflowInterpretorSkeleton
protected WIServiceThread thread;
- private AiravataRegistry2 getRegistry(){
+ private AiravataAPI getRegistry(){
Properties properties = new Properties();
try {
URL url = getXBayaPropertiesURL();
@@ -126,7 +128,7 @@ public class WorkflowInterpretorSkeleton
jcrPassword = (String) properties.get(JCR_PASS);
jcrURL = (String) properties.get(JCR_URL);
jcrComponentRegistry = new JCRComponentRegistry(jcrUserName,jcrPassword);
- return jcrComponentRegistry.getRegistry();
+ return jcrComponentRegistry.getAiravataAPI();
} catch (RegistryException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
} catch (IOException e) {
@@ -171,15 +173,17 @@ public class WorkflowInterpretorSkeleton
List<HostDescription> hostList = getDefinedHostDescriptions();
for(HostDescription host:hostList){
// This will avoid the changes user is doing to one of the predefined Hosts during a restart of the system
- AiravataRegistry2 registry = jcrComponentRegistry.getRegistry();
- if(!registry.isHostDescriptorExists(host.getType().getHostName())){
+ AiravataAPI registry = jcrComponentRegistry.getAiravataAPI();
+ if(!registry.getApplicationManager().isHostDescriptorExists(host.getType().getHostName())){
log.info("Saving the predefined Host: " + host.getType().getHostName());
- registry.addHostDescriptor(host);
+ registry.getApplicationManager().saveHostDescription(host);
}
}
+ } catch (AiravataAPIInvocationException e) {
+ e.printStackTrace();
} catch (RegistryException e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
- }
+ e.printStackTrace();
+ }
}else{
provenance = false;
}
@@ -199,7 +203,7 @@ public class WorkflowInterpretorSkeleton
String localAddress = ServiceUtils.generateServiceURLFromConfigurationContext(configctx,SERVICE_NAME);
log.info("INTERPRETER_SERVICE_ADDRESS:" + localAddress);
configctx.setProperty(SERVICE_URL,new URI(localAddress));
- configctx.setProperty(JCR_REG,jcrComponentRegistry.getRegistry());
+ configctx.setProperty(JCR_REG,jcrComponentRegistry.getAiravataAPI());
/*
* Heart beat message to registry
*/
@@ -273,21 +277,23 @@ public class WorkflowInterpretorSkeleton
parse = ContextHeaderDocument.Factory.parse(workflowContext.toStringWithConsume());
String msgBox = parse.getContextHeader().getWorkflowMonitoringContext().getMsgBoxEpr();
if(msgBox == null || "".equals(msgBox)){
- msgBox = jcrComponentRegistry.getRegistry().getMessageBoxURI().toASCIIString();
+ msgBox = jcrComponentRegistry.getAiravataAPI().getAiravataManager().getMessageBoxServiceURL().toASCIIString();
}
String msgBroker = parse.getContextHeader().getWorkflowMonitoringContext().getEventPublishEpr();
if(msgBroker == null || "".equals(msgBroker)){
- msgBroker = jcrComponentRegistry.getRegistry().getEventingServiceURI().toASCIIString();
+ msgBroker = jcrComponentRegistry.getAiravataAPI().getAiravataManager().getEventingServiceURL().toASCIIString();
}
String gfac = parse.getContextHeader().getSoaServiceEprs().getGfacUrl();
if(gfac == null || "".equals(gfac)){
- gfac = jcrComponentRegistry.getRegistry().getGFacURIs().get(0).toString();
+ gfac = jcrComponentRegistry.getAiravataAPI().getAiravataManager().getGFaCURLs().get(0).toString();
}
configuration.put(BROKER, msgBroker);
configuration.put(GFAC, gfac);
configuration.put(MSGBOX, msgBox);
} catch (XmlException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ } catch (AiravataAPIInvocationException e) {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
return new WorkflowContextHeaderBuilder(parse.getContextHeader());
}
@@ -331,7 +337,7 @@ public class WorkflowInterpretorSkeleton
}
WorkflowInterpretorEventListener listener = null;
WorkflowInterpreter interpreter = null;
- AiravataRegistry2 registry = getRegistry();
+ AiravataAPI registry = getRegistry();
WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,topic,conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null, null);
workflowInterpreterConfiguration.setGfacEmbeddedMode(gfacEmbeddedMode);
workflowInterpreterConfiguration.setActOnProvenance(provenance);
@@ -420,8 +426,12 @@ public class WorkflowInterpretorSkeleton
public void shutDown(ConfigurationContext configctx, AxisService service) {
URI gfacURL = (URI) configctx.getProperty(SERVICE_URL);
if (jcrComponentRegistry != null && thread != null) {
- AiravataRegistry2 registry = jcrComponentRegistry.getRegistry();
- registry.removeWorkflowInterpreterURI(gfacURL);
+ AiravataAPI registry = jcrComponentRegistry.getAiravataAPI();
+ try {
+ registry.getAiravataManager().removeWorkflowInterpreterURI(gfacURL);
+ } catch (AiravataAPIInvocationException e) {
+ e.printStackTrace();
+ }
thread.interrupt();
try {
thread.join();
@@ -469,18 +479,18 @@ public class WorkflowInterpretorSkeleton
}
public static final int URL_UPDATE_INTERVAL = 1000 * 60 * 60 * 3;
- class WIServiceThread extends AbstractRegistryUpdaterThread {
+ class WIServiceThread extends PeriodicExecutorThread {
private ConfigurationContext context = null;
- WIServiceThread(AiravataRegistry2 registry, ConfigurationContext context) {
+ WIServiceThread(AiravataAPI registry, ConfigurationContext context) {
super(registry);
this.context = context;
}
@Override
- protected void updateRegistry(AiravataRegistry2 registry) throws Exception {
+ protected void updateRegistry(AiravataAPI registry) throws Exception {
URI localAddress = (URI) this.context.getProperty(SERVICE_URL);
- registry.addWorkflowInterpreterURI(localAddress);
+ registry.getAiravataManager().addWorkflowInterpreterURI(localAddress);
log.info("Updated Workflow Interpreter service URL in to Repository");
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java Wed Nov 21 19:39:38 2012
@@ -39,6 +39,7 @@ import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.commons.gfac.type.ActualParameter;
@@ -49,7 +50,7 @@ import org.apache.airavata.core.gfac.con
import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.context.message.impl.ParameterContextImpl;
import org.apache.airavata.core.gfac.utils.GfacUtils;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.schemas.gfac.Parameter;
import org.apache.airavata.schemas.gfac.ServiceDescriptionType;
import org.apache.airavata.workflow.model.exceptions.WorkflowException;
@@ -96,11 +97,13 @@ public class EmbeddedGFacInvoker impleme
private ServiceNotifiable notifier;
- private AiravataRegistry2 registry;
+// private AiravataRegistry2 registry;
private String topic;
private String serviceName;
+
+ private AiravataAPI airavataAPI;
/**
* used for notification
*/
@@ -191,8 +194,16 @@ public class EmbeddedGFacInvoker impleme
* @param gfacURL
* @param notifier
*/
- public EmbeddedGFacInvoker(QName portTypeQName, WsdlDefinitions wsdl, String nodeID, String messageBoxURL,
- String gfacURL, WorkflowNotifiable notifier,String topic,AiravataRegistry2 registry,String serviceName,XBayaConfiguration config) {
+ public EmbeddedGFacInvoker(QName portTypeQName,
+ WsdlDefinitions wsdl,
+ String nodeID,
+ String messageBoxURL,
+ String gfacURL,
+ WorkflowNotifiable notifier,
+ String topic,
+ AiravataAPI airavataAPI,
+ String serviceName,
+ XBayaConfiguration config) {
final String wsdlStr = xsul.XmlConstants.BUILDER.serializeToString(wsdl);
this.nodeID = nodeID;
this.portTypeQName = portTypeQName;
@@ -201,7 +212,7 @@ public class EmbeddedGFacInvoker impleme
this.serviceInformation = wsdlStr;
this.gfacURL = gfacURL;
this.notifier = notifier.createServiceNotificationSender(nodeID);
- this.registry = registry;
+ this.airavataAPI = airavataAPI;
this.topic = topic;
this.serviceName = serviceName;
this.failerSent = false;
@@ -243,7 +254,7 @@ public class EmbeddedGFacInvoker impleme
}
this.inputNames.add(name);
this.inputValues.add(value);
- ServiceDescription serviceDescription = registry.getServiceDescriptor(this.serviceName);
+ ServiceDescription serviceDescription = airavataAPI.getApplicationManager().getServiceDescription(this.serviceName);
if(serviceDescription==null){
throw new RegistryException(new Exception("Service Description not found in registry."));
}
@@ -289,7 +300,7 @@ public class EmbeddedGFacInvoker impleme
GFacConfiguration gFacConfiguration = new GFacConfiguration(EmbeddedGFacInvoker.this.configuration.getMyProxyServer(),
EmbeddedGFacInvoker.this.configuration.getMyProxyUsername(),
EmbeddedGFacInvoker.this.configuration.getMyProxyPassphrase(),EmbeddedGFacInvoker.this.configuration.getMyProxyLifetime(),
- EmbeddedGFacInvoker.this.registry, EmbeddedGFacInvoker.this.configuration.getTrustedCertLocation());
+ EmbeddedGFacInvoker.this.airavataAPI, EmbeddedGFacInvoker.this.configuration.getTrustedCertLocation());
GfacAPI gfacAPI1 = new GfacAPI();
InvocationContext defaultInvocationContext = gfacAPI1.gridJobSubmit(jobContext, gFacConfiguration);
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/AiravataConfigurations.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/AiravataConfigurations.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/AiravataConfigurations.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/AiravataConfigurations.java Wed Nov 21 19:39:38 2012
@@ -21,21 +21,34 @@
package org.apache.airavata.xbaya.model.registrybrowser;
+import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.registry.api.AiravataRegistry2;
public class AiravataConfigurations {
- private AiravataRegistry2 registry;
+// private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
- public AiravataConfigurations(AiravataRegistry2 registry) {
- setRegistry(registry);
+// public AiravataConfigurations(AiravataRegistry2 registry) {
+// setRegistry(registry);
+// }
+ public AiravataConfigurations(AiravataAPI airavataAPI) {
+ setAiravataAPI(airavataAPI);
}
- public AiravataRegistry2 getRegistry() {
- return registry;
+// public AiravataRegistry2 getRegistry() {
+// return registry;
+// }
+//
+// public void setRegistry(AiravataRegistry2 registry) {
+// this.registry = registry;
+// }
+
+
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
}
- public void setRegistry(AiravataRegistry2 registry) {
- this.registry = registry;
+ public void setAiravataAPI(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
}
-
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptionWrap.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptionWrap.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptionWrap.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptionWrap.java Wed Nov 21 19:39:38 2012
@@ -21,24 +21,26 @@
package org.apache.airavata.xbaya.model.registrybrowser;
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
public class ApplicationDeploymentDescriptionWrap {
private ApplicationDeploymentDescription applicationDeploymentDescription;
private String service;
private String host;
- private AiravataRegistry2 registry;
+// private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
- public ApplicationDeploymentDescriptionWrap(AiravataRegistry2 registry,
+ public ApplicationDeploymentDescriptionWrap(AiravataAPI airavataAPI,
ApplicationDeploymentDescription applicationDeploymentDescription, String service, String host) {
setApplicationDeploymentDescription(applicationDeploymentDescription);
setService(service);
setHost(host);
- setRegistry(registry);
+ setAiravataAPI(airavataAPI);
}
public ApplicationDeploymentDescription getDescription() {
@@ -53,12 +55,12 @@ public class ApplicationDeploymentDescri
return service;
}
- public ServiceDescription getServiceDescription() throws RegistryException{
- ServiceDescription desc = getRegistry().getServiceDescriptor(getService());
+ public ServiceDescription getServiceDescription() throws AiravataAPIInvocationException {
+ ServiceDescription desc = getAiravataAPI().getApplicationManager().getServiceDescription(getService());
if(desc!=null){
return desc;
}
- throw new RegistryException(new Exception("Service Description not found in registry."));
+ throw new AiravataAPIInvocationException(new Exception("Service Description not found in registry."));
}
public void setService(String service) {
@@ -69,19 +71,28 @@ public class ApplicationDeploymentDescri
return host;
}
- public HostDescription getHostDescription() throws RegistryException{
- return getRegistry().getHostDescriptor(getHost());
+ public HostDescription getHostDescription() throws AiravataAPIInvocationException {
+ return getAiravataAPI().getApplicationManager().getHostDescription(getHost());
}
public void setHost(String host) {
this.host = host;
}
- public AiravataRegistry2 getRegistry() {
- return registry;
+// public AiravataRegistry2 getRegistry() {
+// return registry;
+// }
+//
+// public void setRegistry(AiravataRegistry2 registry) {
+// this.registry = registry;
+// }
+
+
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
}
- public void setRegistry(AiravataRegistry2 registry) {
- this.registry = registry;
+ public void setAiravataAPI(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
}
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java Wed Nov 21 19:39:38 2012
@@ -25,50 +25,73 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
+import org.apache.airavata.client.api.ApplicationManager;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
public class ApplicationDeploymentDescriptions {
- private AiravataRegistry2 registry;
+// private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
private String serviceName;
- public ApplicationDeploymentDescriptions(AiravataRegistry2 registry, String serviceName) {
- setRegistry(registry);
- setServiceName(serviceName);
+// public ApplicationDeploymentDescriptions(AiravataRegistry2 registry, String serviceName) {
+// setRegistry(registry);
+// setServiceName(serviceName);
+// }
+
+
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
}
-
- public ApplicationDeploymentDescriptions(AiravataRegistry2 registry) {
- this(registry,null);
+
+ public void setAiravataAPI(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
}
- public AiravataRegistry2 getRegistry() {
- return registry;
+ public ApplicationDeploymentDescriptions(AiravataAPI airavataAPI, String serviceName) {
+ setAiravataAPI(airavataAPI);
+ setServiceName(serviceName);
}
+
+// public ApplicationDeploymentDescriptions(AiravataRegistry2 registry) {
+// this(registry,null);
+// }
- public void setRegistry(AiravataRegistry2 registry) {
- this.registry = registry;
+ public ApplicationDeploymentDescriptions(AiravataAPI airavataAPI) {
+ this(airavataAPI,null);
}
- public List<ApplicationDeploymentDescriptionWrap> getDescriptions() throws RegistryException {
+// public AiravataRegistry2 getRegistry() {
+// return registry;
+// }
+//
+// public void setRegistry(AiravataRegistry2 registry) {
+// this.registry = registry;
+// }
+
+ public List<ApplicationDeploymentDescriptionWrap> getDescriptions() throws RegistryException, AiravataAPIInvocationException {
List<ApplicationDeploymentDescriptionWrap> list = new ArrayList<ApplicationDeploymentDescriptionWrap>();
if (getServiceName()==null) {
- List<ServiceDescription> serviceDescriptors = getRegistry().getServiceDescriptors();
+ ApplicationManager applicationManager = getAiravataAPI().getApplicationManager();
+ List<ServiceDescription> serviceDescriptors = applicationManager.getAllServiceDescriptions();
for (ServiceDescription serviceDescription : serviceDescriptors) {
String serviceName = serviceDescription.getType().getName();
- Map<String,ApplicationDeploymentDescription> deploymentDescriptions = getRegistry().getApplicationDescriptors(serviceName);
+ Map<String,ApplicationDeploymentDescription> deploymentDescriptions = applicationManager.getApplicationDescriptors(serviceName);
for (String hostName : deploymentDescriptions.keySet()) {
ApplicationDeploymentDescription descriptionWrap=deploymentDescriptions.get(hostName);
- list.add(new ApplicationDeploymentDescriptionWrap(getRegistry(), descriptionWrap, serviceName,hostName));
+ list.add(new ApplicationDeploymentDescriptionWrap(getAiravataAPI(), descriptionWrap, serviceName,hostName));
}
}
}else{
- Map<String,ApplicationDeploymentDescription> deploymentDescriptions = getRegistry().getApplicationDescriptors(serviceName);
+ Map<String,ApplicationDeploymentDescription> deploymentDescriptions = getAiravataAPI().getApplicationManager().getApplicationDescriptors(serviceName);
for (String hostName : deploymentDescriptions.keySet()) {
ApplicationDeploymentDescription descriptionWrap=deploymentDescriptions.get(hostName);
- list.add(new ApplicationDeploymentDescriptionWrap(getRegistry(), descriptionWrap, getServiceName(),hostName));
+ list.add(new ApplicationDeploymentDescriptionWrap(getAiravataAPI(), descriptionWrap, getServiceName(),hostName));
}
}
return list;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/EventingServiceURL.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/EventingServiceURL.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/EventingServiceURL.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/EventingServiceURL.java Wed Nov 21 19:39:38 2012
@@ -21,27 +21,21 @@
package org.apache.airavata.xbaya.model.registrybrowser;
+import org.apache.airavata.client.api.AiravataAPI;
+
import java.net.URI;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
public class EventingServiceURL {
- private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
private URI eventingServiceURL;
- public EventingServiceURL(AiravataRegistry2 registry, URI eventingServiceURL) {
- setRegistry(registry);
+ public EventingServiceURL(AiravataAPI airavataAPI, URI eventingServiceURL) {
+ setAiravataAPI(airavataAPI);
setEventingServiceURL(eventingServiceURL);
}
- public AiravataRegistry2 getRegistry() {
- return registry;
- }
-
- public void setRegistry(AiravataRegistry2 registry) {
- this.registry = registry;
- }
-
public URI getEventingServiceURL() {
return eventingServiceURL;
}
@@ -50,4 +44,11 @@ public class EventingServiceURL {
this.eventingServiceURL = eventingServiceURL;
}
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
+ }
+
+ public void setAiravataAPI(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
+ }
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/EventingServiceURLs.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/EventingServiceURLs.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/EventingServiceURLs.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/EventingServiceURLs.java Wed Nov 21 19:39:38 2012
@@ -21,31 +21,34 @@
package org.apache.airavata.xbaya.model.registrybrowser;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
+
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
public class EventingServiceURLs {
- private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
- public EventingServiceURLs(AiravataRegistry2 registry) {
- setRegistry(registry);
+ public EventingServiceURLs(AiravataAPI airavataAPI) {
+ setAiravataAPI(airavataAPI);
}
- public AiravataRegistry2 getRegistry() {
- return registry;
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
}
- public void setRegistry(AiravataRegistry2 registry) {
- this.registry = registry;
+ public void setAiravataAPI(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
}
- public List<EventingServiceURL> getURLS() {
+ public List<EventingServiceURL> getURLS() throws AiravataAPIInvocationException {
List<EventingServiceURL> urls = new ArrayList<EventingServiceURL>();
- URI gfacDescriptor = getRegistry().getEventingServiceURI();
- urls.add(new EventingServiceURL(getRegistry(), gfacDescriptor));
+ URI gfacDescriptor = getAiravataAPI().getAiravataManager().getEventingServiceURL();
+ urls.add(new EventingServiceURL(getAiravataAPI(), gfacDescriptor));
return urls;
}
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURL.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURL.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURL.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURL.java Wed Nov 21 19:39:38 2012
@@ -21,25 +21,27 @@
package org.apache.airavata.xbaya.model.registrybrowser;
+import org.apache.airavata.client.api.AiravataAPI;
+
import java.net.URI;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
public class GFacURL {
- private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
private URI gfacURL;
- public GFacURL(AiravataRegistry2 registry, URI url) {
- setRegistry(registry);
+ public GFacURL(AiravataAPI airavataAPI, URI url) {
+ setAiravataAPI(airavataAPI);
setGfacURL(url);
}
- public AiravataRegistry2 getRegistry() {
- return registry;
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
}
- public void setRegistry(AiravataRegistry2 registry) {
- this.registry = registry;
+ public void setAiravataAPI(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
}
public URI getGfacURL() {
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java Wed Nov 21 19:39:38 2012
@@ -21,32 +21,35 @@
package org.apache.airavata.xbaya.model.registrybrowser;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
+
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
public class GFacURLs {
- private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
- public GFacURLs(AiravataRegistry2 registry) {
- setRegistry(registry);
+ public GFacURLs(AiravataAPI airavataAPI) {
+ setAiravataAPI(airavataAPI);
}
- public AiravataRegistry2 getRegistry() {
- return registry;
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
}
- public void setRegistry(AiravataRegistry2 registry) {
- this.registry = registry;
+ public void setAiravataAPI(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
}
- public List<GFacURL> getURLS() {
+ public List<GFacURL> getURLS() throws AiravataAPIInvocationException {
List<GFacURL> urls = new ArrayList<GFacURL>();
- List<URI> gfacDescriptorList = getRegistry().getGFacURIs();
+ List<URI> gfacDescriptorList = getAiravataAPI().getAiravataManager().getGFaCURLs();
for (URI url : gfacDescriptorList) {
- urls.add(new GFacURL(getRegistry(), url));
+ urls.add(new GFacURL(getAiravataAPI(), url));
}
return urls;
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java Wed Nov 21 19:39:38 2012
@@ -23,26 +23,28 @@ package org.apache.airavata.xbaya.model.
import java.util.List;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.commons.gfac.type.HostDescription;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
public class HostDescriptions {
- private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
- public HostDescriptions(AiravataRegistry2 registry) {
- setRegistry(registry);
+ public HostDescriptions(AiravataAPI airavataAPI) {
+ setAiravataAPI(airavataAPI);
}
- public AiravataRegistry2 getRegistry() {
- return registry;
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
}
- public void setRegistry(AiravataRegistry2 registry) {
- this.registry = registry;
+ public void setAiravataAPI(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
}
- public List<HostDescription> getDescriptions() throws RegistryException{
- return getRegistry().getHostDescriptors();
+ public List<HostDescription> getDescriptions() throws AiravataAPIInvocationException {
+ return getAiravataAPI().getApplicationManager().getAllHostDescriptions();
}
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURL.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURL.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURL.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURL.java Wed Nov 21 19:39:38 2012
@@ -21,25 +21,27 @@
package org.apache.airavata.xbaya.model.registrybrowser;
+import org.apache.airavata.client.api.AiravataAPI;
+
import java.net.URI;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
public class InterpreterServiceURL {
- private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
private URI interpreterServiceURL;
- public InterpreterServiceURL(AiravataRegistry2 registry, URI interpreterServiceURI) {
- setRegistry(registry);
+ public InterpreterServiceURL(AiravataAPI airavataAPI, URI interpreterServiceURI) {
+ setAiravataAPI(airavataAPI);
setInterpreterServiceURI(interpreterServiceURI);
}
- public AiravataRegistry2 getRegistry() {
- return registry;
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
}
- public void setRegistry(AiravataRegistry2 registry) {
- this.registry = registry;
+ public void setAiravataAPI(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
}
public URI getInterpreterServiceURL() {
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURLs.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURLs.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURLs.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURLs.java Wed Nov 21 19:39:38 2012
@@ -21,32 +21,35 @@
package org.apache.airavata.xbaya.model.registrybrowser;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
+
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
public class InterpreterServiceURLs {
- private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
- public InterpreterServiceURLs(AiravataRegistry2 registry) {
- setRegistry(registry);
+ public InterpreterServiceURLs(AiravataAPI airavataAPI) {
+ setAiravataAPI(airavataAPI);
}
- public AiravataRegistry2 getRegistry() {
- return registry;
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
}
- public void setRegistry(AiravataRegistry2 registry) {
- this.registry = registry;
+ public void setAiravataAPI(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
}
- public List<InterpreterServiceURL> getURLS() {
+ public List<InterpreterServiceURL> getURLS() throws AiravataAPIInvocationException {
List<InterpreterServiceURL> urls = new ArrayList<InterpreterServiceURL>();
- List<URI> gfacDescriptorList = getRegistry().getWorkflowInterpreterURIs();
+ List<URI> gfacDescriptorList = getAiravataAPI().getAiravataManager().getWorkflowInterpreterServiceURLs();
for (URI uri : gfacDescriptorList) {
- urls.add(new InterpreterServiceURL(getRegistry(), uri));
+ urls.add(new InterpreterServiceURL(getAiravataAPI(), uri));
}
return urls;
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURL.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURL.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURL.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURL.java Wed Nov 21 19:39:38 2012
@@ -21,28 +21,30 @@
package org.apache.airavata.xbaya.model.registrybrowser;
+import org.apache.airavata.client.api.AiravataAPI;
+
import java.net.URI;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
public class MessageBoxURL {
- private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
private URI messageBoxURL;
- public MessageBoxURL(AiravataRegistry2 registry, URI messageBoxURL) {
- setRegistry(registry);
+ public MessageBoxURL(AiravataAPI airavataAPI, URI messageBoxURL) {
+ setAiravataAPI(airavataAPI);
setMessageBoxURL(messageBoxURL);
}
- public AiravataRegistry2 getRegistry() {
- return registry;
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
}
- public void setRegistry(AiravataRegistry2 registry) {
- this.registry = registry;
+ public void setAiravataAPI(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
}
- public URI getMessageBoxURL() {
+ public URI getMessageBoxURL() {
return messageBoxURL;
}