svn commit: r1519887 - /airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java

[samindaw]

Author: samindaw
Date: Tue Sep  3 23:35:48 2013
New Revision: 1519887

URL: http://svn.apache.org/r1519887
Log:
removing hardcoded gateway id

Modified:
    
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java

Modified: 
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java?rev=1519887&r1=1519886&r2=1519887&view=diff
==============================================================================
--- 
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
 (original)
+++ 
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
 Tue Sep  3 23:35:48 2013
@@ -108,14 +108,14 @@ public class AiravataClient extends Obse
        protected AiravataClient() {
        }
 
-       private static HashMap<String, String> createConfig(URI registryUrl,
+       private static HashMap<String, String> createConfig(URI registryUrl, 
String gateway,
                        String username, String password) throws 
RepositoryException,
                        RegistryException, AiravataConfigurationException {
                HashMap<String, String> config = new HashMap<String, String>();
                if (registryUrl != null) {
                        config.put(AiravataClient.REGISTRY, 
registryUrl.toString());
                }
-               AiravataRegistry2 registryObject = getRegistry(registryUrl, 
"default",
+               AiravataRegistry2 registryObject = getRegistry(registryUrl, 
gateway,
                                username, new PasswordCallBackImpl(username, 
password));
                if (registryObject != null) {
                        URI uri = registryObject.getEventingServiceURI();
@@ -152,7 +152,7 @@ public class AiravataClient extends Obse
 
         try {
                        if (!configCreated) {
-                               configuration = createConfig(getRegitryURI(), 
getCurrentUser(),
+                               configuration = createConfig(getRegitryURI(), 
getGateway(), getCurrentUser(),
                                                getPassword());
                                configCreated = true;
                        }