Merge pull request #298 from ayyoob/transport

changed the UI calls from tomcat to apimgt gateway
revert-70aa11f8
Ruwan 9 years ago committed by GitHub
commit f6a126b560

@ -45,7 +45,6 @@ public interface Device {
* @return Device List * @return Device List
*/ */
@GET @GET
@Path("devices")
@ApiOperation( @ApiOperation(
consumes = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON,
produces = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON,

@ -2,7 +2,7 @@
"appContext" : "/devicemgt/", "appContext" : "/devicemgt/",
"webAgentContext" : "/devicemgt-web-agent/", "webAgentContext" : "/devicemgt-web-agent/",
"apiContext" : "api", "apiContext" : "api",
"httpsURL" : "https://localhost:9443", "httpsURL" : "https://localhost:8243",
"httpURL" : "%http.ip%", "httpURL" : "%http.ip%",
"httpsWebURL" : "%https.ip%", "httpsWebURL" : "%https.ip%",
"wssURL" : "%https.ip%", "wssURL" : "%https.ip%",

@ -176,8 +176,8 @@ var backendServiceInvoker = function () {
client.executeMethod(httpMethodObject); client.executeMethod(httpMethodObject);
var status = httpMethodObject.getStatusCode(); var status = httpMethodObject.getStatusCode();
if (status == 200) { if (status == 200) {
var responseContentTypeHeader = httpMethodObject.getResponseHeader(constants.CONTENT_TYPE_IDENTIFIER); var responseContentDispositionHeader = httpMethodObject.getResponseHeader(constants.CONTENT_DISPOSITION_IDENTIFIER);
if (responseContentTypeHeader && responseContentTypeHeader.getValue() == constants.APPLICATION_ZIP) { if (responseContentDispositionHeader) {
return successCallback(httpMethodObject.getResponseBodyAsStream(), httpMethodObject.getResponseHeaders()); return successCallback(httpMethodObject.getResponseBodyAsStream(), httpMethodObject.getResponseHeaders());
} else { } else {
return successCallback(httpMethodObject.getResponseBody()); return successCallback(httpMethodObject.getResponseBody());

@ -61,6 +61,7 @@ var WEB_SERVICE_ADDRESSING_VERSION = 1.0;
var ACCESS_TOKEN_PAIR_IDENTIFIER = "accessTokenPair"; var ACCESS_TOKEN_PAIR_IDENTIFIER = "accessTokenPair";
var ENCODED_CLIENT_KEYS_IDENTIFIER = "encodedClientKey"; var ENCODED_CLIENT_KEYS_IDENTIFIER = "encodedClientKey";
var CONTENT_TYPE_IDENTIFIER = "Content-Type"; var CONTENT_TYPE_IDENTIFIER = "Content-Type";
var CONTENT_DISPOSITION_IDENTIFIER = "Content-Disposition";
var APPLICATION_JSON = "application/json"; var APPLICATION_JSON = "application/json";
var APPLICATION_ZIP = "application/zip"; var APPLICATION_ZIP = "application/zip";
var ACCEPT_IDENTIFIER = "Accept"; var ACCEPT_IDENTIFIER = "Accept";

Loading…
Cancel
Save