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/26 21:59:05 UTC
svn commit: r1413838 - in
/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest:
./ client/
Author: chathuri
Date: Mon Nov 26 20:59:03 2012
New Revision: 1413838
URL: http://svn.apache.org/viewvc?rev=1413838&view=rev
Log:
updating rest client classes to get serviceURL
Modified:
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/Test.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/BasicRegistryResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/Test.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/Test.java?rev=1413838&r1=1413837&r2=1413838&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/Test.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/Test.java Mon Nov 26 20:59:03 2012
@@ -40,12 +40,12 @@ public class Test {
public static void configurationResourceClientTest(){
//configuration resource test
- ConfigurationResourceClient configurationResourceClient = new ConfigurationResourceClient("admin", new PasswordCallbackImpl("admin", "admin"));
+// ConfigurationResourceClient configurationResourceClient = new ConfigurationResourceClient("admin", new PasswordCallbackImpl("admin", "admin"));
- System.out.println("###############getConfiguration###############");
- Object configuration = configurationResourceClient.getConfiguration("key3");
- System.out.println(configuration.toString());
+// System.out.println("###############getConfiguration###############");
+// Object configuration = configurationResourceClient.getConfiguration("key3");
+// System.out.println(configuration.toString());
//
// System.out.println("###############getConfigurationList###############");
// configurationResourceClient.addWFInterpreterURI("http://192.168.17.1:8080/axis2/services/WorkflowInterpretor2");
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/BasicRegistryResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/BasicRegistryResourceClient.java?rev=1413838&r1=1413837&r2=1413838&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/BasicRegistryResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/BasicRegistryResourceClient.java Mon Nov 26 20:59:03 2012
@@ -46,15 +46,17 @@ public class BasicRegistryResourceClient
private final static Logger logger = LoggerFactory.getLogger(BasicRegistryResourceClient.class);
private String userName;
private PasswordCallback callback;
+ private String baseURI;
- public BasicRegistryResourceClient(String userName, PasswordCallback callback) {
+ public BasicRegistryResourceClient(String userName, String seriveURI, PasswordCallback callback) {
this.userName = userName;
this.callback = callback;
+ this.baseURI = seriveURI;
}
private URI getBaseURI() {
logger.info("Creating Base URI");
- return UriBuilder.fromUri("http://localhost:9080/airavata-services/").build();
+ return UriBuilder.fromUri(baseURI).build();
}
private WebResource getBasicRegistryBaseResource (){
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java?rev=1413838&r1=1413837&r2=1413838&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java Mon Nov 26 20:59:03 2012
@@ -53,15 +53,17 @@ public class ConfigurationResourceClient
private final static Logger logger = LoggerFactory.getLogger(ConfigurationResourceClient.class);
private String userName;
private PasswordCallback callback;
+ private String baseURI;
- public ConfigurationResourceClient(String userName, PasswordCallback callback) {
+ public ConfigurationResourceClient(String userName, String seriveURI, PasswordCallback callback) {
this.userName = userName;
this.callback = callback;
+ this.baseURI = seriveURI;
}
private URI getBaseURI() {
logger.info("Creating Base URI");
- return UriBuilder.fromUri("http://localhost:9080/airavata-services/").build();
+ return UriBuilder.fromUri(baseURI).build();
}
private WebResource getConfigurationBaseResource (){
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java?rev=1413838&r1=1413837&r2=1413838&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java Mon Nov 26 20:59:03 2012
@@ -54,15 +54,17 @@ public class DescriptorResourceClient {
private final static Logger logger = LoggerFactory.getLogger(DescriptorResourceClient.class);
private String userName;
private PasswordCallback callback;
+ private String baseURI;
- public DescriptorResourceClient(String userName, PasswordCallback callback) {
+ public DescriptorResourceClient(String userName, String serviceURI, PasswordCallback callback) {
this.userName = userName;
this.callback = callback;
+ this.baseURI = serviceURI;
}
private URI getBaseURI() {
logger.info("Creating Base URI");
- return UriBuilder.fromUri("http://localhost:9080/airavata-services/").build();
+ return UriBuilder.fromUri(baseURI).build();
}
private WebResource getDescriptorRegistryBaseResource (){
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java?rev=1413838&r1=1413837&r2=1413838&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java Mon Nov 26 20:59:03 2012
@@ -52,15 +52,17 @@ public class ExperimentResourceClient {
private final static Logger logger = LoggerFactory.getLogger(ExperimentResourceClient.class);
private String userName;
private PasswordCallback callback;
+ private String baseURI;
- public ExperimentResourceClient(String userName, PasswordCallback callback) {
+ public ExperimentResourceClient(String userName, String serviceURI, PasswordCallback callback) {
this.userName = userName;
this.callback = callback;
+ this.baseURI = serviceURI;
}
private URI getBaseURI() {
logger.info("Creating Base URI");
- return UriBuilder.fromUri("http://localhost:9080/airavata-services/").build();
+ return UriBuilder.fromUri(baseURI).build();
}
private WebResource getExperimentRegistryBaseResource (){
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java?rev=1413838&r1=1413837&r2=1413838&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java Mon Nov 26 20:59:03 2012
@@ -49,15 +49,17 @@ public class ProjectResourceClient {
private final static Logger logger = LoggerFactory.getLogger(ProjectResourceClient.class);
private String userName;
private PasswordCallback callback;
+ private String baseURI;
- public ProjectResourceClient(String userName, PasswordCallback callback) {
+ public ProjectResourceClient(String userName, String serviceURI, PasswordCallback callback) {
this.callback = callback;
this.userName = userName;
+ this.baseURI = serviceURI;
}
private URI getBaseURI() {
logger.info("Creating Base URI");
- return UriBuilder.fromUri("http://localhost:9080/airavata-services/").build();
+ return UriBuilder.fromUri(baseURI).build();
}
private WebResource getProjectRegistryBaseResource (){
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java?rev=1413838&r1=1413837&r2=1413838&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java Mon Nov 26 20:59:03 2012
@@ -56,15 +56,17 @@ public class ProvenanceResourceClient {
private final static Logger logger = LoggerFactory.getLogger(ProvenanceResourceClient.class);
private String userName;
private PasswordCallback callback;
+ private String baseURI;
- public ProvenanceResourceClient(String userName, PasswordCallback callback) {
+ public ProvenanceResourceClient(String userName, String serviceURL, PasswordCallback callback) {
this.userName = userName;
this.callback = callback;
+ this.baseURI = serviceURL;
}
private URI getBaseURI() {
logger.info("Creating Base URI");
- return UriBuilder.fromUri("http://localhost:9080/airavata-services/").build();
+ return UriBuilder.fromUri(baseURI).build();
}
private WebResource getProvenanceRegistryBaseResource (){
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java?rev=1413838&r1=1413837&r2=1413838&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java Mon Nov 26 20:59:03 2012
@@ -52,10 +52,12 @@ public class PublishedWorkflowResourceCl
private final static Logger logger = LoggerFactory.getLogger(PublishedWorkflowResourceClient.class);
private String userName;
private PasswordCallback callback;
+ private String baseURI;
- public PublishedWorkflowResourceClient(String userName, PasswordCallback callback) {
+ public PublishedWorkflowResourceClient(String userName, String serviceURI, PasswordCallback callback) {
this.userName = userName;
this.callback = callback;
+ this.baseURI = serviceURI;
}
private URI getBaseURI() {
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java?rev=1413838&r1=1413837&r2=1413838&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java Mon Nov 26 20:59:03 2012
@@ -32,6 +32,7 @@ import org.apache.airavata.registry.api.
import org.apache.airavata.registry.api.workflow.*;
import org.apache.airavata.registry.api.PasswordCallback;
+import javax.ws.rs.core.UriBuilder;
import java.net.URI;
import java.util.Date;
import java.util.List;
@@ -51,15 +52,19 @@ public class RegistryClient extends Aira
private PublishedWorkflowResourceClient publishedWorkflowResourceClient;
private UserWorkflowResourceClient userWorkflowResourceClient;
- public RegistryClient(String userName, PasswordCallback callback) {
- basicRegistryResourceClient = new BasicRegistryResourceClient(userName, callback);
- configurationResourceClient = new ConfigurationResourceClient(userName, callback);
- descriptorResourceClient = new DescriptorResourceClient(userName, callback);
- experimentResourceClient = new ExperimentResourceClient(userName, callback);
- projectResourceClient = new ProjectResourceClient(userName, callback);
- provenanceResourceClient = new ProvenanceResourceClient(userName, callback);
- publishedWorkflowResourceClient = new PublishedWorkflowResourceClient(userName, callback);
- userWorkflowResourceClient = new UserWorkflowResourceClient(userName, callback);
+ public RegistryClient(String userName, String serviceURI, PasswordCallback callback) {
+ basicRegistryResourceClient = new BasicRegistryResourceClient(userName, serviceURI, callback);
+ configurationResourceClient = new ConfigurationResourceClient(userName, serviceURI, callback);
+ descriptorResourceClient = new DescriptorResourceClient(userName, serviceURI, callback);
+ experimentResourceClient = new ExperimentResourceClient(userName, serviceURI, callback);
+ projectResourceClient = new ProjectResourceClient(userName, serviceURI, callback);
+ provenanceResourceClient = new ProvenanceResourceClient(userName, serviceURI, callback);
+ publishedWorkflowResourceClient = new PublishedWorkflowResourceClient(userName, serviceURI, callback);
+ userWorkflowResourceClient = new UserWorkflowResourceClient(userName,serviceURI,callback);
+ }
+
+ private URI getBaseURI() {
+ return UriBuilder.fromUri("http://localhost:9080/airavata-services/").build();
}
public BasicRegistryResourceClient getBasicRegistryResourceClient() {
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java?rev=1413838&r1=1413837&r2=1413838&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java Mon Nov 26 20:59:03 2012
@@ -51,15 +51,17 @@ public class UserWorkflowResourceClient
private final static Logger logger = LoggerFactory.getLogger(UserWorkflowResourceClient.class);
private String userName;
private PasswordCallback callback;
+ private String baseURI;
- public UserWorkflowResourceClient(String userName, PasswordCallback callback) {
+ public UserWorkflowResourceClient(String userName, String serviceURI, PasswordCallback callback) {
this.userName = userName;
this.callback = callback;
+ this.baseURI = serviceURI;
}
private URI getBaseURI() {
logger.info("Creating Base URI");
- return UriBuilder.fromUri("http://localhost:9080/airavata-services/").build();
+ return UriBuilder.fromUri(baseURI).build();
}
private com.sun.jersey.api.client.WebResource getUserWFRegistryBaseResource (){