You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/11/26 09:40:07 UTC
svn commit: r1413508 - in /airavata/trunk/modules:
airavata-client/src/main/java/org/apache/airavata/client/
gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/
gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/
workflow...
Author: samindaw
Date: Mon Nov 26 08:40:05 2012
New Revision: 1413508
URL: http://svn.apache.org/viewvc?rev=1413508&view=rev
Log:
refactoring Airavata API to a factory class & overloading to get API object without credentials
Added:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataAPIFactory.java
- copied, changed from r1413246, airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java (with props)
Modified:
airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java
airavata/trunk/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
Copied: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataAPIFactory.java (from r1413246, airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataAPIFactory.java?p2=airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataAPIFactory.java&p1=airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java&r1=1413246&r2=1413508&rev=1413508&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java (original)
+++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataAPIFactory.java Mon Nov 26 08:40:05 2012
@@ -33,7 +33,15 @@ import org.apache.airavata.client.impl.P
import org.apache.airavata.registry.api.PasswordCallback;
import org.apache.airavata.registry.api.exception.RegistryException;
-public class AiravataClientUtils {
+public class AiravataAPIFactory {
+
+ public static AiravataAPI getAPI(String gateway, String username, String alternativeUser) throws MalformedURLException, RepositoryException, RegistryException{
+ return getAPI(null, gateway, username, alternativeUser, (PasswordCallback)null);
+ }
+
+ public static AiravataAPI getAPI(String gateway, String username) throws MalformedURLException, RepositoryException, RegistryException{
+ return getAPI(null, gateway, username, (PasswordCallback)null);
+ }
public static AiravataAPI getAPI(URI registryURL, String gateway, String username, PasswordCallback callback) throws MalformedURLException, RepositoryException, RegistryException{
return getAPI(registryURL, gateway, username, username, callback);
Added: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java?rev=1413508&view=auto
==============================================================================
--- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java (added)
+++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java Mon Nov 26 08:40:05 2012
@@ -0,0 +1,27 @@
+/*
+ *
+ * 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.client;
+
+@Deprecated
+public class AiravataClientUtils extends AiravataAPIFactory {
+
+}
Propchange: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java?rev=1413508&r1=1413507&r2=1413508&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java (original)
+++ airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java Mon Nov 26 08:40:05 2012
@@ -30,7 +30,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Properties;
-import org.apache.airavata.client.AiravataClientUtils;
+import org.apache.airavata.client.AiravataAPIFactory;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.client.tools.PeriodicExecutorThread;
@@ -136,7 +136,7 @@ public class GFacService implements Serv
e.printStackTrace();
}
URI baseUri = new URI(properties.getProperty(REGISTRY_URL));
- airavataAPI = AiravataClientUtils.getAPI(baseUri, username, password);
+ airavataAPI = AiravataAPIFactory.getAPI(baseUri, username, password);
context.setProperty(GFAC_URL, ServiceUtils.generateServiceURLFromConfigurationContext(context,SERVICE_NAME));
GFacConfiguration gfacConfig = new GFacConfiguration(properties.getProperty(MYPROXY_SERVER),properties.getProperty(MYPROXY_USER),
properties.getProperty(MYPROXY_PASS),Integer.parseInt(properties.getProperty(MYPROXY_LIFE)),airavataAPI,properties.getProperty(TRUSTED_CERT_LOCATION));
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java?rev=1413508&r1=1413507&r2=1413508&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java Mon Nov 26 08:40:05 2012
@@ -21,7 +21,7 @@
package org.apache.airavata.core.gfac.services.impl;
-import org.apache.airavata.client.AiravataClientUtils;
+import org.apache.airavata.client.AiravataAPIFactory;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
@@ -248,7 +248,7 @@ public class PropertiesBasedServiceImpl
baseUri = new URI(loadFromProperty(REGISTRY_URL, true));
String regUser = loadFromProperty(REGISTRY_USER, true);
String regUserPW = loadFromProperty(REGISTRY_PASSWORD, true);
- airavataAPI = AiravataClientUtils.getAPI(baseUri, regUser, regUserPW);
+ airavataAPI = AiravataAPIFactory.getAPI(baseUri, regUser, regUserPW);
} catch (URISyntaxException e) {
e.printStackTrace();
} catch (RepositoryException e) {
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=1413508&r1=1413507&r2=1413508&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 Mon Nov 26 08:40:05 2012
@@ -21,7 +21,7 @@
package org.apache.airavata.workflow.model.component.registry;
-import org.apache.airavata.client.AiravataClientUtils;
+import org.apache.airavata.client.AiravataAPIFactory;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
import org.apache.airavata.registry.api.AiravataRegistryConnectionDataProvider;
@@ -96,7 +96,7 @@ public class JCRComponentRegistry extend
URI baseUri = new URI(registryURL);
//TODO callback class
PasswordCallBackImpl passwordCallBack = new PasswordCallBackImpl(username, password);
- this.airavataAPI = AiravataClientUtils.getAPI(baseUri, gatewayName, username, passwordCallBack);
+ this.airavataAPI = AiravataAPIFactory.getAPI(baseUri, gatewayName, username, passwordCallBack);
} catch (URISyntaxException e) {
log.error("Error initializing Airavata Client");
} catch (RepositoryException e) {
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=1413508&r1=1413507&r2=1413508&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 Mon Nov 26 08:40:05 2012
@@ -27,7 +27,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import org.apache.airavata.client.AiravataClientUtils;
+import org.apache.airavata.client.AiravataAPIFactory;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.common.utils.ServiceUtils;
@@ -120,7 +120,7 @@ public class MsgBoxServiceLifeCycle impl
String regURL = properties.getProperty("registry.jdbc.url");
URI baseUri = new URI(regURL);
- AiravataAPI airavataAPI = AiravataClientUtils.getAPI(baseUri, userName, password);
+ AiravataAPI airavataAPI = AiravataAPIFactory.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));
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=1413508&r1=1413507&r2=1413508&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 Mon Nov 26 08:40:05 2012
@@ -29,7 +29,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import org.apache.airavata.client.AiravataClientUtils;
+import org.apache.airavata.client.AiravataAPIFactory;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.client.tools.PeriodicExecutorThread;
@@ -160,7 +160,7 @@ public class BrokerServiceLifeCycle impl
String regURL = properties.getProperty("registry.jdbc.url");
URI baseUri = new URI(regURL);
- AiravataAPI airavataAPI = AiravataClientUtils.getAPI(baseUri, userName, password);
+ AiravataAPI airavataAPI = AiravataAPIFactory.getAPI(baseUri, userName, password);
String localAddress = ServiceUtils
.generateServiceURLFromConfigurationContext(
context,
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=1413508&r1=1413507&r2=1413508&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 Mon Nov 26 08:40:05 2012
@@ -30,7 +30,7 @@ import java.util.List;
import java.util.Observable;
import java.util.Observer;
-import org.apache.airavata.client.AiravataClientUtils;
+import org.apache.airavata.client.AiravataAPIFactory;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.workflow.model.component.registry.JCRComponentRegistry;
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=1413508&r1=1413507&r2=1413508&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 Mon Nov 26 08:40:05 2012
@@ -25,7 +25,7 @@ import java.net.URI;
import java.util.List;
//import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.client.AiravataClientUtils;
+import org.apache.airavata.client.AiravataAPIFactory;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.client.api.AiravataManager;
import org.apache.airavata.workflow.model.component.ComponentRegistryException;