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=1429054&r1=1429053&r2=1429054&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 Fri Jan 4 19:38:38 2013 @@ -54,6 +54,7 @@ import org.apache.airavata.rest.mappings import org.apache.airavata.rest.mappings.utils.ResourcePathConstants; import org.apache.airavata.rest.utils.BasicAuthHeaderUtil; import org.apache.airavata.rest.utils.ClientConstant; +import org.apache.airavata.rest.utils.CookieManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -74,15 +75,18 @@ public class ProvenanceResourceClient { private Cookie cookie; private WebResource.Builder builder; private String gateway; +// private CookieManager CookieManager = new CookieManager(); public ProvenanceResourceClient(String userName, String gateway, String serviceURL, - PasswordCallback callback) { + PasswordCallback callback, + Cookie cookie) { this.userName = userName; this.callback = callback; this.baseURI = serviceURL; this.gateway = gateway; + this.cookie = cookie; } private URI getBaseURI() { @@ -116,6 +120,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -130,6 +135,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else { @@ -153,6 +159,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -169,6 +176,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -197,6 +205,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } String exists = response.getEntity(String.class); if (exists.equals("True")) { @@ -212,6 +221,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } String exists = response.getEntity(String.class); @@ -241,6 +251,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -257,6 +268,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -285,6 +297,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -298,6 +311,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else { @@ -321,6 +335,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -337,6 +352,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -366,6 +382,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -379,6 +396,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else { @@ -403,6 +421,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -419,6 +438,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -449,6 +469,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -462,6 +483,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else { @@ -487,6 +509,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -503,6 +526,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -538,6 +562,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } return true; } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { @@ -548,6 +573,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } String exists = response.getEntity(String.class); @@ -579,6 +605,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } return true; } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { @@ -589,6 +616,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } String exists = response.getEntity(String.class); @@ -620,6 +648,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -633,6 +662,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else { @@ -664,6 +694,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -678,6 +709,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else { @@ -702,6 +734,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -718,6 +751,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -749,6 +783,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -763,6 +798,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else { @@ -789,6 +825,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -802,6 +839,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else { @@ -826,6 +864,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -842,6 +881,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -871,6 +911,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -887,6 +928,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -917,6 +959,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -933,6 +976,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -969,6 +1013,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -985,6 +1030,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -1019,6 +1065,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -1035,6 +1082,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -1066,6 +1114,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -1082,6 +1131,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -1121,6 +1171,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -1135,6 +1186,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else { @@ -1163,6 +1215,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -1177,6 +1230,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else { @@ -1205,6 +1259,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -1219,6 +1274,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else { @@ -1244,6 +1300,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -1260,6 +1317,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -1291,6 +1349,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -1307,6 +1366,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -1343,6 +1403,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -1359,6 +1420,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -1394,6 +1456,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -1408,6 +1471,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else { @@ -1432,6 +1496,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -1448,6 +1513,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -1478,6 +1544,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } return true; } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { @@ -1488,6 +1555,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } String exists = response.getEntity(String.class); @@ -1522,6 +1590,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } return true; } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { @@ -1532,6 +1601,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } String exists = response.getEntity(String.class); @@ -1564,6 +1634,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -1580,6 +1651,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -1614,6 +1686,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -1628,6 +1701,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else { @@ -1655,6 +1729,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -1669,6 +1744,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else { @@ -1695,6 +1771,7 @@ public class ProvenanceResourceClient { if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -1708,6 +1785,7 @@ public class ProvenanceResourceClient { } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else {
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=1429054&r1=1429053&r2=1429054&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 Fri Jan 4 19:38:38 2013 @@ -36,6 +36,7 @@ import org.apache.airavata.rest.mappings import org.apache.airavata.rest.mappings.utils.ResourcePathConstants; import org.apache.airavata.rest.utils.BasicAuthHeaderUtil; import org.apache.airavata.rest.utils.ClientConstant; +import org.apache.airavata.rest.utils.CookieManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,15 +59,18 @@ public class PublishedWorkflowResourceCl private Cookie cookie; private WebResource.Builder builder; private String gateway; +// private CookieManager cookieManager = new CookieManager(); public PublishedWorkflowResourceClient(String userName, String gateway, String serviceURI, - PasswordCallback callback) { + PasswordCallback callback, + Cookie cookie) { this.userName = userName; this.callback = callback; this.baseURI = serviceURI; this.gateway = gateway; + this.cookie = cookie; } private URI getBaseURI() { @@ -100,6 +104,7 @@ public class PublishedWorkflowResourceCl if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } String exists = response.getEntity(String.class); if (exists.equals("True")) { @@ -115,6 +120,7 @@ public class PublishedWorkflowResourceCl if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } String exists = response.getEntity(String.class); @@ -146,6 +152,7 @@ public class PublishedWorkflowResourceCl if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -159,6 +166,7 @@ public class PublishedWorkflowResourceCl } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else { @@ -183,6 +191,7 @@ public class PublishedWorkflowResourceCl if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -196,6 +205,7 @@ public class PublishedWorkflowResourceCl } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else { @@ -220,6 +230,7 @@ public class PublishedWorkflowResourceCl if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -237,6 +248,7 @@ public class PublishedWorkflowResourceCl } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -265,6 +277,7 @@ public class PublishedWorkflowResourceCl if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -281,6 +294,7 @@ public class PublishedWorkflowResourceCl } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -311,6 +325,7 @@ public class PublishedWorkflowResourceCl if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -327,6 +342,7 @@ public class PublishedWorkflowResourceCl } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -362,6 +378,7 @@ public class PublishedWorkflowResourceCl if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -376,6 +393,7 @@ public class PublishedWorkflowResourceCl } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else { 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=1429054&r1=1429053&r2=1429054&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 Fri Jan 4 19:38:38 2013 @@ -40,6 +40,7 @@ import org.apache.airavata.registry.api. import org.apache.airavata.registry.api.exception.worker.ExperimentDoesNotExistsException; import org.apache.airavata.registry.api.workflow.*; import org.apache.airavata.registry.api.workflow.NodeExecutionData; +import org.apache.airavata.rest.utils.CookieManager; public class RegistryClient extends AiravataRegistry2 { @@ -55,6 +56,8 @@ public class RegistryClient extends Aira private PublishedWorkflowResourceClient publishedWorkflowResourceClient; private UserWorkflowResourceClient userWorkflowResourceClient; +// private CookieManager cookieManager = new CookieManager(); + public RegistryClient() { } @@ -97,14 +100,30 @@ public class RegistryClient extends Aira String userName = getUser().getUserName(); callback = getCallback(); String serviceURI = getConnectionURI().toString(); - 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); + basicRegistryResourceClient = + new BasicRegistryResourceClient( + userName, getGateway().getGatewayName(), serviceURI, callback, CookieManager.getCookie()); + configurationResourceClient = + new ConfigurationResourceClient( + userName, getGateway().getGatewayName(),serviceURI, callback, CookieManager.getCookie()); + descriptorResourceClient = + new DescriptorResourceClient( + userName, getGateway().getGatewayName(),serviceURI, callback, CookieManager.getCookie()); + experimentResourceClient = + new ExperimentResourceClient( + userName, getGateway().getGatewayName(),serviceURI, callback, CookieManager.getCookie()); + projectResourceClient = + new ProjectResourceClient( + userName, getGateway().getGatewayName(),serviceURI, callback, CookieManager.getCookie()); + provenanceResourceClient = + new ProvenanceResourceClient( + userName, getGateway().getGatewayName(),serviceURI, callback, CookieManager.getCookie()); + publishedWorkflowResourceClient = + new PublishedWorkflowResourceClient( + userName, getGateway().getGatewayName(),serviceURI, callback, CookieManager.getCookie()); + userWorkflowResourceClient = + new UserWorkflowResourceClient( + userName,getGateway().getGatewayName(),serviceURI,callback, CookieManager.getCookie()); } 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=1429054&r1=1429053&r2=1429054&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 Fri Jan 4 19:38:38 2013 @@ -37,6 +37,7 @@ import org.apache.airavata.rest.mappings import org.apache.airavata.rest.mappings.utils.ResourcePathConstants; import org.apache.airavata.rest.utils.BasicAuthHeaderUtil; import org.apache.airavata.rest.utils.ClientConstant; +import org.apache.airavata.rest.utils.CookieManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,15 +59,18 @@ public class UserWorkflowResourceClient private Cookie cookie; private WebResource.Builder builder; private String gateway; +// private CookieManager cookieManager = new CookieManager(); public UserWorkflowResourceClient(String userName, String gateway, String serviceURI, - PasswordCallback callback) { + PasswordCallback callback, + Cookie cookie) { this.userName = userName; this.callback = callback; this.baseURI = serviceURI; this.gateway = gateway; + this.cookie = cookie; } @@ -101,6 +105,7 @@ public class UserWorkflowResourceClient if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } String exists = response.getEntity(String.class); if (exists.equals("True")) { @@ -116,6 +121,7 @@ public class UserWorkflowResourceClient if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } String exists = response.getEntity(String.class); @@ -148,6 +154,7 @@ public class UserWorkflowResourceClient if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -166,6 +173,7 @@ public class UserWorkflowResourceClient } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_BAD_REQUEST){ @@ -194,6 +202,7 @@ public class UserWorkflowResourceClient if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -208,6 +217,7 @@ public class UserWorkflowResourceClient } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else { @@ -232,6 +242,7 @@ public class UserWorkflowResourceClient if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -249,6 +260,7 @@ public class UserWorkflowResourceClient } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else if (status == ClientConstant.HTTP_NO_CONTENT) { @@ -277,6 +289,7 @@ public class UserWorkflowResourceClient if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -295,6 +308,7 @@ public class UserWorkflowResourceClient } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else { @@ -328,6 +342,7 @@ public class UserWorkflowResourceClient if (status == ClientConstant.HTTP_OK) { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } else if (status == ClientConstant.HTTP_UNAUTHORIZED) { builder = BasicAuthHeaderUtil.getBuilder( @@ -342,6 +357,7 @@ public class UserWorkflowResourceClient } else { if (response.getCookies().size() > 0) { cookie = response.getCookies().get(0).toCookie(); + CookieManager.setCookie(cookie); } } } else { Added: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/CookieManager.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/CookieManager.java?rev=1429054&view=auto ============================================================================== --- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/CookieManager.java (added) +++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/CookieManager.java Fri Jan 4 19:38:38 2013 @@ -0,0 +1,37 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +package org.apache.airavata.rest.utils; + +import javax.ws.rs.core.Cookie; + +public class CookieManager { + private static Cookie cookie; + + public static Cookie getCookie() { + return cookie; + } + + + public static void setCookie(Cookie httpcookie) { + cookie = httpcookie; + } +}
