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=1424180&r1=1424179&r2=1424180&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 Wed Dec 19 22:35:18 2012 @@ -57,13 +57,16 @@ public class PublishedWorkflowResourceCl private String baseURI; private Cookie cookie; private WebResource.Builder builder; + private String gateway; public PublishedWorkflowResourceClient(String userName, + String gateway, String serviceURI, PasswordCallback callback) { this.userName = userName; this.callback = callback; this.baseURI = serviceURI; + this.gateway = gateway; } private URI getBaseURI() { @@ -87,7 +90,10 @@ public class PublishedWorkflowResourceCl ResourcePathConstants.PublishedWFConstants.PUBLISHWF_EXIST); MultivaluedMap queryParams = new MultivaluedMapImpl(); queryParams.add("workflowName", workflowName); - ClientResponse response = webResource.queryParams(queryParams).accept( + builder = BasicAuthHeaderUtil.getBuilder( + webResource, queryParams, userName, null, cookie, gateway); + + ClientResponse response = builder.accept( MediaType.TEXT_PLAIN).get(ClientResponse.class); int status = response.getStatus(); @@ -96,30 +102,32 @@ public class PublishedWorkflowResourceCl throw new RuntimeException("Failed : HTTP error code : " + status); } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { - if (cookie != null){ - builder = BasicAuthHeaderUtil.getBuilder( - webResource, queryParams, userName, callback.getPassword(userName), cookie); - response = builder.accept(MediaType.TEXT_PLAIN).get(ClientResponse.class); + builder = BasicAuthHeaderUtil.getBuilder( + webResource, queryParams, userName, callback.getPassword(userName), null, gateway); + response = builder.accept(MediaType.TEXT_PLAIN).get(ClientResponse.class); + status = response.getStatus(); + if (status == ClientConstant.HTTP_OK) { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); + } + } + String exists = response.getEntity(String.class); + if (exists.equals("True")) { + return true; } else { - builder = BasicAuthHeaderUtil.getBuilder( - webResource, queryParams, userName, callback.getPassword(userName), null); - response = builder.accept(MediaType.TEXT_PLAIN).get(ClientResponse.class); + return false; + } + } else { + if(response.getCookies().size() > 0){ cookie = response.getCookies().get(0).toCookie(); } - status = response.getStatus(); - String exists = response.getEntity(String.class); - if (exists.equals("True")){ + if (exists.equals("True")) { return true; } else { return false; } } - else { - logger.error(response.getEntity(String.class)); - throw new RuntimeException("Failed : HTTP error code : " - + status); - } } public void publishWorkflow(String workflowName, String publishWorkflowName) { @@ -128,8 +136,10 @@ public class PublishedWorkflowResourceCl MultivaluedMap formParams = new MultivaluedMapImpl(); formParams.add("workflowName", workflowName); formParams.add("publishWorkflowName", publishWorkflowName); + builder = BasicAuthHeaderUtil.getBuilder( + webResource, null, userName, null, cookie, gateway); - ClientResponse response = webResource.accept( + ClientResponse response = builder.accept( MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams); int status = response.getStatus(); if (status != ClientConstant.HTTP_OK && status != ClientConstant.HTTP_UNAUTHORIZED) { @@ -137,21 +147,22 @@ public class PublishedWorkflowResourceCl throw new RuntimeException("Failed : HTTP error code : " + status); } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { - if (cookie != null){ - builder = BasicAuthHeaderUtil.getBuilder( - webResource, null, userName, callback.getPassword(userName), cookie); - response = builder.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams); - } else { - builder = BasicAuthHeaderUtil.getBuilder( - webResource, null, userName, callback.getPassword(userName), null); - response = builder.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams); - cookie = response.getCookies().get(0).toCookie(); - } + builder = BasicAuthHeaderUtil.getBuilder( + webResource, null, userName, callback.getPassword(userName), null, gateway); + response = builder.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams); status = response.getStatus(); if (status != ClientConstant.HTTP_OK) { logger.error(response.getEntity(String.class)); throw new RuntimeException("Failed : HTTP error code : " + status); + } else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); + } + } + } else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); } } } @@ -161,8 +172,10 @@ public class PublishedWorkflowResourceCl ResourcePathConstants.PublishedWFConstants.PUBLISH_DEFAULT_WORKFLOW); MultivaluedMap formParams = new MultivaluedMapImpl(); formParams.add("workflowName", workflowName); + builder = BasicAuthHeaderUtil.getBuilder( + webResource, null, userName, null, cookie, gateway); - ClientResponse response = webResource.accept( + ClientResponse response = builder.accept( MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams); int status = response.getStatus(); if (status != ClientConstant.HTTP_OK && status != ClientConstant.HTTP_UNAUTHORIZED) { @@ -170,21 +183,22 @@ public class PublishedWorkflowResourceCl throw new RuntimeException("Failed : HTTP error code : " + status); } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { - if (cookie != null){ - builder = BasicAuthHeaderUtil.getBuilder( - webResource, null, userName, callback.getPassword(userName), cookie); - response = builder.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams); - } else { - builder = BasicAuthHeaderUtil.getBuilder( - webResource, null, userName, callback.getPassword(userName), null); - response = builder.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams); - cookie = response.getCookies().get(0).toCookie(); - } + builder = BasicAuthHeaderUtil.getBuilder( + webResource, null, userName, callback.getPassword(userName), null, gateway); + response = builder.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams); status = response.getStatus(); if (status != ClientConstant.HTTP_OK) { logger.error(response.getEntity(String.class)); throw new RuntimeException("Failed : HTTP error code : " + status); + } else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); + } + } + } else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); } } @@ -195,35 +209,42 @@ public class PublishedWorkflowResourceCl ResourcePathConstants.PublishedWFConstants.GET_PUBLISHWORKFLOWGRAPH); MultivaluedMap queryParams = new MultivaluedMapImpl(); queryParams.add("workflowName", workflowName); - ClientResponse response = webResource.queryParams(queryParams).accept( + builder = BasicAuthHeaderUtil.getBuilder( + webResource, queryParams, userName, null, cookie, gateway); + + ClientResponse response = builder.accept( MediaType.APPLICATION_FORM_URLENCODED).get(ClientResponse.class); int status = response.getStatus(); - if (status != ClientConstant.HTTP_OK && status != ClientConstant.HTTP_UNAUTHORIZED) { + if (status != ClientConstant.HTTP_OK && + status != ClientConstant.HTTP_UNAUTHORIZED && + status != ClientConstant.HTTP_NO_CONTENT) { logger.error(response.getEntity(String.class)); throw new RuntimeException("Failed : HTTP error code : " + status); } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { - if (cookie != null){ - builder = BasicAuthHeaderUtil.getBuilder( - webResource, queryParams, userName, callback.getPassword(userName), cookie); - response = builder.accept( - MediaType.APPLICATION_FORM_URLENCODED).get(ClientResponse.class); - } else { - builder = BasicAuthHeaderUtil.getBuilder( - webResource, queryParams, userName, callback.getPassword(userName), null); - response = builder.accept( - MediaType.APPLICATION_FORM_URLENCODED).get(ClientResponse.class); - cookie = response.getCookies().get(0).toCookie(); - } + builder = BasicAuthHeaderUtil.getBuilder( + webResource, queryParams, userName, callback.getPassword(userName), null, gateway); + response = builder.accept( + MediaType.APPLICATION_FORM_URLENCODED).get(ClientResponse.class); status = response.getStatus(); - if(status == ClientConstant.HTTP_NO_CONTENT){ + if (status == ClientConstant.HTTP_NO_CONTENT) { return null; } if (status != ClientConstant.HTTP_OK) { logger.error(response.getEntity(String.class)); throw new RuntimeException("Failed : HTTP error code : " + status); + } else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); + } + } + } else if (status == ClientConstant.HTTP_NO_CONTENT) { + return null; + }else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); } } String wfGraph = response.getEntity(String.class); @@ -234,33 +255,41 @@ public class PublishedWorkflowResourceCl public List<String> getPublishedWorkflowNames() { webResource = getPublishedWFRegistryBaseResource().path( ResourcePathConstants.PublishedWFConstants.GET_PUBLISHWORKFLOWNAMES); - ClientResponse response = webResource.accept( + builder = BasicAuthHeaderUtil.getBuilder( + webResource, null, userName, null, cookie, gateway); + + ClientResponse response = builder.accept( MediaType.APPLICATION_JSON).get(ClientResponse.class); int status = response.getStatus(); - if (status != ClientConstant.HTTP_OK && status != ClientConstant.HTTP_UNAUTHORIZED) { + if (status != ClientConstant.HTTP_OK && + status != ClientConstant.HTTP_UNAUTHORIZED && + status != ClientConstant.HTTP_NO_CONTENT) { logger.error(response.getEntity(String.class)); throw new RuntimeException("Failed : HTTP error code : " + status); } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { - if (cookie != null){ - builder = BasicAuthHeaderUtil.getBuilder( - webResource, null, userName, callback.getPassword(userName), cookie); - response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - } else { - builder = BasicAuthHeaderUtil.getBuilder( - webResource, null, userName, callback.getPassword(userName), null); - response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - cookie = response.getCookies().get(0).toCookie(); - } + builder = BasicAuthHeaderUtil.getBuilder( + webResource, null, userName, callback.getPassword(userName), null, gateway); + response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); status = response.getStatus(); - if(status == ClientConstant.HTTP_NO_CONTENT){ + if (status == ClientConstant.HTTP_NO_CONTENT) { return new ArrayList<String>(); } if (status != ClientConstant.HTTP_OK) { logger.error(response.getEntity(String.class)); throw new RuntimeException("Failed : HTTP error code : " + status); + } else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); + } + } + } else if (status == ClientConstant.HTTP_NO_CONTENT) { + return new ArrayList<String>(); + } else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); } } @@ -274,33 +303,41 @@ public class PublishedWorkflowResourceCl Map<String, String> publishWFmap = new HashMap<String, String>(); webResource = getPublishedWFRegistryBaseResource().path( ResourcePathConstants.PublishedWFConstants.GET_PUBLISHWORKFLOWS); - ClientResponse response = webResource.accept( + builder = BasicAuthHeaderUtil.getBuilder( + webResource, null, userName, null, cookie, gateway); + + ClientResponse response = builder.accept( MediaType.APPLICATION_JSON).get(ClientResponse.class); int status = response.getStatus(); - if (status != ClientConstant.HTTP_OK && status != ClientConstant.HTTP_UNAUTHORIZED) { + if (status != ClientConstant.HTTP_OK && + status != ClientConstant.HTTP_UNAUTHORIZED && + status != ClientConstant.HTTP_NO_CONTENT) { logger.error(response.getEntity(String.class)); throw new RuntimeException("Failed : HTTP error code : " + status); } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { - if (cookie != null){ - builder = BasicAuthHeaderUtil.getBuilder( - webResource, null, userName, callback.getPassword(userName), cookie); - response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - } else { - builder = BasicAuthHeaderUtil.getBuilder( - webResource, null, userName, callback.getPassword(userName), null); - response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - cookie = response.getCookies().get(0).toCookie(); - } + builder = BasicAuthHeaderUtil.getBuilder( + webResource, null, userName, callback.getPassword(userName), null, gateway); + response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); status = response.getStatus(); - if(status == ClientConstant.HTTP_NO_CONTENT){ + if (status == ClientConstant.HTTP_NO_CONTENT) { return publishWFmap; } if (status != ClientConstant.HTTP_OK) { logger.error(response.getEntity(String.class)); throw new RuntimeException("Failed : HTTP error code : " + status); + } else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); + } + } + } else if (status == ClientConstant.HTTP_NO_CONTENT) { + return publishWFmap; + } else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); } } @@ -319,7 +356,10 @@ public class PublishedWorkflowResourceCl ResourcePathConstants.PublishedWFConstants.REMOVE_PUBLISHWORKFLOW); MultivaluedMap queryParams = new MultivaluedMapImpl(); queryParams.add("workflowName", workflowName); - ClientResponse response = webResource.queryParams(queryParams).accept( + builder = BasicAuthHeaderUtil.getBuilder( + webResource, queryParams, userName, null, cookie, gateway); + + ClientResponse response = builder.accept( MediaType.TEXT_PLAIN).delete(ClientResponse.class); int status = response.getStatus(); @@ -328,22 +368,23 @@ public class PublishedWorkflowResourceCl throw new RuntimeException("Failed : HTTP error code : " + status); } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { - if (cookie != null){ - builder = BasicAuthHeaderUtil.getBuilder( - webResource, queryParams, userName, callback.getPassword(userName), cookie); - response = builder.accept(MediaType.TEXT_PLAIN).delete(ClientResponse.class); - } else { - builder = BasicAuthHeaderUtil.getBuilder( - webResource, queryParams, userName, callback.getPassword(userName), null); - response = builder.accept(MediaType.TEXT_PLAIN).delete(ClientResponse.class); - cookie = response.getCookies().get(0).toCookie(); - } + builder = BasicAuthHeaderUtil.getBuilder( + webResource, queryParams, userName, callback.getPassword(userName), null, gateway); + response = builder.accept(MediaType.TEXT_PLAIN).delete(ClientResponse.class); status = response.getStatus(); if (status != ClientConstant.HTTP_OK) { logger.error(response.getEntity(String.class)); throw new RuntimeException("Failed : HTTP error code : " + status); + } else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); + } + } + } else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); } }
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=1424180&r1=1424179&r2=1424180&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 Wed Dec 19 22:35:18 2012 @@ -97,14 +97,14 @@ public class RegistryClient extends Aira String userName = getUser().getUserName(); callback = getCallback(); String serviceURI = getConnectionURI().toString(); - 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); + basicRegistryResourceClient = new BasicRegistryResourceClient(userName, getGateway().getGatewayName(), serviceURI, callback); + configurationResourceClient = new ConfigurationResourceClient(userName, getGateway().getGatewayName(),serviceURI, callback); + descriptorResourceClient = new DescriptorResourceClient(userName, getGateway().getGatewayName(),serviceURI, callback); + experimentResourceClient = new ExperimentResourceClient(userName, getGateway().getGatewayName(),serviceURI, callback); + projectResourceClient = new ProjectResourceClient(userName, getGateway().getGatewayName(),serviceURI, callback); + provenanceResourceClient = new ProvenanceResourceClient(userName, getGateway().getGatewayName(),serviceURI, callback); + publishedWorkflowResourceClient = new PublishedWorkflowResourceClient(userName, getGateway().getGatewayName(),serviceURI, callback); + userWorkflowResourceClient = new UserWorkflowResourceClient(userName,getGateway().getGatewayName(),serviceURI,callback); } public Object getConfiguration(String key) { 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=1424180&r1=1424179&r2=1424180&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 Wed Dec 19 22:35:18 2012 @@ -55,15 +55,19 @@ public class UserWorkflowResourceClient private String baseURI; private Cookie cookie; private WebResource.Builder builder; + private String gateway; public UserWorkflowResourceClient(String userName, + String gateway, String serviceURI, PasswordCallback callback) { this.userName = userName; this.callback = callback; this.baseURI = serviceURI; + this.gateway = gateway; } + private URI getBaseURI() { logger.debug("Creating Base URI"); return UriBuilder.fromUri(baseURI).build(); @@ -85,7 +89,10 @@ public class UserWorkflowResourceClient ResourcePathConstants.UserWFConstants.WORKFLOW_EXIST); MultivaluedMap queryParams = new MultivaluedMapImpl(); queryParams.add("workflowName", workflowName); - ClientResponse response = webResource.queryParams(queryParams).accept( + builder = BasicAuthHeaderUtil.getBuilder( + webResource, queryParams, userName, null, cookie, gateway); + + ClientResponse response = builder.accept( MediaType.TEXT_PLAIN).get(ClientResponse.class); int status = response.getStatus(); @@ -94,28 +101,31 @@ public class UserWorkflowResourceClient throw new RuntimeException("Failed : HTTP error code : " + status); } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { - if (cookie != null){ - builder = BasicAuthHeaderUtil.getBuilder( - webResource, queryParams, userName, callback.getPassword(userName), cookie); - response = builder.accept(MediaType.TEXT_PLAIN).get(ClientResponse.class); + builder = BasicAuthHeaderUtil.getBuilder( + webResource, queryParams, userName, callback.getPassword(userName), null, gateway); + response = builder.accept(MediaType.TEXT_PLAIN).get(ClientResponse.class); + status = response.getStatus(); + if (status == ClientConstant.HTTP_OK) { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); + } + } + String exists = response.getEntity(String.class); + if (exists.equals("True")) { + return true; } else { - builder = BasicAuthHeaderUtil.getBuilder( - webResource, queryParams, userName, callback.getPassword(userName), null); - response = builder.accept(MediaType.TEXT_PLAIN).get(ClientResponse.class); + return false; + } + } else { + if(response.getCookies().size() > 0){ cookie = response.getCookies().get(0).toCookie(); } - status = response.getStatus(); - String exists = response.getEntity(String.class); - if (exists.equals("True")){ + if (exists.equals("True")) { return true; } else { return false; } - }else { - logger.error(response.getEntity(String.class)); - throw new RuntimeException("Failed : HTTP error code : " - + status); } } @@ -125,8 +135,10 @@ public class UserWorkflowResourceClient MultivaluedMap formParams = new MultivaluedMapImpl(); formParams.add("workflowName", workflowName); formParams.add("workflowGraphXml", workflowGraphXml); + builder = BasicAuthHeaderUtil.getBuilder( + webResource, null, userName, null, cookie, gateway); - ClientResponse response = webResource.type( + ClientResponse response = builder.type( MediaType.APPLICATION_FORM_URLENCODED).accept( MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams); int status = response.getStatus(); @@ -135,23 +147,23 @@ public class UserWorkflowResourceClient throw new RuntimeException("Failed : HTTP error code : " + status); } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { - if (cookie != null){ - builder = BasicAuthHeaderUtil.getBuilder( - webResource, null, userName, callback.getPassword(userName), cookie); - response = builder.type(MediaType.APPLICATION_FORM_URLENCODED).accept( - MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams); - } else { - builder = BasicAuthHeaderUtil.getBuilder( - webResource, null, userName, callback.getPassword(userName), null); - response = builder.type(MediaType.APPLICATION_FORM_URLENCODED).accept( - MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams); - cookie = response.getCookies().get(0).toCookie(); - } + builder = BasicAuthHeaderUtil.getBuilder( + webResource, null, userName, callback.getPassword(userName), null, gateway); + response = builder.type(MediaType.APPLICATION_FORM_URLENCODED).accept( + MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams); status = response.getStatus(); if (status != ClientConstant.HTTP_OK) { logger.error(response.getEntity(String.class)); throw new RuntimeException("Failed : HTTP error code : " + status); + } else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); + } + } + } else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); } } } @@ -162,8 +174,10 @@ public class UserWorkflowResourceClient MultivaluedMap formParams = new MultivaluedMapImpl(); formParams.add("workflowName", workflowName); formParams.add("workflowGraphXml", workflowGraphXml); + builder = BasicAuthHeaderUtil.getBuilder( + webResource, null, userName, null, cookie, gateway); - ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).type( + ClientResponse response = builder.accept(MediaType.TEXT_PLAIN).type( MediaType.APPLICATION_FORM_URLENCODED).post(ClientResponse.class, formParams); int status = response.getStatus(); if (status != ClientConstant.HTTP_OK && status != ClientConstant.HTTP_UNAUTHORIZED) { @@ -171,23 +185,23 @@ public class UserWorkflowResourceClient throw new RuntimeException("Failed : HTTP error code : " + status); } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { - if (cookie != null){ - builder = BasicAuthHeaderUtil.getBuilder( - webResource, null, userName, callback.getPassword(userName), cookie); - response = builder.accept(MediaType.TEXT_PLAIN).type( - MediaType.APPLICATION_FORM_URLENCODED).post(ClientResponse.class, formParams); - } else { - builder = BasicAuthHeaderUtil.getBuilder( - webResource, null, userName, callback.getPassword(userName), null); - response = builder.accept(MediaType.TEXT_PLAIN).type( - MediaType.APPLICATION_FORM_URLENCODED).post(ClientResponse.class, formParams); - cookie = response.getCookies().get(0).toCookie(); - } + builder = BasicAuthHeaderUtil.getBuilder( + webResource, null, userName, callback.getPassword(userName), null, gateway); + response = builder.accept(MediaType.TEXT_PLAIN).type( + MediaType.APPLICATION_FORM_URLENCODED).post(ClientResponse.class, formParams); status = response.getStatus(); if (status != ClientConstant.HTTP_OK) { logger.error(response.getEntity(String.class)); throw new RuntimeException("Failed : HTTP error code : " + status); + } else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); + } + } + } else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); } } } @@ -197,35 +211,42 @@ public class UserWorkflowResourceClient ResourcePathConstants.UserWFConstants.GET_WORKFLOWGRAPH); MultivaluedMap queryParams = new MultivaluedMapImpl(); queryParams.add("workflowName", workflowName); - ClientResponse response = webResource.queryParams(queryParams).accept( + builder = BasicAuthHeaderUtil.getBuilder( + webResource, queryParams, userName, callback.getPassword(userName), cookie, gateway); + + ClientResponse response = builder.accept( MediaType.APPLICATION_FORM_URLENCODED).get(ClientResponse.class); int status = response.getStatus(); - if (status != ClientConstant.HTTP_OK && status != ClientConstant.HTTP_UNAUTHORIZED) { + if (status != ClientConstant.HTTP_OK && + status != ClientConstant.HTTP_UNAUTHORIZED && + status != ClientConstant.HTTP_NO_CONTENT) { logger.error(response.getEntity(String.class)); throw new RuntimeException("Failed : HTTP error code : " + status); } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { - if (cookie != null){ - builder = BasicAuthHeaderUtil.getBuilder( - webResource, queryParams, userName, callback.getPassword(userName), cookie); - response = builder.accept( - MediaType.APPLICATION_FORM_URLENCODED).get(ClientResponse.class); - } else { - builder = BasicAuthHeaderUtil.getBuilder( - webResource, queryParams, userName, callback.getPassword(userName), null); - response = builder.accept( - MediaType.APPLICATION_FORM_URLENCODED).get(ClientResponse.class); - cookie = response.getCookies().get(0).toCookie(); - } + builder = BasicAuthHeaderUtil.getBuilder( + webResource, queryParams, userName, callback.getPassword(userName), null, gateway); + response = builder.accept( + MediaType.APPLICATION_FORM_URLENCODED).get(ClientResponse.class); status = response.getStatus(); - if(status == ClientConstant.HTTP_NO_CONTENT){ + if (status == ClientConstant.HTTP_NO_CONTENT) { return null; } if (status != ClientConstant.HTTP_OK) { logger.error(response.getEntity(String.class)); throw new RuntimeException("Failed : HTTP error code : " + status); + } else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); + } + } + } else if (status == ClientConstant.HTTP_NO_CONTENT) { + return null; + }else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); } } @@ -237,33 +258,41 @@ public class UserWorkflowResourceClient Map<String, String> userWFMap = new HashMap<String, String>(); webResource = getUserWFRegistryBaseResource().path( ResourcePathConstants.UserWFConstants.GET_WORKFLOWS); - ClientResponse response = webResource.accept( + builder = BasicAuthHeaderUtil.getBuilder( + webResource, null, userName, null, cookie, gateway); + + ClientResponse response = builder.accept( MediaType.APPLICATION_JSON).get(ClientResponse.class); int status = response.getStatus(); - if (status != ClientConstant.HTTP_OK && status != ClientConstant.HTTP_UNAUTHORIZED) { + if (status != ClientConstant.HTTP_OK && + status != ClientConstant.HTTP_UNAUTHORIZED && + status != ClientConstant.HTTP_NO_CONTENT) { logger.error(response.getEntity(String.class)); throw new RuntimeException("Failed : HTTP error code : " + status); } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { - if (cookie != null){ - builder = BasicAuthHeaderUtil.getBuilder( - webResource, null, userName, callback.getPassword(userName), cookie); - response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - } else { - builder = BasicAuthHeaderUtil.getBuilder( - webResource, null, userName, callback.getPassword(userName), null); - response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - cookie = response.getCookies().get(0).toCookie(); - } + builder = BasicAuthHeaderUtil.getBuilder( + webResource, null, userName, callback.getPassword(userName), null, gateway); + response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); status = response.getStatus(); - if(status == ClientConstant.HTTP_NO_CONTENT){ + if (status == ClientConstant.HTTP_NO_CONTENT) { return userWFMap; } if (status != ClientConstant.HTTP_OK) { logger.error(response.getEntity(String.class)); throw new RuntimeException("Failed : HTTP error code : " + status); + } else if (status == ClientConstant.HTTP_NO_CONTENT) { + return userWFMap; + } else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); + } + } + } else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); } } @@ -282,7 +311,10 @@ public class UserWorkflowResourceClient ResourcePathConstants.UserWFConstants.REMOVE_WORKFLOW); MultivaluedMap queryParams = new MultivaluedMapImpl(); queryParams.add("workflowName", workflowName); - ClientResponse response = webResource.queryParams(queryParams).accept( + builder = BasicAuthHeaderUtil.getBuilder( + webResource, queryParams, userName, null, cookie, gateway); + + ClientResponse response = builder.accept( MediaType.TEXT_PLAIN).delete(ClientResponse.class); int status = response.getStatus(); @@ -291,22 +323,23 @@ public class UserWorkflowResourceClient throw new RuntimeException("Failed : HTTP error code : " + status); } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { - if (cookie != null){ - builder = BasicAuthHeaderUtil.getBuilder( - webResource, queryParams, userName, callback.getPassword(userName), cookie); - response = builder.accept(MediaType.TEXT_PLAIN).delete(ClientResponse.class); - } else { - builder = BasicAuthHeaderUtil.getBuilder( - webResource, queryParams, userName, callback.getPassword(userName), null); - response = builder.accept(MediaType.TEXT_PLAIN).delete(ClientResponse.class); - cookie = response.getCookies().get(0).toCookie(); - } + builder = BasicAuthHeaderUtil.getBuilder( + webResource, queryParams, userName, callback.getPassword(userName), null, gateway); + response = builder.accept(MediaType.TEXT_PLAIN).delete(ClientResponse.class); status = response.getStatus(); if (status != ClientConstant.HTTP_OK) { logger.error(response.getEntity(String.class)); throw new RuntimeException("Failed : HTTP error code : " + status); + } else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); + } + } + } else { + if(response.getCookies().size() > 0){ + cookie = response.getCookies().get(0).toCookie(); } } } Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/BasicAuthHeaderUtil.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/BasicAuthHeaderUtil.java?rev=1424180&r1=1424179&r2=1424180&view=diff ============================================================================== --- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/BasicAuthHeaderUtil.java (original) +++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/BasicAuthHeaderUtil.java Wed Dec 19 22:35:18 2012 @@ -48,12 +48,14 @@ public class BasicAuthHeaderUtil { MultivaluedMap queryParams, String userName, String password, - Cookie cookie) { + Cookie cookie, + String gateway) { if (queryParams != null){ webResource = webResource.queryParams(queryParams); } WebResource.Builder builder = webResource.header("Authorization", BasicAuthHeaderUtil.getBasicAuthHeader(userName, password)); + builder.header("gateway_id", gateway); if (cookie != null){ builder.cookie(cookie); } Modified: airavata/trunk/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml?rev=1424180&r1=1424179&r2=1424180&view=diff ============================================================================== --- airavata/trunk/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml (original) +++ airavata/trunk/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml Wed Dec 19 22:35:18 2012 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- This web.xml file is not required when using Servlet 3.0 container, see implementation details http://jersey.java.net/nonav/documentation/latest/jax-rs.html#d4e194 --> -<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://java.sun.com/xml/ns/javaee"; - xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"; +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns="http://java.sun.com/xml/ns/javaee"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"; id="WebApp_ID" version="2.5"> <listener>
