Merge pull request #92 from Cognifide/aem-6.3-window-title

AEM 6.3 window title fix + version bumps

Author: pun-ky

README.md

@@ -58,7 +58,6 @@ so that this repository need to be included in *buildscript* section.
 buildscript {
     repositories {
         jcenter()
-        mavenCentral() 
         maven { url  "http://dl.bintray.com/cognifide/maven-public" }
     }
     

build.gradle

@@ -6,12 +6,11 @@ plugins {
 }
 
 group 'com.cognifide.gradle'
-version '2.0.13'
+version '2.0.14'
 description = 'Gradle AEM Plugin'
 defaultTasks = ['clean', 'publishToMavenLocal']
 
 repositories {
-    mavenCentral()
     jcenter()
 }
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Mon Dec 04 07:36:15 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -50,11 +50,11 @@ class LocalHandle(val project: Project, val sync: InstanceSync) {
     val stopScript: Script
         get() = binScript("stop")
 
-    private fun binScript(name: String): Script {
-        return if (OperatingSystem.current().isWindows) {
+    private fun binScript(name: String, os: OperatingSystem = OperatingSystem.current()): Script {
+        return if (os.isWindows) {
             Script(File(dir, "$name.bat"), File(staticDir, "bin/$name.bat"), listOf("cmd", "/C"))
         } else {
-            Script(File(dir, "$name.sh"), File(staticDir, "bin/$name.sh"), listOf("sh"))
+            Script(File(dir, name), File(staticDir, "bin/$name"), listOf("sh"))
         }
     }
 
@@ -108,13 +108,15 @@ class LocalHandle(val project: Project, val sync: InstanceSync) {
     }
 
     private fun correctStaticFiles() {
-        if (OperatingSystem.current().isWindows) {
-            FileOperations.amendFile(startScript.bin, { it.replace("start \"CQ\" cmd.exe /K", "start /min \"$instance\" cmd.exe /C") })
-        }
+        // Force CMD to be launched in closable window mode. Inject nice title.
+        FileOperations.amendFile(binScript("start", OperatingSystem.forName("windows")).bin, {
+            it.replace("start \"CQ\" cmd.exe /K", "start /min \"$instance\" cmd.exe /C") // AEM <= 6.2
+            it.replace("start \"CQ\" cmd.exe /C", "start /min \"$instance\" cmd.exe /C") // AEM 6.3
+        })
 
+        // Ensure that 'logs' directory exists
         GFileUtils.mkdirs(File(staticDir, "logs"))
     }
-
     private fun extractStaticFiles() {
         val progressLogger = ProgressLogger(project, "Extracting static files from JAR  '${jar.absolutePath}' to directory: $staticDir")
         progressLogger.started()

src/main/kotlin/com/cognifide/gradle/aem/instance/LocalHandle.kt

@@ -16,7 +16,6 @@ allprojects { subproject ->
         maven { url "https://repo.adobe.com/nexus/content/groups/public" }
         maven { url "https://repo1.maven.org/maven2" }
         jcenter()
-        mavenCentral()
         mavenLocal()
     }
 

…ifide/gradle/aem/local-instance/start.sh …ognifide/gradle/aem/local-instance/startsrc/main/resources/com/cognifide/gradle/aem/local-instance/start.sh renamed to src/main/resources/com/cognifide/gradle/aem/local-instance/start src/main/resources/com/cognifide/gradle/aem/local-instance/start.sh renamed to src/main/resources/com/cognifide/gradle/aem/local-instance/start

@@ -1,6 +1,5 @@
 repositories {
     mavenLocal()
-    mavenCentral()
     jcenter()
     maven { url  "http://dl.bintray.com/cognifide/maven-public" }
     maven { url "https://plugins.gradle.org/m2/" }

…nifide/gradle/aem/local-instance/stop.sh …cognifide/gradle/aem/local-instance/stopsrc/main/resources/com/cognifide/gradle/aem/local-instance/stop.sh renamed to src/main/resources/com/cognifide/gradle/aem/local-instance/stop src/main/resources/com/cognifide/gradle/aem/local-instance/stop.sh renamed to src/main/resources/com/cognifide/gradle/aem/local-instance/stop

@@ -2,7 +2,6 @@ buildscript {
     repositories {
         jcenter()
         mavenLocal()
-        mavenCentral()
         maven { url  "http://dl.bintray.com/cognifide/maven-public" }
     }
 
@@ -25,7 +24,6 @@ repositories {
     maven { url "https://repo.adobe.com/nexus/content/groups/public" }
     maven { url "https://repo1.maven.org/maven2" }
     jcenter()
-    mavenCentral()
 }
 
 dependencies {