SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed more lattice references

Browse Source
This commit is contained in:
Mark Fisher
2016-02-04 08:55:07 -05:00
parent 32c727a5d4
commit 7ffe9070e3
3 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/main/resources/META-INF/spring-cloud-stream/kafka-binder-lattice.properties
View File

@@ -1,25 +0,0 @@
spring.cloud.stream.binder.kafka.brokers=kafka.192.168.11.11.xip.io
spring.cloud.stream.binder.kafka.defaultBrokerPort=9092
spring.cloud.stream.binder.kafka.zkNodes=kafka.192.168.11.11.xip.io
spring.cloud.stream.binder.kafka.defaultZkPort=2181
spring.cloud.stream.binder.kafka.mode=embeddedHeaders
spring.cloud.stream.binder.kafka.offsetStoreTopic=SpringXdOffsets
spring.cloud.stream.binder.kafka.offsetStoreSegmentSize=25000000
spring.cloud.stream.binder.kafka.offsetStoreRetentionTime=60000
spring.cloud.stream.binder.kafka.offsetStoreRequiredAcks=1
spring.cloud.stream.binder.kafka.offsetStoreMaxFetchSize=1048576
spring.cloud.stream.binder.kafka.offsetStoreBatchBytes=16384
spring.cloud.stream.binder.kafka.offsetStoreBatchTime=1000
spring.cloud.stream.binder.kafka.offsetUpdateTimeWindow=10000
spring.cloud.stream.binder.kafka.offsetUpdateCount=0
spring.cloud.stream.binder.kafka.offsetUpdateShutdownTimeout=2000
spring.cloud.stream.binder.kafka.default.batchSize=16384
spring.cloud.stream.binder.kafka.default.batchTimeout=0
spring.cloud.stream.binder.kafka.default.requiredAcks=1
spring.cloud.stream.binder.kafka.default.replicationFactor=1
spring.cloud.stream.binder.kafka.default.concurrency=1
spring.cloud.stream.binder.kafka.default.compressionCodec=none
spring.cloud.stream.binder.kafka.default.autoCommitEnabled=true
spring.cloud.stream.binder.kafka.default.fetchSize=1048576
spring.cloud.stream.binder.kafka.default.minPartitionCount=1
spring.cloud.stream.binder.kafka.default.queueSize=8192

5
spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java
View File

@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Profile;
import org.springframework.context.annotation.PropertySource; import org.springframework.context.annotation.PropertySource;
/** /**
* Bind to services, either locally or in a Lattice environment. * Bind to services, either locally or in a cloud environment.
* *
* @author Mark Fisher * @author Mark Fisher
* @author Dave Syer * @author Dave Syer
@@ -49,10 +49,12 @@ import org.springframework.context.annotation.PropertySource;
@AutoConfigureBefore({CloudAutoConfiguration.class, RabbitAutoConfiguration.class}) @AutoConfigureBefore({CloudAutoConfiguration.class, RabbitAutoConfiguration.class})
@PropertySource("classpath:/META-INF/spring-cloud-stream/rabbit-binder.properties") @PropertySource("classpath:/META-INF/spring-cloud-stream/rabbit-binder.properties")
public class RabbitServiceAutoConfiguration { public class RabbitServiceAutoConfiguration {
@Configuration @Configuration
@Profile("cloud") @Profile("cloud")
@ConditionalOnClass(Cloud.class) @ConditionalOnClass(Cloud.class)
protected static class CloudConfig { protected static class CloudConfig {
@Bean @Bean
public Cloud cloud() { public Cloud cloud() {
return new CloudFactory().getCloud(); return new CloudFactory().getCloud();
@@ -69,7 +71,6 @@ public class RabbitServiceAutoConfiguration {
@Profile("!cloud") @Profile("!cloud")
@Import(RabbitAutoConfiguration.class) @Import(RabbitAutoConfiguration.class)
protected static class NoCloudConfig { protected static class NoCloudConfig {
} }
@Bean @Bean

4
spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/main/java/org/springframework/cloud/stream/binder/redis/config/RedisServiceAutoConfiguration.java
View File

@@ -34,7 +34,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.connection.RedisConnectionFactory;
/** /**
* Bind to services, either locally or in a Lattice environment. * Bind to services, either locally or in a cloud environment.
* *
* @author Mark Fisher * @author Mark Fisher
* @author Dave Syer * @author Dave Syer
@@ -52,10 +52,12 @@ public class RedisServiceAutoConfiguration {
@ConditionalOnClass(Cloud.class) @ConditionalOnClass(Cloud.class)
@Profile("cloud") @Profile("cloud")
protected static class CloudConfig { protected static class CloudConfig {
@Bean @Bean
public Cloud cloud() { public Cloud cloud() {
return new CloudFactory().getCloud(); return new CloudFactory().getCloud();
} }
@Bean @Bean
@ConditionalOnMissingBean(RedisConnectionFactory.class) @ConditionalOnMissingBean(RedisConnectionFactory.class)
RedisConnectionFactory redisConnectionFactory(Cloud cloud) { RedisConnectionFactory redisConnectionFactory(Cloud cloud) {