update gitbook; update xmls

daggerok · Mar 6, 2018 · aa8ea75 · aa8ea75
1 parent 899e3f4
commit aa8ea75
Show file tree

Hide file tree

Showing 41 changed files with 59 additions and 61 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,13 @@
-group: trusty_lts
 service:
 - docker
 env:
   global:
   - TERM=dumb
 language: java
+jdk: oraclejdk8
 #jdk:
+#-oraclejdk8
 #- openjdk8
-#- oraclejdk8
 install: true
 before_install:
 # install docker-compose
@@ -19,27 +19,17 @@ before_install:
 - stop_any 5432 5672 27017 3000 8000 8080 80 27017 5672 5432
 script:
 # gitbook
-- bash gradlew clean buildDocs
-# all
+- bash gradlew clean gitbook
 - export ROOT=$PWD
-- cd $ROOT/hello-xml
+# xml-hello
+- cd $ROOT/xml-hello
 - bash ./mvnw
 - bash target/*.jar &
 - wait_for 8080
 - http :8080
 - http :8080 message=hello!
 - http :8080 ololo=trololo
 - stop_any 8080 8000 80
-- >
-  for path in \
-    xml-starter \
-    spring-integration-5-example-02 \
-    spring-integration-5-example-01 \
-  ; do
-    export TARGET="$ROOT/$path"
-    cd $TARGET
-    bash gradlew clean build
-  done;
 # 01 e2e
 - cd $ROOT/spring-integration-5-example-01
 - bash gradlew clean build
@@ -51,6 +41,16 @@ script:
 - curl localhost:8080/sse &
 - sleep 1
 - sudo service 01 stop
+# others
+- >
+  for path in \
+    xml-starter \
+    spring-integration-5-example-02 \
+  ; do
+    export TARGET="$ROOT/$path"
+    cd $TARGET
+    bash gradlew clean build
+  done;
 cache:
   directories:
   - docs/

diff --git a/README.adoc b/README.adoc
@@ -1,19 +1,11 @@
-= spring-integration-5-example image:https://travis-ci.org/daggerok/spring-integration-5-examples.svg?branch=master["Build Status", link="https://travis-ci.org/daggerok/spring-integration-5-examples"]
+= spring-integration-5-examples image:https://travis-ci.org/daggerok/spring-integration-5-examples.svg?branch=master["Build Status", link="https://travis-ci.org/daggerok/spring-integration-5-examples"]
 
 this repository is containing spring-integration 5 examples
 
-. link:hello-xml[simple xml example]
+. link:xml-hello[simple xml example]
 . link:spring-integration-5-example-01[sse]
 . link:reactive-data-flow-systems/[reactive data-flow systems]
 
-### docs
-
-.build gitbook docs
-----
-cd gitbook/
-bash gradlew clean build
-----
-
-### links:
+links:
 
 . link:https://github.com/spring-projects/spring-integration-java-dsl/wiki/spring-integration-java-dsl-reference[Java DSL]
diff --git a/docs/404.html b/docs/404.html
@@ -55,7 +55,7 @@
         data-chapter-title="Introduction"
         data-filepath="README.md"
         data-basepath="."
-        data-revision="Tue Mar 06 2018 01:23:37 GMT+0200 (EET)"
+        data-revision="Tue Mar 06 2018 12:31:20 GMT+0200 (EET)"
         data-innerlanguage="">
 
 

diff --git a/docs/index.html b/docs/index.html
@@ -55,7 +55,7 @@
         data-chapter-title="Introduction"
         data-filepath="README.md"
         data-basepath="."
-        data-revision="Tue Mar 06 2018 01:23:37 GMT+0200 (EET)"
+        data-revision="Tue Mar 06 2018 12:31:20 GMT+0200 (EET)"
         data-innerlanguage="">
 
 

diff --git a/docs/projects/01.html b/docs/projects/01.html
@@ -57,7 +57,7 @@
         data-chapter-title="Spring Integration 5 example"
         data-filepath="projects/01.md"
         data-basepath=".."
-        data-revision="Tue Mar 06 2018 01:23:37 GMT+0200 (EET)"
+        data-revision="Tue Mar 06 2018 12:31:20 GMT+0200 (EET)"
         data-innerlanguage="">
 
 

diff --git a/docs/projects/02.html b/docs/projects/02.html
@@ -55,7 +55,7 @@
         data-chapter-title="Spring Integration 5 example"
         data-filepath="projects/02.md"
         data-basepath=".."
-        data-revision="Tue Mar 06 2018 01:23:37 GMT+0200 (EET)"
+        data-revision="Tue Mar 06 2018 12:31:20 GMT+0200 (EET)"
         data-innerlanguage="">
 
 

diff --git a/gitbook/README.adoc b/gitbook/README.adoc
@@ -0,0 +1,6 @@
+= spring-integration-5-examples | gitbook image:https://travis-ci.org/daggerok/spring-integration-5-examples.svg?branch=master["Build Status", link="https://travis-ci.org/daggerok/spring-integration-5-examples"]
+
+.build docs
+----
+./gradlew clean gitbook
+----
diff --git a/gitbook/build.gradle b/gitbook/build.gradle
@@ -15,6 +15,7 @@ node {
   yarnVersion = "v0.24.5"
   workDir = file("$project.buildDir/nodejs")
 }
+
 clean.doFirst {
   [
       "out", 
@@ -29,9 +30,9 @@ clean.doFirst {
   delete "$rootDir/docs"
 }
 
-task buildDocs(dependsOn: [npm_run_docs])
-buildDocs.dependsOn examplesClasses
-assemble.dependsOn buildDocs
+task gitbook(dependsOn: [npm_run_docs])
+gitbook.dependsOn examplesClasses
+assemble.dependsOn gitbook
 
 task wrapper(type: Wrapper) {
   gradleVersion = "4.6"

diff --git a/hello-xml/README.adoc b/hello-xml/README.adoc
diff --git a/hello-xml/settings.gradle b/hello-xml/settings.gradle
diff --git a/hello-xml/.gitignore → xml-hello/.gitignore b/hello-xml/.gitignore → xml-hello/.gitignore
diff --git a/hello-xml/.hgignore → xml-hello/.hgignore b/hello-xml/.hgignore → xml-hello/.hgignore
diff --git a/hello-xml/.mvn/Dockerfile → xml-hello/.mvn/Dockerfile b/hello-xml/.mvn/Dockerfile → xml-hello/.mvn/Dockerfile
diff --git a/hello-xml/.mvn/wrapper/maven-wrapper.jar → xml-hello/.mvn/wrapper/maven-wrapper.jar b/hello-xml/.mvn/wrapper/maven-wrapper.jar → xml-hello/.mvn/wrapper/maven-wrapper.jar
diff --git a/...xml/.mvn/wrapper/maven-wrapper.properties → ...llo/.mvn/wrapper/maven-wrapper.properties b/...xml/.mvn/wrapper/maven-wrapper.properties → ...llo/.mvn/wrapper/maven-wrapper.properties
diff --git a/hello-xml/.travis.yml → xml-hello/.travis.yml b/hello-xml/.travis.yml → xml-hello/.travis.yml
diff --git a/xml-hello/README.adoc b/xml-hello/README.adoc
@@ -0,0 +1,10 @@
+= spring-integration-5-examples | xml image:https://travis-ci.org/daggerok/spring-integration-5-examples.svg?branch=master["Build Status", link="https://travis-ci.org/daggerok/spring-integration-5-examples"]
+
+//tag::content[]
+.gradle
+----
+./gradlew # or ./mvnw
+----
+
+generated by link:https://github.com/daggerok/generator-daggerok-fatjar/[daggerok-fatjar] yeoman generator
+//end::content[]
diff --git a/hello-xml/build.gradle → xml-hello/build.gradle b/hello-xml/build.gradle → xml-hello/build.gradle
diff --git a/hello-xml/docker-compose-gradle.yaml → xml-hello/docker-compose-gradle.yaml b/hello-xml/docker-compose-gradle.yaml → xml-hello/docker-compose-gradle.yaml
@@ -2,17 +2,17 @@ version: "2.1"
 
 services:
 
-  gradle-xml-starter-app:
+  gradle-xml-app:
     build:
       context: .
       dockerfile: gradle/Dockerfile
-    volumes: ["gradle-xml-starter-app-data:/home/app"]
+    volumes: ["gradle-xml-app-data:/home/app"]
     ports: ["8080:8080"]
     networks: [backing-services]
     mem_limit: 786432000 # container limit: 700Mb (700 * 1024 * 1024)
 
 volumes:
-  gradle-xml-starter-app-data: {}
+  gradle-xml-app-data: {}
 
 networks:
   backing-services:

diff --git a/hello-xml/docker-compose-maven.yaml → xml-hello/docker-compose-maven.yaml b/hello-xml/docker-compose-maven.yaml → xml-hello/docker-compose-maven.yaml
@@ -2,17 +2,17 @@ version: "2.1"
 
 services:
 
-  maven-xml-starter-app:
+  maven-xml-app:
     build:
       context: .
       dockerfile: .mvn/Dockerfile
-    volumes: ["maven-xml-starter-app-data:/home/app"]
+    volumes: ["maven-xml-app-data:/home/app"]
     ports: ["8080:8080"]
     networks: [backing-services]
     mem_limit: 786432000 # container limit: 700Mb (700 * 1024 * 1024)
 
 volumes:
-  maven-xml-starter-app-data: {}
+  maven-xml-app-data: {}
 
 networks:
   backing-services:

diff --git a/hello-xml/gradle/Dockerfile → xml-hello/gradle/Dockerfile b/hello-xml/gradle/Dockerfile → xml-hello/gradle/Dockerfile
diff --git a/hello-xml/gradle/wrapper/gradle-wrapper.jar → xml-hello/gradle/wrapper/gradle-wrapper.jar b/hello-xml/gradle/wrapper/gradle-wrapper.jar → xml-hello/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/hello-xml/gradlew → xml-hello/gradlew b/hello-xml/gradlew → xml-hello/gradlew
diff --git a/hello-xml/gradlew.bat → xml-hello/gradlew.bat b/hello-xml/gradlew.bat → xml-hello/gradlew.bat
diff --git a/hello-xml/mvnw → xml-hello/mvnw b/hello-xml/mvnw → xml-hello/mvnw
diff --git a/hello-xml/mvnw.cmd → xml-hello/mvnw.cmd b/hello-xml/mvnw.cmd → xml-hello/mvnw.cmd
diff --git a/hello-xml/pom.xml → xml-hello/pom.xml b/hello-xml/pom.xml → xml-hello/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>daggerok</groupId>
-  <artifactId>hello-xml</artifactId>
+  <artifactId>xml</artifactId>
   <version>0.0.1</version>
   <packaging>jar</packaging>
 

diff --git a/xml-hello/settings.gradle b/xml-hello/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = "xml"
diff --git a/hello-xml/src/main/java/daggerok/App.kt → xml-hello/src/main/java/daggerok/App.kt b/hello-xml/src/main/java/daggerok/App.kt → xml-hello/src/main/java/daggerok/App.kt
diff --git a/hello-xml/src/main/java/lombok.config → xml-hello/src/main/java/lombok.config b/hello-xml/src/main/java/lombok.config → xml-hello/src/main/java/lombok.config
diff --git a/.../src/main/kotlin/daggerok/rest/Webflux.kt → .../src/main/kotlin/daggerok/rest/Webflux.kt b/.../src/main/kotlin/daggerok/rest/Webflux.kt → .../src/main/kotlin/daggerok/rest/Webflux.kt
diff --git a/...o-xml/src/main/resources/application.yaml → ...hello/src/main/resources/application.yaml b/...o-xml/src/main/resources/application.yaml → ...hello/src/main/resources/application.yaml
diff --git a/...urces/config/application-spring-boot.yaml → ...urces/config/application-spring-boot.yaml b/...urces/config/application-spring-boot.yaml → ...urces/config/application-spring-boot.yaml
diff --git a/...n/resources/config/spring-integration.xml → ...n/resources/config/spring-integration.xml b/...n/resources/config/spring-integration.xml → ...n/resources/config/spring-integration.xml
diff --git a/hello-xml/src/test/kotlin/AppTests.kt → xml-hello/src/test/kotlin/AppTests.kt b/hello-xml/src/test/kotlin/AppTests.kt → xml-hello/src/test/kotlin/AppTests.kt
diff --git a/xml-starter/README.adoc b/xml-starter/README.adoc
@@ -1,4 +1,4 @@
-= xml-starter
+= spring-integration-5-examples | xml image:https://travis-ci.org/daggerok/spring-integration-5-examples.svg?branch=master["Build Status", link="https://travis-ci.org/daggerok/spring-integration-5-examples"]
 
 //tag::content[]
 includes spring-integration xml configuration with few dependencies

diff --git a/xml-starter/docker-compose-gradle.yaml b/xml-starter/docker-compose-gradle.yaml
@@ -2,17 +2,17 @@ version: "2.1"
 
 services:
 
-  gradle-xml-starter-app:
+  gradle-xml-app:
     build:
       context: .
       dockerfile: gradle/Dockerfile
-    volumes: ["gradle-xml-starter-app-data:/home/app"]
+    volumes: ["gradle-xml-app-data:/home/app"]
     ports: ["8080:8080"]
     networks: [backing-services]
     mem_limit: 786432000 # container limit: 700Mb (700 * 1024 * 1024)
 
 volumes:
-  gradle-xml-starter-app-data: {}
+  gradle-xml-app-data: {}
 
 networks:
   backing-services:

diff --git a/xml-starter/docker-compose-maven.yaml b/xml-starter/docker-compose-maven.yaml
@@ -2,17 +2,17 @@ version: "2.1"
 
 services:
 
-  maven-xml-starter-app:
+  maven-xml-app:
     build:
       context: .
       dockerfile: .mvn/Dockerfile
-    volumes: ["maven-xml-starter-app-data:/home/app"]
+    volumes: ["maven-xml-app-data:/home/app"]
     ports: ["8080:8080"]
     networks: [backing-services]
     mem_limit: 786432000 # container limit: 700Mb (700 * 1024 * 1024)
 
 volumes:
-  maven-xml-starter-app-data: {}
+  maven-xml-app-data: {}
 
 networks:
   backing-services:

diff --git a/xml-starter/pom.xml b/xml-starter/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>daggerok</groupId>
-  <artifactId>xml-starter</artifactId>
+  <artifactId>xml</artifactId>
   <version>0.0.1</version>
   <packaging>jar</packaging>
 

diff --git a/xml-starter/settings.gradle b/xml-starter/settings.gradle
@@ -1 +1 @@
-rootProject.name = "xml-starter"
+rootProject.name = "xml"