diff --git a/pom.xml b/pom.xml index 549e5a3f..2cf6e62a 100644 --- a/pom.xml +++ b/pom.xml @@ -31,13 +31,11 @@ spring-cloud-consul-config spring-cloud-consul-discovery spring-cloud-consul-bus - spring-cloud-consul-ui spring-cloud-consul-sample spring-cloud-starter-consul spring-cloud-starter-consul-bus spring-cloud-starter-consul-config spring-cloud-starter-consul-discovery - spring-cloud-starter-consul-ui spring-cloud-starter-consul-all docs diff --git a/spring-cloud-consul-ui/pom.xml b/spring-cloud-consul-ui/pom.xml deleted file mode 100644 index b91e8b2c..00000000 --- a/spring-cloud-consul-ui/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - - spring-cloud-consul-ui - jar - Spring Cloud Consul UI - Spring Cloud Consul UI - - - org.springframework.cloud - spring-cloud-consul - 1.0.0.BUILD-SNAPSHOT - .. - - - - - org.springframework.cloud - spring-cloud-consul-core - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.cloud - spring-cloud-starter-zuul - - - org.projectlombok - lombok - - provided - - - org.springframework.boot - spring-boot-starter-test - test - - - com.ecwid.consul - consul-api - test - - - - - diff --git a/spring-cloud-consul-ui/src/main/java/org/springframework/cloud/ui/ConsulUiConfiguration.java b/spring-cloud-consul-ui/src/main/java/org/springframework/cloud/ui/ConsulUiConfiguration.java deleted file mode 100644 index 4b631e41..00000000 --- a/spring-cloud-consul-ui/src/main/java/org/springframework/cloud/ui/ConsulUiConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2013-2015 the original author or authors. - * - * Licensed 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.springframework.cloud.ui; - -import javax.annotation.PostConstruct; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.consul.ConsulProperties; -import org.springframework.cloud.netflix.zuul.EnableZuulProxy; -import org.springframework.cloud.netflix.zuul.filters.ZuulProperties; -import org.springframework.cloud.netflix.zuul.web.ZuulHandlerMapping; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * @author Spencer Gibb - */ -@Configuration -@EnableZuulProxy -public class ConsulUiConfiguration { - - @Autowired - private ZuulProperties zuulProperties; - - @Autowired - private ConsulProperties consulProperties; - - @Autowired - private ZuulHandlerMapping zuulHandlerMapping; - - @PostConstruct - public void init() { - String url = String.format("http://%s:%s", consulProperties.getHost(), - consulProperties.getPort()); - - ZuulProperties.ZuulRoute route = new ZuulProperties.ZuulRoute("consulApi", - "/v1/**", null, url, false, false); - zuulProperties.getRoutes().put("consulApi", route); - - route = new ZuulProperties.ZuulRoute("consulUi", - "/consul/**", null, url, true, false); - zuulProperties.getRoutes().put("consulUi", route); - - zuulHandlerMapping.registerHandlers(); - } - - @Bean - public ConsulUiProperties consulUiProperties() { - return new ConsulUiProperties(); - } -} diff --git a/spring-cloud-consul-ui/src/main/java/org/springframework/cloud/ui/ConsulUiProperties.java b/spring-cloud-consul-ui/src/main/java/org/springframework/cloud/ui/ConsulUiProperties.java deleted file mode 100644 index 82cdbce7..00000000 --- a/spring-cloud-consul-ui/src/main/java/org/springframework/cloud/ui/ConsulUiProperties.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2013-2015 the original author or authors. - * - * Licensed 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.springframework.cloud.ui; - -import lombok.Data; - -import org.springframework.boot.context.properties.ConfigurationProperties; - -/** - * @author Spencer Gibb - */ -@ConfigurationProperties("spring.cloud.consul.ui") -@Data -public class ConsulUiProperties { - private String path = "/consul/**"; -} diff --git a/spring-cloud-consul-ui/src/main/java/org/springframework/cloud/ui/EnableConsulUi.java b/spring-cloud-consul-ui/src/main/java/org/springframework/cloud/ui/EnableConsulUi.java deleted file mode 100644 index 5204278d..00000000 --- a/spring-cloud-consul-ui/src/main/java/org/springframework/cloud/ui/EnableConsulUi.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2013-2015 the original author or authors. - * - * Licensed 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.springframework.cloud.ui; - -import org.springframework.cloud.netflix.zuul.EnableZuulServer; -import org.springframework.context.annotation.Import; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * @author Spencer Gibb - */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Inherited -@Import(ConsulUiConfiguration.class) -@EnableZuulServer -public @interface EnableConsulUi { - -} diff --git a/spring-cloud-consul-ui/src/test/java/org/springframework/cloud/ui/EnableConsulUiTests.java b/spring-cloud-consul-ui/src/test/java/org/springframework/cloud/ui/EnableConsulUiTests.java deleted file mode 100644 index 14b663c1..00000000 --- a/spring-cloud-consul-ui/src/test/java/org/springframework/cloud/ui/EnableConsulUiTests.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2013-2015 the original author or authors. - * - * Licensed 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.springframework.cloud.ui; - -import static org.junit.Assert.*; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.boot.test.TestRestTemplate; -import org.springframework.boot.test.WebIntegrationTest; -import org.springframework.cloud.consul.ConsulAutoConfiguration; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -/** - * @author Spencer Gibb - */ -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = TestConfig.class) -@WebIntegrationTest(value = "spring.application.name=myTestService", randomPort = true) -public class EnableConsulUiTests { - - @Value("${local.server.port}") - private int port; - - @Test - public void consulWebUiWorks() { - ResponseEntity response = new TestRestTemplate().getForEntity("http://localhost:" + port + "/consul/ui/", String.class); - assertEquals("Wrong response code", HttpStatus.OK, response.getStatusCode()); - String body = response.getBody(); - assertNotNull("Null body", body); - assertTrue("Missing body text", body.toLowerCase().contains("consul") && body.toLowerCase().contains("services")); - } - -} - -@Configuration -@EnableAutoConfiguration -@Import({ ConsulAutoConfiguration.class }) -@EnableConsulUi -class TestConfig { - -} \ No newline at end of file diff --git a/spring-cloud-starter-consul-ui/pom.xml b/spring-cloud-starter-consul-ui/pom.xml deleted file mode 100644 index 485b7415..00000000 --- a/spring-cloud-starter-consul-ui/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-consul - 1.0.0.BUILD-SNAPSHOT - .. - - spring-cloud-starter-consul-ui - Spring Cloud Starter Consul UI - Spring Cloud Starter Consul UI - http://projects.spring.io/spring-cloud - - Pivotal Software, Inc. - http://www.spring.io - - - ${basedir}/../.. - - - - org.springframework.cloud - spring-cloud-consul-ui - - - org.springframework.cloud - spring-cloud-consul-core - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.cloud - spring-cloud-starter-zuul - - - diff --git a/spring-cloud-starter-consul-ui/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-consul-ui/src/main/resources/META-INF/spring.provides deleted file mode 100644 index e5fe9b5e..00000000 --- a/spring-cloud-starter-consul-ui/src/main/resources/META-INF/spring.provides +++ /dev/null @@ -1 +0,0 @@ -provides: spring-cloud-consul-ui \ No newline at end of file