Repository: knox Updated Branches: refs/heads/master 7025086a8 -> e8ba712c8
http://git-wip-us.apache.org/repos/asf/knox/blob/e8ba712c/gateway-applications/src/main/resources/applications/admin-ui/app/styles.2ee5b7f4cd59a6cf015e.bundle.css ---------------------------------------------------------------------- diff --git a/gateway-applications/src/main/resources/applications/admin-ui/app/styles.2ee5b7f4cd59a6cf015e.bundle.css b/gateway-applications/src/main/resources/applications/admin-ui/app/styles.2ee5b7f4cd59a6cf015e.bundle.css new file mode 100644 index 0000000..98593d9 --- /dev/null +++ b/gateway-applications/src/main/resources/applications/admin-ui/app/styles.2ee5b7f4cd59a6cf015e.bundle.css @@ -0,0 +1 @@ +/* You can add global styles to this file, and also import other style files */.navbar-static-top{min-height:110px}.clickable{cursor:pointer} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/knox/blob/e8ba712c/gateway-applications/src/main/resources/applications/admin-ui/app/styles.d41d8cd98f00b204e980.bundle.css ---------------------------------------------------------------------- diff --git a/gateway-applications/src/main/resources/applications/admin-ui/app/styles.d41d8cd98f00b204e980.bundle.css b/gateway-applications/src/main/resources/applications/admin-ui/app/styles.d41d8cd98f00b204e980.bundle.css deleted file mode 100644 index e69de29..0000000 http://git-wip-us.apache.org/repos/asf/knox/blob/e8ba712c/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java ---------------------------------------------------------------------- diff --git a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java b/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java index f960734..823f9ad 100644 --- a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java +++ b/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java @@ -210,7 +210,7 @@ public class TopologiesResource { } @GET - @Produces({APPLICATION_XML}) + @Produces({APPLICATION_XML, APPLICATION_JSON, TEXT_PLAIN}) @Path(SINGLE_PROVIDERCONFIG_API_PATH) public Response getProviderConfiguration(@PathParam("name") String name) { Response response; http://git-wip-us.apache.org/repos/asf/knox/blob/e8ba712c/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAdminTopologyFuncTest.java ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAdminTopologyFuncTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAdminTopologyFuncTest.java index e6f7b80..c5d5fba 100644 --- a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAdminTopologyFuncTest.java +++ b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAdminTopologyFuncTest.java @@ -959,14 +959,6 @@ public class GatewayAdminTopologyFuncTest { assertTrue(configFileNames.contains(pcOne)); assertTrue(configFileNames.contains(pcTwo)); - // Request a specific provider configuration with an INCORRECT Accept header - given() - .auth().preemptive().basic(username, password) - .header("Accept", MediaType.APPLICATION_JSON) - .then() - .statusCode(HttpStatus.SC_NOT_ACCEPTABLE) - .when().get(href1).body(); - // Request a specific provider configuration (with the CORRECT Accept header) responseBody = given() .auth().preemptive().basic(username, password)
