fix: #14818 - web plugin & plugin adjustments

Author: jdaugherty

grails-profiles/web-plugin/build.gradle

@@ -29,7 +29,8 @@ ext {
 }
 
 dependencies {
-    profileRuntimeApi project(':grails-profiles-base')
+    profileRuntimeApi project(':grails-profiles-web')
+    profileRuntimeApi project(':grails-profiles-plugin')
 }
 
 apply {

grails-profiles/web-plugin/profile.yml

@@ -31,9 +31,9 @@ features:
 build:
     merge:
         - base
+        - web
         - plugin
     excludes:
         - war
-        - org.apache.grails.gradle.grails-web
 
 

grails-shell-cli/src/main/groovy/org/grails/cli/profile/commands/CreatePluginCommand.groovy

@@ -48,7 +48,7 @@ class CreatePluginCommand extends CreateAppCommand {
     String getName() { NAME }
 
     @Override
-    protected String getDefaultProfile() { "web-plugin" }
+    protected String getDefaultProfile() { "plugin" }
 
     protected boolean validateProfile(Profile profileInstance, String profileName, ExecutionContext executionContext) {
         def pluginProfile = profileInstance.extends.find() { Profile parent -> parent.name == 'plugin' }

grails-shell-cli/src/main/groovy/org/grails/cli/profile/commands/CreateWebPluginCommand.groovy

@@ -0,0 +1,57 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.grails.cli.profile.commands
+
+import groovy.transform.CompileStatic
+import org.grails.cli.profile.ExecutionContext
+import org.grails.cli.profile.Profile
+
+@CompileStatic
+class CreateWebPluginCommand extends CreateAppCommand {
+
+    public static final String NAME = "create-web-plugin"
+
+    CreateWebPluginCommand() {
+        description.description = "Creates a web plugin"
+        description.usage = "create-web-plugin [NAME]"
+    }
+
+    @Override
+    protected void populateDescription() {
+        description.argument(name: "Plugin Name", description: "The name of the plugin to create.", required: false)
+    }
+
+    @Override
+    String getName() { NAME }
+
+    @Override
+    protected String getDefaultProfile() { "web-plugin" }
+
+    protected boolean validateProfile(Profile profileInstance, String profileName, ExecutionContext executionContext) {
+        def pluginProfile = profileInstance.extends.find() { Profile parent -> parent.name == 'plugin' }
+        if(profileName != 'plugin' && pluginProfile == null) {
+            executionContext.console.error("No valid plugin profile found for name [$profileName]")
+            return false
+        }
+        else {
+            return super.validateProfile(profileInstance, profileName)
+        }
+    }
+}

grails-shell-cli/src/main/resources/META-INF/services/org.grails.cli.profile.Command

@@ -1,5 +1,6 @@
 org.grails.cli.profile.commands.CreateAppCommand
 org.grails.cli.profile.commands.CreatePluginCommand
+org.grails.cli.profile.commands.CreateWebPluginCommand
 org.grails.cli.profile.commands.CreateProfileCommand
 org.grails.cli.profile.commands.OpenCommand
 org.grails.cli.profile.commands.HelpCommand