diff --git a/README.md b/README.md
index 929835f..3e3e527 100644
--- a/README.md
+++ b/README.md
@@ -2,17 +2,46 @@
-The docs for the 2.x branch can be found [here](https://github.com/Grails-Plugin-Consortium/grails-cxf/tree/grails-2). A lot of the previous documentation is somewhat applicable, but I will be creating new docs in the coming weeks.
+The docs for the 2.x branch can be found [here](https://github.com/Grails-Plugin-Consortium/grails-cxf/tree/grails-2) and grails 3.x branch can be found [here](https://github.com/Grails-Plugin-Consortium/grails-cxf/tree/master). A lot of the previous documentation is somewhat applicable, but I will be creating new docs in the coming weeks.
Grails CXF Plugin
=========
-The 3.x branch of the plugin is a grails plugin that contains simplified features to get simple soap endpoints exposed in grails 3 applications.
+The 6.x branch of the plugin is a grails plugin that contains simplified features to get simple soap endpoints exposed in grails 6 applications.
Getting Started
-----------
-At the core, this plugin is a simple wrapper for geeting grails service classes wired up as direct soap endpoints. As many of the previous features from the 2.x branch as could be ported for the initial release were ported. There will be continued support added for the more complex CXF features going forward.
+At the core, this plugin is a simple wrapper for getting grails service classes wired up as direct soap endpoints. All the previous features from the 3.x branch were ported. There will be continued support added for the more complex CXF features going forward.
+
+Installation
+-----------
+
+Grails 3.x:
+```groovy
+compile 'org.grails.plugins:cxf:3.1.2'
+```
+
+Grails 6.x:
+```groovy
+implemenation 'org.grails.plugins:cxf:6.0-JDK11-M1'
+```
+In addition if you want to use github package registry:
+
+```groovy
+repositories {
+ maven {
+ name = "GitHubPackages"
+ url = uri("https://maven.pkg.github.com/vsachinv/grails-cxf")
+ credentials {
+ username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_USERNAME")
+ password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")
+ }
+ }
+ }
+
+```
+
Basic Usage
---------
diff --git a/build.gradle b/build.gradle
index c2dea5c..c61587d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,105 +1,133 @@
-buildscript {
- ext {
- grailsVersion = project.grailsVersion
- }
- repositories {
- mavenLocal()
- maven { url "https://repo.grails.org/grails/core" }
- }
- dependencies {
- classpath "org.grails:grails-gradle-plugin:$grailsVersion"
- }
+plugins {
+ id "groovy"
+ id "war"
+ id "idea"
+ id "org.grails.grails-plugin"
+ id "eclipse"
+ id "com.gorylenko.gradle-git-properties"
+ id "maven-publish"
}
-version "3.1.2"
group "org.grails.plugins"
-apply plugin:"eclipse"
-apply plugin:"idea"
-apply plugin:"org.grails.grails-plugin"
-apply plugin:"org.grails.grails-plugin-publish"
-
-ext {
- grailsVersion = project.grailsVersion
- gradleWrapperVersion = project.gradleWrapperVersion
-}
-
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
repositories {
- mavenLocal()
- mavenCentral()
- maven { url "https://repo.grails.org/grails/core" }
+ mavenCentral()
+ maven { url "https://repo.grails.org/grails/core/" }
}
-dependencyManagement {
- imports {
- mavenBom "org.grails:grails-bom:$grailsVersion"
- }
- applyMavenExclusions false
+configurations {
+ all {
+ }
}
dependencies {
- compile "org.springframework.boot:spring-boot-starter-logging"
- compile "org.springframework.boot:spring-boot-autoconfigure"
- compile "org.grails:grails-core"
+ implementation("org.grails:grails-core")
+ implementation("org.grails:grails-logging")
+ implementation("org.grails:grails-web-boot")
+ implementation("org.springframework.boot:spring-boot-autoconfigure")
+ implementation("org.springframework.boot:spring-boot-starter-logging")
+ implementation("org.springframework.boot:spring-boot-starter-validation")
+ compileOnly("io.micronaut:micronaut-inject-groovy")
+ console("org.grails:grails-console")
+ testImplementation("io.micronaut:micronaut-inject-groovy")
+ testImplementation("org.grails:grails-gorm-testing-support")
+ testImplementation("org.spockframework:spock-core")
+ testImplementation("io.micronaut:micronaut-http-client")
+
+ implementation 'org.apache.commons:commons-lang3:3.12.0'
+ implementation "org.apache.cxf:cxf-core:${cxfVersion}"
+ implementation "org.apache.cxf:cxf-rt-transports-http:${cxfVersion}"
+ implementation "org.apache.cxf:cxf-rt-frontend-jaxrs:${cxfVersion}"
+ implementation "org.apache.cxf:cxf-rt-frontend-jaxws:${cxfVersion}"
+}
- provided "org.grails:grails-web-boot"
- provided "org.grails:grails-dependencies"
- provided 'javax.servlet:javax.servlet-api:3.1.0'
- console "org.grails:grails-console"
+java {
+ sourceCompatibility = JavaVersion.toVersion("11")
+ targetCompatibility = JavaVersion.toVersion("11")
+}
- profile "org.grails.profiles:plugin"
+tasks.withType(GroovyCompile) {
+ configure(groovyOptions) {
+ forkOptions.jvmArgs = ['-Xmx1024m']
+ }
+}
- compile 'org.apache.commons:commons-lang3:3.4'
- compile 'org.apache.cxf:cxf-core:3.1.8'
- compile 'org.apache.cxf:cxf-rt-frontend-jaxws:3.1.8'
- compile 'org.apache.cxf:cxf-rt-frontend-jaxrs:3.1.8'
- compile 'org.apache.cxf:cxf-rt-transports-http:3.1.8'
+tasks.withType(Test) {
+ useJUnitPlatform()
+}
- testCompile "org.grails:grails-plugin-testing"
+task sourceJar(type: Jar) {
+ classifier = 'sources'
+ from sourceSets.main.allSource
}
-task wrapper(type: Wrapper) {
- gradleVersion = gradleWrapperVersion
+task packageJavadoc(type: Jar) {
+ from javadoc
+ classifier = 'javadoc'
}
-grailsPublish {
- githubSlug = 'Grails-Plugin-Consortium/grails-cxf'
- license {
- name = 'Apache-2.0'
- }
- title = "Grails CXF Plugin"
- desc = "Grails CXF Plugin"
- developers = [acetrike: "Christian Oestreich",
- 'ryan.j.crum': "Ryan Crum",
- crafsman: "Ben Doerr"]
-
- portalUser = ""
- portalPassword = ""
+task packageGroovydoc(type: Jar) {
+ from groovydoc
+ classifier = 'groovydoc'
}
-bintray {
- user = System.getenv("BINTRAY_USER") ?: project.hasProperty("bintrayUser") ? project.bintrayUser : ''
- key = System.getenv("BINTRAY_KEY") ?: project.hasProperty("bintrayKey") ? project.bintrayKey : ''
- publications = ['maven']
- pkg {
- repo = 'grails-plugins'
- userOrg = 'ctoestreich'
- name = "cxf"
- desc = "Grails CXF Plugin"
- websiteUrl = "http://grails.org/plugin/grails-cxf"
- issueTrackerUrl = "https://github.com/Grails-Plugin-Consortium/grails-cxf/issues"
- vcsUrl = "https://github.com/Grails-Plugin-Consortium/grails-cxf"
- licenses = ['Apache-2.0']
- publicDownloadNumbers = true
- }
+gitProperties {
+ keys = ['git.branch', 'git.commit.id', 'git.commit.time', 'git.commit.id.abbrev']
+ failOnNoGitDirectory = true
+ extProperty = 'gitProps' // git properties will be put in a map at project.ext.gitProps
}
+generateGitProperties.outputs.upToDateWhen { false } // make sure the generateGitProperties task always executes (even when git.properties is not changed)
+
jar {
- exclude 'org/grails/cxf/test/**'
+ dependsOn generateGitProperties
+ manifest {
+ attributes("Built-By": System.getProperty("user.name"))
+ attributes(["Plugin-Version" : version,
+ "Plugin-Title" : project.name,
+ "Plugin-Build-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
+ "Git-Commit" : "${-> project.ext.gitProps['git.commit.id.abbrev']}",
+ "Git-Branch" : "${-> project.ext.gitProps['git.branch']}",
+ "Published-By" : project.findProperty("nexusUsername") ?: System.getenv("NEXUS_USERNAME")])
+ }
+ from sourceSets.main.output
+ exclude 'git.properties'
+}
+
+publishing {
+
+ publications {
+ mavenJar(MavenPublication) {
+ from components.java
+ artifact sourceJar
+ artifact packageJavadoc
+ artifact packageGroovydoc
+ }
+ }
+
+ repositories {
+ maven {
+ name = "GitHubPackages"
+ url = uri("https://maven.pkg.github.com/vsachinv/grails-cxf")
+ credentials {
+ username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_USERNAME")
+ password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")
+ }
+ }
+ maven {
+ name = "NexusRepo"
+ credentials {
+ username project.findProperty("nexusUsername") ?: System.getenv("NEXUS_USERNAME")
+ password project.findProperty("nexusPassword") ?: System.getenv("NEXUS_PASSWORD")
+ }
+ url project.findProperty("nexusUrl") ?: System.getenv("NEXUS_URL")
+ allowInsecureProtocol = project.findProperty("isNexusUrlInsecure") ? true : false
+ }
+ }
}
-bintrayUpload.dependsOn sourcesJar, javadocJar
+// enable if you wish to package this plugin as a standalone application
+bootJar.enabled = false
+
+bootRun.onlyIf { false }
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
new file mode 100644
index 0000000..4f8f72a
--- /dev/null
+++ b/buildSrc/build.gradle
@@ -0,0 +1,8 @@
+repositories {
+ mavenCentral()
+ maven { url "https://repo.grails.org/grails/core/" }
+}
+dependencies {
+ implementation("org.grails:grails-gradle-plugin:6.1.2")
+ implementation "com.gorylenko.gradle-git-properties:gradle-git-properties:2.4.2"
+}
diff --git a/gradle.properties b/gradle.properties
index a1b4a19..28d79cb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,8 @@
-grailsVersion=3.3.4
-gormVersion=6.1.9.RELEASE
-gradleWrapperVersion=3.5
+grailsVersion=6.2.0
+grailsGradlePluginVersion=6.1.2
+version=6.0-JDK11-M1
+org.gradle.caching=true
+org.gradle.daemon=true
+org.gradle.parallel=true
+org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M
+cxfVersion=3.6.6
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index deedc7f..7454180 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ca9ec11..3994438 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Nov 27 23:09:32 CET 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
diff --git a/gradlew b/gradlew
index 9d82f78..1b6c787 100755
--- a/gradlew
+++ b/gradlew
@@ -1,74 +1,129 @@
-#!/usr/bin/env bash
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed 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.
+#
##############################################################################
-##
-## Gradle start up script for UN*X
-##
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
##############################################################################
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
-warn ( ) {
+warn () {
echo "$*"
-}
+} >&2
-die ( ) {
+die () {
echo
echo "$*"
echo
exit 1
-}
+} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
+nonstop=false
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
esac
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
+ JAVACMD=$JAVA_HOME/jre/sh/java
else
- JAVACMD="$JAVA_HOME/bin/java"
+ JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -77,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
- JAVACMD="java"
+ JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
@@ -85,76 +140,95 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
fi
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
fi
- i=$((i+1))
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
done
- case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
fi
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
- JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index aec9973..ac1b06f 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -8,20 +24,23 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,34 +64,14 @@ echo location of your Java installation.
goto fail
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
diff --git a/grails-app/conf/application.yml b/grails-app/conf/application.yml
index aeb2495..7b75f40 100644
--- a/grails-app/conf/application.yml
+++ b/grails-app/conf/application.yml
@@ -1,21 +1,5 @@
-grails:
- profile: plugin
- codegen:
- defaultPackage: grails.cxf
- spring:
- transactionManagement:
- proxies: false
info:
- app:
- name: '@info.app.name@'
- version: '@info.app.version@'
- grailsVersion: '@info.app.grailsVersion@'
-spring:
- groovy:
- template:
- check-template-location: false
-# Spring Actuator Endpoints are Disabled by Default
-endpoints:
- enabled: false
- jmx:
- enabled: true
+ app:
+ name: '@info.app.name@'
+ version: '@info.app.version@'
+ grailsVersion: '@info.app.grailsVersion@'
diff --git a/grails-app/conf/logback.groovy b/grails-app/conf/logback.groovy
deleted file mode 100644
index 2f7c41c..0000000
--- a/grails-app/conf/logback.groovy
+++ /dev/null
@@ -1,23 +0,0 @@
-import grails.util.BuildSettings
-import grails.util.Environment
-
-// See http://logback.qos.ch/manual/groovy.html for details on configuration
-appender('STDOUT', ConsoleAppender) {
- encoder(PatternLayoutEncoder) {
- pattern = "%level %logger - %msg%n"
- }
-}
-
-root(ERROR, ['STDOUT'])
-
-def targetDir = BuildSettings.TARGET_DIR
-if (Environment.isDevelopmentMode() && targetDir) {
- appender("FULL_STACKTRACE", FileAppender) {
- file = "${targetDir}/stacktrace.log"
- append = true
- encoder(PatternLayoutEncoder) {
- pattern = "%level %logger - %msg%n"
- }
- }
- logger("StackTrace", ERROR, ['FULL_STACKTRACE'], false)
-}
diff --git a/grails-app/conf/logback.xml b/grails-app/conf/logback.xml
new file mode 100644
index 0000000..70b1484
--- /dev/null
+++ b/grails-app/conf/logback.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+ true
+
+ UTF-8
+ %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wex
+
+
+
+
+
+
+
+
diff --git a/grails-cli.yml b/grails-cli.yml
new file mode 100644
index 0000000..51fa0c9
--- /dev/null
+++ b/grails-cli.yml
@@ -0,0 +1,8 @@
+applicationType: plugin
+defaultPackage: grails6pluginsample
+testFramework: spock
+sourceLanguage: groovy
+buildTool: gradle
+gormImpl: gorm-hibernate5
+servletImpl: spring-boot-starter-tomcat
+features: [app-name, base, gorm-hibernate5, gradle, grails-application, grails-console, grails-dependencies, grails-gorm-testing-support, grails-gradle-plugin, h2, logback, micronaut-inject-groovy, readme, spock, spring-boot-autoconfigure, spring-boot-starter, yaml]
diff --git a/settings.gradle b/settings.gradle
index 660eea4..70c2c0a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,12 @@
-rootProject.name = "cxf"
\ No newline at end of file
+
+pluginManagement {
+ repositories {
+ mavenLocal()
+ maven { url "https://repo.grails.org/grails/core/" }
+ gradlePluginPortal()
+ }
+ plugins {
+ }
+}
+
+rootProject.name="cxf"
\ No newline at end of file
diff --git a/src/main/groovy/grails/cxf/CxfGrailsPlugin.groovy b/src/main/groovy/grails/cxf/CxfGrailsPlugin.groovy
index 7fd4caa..a3d68cc 100644
--- a/src/main/groovy/grails/cxf/CxfGrailsPlugin.groovy
+++ b/src/main/groovy/grails/cxf/CxfGrailsPlugin.groovy
@@ -9,7 +9,7 @@ import org.springframework.boot.web.servlet.ServletRegistrationBean
@Slf4j
class CxfGrailsPlugin extends Plugin {
- def grailsVersion = "3.1.0 > *"
+ def grailsVersion = "6.0.0 > *"
def pluginExcludes = [
'grails-app/views/error.gsp',
'grails-app/conf/spring/ApplicationResources.groovy',
@@ -41,7 +41,8 @@ class CxfGrailsPlugin extends Plugin {
def developers = [
[name: "Christian Oestreich", email: "acetrike@gmail.com"],
[name: "Ryan Crum", email: "ryan.j.crum@gmail.com"],
- [name: "Ben Doerr", email: "craftsman@bendoerr.me"]]
+ [name: "Ben Doerr", email: "craftsman@bendoerr.me"],
+ [name: "Sachin Verma", email: "sachin.verma@rxlogix.com"]]
def documentation = "http://grails.org/plugin/grails-cxf"
def license = "APACHE"
diff --git a/src/main/groovy/org/grails/cxf/utils/EndpointType.groovy b/src/main/groovy/org/grails/cxf/utils/EndpointType.groovy
index 8b34211..adc3a6c 100644
--- a/src/main/groovy/org/grails/cxf/utils/EndpointType.groovy
+++ b/src/main/groovy/org/grails/cxf/utils/EndpointType.groovy
@@ -1,8 +1,10 @@
package org.grails.cxf.utils
+import groovy.transform.CompileStatic
import org.apache.cxf.endpoint.AbstractEndpointFactory
import org.apache.cxf.jaxws.JaxWsServerFactoryBean
+@CompileStatic
public enum EndpointType {
JAX_WS(JaxWsServerFactoryBean.class);