Merged fix for GRAILS-6381 "Remove redundant artifact suffixes when u…

…sing the scripts "grails create-xxxxx""

scripts/CreateController.groovy

@@ -32,7 +32,8 @@ target ('default': "Creates a new controller") {
     promptForName(type: type)
 
     def name = argsMap["params"][0]
-	createArtifact(name: name, suffix: type, type: type, path: "grails-app/controllers")
+    name = purgeRedundantArtifactSuffix(name, type)
+    createArtifact(name: name, suffix: type, type: type, path: "grails-app/controllers")
 
     def viewsDir = "${basedir}/grails-app/views/${propertyName}"
     ant.mkdir(dir:viewsDir)

scripts/CreateFilters.groovy

@@ -34,6 +34,7 @@ target ('default': "Creates a new filters class") {
     promptForName(type: type)
 
     def name = argsMap["params"][0]
+    name = purgeRedundantArtifactSuffix(name, type)
     createArtifact(name: name, suffix: type, type: type, path: "grails-app/conf")
 	createUnitTest(name: name, suffix: type)
 }

scripts/CreateIntegrationTest.groovy

@@ -31,5 +31,6 @@ target ('default': "Creates a new Grails integration test which loads the whole
     promptForName(type: "Integration test")
 
     def name = argsMap["params"][0]
+    name = purgeRedundantArtifactSuffix(name, type)
     createIntegrationTest(name: name, suffix: "")
 }                            

scripts/CreateService.groovy

@@ -34,6 +34,7 @@ target ('default': "Creates a new service class") {
     promptForName(type: type)
 
     def name = argsMap["params"][0]
-	createArtifact(name: name, suffix: type, type: type, path: "grails-app/services")
-	createUnitTest(name: name, suffix: type)
+    name = purgeRedundantArtifactSuffix(name, type)
+    createArtifact(name: name, suffix: type, type: type, path: "grails-app/services")
+    createUnitTest(name: name, suffix: type)
 }

scripts/CreateTagLib.groovy

@@ -32,6 +32,7 @@ target ('default': "Creates a new tag library") {
     promptForName(type: type)
 
     def name = argsMap["params"][0]
-	createArtifact(name: name, suffix: type, type: type, path: "grails-app/taglib")
-	createUnitTest(name: name, suffix: type, superClass: "TagLibUnitTestCase")
+    name = purgeRedundantArtifactSuffix(name, type)
+    createArtifact(name: name, suffix: type, type: type, path: "grails-app/taglib")
+    createUnitTest(name: name, suffix: type, superClass: "TagLibUnitTestCase")
 }

scripts/CreateUnitTest.groovy

@@ -31,5 +31,6 @@ target ('default': "Creates a new Grails unit test. A unit test requires that yo
     promptForName(type: "Unit test")
 
     def name = argsMap["params"][0]
+    name = purgeRedundantArtifactSuffix(name, type)
     createUnitTest(name: name, suffix: "")
 }                            

scripts/_GrailsCreateArtifacts.groovy

@@ -123,3 +123,12 @@ promptForName = { Map args = [:] ->
         argsMap["params"] << ant.antProject.properties."artifact.name"
     }
 }
+
+purgeRedundantArtifactSuffix = { name, suffix ->
+    if (name && suffix) {
+        if (name =~ /.+$suffix$/) {
+            name = name.replaceAll(/$suffix$/, "")
+        }
+    }
+    name
+}