Author: samindaw
Date: Tue Nov 27 20:29:50 2012
New Revision: 1414377
URL: http://svn.apache.org/viewvc?rev=1414377&view=rev
Log:
add the registry url to config
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientConfiguration.java
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.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=1414377&r1=1414376&r2=1414377&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 Nov 27 20:29:50 2012
@@ -68,11 +68,11 @@ import org.apache.airavata.common.except
import org.apache.airavata.common.utils.Version;
import org.apache.airavata.common.utils.XMLUtil;
import
org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
-import org.apache.airavata.registry.api.*;
-import
org.apache.airavata.registry.api.exception.RegistryAccessorInstantiateException;
-import
org.apache.airavata.registry.api.exception.RegistryAccessorInvalidException;
-import
org.apache.airavata.registry.api.exception.RegistryAccessorNotFoundException;
-import
org.apache.airavata.registry.api.exception.RegistryAccessorUndefinedException;
+import org.apache.airavata.registry.api.AiravataRegistry2;
+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.PasswordCallback;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.registry.api.workflow.ExperimentData;
import org.apache.airavata.workflow.model.component.ComponentException;
@@ -96,6 +96,7 @@ public class AiravataClient implements A
private static final Logger log = LoggerFactory
.getLogger(AiravataClient.class);
+ public static final String REGISTRY = "JCR";
public static final String GFAC = "gfac";
public static final String PROXYSERVER = "proxyserver";
public static final String MSGBOX = "msgbox";
@@ -196,7 +197,7 @@ public class AiravataClient implements A
private static HashMap<String, String> createConfig(URI
registryUrl,String username, String password) throws RepositoryException,
RegistryException, AiravataConfigurationException {
HashMap<String, String> config = new HashMap<String, String>();
-// config.put(AiravataClient.JCR, registryUrl.toString());
+ config.put(AiravataClient.REGISTRY, registryUrl.toString());
// config.put(AiravataClient.JCR_USERNAME, username);
// config.put(AiravataClient.JCR_PASSWORD, password);
AiravataRegistry2 registryObject = getRegistry(registryUrl,
"default", username, new PasswordCallBackImpl(username, password));
@@ -227,7 +228,7 @@ public class AiravataClient implements A
}
protected void initialize() throws MalformedURLException,
AiravataConfigurationException, RepositoryException, RegistryException {
if (!configCreated){
- createConfig(getRegitryURI(), getCurrentUser(),
getPassword());
+ configuration=createConfig(getRegitryURI(),
getCurrentUser(), getPassword());
configCreated=true;
}
updateClientConfiguration(configuration);
@@ -259,10 +260,9 @@ public class AiravataClient implements A
clientConfiguration.setMessagebrokerURL(new
URL(configuration
.get(BROKER)));
}
- // if (configuration.get(JCR)!= null) {
- // clientConfiguration
- // .setJcrURL(new URL(configuration.get(JCR)));
- // }
+ if (configuration.get(REGISTRY)!= null) {
+ clientConfiguration.setRegistryURL(new
URL(configuration.get(REGISTRY)));
+ }
if (configuration.get(WORKFLOWSERVICEURL) != null) {
clientConfiguration.setXbayaServiceURL(new
URL(configuration
.get(WORKFLOWSERVICEURL)));
@@ -272,7 +272,7 @@ public class AiravataClient implements A
.get(MSGBOX)));
}
- if (clientConfiguration.getJcrURL() != null
+ if (clientConfiguration.getRegistryURL() != null
&& clientConfiguration.getGfacURL() == null) {
try {
clientConfiguration.setGfacURL(getRegistryClient().getGFacURIs()
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientConfiguration.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientConfiguration.java?rev=1414377&r1=1414376&r2=1414377&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientConfiguration.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientConfiguration.java
Tue Nov 27 20:29:50 2012
@@ -78,10 +78,10 @@ public class AiravataClientConfiguration
public void setXbayaServiceURL(URL xbayaServiceURL) {
this.xbayaServiceURL = xbayaServiceURL;
}
- public URL getJcrURL() {
+ public URL getRegistryURL() {
return jcrURL;
}
- public void setJcrURL(URL jcrURL) {
+ public void setRegistryURL(URL jcrURL) {
this.jcrURL = jcrURL;
}
public String getJcrUsername() {
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java?rev=1414377&r1=1414376&r2=1414377&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java
Tue Nov 27 20:29:50 2012
@@ -176,7 +176,7 @@ public class AiravataManagerImpl impleme
@Override
public URI getRegistryURL() throws AiravataAPIInvocationException {
try {
- return
getClient().getClientConfiguration().getJcrURL().toURI();
+ return
getClient().getClientConfiguration().getRegistryURL().toURI();
} catch (URISyntaxException e) {
throw new AiravataAPIInvocationException(e);
}
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java?rev=1414377&r1=1414376&r2=1414377&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java
Tue Nov 27 20:29:50 2012
@@ -113,7 +113,7 @@ public class ExecutionManagerImpl implem
AiravataClientConfiguration config =
getClient().getClientConfiguration();
try {
return new
WorkflowContextHeaderBuilder(config.getMessagebrokerURL().toString(),
-
config.getGfacURL().toString(),config.getJcrURL().toString(),null,null,
+
config.getGfacURL().toString(),config.getRegistryURL().toString(),null,null,
config.getMessageboxURL().toString());
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
