diff --git a/docs/src/main/asciidoc/spring-cloud-cli.adoc b/docs/src/main/asciidoc/spring-cloud-cli.adoc index 51ee3e5..bba7d96 100644 --- a/docs/src/main/asciidoc/spring-cloud-cli.adoc +++ b/docs/src/main/asciidoc/spring-cloud-cli.adoc @@ -42,9 +42,6 @@ Summary of supported deployables: |kafka | Kafka Broker | http://localhost:9091 (actuator endpoints), localhost:9092 | -|hystrixdashboard | Hystrix Dashboard | http://localhost:7979 -|Any Spring Cloud app that declares Hystrix circuit breakers publishes metrics on `/hystrix.stream`. Type that address into the dashboard to visualize all the metrics, - |dataflow | Dataflow Server | http://localhost:9393 | Spring Cloud Dataflow server with UI at /admin-ui. Connect the Dataflow shell to target at root path. @@ -108,7 +105,7 @@ when you list the apps: [source] ---- $ spring cloud --list -source sink configserver dataflow eureka h2 hystrixdashboard kafka stubrunner zipkin +source sink configserver dataflow eureka h2 kafka stubrunner zipkin ---- (notice the additional apps at the start of the list). diff --git a/spring-cloud-cli-integration-tests/samples/zuulproxy.groovy b/spring-cloud-cli-integration-tests/samples/zuulproxy.groovy deleted file mode 100644 index 5696e23..0000000 --- a/spring-cloud-cli-integration-tests/samples/zuulproxy.groovy +++ /dev/null @@ -1,6 +0,0 @@ -package org.test - -@EnableZuulProxy -class Example { -} - diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixCompilerAutoConfiguration.java deleted file mode 100644 index a942ba5..0000000 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixCompilerAutoConfiguration.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2013-2014 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 - * - * https://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.cli.compiler; - -import org.codehaus.groovy.ast.ClassNode; -import org.codehaus.groovy.control.CompilationFailedException; -import org.codehaus.groovy.control.customizers.ImportCustomizer; -import org.springframework.boot.cli.compiler.AstUtils; -import org.springframework.boot.cli.compiler.CompilerAutoConfiguration; -import org.springframework.boot.cli.compiler.DependencyCustomizer; - -/** - * @author Dave Syer - * - */ -public class HystrixCompilerAutoConfiguration extends CompilerAutoConfiguration { - - @Override - public boolean matches(ClassNode classNode) { - return AstUtils.hasAtLeastOneAnnotation(classNode, "EnableCircuitBreaker"); - } - - @Override - public void applyDependencies(DependencyCustomizer dependencies) { - dependencies.ifAnyMissingClasses( - "org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker") - .add("spring-cloud-starter-netflix-hystrix"); - } - - @Override - public void applyImports(ImportCustomizer imports) throws CompilationFailedException { - imports.addImports( - "org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker", - "com.netflix.hystrix.contrib.javanica.annotation.HystrixCollapser", - "com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand"); - } - -} diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixDashboardCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixDashboardCompilerAutoConfiguration.java deleted file mode 100644 index d94b89b..0000000 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixDashboardCompilerAutoConfiguration.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2013-2014 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 - * - * https://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.cli.compiler; - -import org.codehaus.groovy.ast.ClassNode; -import org.codehaus.groovy.control.CompilationFailedException; -import org.codehaus.groovy.control.customizers.ImportCustomizer; -import org.springframework.boot.cli.compiler.AstUtils; -import org.springframework.boot.cli.compiler.CompilerAutoConfiguration; -import org.springframework.boot.cli.compiler.DependencyCustomizer; - -/** - * @author Dave Syer - * - */ -public class HystrixDashboardCompilerAutoConfiguration extends CompilerAutoConfiguration { - - @Override - public boolean matches(ClassNode classNode) { - return AstUtils.hasAtLeastOneAnnotation(classNode, "EnableHystrixDashboard"); - } - - @Override - public void applyDependencies(DependencyCustomizer dependencies) { - dependencies.ifAnyMissingClasses( - "org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboard") - .add("spring-cloud-starter-netflix-hystrix-dashboard"); - } - - @Override - public void applyImports(ImportCustomizer imports) throws CompilationFailedException { - imports.addImports( - "org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboard"); - } - -} diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/RibbonClientCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/RibbonClientCompilerAutoConfiguration.java deleted file mode 100644 index 765ac83..0000000 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/RibbonClientCompilerAutoConfiguration.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2013-2014 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 - * - * https://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.cli.compiler; - -import org.codehaus.groovy.ast.ClassNode; -import org.codehaus.groovy.control.CompilationFailedException; -import org.codehaus.groovy.control.customizers.ImportCustomizer; -import org.springframework.boot.cli.compiler.AstUtils; -import org.springframework.boot.cli.compiler.CompilerAutoConfiguration; -import org.springframework.boot.cli.compiler.DependencyCustomizer; - -/** - * @author Dave Syer - * - */ -public class RibbonClientCompilerAutoConfiguration extends CompilerAutoConfiguration { - - @Override - public boolean matches(ClassNode classNode) { - return AstUtils.hasAtLeastOneAnnotation(classNode, "RibbonClient"); - } - - @Override - public void applyDependencies(DependencyCustomizer dependencies) { - dependencies.ifAnyMissingClasses( - "org.springframework.cloud.netflix.ribbon.RibbonClient").add( - "spring-cloud-starter-ribbon", "spring-web"); - } - - @Override - public void applyImports(ImportCustomizer imports) throws CompilationFailedException { - imports.addImports("org.springframework.cloud.netflix.ribbon.RibbonClient", - "org.springframework.cloud.client.loadbalancer.LoadBalancerClient", - "org.springframework.web.client.RestTemplate", - "com.netflix.client.config.DefaultClientConfigImpl", - "com.netflix.client.config.IClientConfig", - "com.netflix.loadbalancer.DynamicServerListLoadBalancer", - "com.netflix.loadbalancer.ILoadBalancer", - "com.netflix.loadbalancer.Server", "com.netflix.loadbalancer.ServerList", - "com.netflix.loadbalancer.ServerListFilter", - "com.netflix.niws.client.http.RestClient"); - } - -} diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/ZuulCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/ZuulCompilerAutoConfiguration.java deleted file mode 100644 index 29d07cb..0000000 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/ZuulCompilerAutoConfiguration.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2013-2014 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 - * - * https://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.cli.compiler; - -import org.codehaus.groovy.ast.ClassNode; -import org.codehaus.groovy.control.CompilationFailedException; -import org.codehaus.groovy.control.customizers.ImportCustomizer; -import org.springframework.boot.cli.compiler.AstUtils; -import org.springframework.boot.cli.compiler.CompilerAutoConfiguration; -import org.springframework.boot.cli.compiler.DependencyCustomizer; - -/** - * @author Dave Syer - * - */ -public class ZuulCompilerAutoConfiguration extends CompilerAutoConfiguration { - - @Override - public boolean matches(ClassNode classNode) { - return AstUtils.hasAtLeastOneAnnotation(classNode, "EnableZuulProxy"); - } - - @Override - public void applyDependencies(DependencyCustomizer dependencies) { - dependencies - .ifAnyMissingClasses("org.springframework.cloud.netflix.zuul.EnableZuulProxy") - .add("spring-cloud-starter-netflix-zuul"); - } - - @Override - public void applyImports(ImportCustomizer imports) throws CompilationFailedException { - imports.addImports("org.springframework.cloud.netflix.zuul.EnableZuulProxy"); - } - -} diff --git a/spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration b/spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration index 902572a..523c834 100644 --- a/spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration +++ b/spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration @@ -2,11 +2,7 @@ org.springframework.cloud.cli.compiler.SpringCloudCompilerAutoConfiguration org.springframework.cloud.cli.compiler.ConfigServerCompilerAutoConfiguration org.springframework.cloud.cli.compiler.EurekaClientCompilerAutoConfiguration org.springframework.cloud.cli.compiler.EurekaServerCompilerAutoConfiguration -org.springframework.cloud.cli.compiler.HystrixCompilerAutoConfiguration -org.springframework.cloud.cli.compiler.HystrixDashboardCompilerAutoConfiguration org.springframework.cloud.cli.compiler.OAuth2LoadBalancedCompilerAutoConfiguration -org.springframework.cloud.cli.compiler.RibbonClientCompilerAutoConfiguration org.springframework.cloud.cli.compiler.StreamKafkaCompilerAutoConfiguration org.springframework.cloud.cli.compiler.StreamRabbitCompilerAutoConfiguration org.springframework.cloud.cli.compiler.StubRunnerCompilerAutoConfiguration -org.springframework.cloud.cli.compiler.ZuulCompilerAutoConfiguration diff --git a/spring-cloud-launcher/README.md b/spring-cloud-launcher/README.md index 79fbb71..2a90e58 100644 --- a/spring-cloud-launcher/README.md +++ b/spring-cloud-launcher/README.md @@ -14,7 +14,7 @@ $ spring cloud ``` -Currently starts configserver, dataflow, eureka, h2 (db server), hystrixdashboard and kafka. [Here](spring-cloud-launcher-deployer/src/main/resources/cloud.yml) is the full configuration. +Currently starts configserver, dataflow, eureka, h2 (db server) and kafka. [Here](spring-cloud-launcher-deployer/src/main/resources/cloud.yml) is the full configuration. ### Configuring @@ -60,7 +60,6 @@ spring: - [X] Eureka - [X] Configserver -- [X] Hystrix Dashboard - [X] Kafka Broker - [X] Kafka Bus - [X] Easy inclusion of default deployables diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/cloud.yml b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/cloud.yml index 3c54194..d28bbae 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/cloud.yml +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/cloud.yml @@ -59,14 +59,6 @@ spring: spring.cloud.deployer.local.javaOpts: ${dt.opts} application-properties: management.security.enabled: false - hystrixdashboard: - coordinates: ${dt.pre}hystrixdashboard:${dt.ver} - port: 7979 - properties: - spring.cloud.deployer.memory: ${dt.mem} - spring.cloud.deployer.local.javaOpts: ${dt.opts} - application-properties: - management.security.enabled: false kafka: coordinates: ${dt.pre}kafka:${dt.ver} port: 9091 @@ -126,11 +118,6 @@ spring: spring.cloud.deployer.thin.profile: rabbit application-properties: spring.cloud.bus.enabled: true - hystrixdashboard: - properties: - spring.cloud.deployer.thin.profile: rabbit - application-properties: - spring.cloud.bus.enabled: true stubrunner: properties: spring.cloud.deployer.thin.profile: rabbit