OpenCms Calendar module update

.gitignore

@@ -11,3 +11,7 @@
 /3.2.1
 /native
 /daemon
+c.xml
+/*.iml
+/out
+*.log

all-modules.properties

@@ -1,32 +1,2 @@
 modules.common.all=com.alkacon.opencms.commons,\
-com.alkacon.opencms.calendar,\
-com.alkacon.opencms.documentcenter,\
-com.alkacon.opencms.newsletter,\
-com.alkacon.opencms.feeder,\
-com.alkacon.opencms.formgenerator,\
-com.alkacon.opencms.survey,\
-com.alkacon.opencms.registration,\
-com.alkacon.opencms.counter,\
-com.alkacon.opencms.oampdemo,\
-com.alkacon.opencms.comments,\
-com.alkacon.opencms.usagereport,\
-com.alkacon.opencms.weboptimization,\
-com.alkacon.opencms.excelimport,\
-com.alkacon.opencms.geomap,\
-com.alkacon.opencms.htmlcleaner,\
-com.alkacon.opencms.v8.calendar,\
-com.alkacon.opencms.v8.comments,\
-com.alkacon.opencms.v8.commons,\
-com.alkacon.opencms.v8.counter,\
-com.alkacon.opencms.v8.documentcenter,\
-com.alkacon.opencms.v8.excelimport,\
-com.alkacon.opencms.v8.feeder,\
-com.alkacon.opencms.v8.formgenerator,\
-com.alkacon.opencms.v8.geomap,\
-com.alkacon.opencms.v8.htmlcleaner,\
-com.alkacon.opencms.v8.newsletter,\
-com.alkacon.opencms.v8.photoalbum,\
-com.alkacon.opencms.v8.registration,\
-com.alkacon.opencms.v8.survey,\
-com.alkacon.opencms.v8.usagereport,\
-com.alkacon.opencms.v8.weboptimization
+com.alkacon.opencms.v8.calendar

build.gradle

@@ -2,6 +2,15 @@ plugins {
     id "com.dorongold.task-tree" version "1.3"
 }
 
+plugins {
+    id 'com.gradle.build-scan' version '1.13.4'
+}
+
+buildScan {
+    licenseAgreementUrl = 'https://gradle.com/terms-of-service'
+    licenseAgree = 'yes'
+}
+
 apply plugin: 'java'
 apply plugin: 'maven'
 
@@ -23,19 +32,36 @@ repositories {
         }
     }
     mavenCentral()
+    jcenter()
+    maven {
+        url "http://maven.vaadin.com/vaadin-addons"
+    }
 }
 
 configurations {
+    distribution {
+        description = 'libraries included into the opencms distribution'
+        transitive = false
+    }
     compile {
         description = 'used to compile the modules jars'
+        extendsFrom distribution
     }
     gwtCompile {
         description = 'used by the gwt-compiler to compile modules with gwt code'
     }
 }
 
 configurations.all {
-    transitive = false;
+    transitive = false
+}
+
+configurations.testCompile {
+    transitive = true
+}
+
+configurations.testRuntime {
+    transitive = true
 }
 
 
@@ -49,9 +75,39 @@ modules_oamp_all.split(',').each{ moduleName ->
             exclude '**/test/**'
             exclude '**/client/**'
         }
-        resources.srcDir "${moduleName}/src"
-    });
-    sourceSets[moduleName].compileClasspath=configurations.compile
+        resources {
+            srcDir "${moduleName}/resources"
+        }
+    })
+    sourceSets[moduleName].compileClasspath = configurations.compile
+    String testSourceSetName = "test" + moduleName.capitalize()
+    testSourceSetName = testSourceSetName.split('\\.').collect{it.capitalize()}.join().uncapitalize()
+    sourceSets.create(testSourceSetName,{
+        java {
+            srcDirs = ["${moduleName}/test"]
+        }
+        resources {
+            srcDirs = ["${moduleName}/test"]
+        }
+        compileClasspath = sourceSets[moduleName].output
+        compileClasspath += sourceSets[moduleName].compileClasspath
+        compileClasspath += configurations.testCompile
+        runtimeClasspath = output + compileClasspath
+    })
+//    String testTaskName = testSourceSetName.split('\\.').collect{it.capitalize()}.join().uncapitalize()
+    String testTaskName = testSourceSetName
+    task "$testTaskName" (type: Test, group: "Verification"){
+//        doFirst {
+//            cleanTest
+//        }
+
+        doFirst {
+            println "xxx>" + testClassesDir
+        }
+        include "**.*"
+        testClassesDir = sourceSets[testSourceSetName].output.classesDir
+        classpath = sourceSets[testSourceSetName].runtimeClasspath
+    }
     def moduleFolder = file("${projectDir}/${moduleName}")
     def srcGwtDir = file("${moduleFolder}/src")
     def manifestFile = file("${moduleFolder}/resources/manifest.xml")
@@ -202,13 +258,13 @@ modules_oamp_all.split(',').each{ moduleName ->
 
             classpath {
                 [
+                    // Classpath with the gwt-compiler
+                    configurations.gwtCompile,
                     sourceSets[moduleName].java.srcDirs,
                     sourceSets[moduleName].compileClasspath,
                     sourceSets[gwtSourceSetName].java.srcDirs,
                     sourceSets[gwtSourceSetName].output.resourcesDir,
-                    sourceSets[gwtSourceSetName].output.classesDir,
-                    // Classpath with the gwt-compiler
-                    configurations.gwtCompile
+                    sourceSets[gwtSourceSetName].output.classesDir
                 ]
             }
 
@@ -224,11 +280,12 @@ modules_oamp_all.split(',').each{ moduleName ->
                         '-localWorkers',
                         '2',
                         '-style',
-                        'obfuscated',
+                        'PRETTY',
                         '-extra',
                         extraDir,
-                        '-strict'
-                        // '-draftCompile' // Speeds up compile with 25%
+                        '-strict',
+                        '-failOnError',
+                        '-draftCompile' // Speeds up compile with 25%
                     ]
 
             maxHeapSize = max_heap_size