svn commit: r1293450 - in /incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata: AiravataClient.java AiravataClientConfiguration.java XBayaClient.java XBayaClientConfiguration.java

[he...@apache.org]

Author: heshan
Date: Fri Feb 24 22:01:40 2012
New Revision: 1293450

URL: http://svn.apache.org/viewvc?rev=1293450&view=rev
Log:
AIRAVATA-319 Renaming the client.

Added:
    incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClient.java
      - copied, changed from r1293449, incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/XBayaClient.java
    incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClientConfiguration.java
      - copied, changed from r1293449, incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/XBayaClientConfiguration.java
Removed:
    incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/XBayaClient.java
    incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/XBayaClientConfiguration.java

Copied: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClient.java (from r1293449, incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/XBayaClient.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClient.java?p2=incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClient.java&p1=incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/XBayaClient.java&r1=1293449&r2=1293450&rev=1293450&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/XBayaClient.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClient.java Fri Feb 24 22:01:40 2012
@@ -49,7 +49,7 @@ import java.util.List;
 import java.util.Properties;
 
 
-public class XBayaClient {
+public class AiravataClient {
     private static final MLogger log = MLogger.getLogger();
 
     public static final String GFAC = "gfac";
@@ -68,7 +68,7 @@ public class XBayaClient {
     public static final String MYPROXYPASS = "myproxy.password";
     public static final String WITHLISTENER = "with.Listener";
     public static final String WORKFLOWSERVICEURL = "xbaya.service.url";
-    private XBayaClientConfiguration clientConfiguration;
+    private AiravataClientConfiguration clientConfiguration;
     private static String workflow = "";
 
     private AiravataRegistry registry;
@@ -77,12 +77,12 @@ public class XBayaClient {
     
 //    private NameValue[] configurations = new NameValue[7];
 
-    public XBayaClient(NameValue[] configuration) throws MalformedURLException {
+    public AiravataClient(NameValue[] configuration) throws MalformedURLException {
         configurations = configuration;
         updateClientConfiguration(configurations);
     }
 
-    public XBayaClient(String fileName) throws RegistryException,MalformedURLException,IOException{
+    public AiravataClient(String fileName) throws RegistryException,MalformedURLException,IOException{
         URL url = this.getClass().getClassLoader().getResource(fileName);
         if(url == null){
             url = (new File(fileName)).toURL();
@@ -139,7 +139,7 @@ public class XBayaClient {
     }
 
     private void updateClientConfiguration(NameValue[] configurations) throws MalformedURLException {
-		XBayaClientConfiguration clientConfiguration = getClientConfiguration();
+		AiravataClientConfiguration clientConfiguration = getClientConfiguration();
     	for (NameValue configuration : configurations) {
 			if (configuration.getName().equals(GFAC)){
     			clientConfiguration.setJcrURL(new URL(configuration.getValue()));
@@ -176,7 +176,7 @@ public class XBayaClient {
 	}
     public void loadWorkflowFromaFile(String workflowFile)throws URISyntaxException,IOException {
         File workflow = null;
-        URL url = XBayaClient.class.getClassLoader().getResource(workflowFile);
+        URL url = AiravataClient.class.getClassLoader().getResource(workflowFile);
         if(url == null){
             url = (new File(workflowFile)).toURL();
         }
@@ -336,7 +336,7 @@ public class XBayaClient {
     }
 
     public static void setWorkflow(String workflow) {
-        XBayaClient.workflow = workflow;
+        AiravataClient.workflow = workflow;
     }
 
 	public AiravataRegistry getRegistry() {
@@ -355,9 +355,9 @@ public class XBayaClient {
 		return registry;
 	}
 
-	public XBayaClientConfiguration getClientConfiguration() {
+	public AiravataClientConfiguration getClientConfiguration() {
 		if (clientConfiguration==null){
-			clientConfiguration=new XBayaClientConfiguration();
+			clientConfiguration=new AiravataClientConfiguration();
 		}
 		return clientConfiguration;
 	}

Copied: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClientConfiguration.java (from r1293449, incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/XBayaClientConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClientConfiguration.java?p2=incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClientConfiguration.java&p1=incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/XBayaClientConfiguration.java&r1=1293449&r2=1293450&rev=1293450&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/XBayaClientConfiguration.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClientConfiguration.java Fri Feb 24 22:01:40 2012
@@ -23,7 +23,7 @@ package org.apache.airavata.client.airav
 
 import java.net.URL;
 
-public class XBayaClientConfiguration {
+public class AiravataClientConfiguration {
 	private URL gfacURL;
 	private URL xregistryURL;
 	private String myproxyHost="myproxy.teragrid.org";