sync v1.1.0

build.gradle

@@ -6,15 +6,35 @@ buildscript {
   }
   dependencies {
     classpath "net.saliman:gradle-cobertura-plugin:2.2.8"
+    classpath group: "org.asciidoctor", name: "asciidoctorj-pdf", version: "1.5.0-alpha.11"
+
   }
 }
 
 plugins {
   id "org.sonarqube" version "1.0"
+  id "org.asciidoctor.convert" version "1.5.3"
 }
 
+apply plugin: "org.asciidoctor.convert"
+apply plugin: "java"
 apply from: "configuration.gradle"
 
+asciidoctor {
+  backends = ["pdf", "html5"]
+  attributes	"stylesheet": "openmuc-asciidoc.css",
+  "toc2": "left",
+  "sampleSrc": file("src/sample/java"),
+  "pdf-stylesdir": "./",
+  "pdf-style": "pdf"
+
+  resources {
+    from("$sourceDir") {
+      include "images/**"
+    }	
+  }
+}
+
 configure(allprojects) {
   version = cfgVersion
 }
@@ -122,8 +142,9 @@ configure(javaProjects) {
       }
     }
   }
-
-  build.dependsOn(jarAll)
+
+  build.dependsOn {asciidoctor}
+  build.dependsOn {jarAll}
 
   eclipse.pathVariables([GRADLE_USER_HOME:file(gradle.gradleUserHomeDir)])
   tasks.eclipse.dependsOn(cleanEclipse)
@@ -158,7 +179,7 @@ configure(repositoryProjects) {
   if (cfgSignPom) {
     signing {
       if ( project.hasProperty('signing.keyId') ) {
-	sign configurations.archives
+        sign configurations.archives
       }
     }
   }
@@ -220,6 +241,8 @@ task javadocAll(type: Javadoc) {
   }
 
   exclude '**/internal/**'
+  exclude '**/java-gen/**'
+  exclude '**/app/**'
 
   destinationDir = new File(buildDir, 'docs/javadoc-all')
 
@@ -267,6 +290,7 @@ tasks.withType(Tar) {
   dependsOn(writeSettings)
   dependsOn(distributionProjects.build)
   dependsOn(javadocAll)
+  dependsOn(asciidoctor)
 
   compression = Compression.GZIP
 

configuration.gradle

@@ -1,7 +1,7 @@
 
 project.ext {
 
-  cfgVersion = '1.0.0'
+  cfgVersion = '1.1.0'
 
   cfgGroup = 'org.openmuc'
 
@@ -35,12 +35,12 @@ tasks.withType(Tar) {
       include 'build.gradle'
       include 'configuration.gradle'
       include 'license/**'
-      include 'doc/*.txt'
-      include 'doc/userguide/' + project.name + '-doc*.html'
-      include 'doc/userguide/' + project.name + '-doc_img/**'
+      include 'doc/CHANGELOG.txt'
       include 'run-scripts/**'
+      include 'gradle/wrapper/**'
+      include 'gradlew'
+      include 'gradlew.bat'
       include 'build/libs/**'
-      include 'build/docs/javadoc/**'
       include 'src/**'
     }
 
@@ -49,6 +49,22 @@ tasks.withType(Tar) {
     }
 
   }
+
+  into(project.name + '/doc/user-guide/') {
+    from('./build/asciidoc/html5/') {
+      include '**'
+    }
+    from('./build/asciidoc/pdf/') {
+      include '**'
+    }
+  }
+
+  into(project.name + '/doc/') {
+    from('./build/docs/') {
+      include 'javadoc/**'
+    }
+  }
+
 }
 
 
@@ -87,4 +103,3 @@ uploadArchives {
     }
   }
 }
-

doc/CHANGELOG.txt

@@ -1,5 +1,14 @@
-v1.0 24-Feb-2016
-----------------
+v1.1.0 06-Jun-2016
+------------------
+- Renamed ClientSap to ClientConnectionBuilder and ServerSap to
+  Server.Builder
+- fixed time conversion to ms of IeTime24 thanks to Jürgen Wieferink
+  from BTC AG
+- added stopListening() to ServerSap allowing for clean close
+- refactored console client
+
+v1.0.0 24-Feb-2016
+------------------
 - fixed bug when creating multiple parallel connections using
   the same ClientSap
 - fixed a synchronization problem in the server implementation