Branches so umbenannt, dass die Aufteilung Vorlage vs. Musterlösung passt

diff --git a/BRANCHES.sh b/BRANCHES.sh
index b90afce..1486224 100755 (executable)
--- a/BRANCHES.sh
+++ b/BRANCHES.sh
@@ -11,10 +11,10 @@ grundlagen__simple_consumer=grundlagen/simple-consumer
 grundlagen__simple_consumer__ROOT=grundlagen/simple-producer
 grundlagen__simple_consumer__vorlage=grundlagen/simple-consumer--vorlage
 grundlagen__simple_consumer__vorlage__ROOT=grundlagen/simple-consumer
-grundlagen__simple_consumer__consumergroup=grundlagen/simple-consumer--consumergroup
-grundlagen__simple_consumer__consumergroup__ROOT=grundlagen/simple-consumer--vorlage
-producer__batch_size=producer/batch-size
-producer__batch_size__ROOT=grundlagen/docker
+grundlagen__simple_consumer__consumergroup__vorlage=grundlagen/simple-consumer--consumergroup--vorlage
+grundlagen__simple_consumer__consumergroup__vorlage__ROOT=grundlagen/simple-consumer--vorlage
+producer__batch_size__vorlage=producer/batch-size--vorlage
+producer__batch_size__vorlage__ROOT=grundlagen/docker
 producer__spring_producer=producer/spring-producer
 producer__spring_producer__ROOT=grundlagen/simple-producer
 producer__spring_producer__vorlage=producer/spring-producer--vorlage
@@ -23,20 +23,20 @@ producer__spring_producer__fixedsharding=producer/spring-producer--fixedsharding
 producer__spring_producer__fixedsharding__ROOT=producer/spring-producer
 producer__spring_producer__fixedsharding__vorlage=producer/spring-producer--fixedsharding--vorlage
 producer__spring_producer__fixedsharding__vorlage__ROOT=producer/spring-producer--fixedsharding
-producer__spring_producer__delivery_timeout=producer/spring-producer--delivery-timeout
-producer__spring_producer__delivery_timeout__ROOT=producer/spring-producer
-producer__spring_producer__backpressure=producer/spring-producer--backpressure
-producer__spring_producer__backpressure__ROOT=producer/spring-producer--delivery-timeout
+producer__spring_producer__delivery_timeout__vorlage=producer/spring-producer--delivery-timeout--vorlage
+producer__spring_producer__delivery_timeout__vorlage__ROOT=producer/spring-producer--delivery-timeout
+producer__spring_producer__backpressure__vorlage=producer/spring-producer--backpressure--vorlage
+producer__spring_producer__backpressure__vorlage__ROOT=producer/spring-producer--backpressure
 producer__spring_producer__auditheaders=producer/spring-producer--auditheaders
 producer__spring_producer__auditheaders__ROOT=producer/spring-producer--backpressure
 producer__spring_producer__auditheaders__vorlage=producer/spring-producer--auditheaders--vorlage
 producer__spring_producer__auditheaders__vorlage__ROOT=producer/spring-producer--auditheaders
 producer__rest_producer=producer/rest-producer
 producer__rest_producer__ROOT=producer/spring-producer
-consumer__simple_consumer__megagroup=consumer/simple-consumer--megagroup
-consumer__simple_consumer__megagroup__ROOT=grundlagen/simple-consumer--consumergroup
-consumer__simple_consumer__spickzettel=consumer/simple-consumer--spickzettel
-consumer__simple_consumer__spickzettel__ROOT=grundlagen/simple-consumer--consumergroup
+consumer__simple_consumer__megagroup__vorlage=consumer/simple-consumer--megagroup--vorlage
+consumer__simple_consumer__megagroup__vorlage__ROOT=grundlagen/simple-consumer--consumergroup--vorlage
+consumer__simple_consumer__spickzettel__vorlage=consumer/simple-consumer--spickzettel--vorlage
+consumer__simple_consumer__spickzettel__vorlage__ROOT=grundlagen/simple-consumer--consumergroup
 consumer__spring_consumer=consumer/spring-consumer
 consumer__spring_consumer__ROOT=grundlagen/simple-consumer
 consumer__spring_consumer__log_compaction=consumer/spring-consumer--log-compaction
@@ -67,27 +67,30 @@ consumer__spring_consumer__assign__vorlage=consumer/spring-consumer--assign--vor
 consumer__spring_consumer__assign__vorlage__ROOT=consumer/spring-consumer--assign
 consumer__spring_consumer__json=consumer/spring-consumer--json
 consumer__spring_consumer__json__ROOT=consumer/spring-consumer
-consumer__spring_producer__json=consumer/spring-producer--json
-consumer__spring_producer__json__ROOT=consumer/spring-producer
+consumer__spring_consumer__json__vorlage=consumer/spring-consumer--json--vorlage
+consumer__spring_consumer__json__vorlage__ROOT=consumer/spring-consumer--json
+producer__spring_producer__json=producer/spring-producer--json
+producer__spring_producer__json__ROOT=producer/spring-producer
+producer__spring_producer__json__vorlage=producer/spring-producer--json--vorlage
+producer__spring_producer__json__vorlage__ROOT=producer/spring-producer--json
 
 BRANCHES="\
-  config__flawed_setup__zookeeper \
   grundlagen__simple_producer \
   grundlagen__simple_producer__vorlage \
   grundlagen__simple_consumer \
   grundlagen__simple_consumer__vorlage \
-  grundlagen__simple_consumer__consumergroup \
+  grundlagen__simple_consumer__consumergroup__vorlage \
   producer__spring_producer \
   producer__spring_producer__vorlage \
   producer__spring_producer__fixedsharding \
   producer__spring_producer__fixedsharding__vorlage \
-  producer__spring_producer__delivery_timeout \
-  producer__spring_producer__backpressure \
+  producer__spring_producer__delivery_timeout__vorlage \
+  producer__spring_producer__backpressure__vorlage \
   producer__spring_producer__auditheaders \
   producer__spring_producer__auditheaders__vorlage \
   producer__rest_producer \
-  consumer__simple_consumer__megagroup \
-  consumer__simple_consumer__spickzettel \
+  consumer__simple_consumer__megagroup__vorlage \
+  consumer__simple_consumer__spickzettel__vorlage \
   consumer__spring_consumer \
   consumer__spring_consumer__log_compaction \
   consumer__spring_consumer__rebalance_listener \
@@ -102,6 +105,8 @@ BRANCHES="\
   consumer__spring_consumer__deserialization_error__vorlage \
   consumer__spring_consumer__assign \
   consumer__spring_consumer__assign__vorlage \
-  consumer__spring_producer__json \
+  producer__spring_producer__json \
+  producer__spring_producer__json__vorlage \
   consumer__spring_consumer__json \
+  consumer__spring_consumer__json__vorlage \
   "