Skip to content

Commit 568b0f1

Browse files
luiszimmermannluiszimmermann
committed
Tab to 4 Spaces All project
1 parent 5d18034 commit 568b0f1

15 files changed

Lines changed: 779 additions & 779 deletions

‎TomcatGrailsPlugin.groovy‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
* limitations under the License.
1515
*/
1616
class TomcatGrailsPlugin {
17-
def version = '9.0.39'
18-
def grailsVersion = '2.5 > *'
19-
def scopes = [excludes: 'war']
20-
def title = 'Apache Tomcat plugin'
21-
def description = 'Makes Tomcat 9.0.x the servlet container for Grails at development time'
22-
def documentation = 'http://grails.org/plugin/tomcat'
23-
def license = 'APACHE'
24-
def organization = [name: 'Grails', url: 'http://www.grails.org']
25-
def developers = [
26-
[name: 'Graeme Rocher', email: 'rocherg@ociweb.com'],
27-
[name: 'Burt Beckwith', email: 'burt@burtbeckwith.com']
28-
]
29-
def issueManagement = [url: 'https://github.com/grails-plugins/grails-tomcat-plugin/issues']
30-
def scm = [url: 'https://github.com/grails-plugins/grails-tomcat-plugin']
17+
def version = '9.0.39'
18+
def grailsVersion = '2.5 > *'
19+
def scopes = [excludes: 'war']
20+
def title = 'Apache Tomcat plugin'
21+
def description = 'Makes Tomcat 9.0.x the servlet container for Grails at development time'
22+
def documentation = 'http://grails.org/plugin/tomcat'
23+
def license = 'APACHE'
24+
def organization = [name: 'Grails', url: 'http://www.grails.org']
25+
def developers = [
26+
[name: 'Graeme Rocher', email: 'rocherg@ociweb.com'],
27+
[name: 'Burt Beckwith', email: 'burt@burtbeckwith.com']
28+
]
29+
def issueManagement = [url: 'https://github.com/grails-plugins/grails-tomcat-plugin/issues']
30+
def scm = [url: 'https://github.com/grails-plugins/grails-tomcat-plugin']
3131
}

‎grails-app/conf/BuildConfig.groovy‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
if (System.getenv('TRAVIS_BRANCH')) {
2-
grails.project.repos.grailsCentral.username = System.getenv('GRAILS_CENTRAL_USERNAME')
3-
grails.project.repos.grailsCentral.password = System.getenv('GRAILS_CENTRAL_PASSWORD')
2+
grails.project.repos.grailsCentral.username = System.getenv('GRAILS_CENTRAL_USERNAME')
3+
grails.project.repos.grailsCentral.password = System.getenv('GRAILS_CENTRAL_PASSWORD')
44
}
55

66
grails.project.work.dir = 'target'
77

88
grails.project.dependency.resolver = 'maven'
99
grails.project.dependency.resolution = {
1010

11-
inherits 'global'
12-
log 'warn'
11+
inherits 'global'
12+
log 'warn'
1313

14-
repositories {
15-
mavenLocal()
16-
grailsCentral()
17-
mavenCentral()
18-
}
14+
repositories {
15+
mavenLocal()
16+
grailsCentral()
17+
mavenCentral()
18+
}
1919

20-
dependencies {
21-
String tomcatVersion = '9.0.39'
20+
dependencies {
21+
String tomcatVersion = '9.0.39'
2222
String tomcatLogVersion = '8.5.2'
2323

24-
compile "org.apache.tomcat.embed:tomcat-embed-core:$tomcatVersion"
24+
compile "org.apache.tomcat.embed:tomcat-embed-core:$tomcatVersion"
2525

2626
['el', 'jasper', 'websocket'].each {
27-
runtime "org.apache.tomcat.embed:tomcat-embed-$it:$tomcatVersion"
28-
}
27+
runtime "org.apache.tomcat.embed:tomcat-embed-$it:$tomcatVersion"
28+
}
2929

3030
['logging-log4j', 'logging-juli'].each {
3131
runtime "org.apache.tomcat.embed:tomcat-embed-$it:$tomcatLogVersion"
3232
}
33-
}
33+
}
3434

35-
plugins {
36-
build ':release:3.1.2', ':rest-client-builder:2.1.1', {
37-
export = false
38-
}
39-
}
35+
plugins {
36+
build ':release:3.1.2', ':rest-client-builder:2.1.1', {
37+
export = false
38+
}
39+
}
4040
}

‎grailsw‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ die() {
2020
}
2121

2222
earlyInit() {
23-
return
23+
return
2424
}
2525
lateInit() {
26-
return
26+
return
2727
}
2828

2929
GROOVY_STARTUP=~/.groovy/startup
3030
if [ -r "$GROOVY_STARTUP" ]; then
31-
. "$GROOVY_STARTUP"
31+
. "$GROOVY_STARTUP"
3232
fi
3333

3434
earlyInit
@@ -54,16 +54,16 @@ esac
5454
# Attempt to set JAVA_HOME if it's not already set
5555
if [ -z "$JAVA_HOME" ]; then
5656

57-
# Set JAVA_HOME for Darwin
58-
if $darwin; then
57+
# Set JAVA_HOME for Darwin
58+
if $darwin; then
5959

60-
[ -z "$JAVA_HOME" -a -d "/Library/Java/Home" ] &&
61-
export JAVA_HOME="/Library/Java/Home"
60+
[ -z "$JAVA_HOME" -a -d "/Library/Java/Home" ] &&
61+
export JAVA_HOME="/Library/Java/Home"
6262

63-
[ -z "$JAVA_HOME" -a -d "/System/Library/Frameworks/JavaVM.framework/Home" ] &&
64-
export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home"
63+
[ -z "$JAVA_HOME" -a -d "/System/Library/Frameworks/JavaVM.framework/Home" ] &&
64+
export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home"
6565

66-
fi
66+
fi
6767

6868
fi
6969

@@ -169,21 +169,21 @@ fi
169169
# Increase the maximum file descriptors if we can
170170
if [ "$cygwin" = "false" ]; then
171171
MAX_FD_LIMIT=`ulimit -H -n`
172-
if [ "$MAX_FD_LIMIT" != "unlimited" ]; then
173-
if [ $? -eq 0 ]; then
174-
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
175-
# use the businessSystem max
176-
MAX_FD="$MAX_FD_LIMIT"
177-
fi
178-
179-
ulimit -n $MAX_FD
180-
if [ $? -ne 0 ]; then
181-
warn "Could not set maximum file descriptor limit: $MAX_FD"
182-
fi
183-
else
184-
warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
185-
fi
186-
fi
172+
if [ "$MAX_FD_LIMIT" != "unlimited" ]; then
173+
if [ $? -eq 0 ]; then
174+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
175+
# use the businessSystem max
176+
MAX_FD="$MAX_FD_LIMIT"
177+
fi
178+
179+
ulimit -n $MAX_FD
180+
if [ $? -ne 0 ]; then
181+
warn "Could not set maximum file descriptor limit: $MAX_FD"
182+
fi
183+
else
184+
warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
185+
fi
186+
fi
187187
fi
188188

189189
# Fix the cygwin agent issue
@@ -289,28 +289,28 @@ if $cygwin; then
289289
fi
290290
TOOLS_JAR=`cygpath --path --mixed "$TOOLS_JAR"`
291291
STARTER_CLASSPATH=`cygpath --path --mixed "$STARTER_CLASSPATH"`
292-
# We build the pattern for arguments to be converted via cygpath
292+
# We build the pattern for arguments to be converted via cygpath
293293
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
294294
SEP=""
295295
for dir in $ROOTDIRSRAW; do
296-
ROOTDIRS="$ROOTDIRS$SEP$dir"
297-
SEP="|"
296+
ROOTDIRS="$ROOTDIRS$SEP$dir"
297+
SEP="|"
298298
done
299299
OURCYGPATTERN="(^($ROOTDIRS))"
300300
# Add a user-defined pattern to the cygpath arguments
301301
if [ "$GROOVY_CYGPATTERN" != "" ] ; then
302-
OURCYGPATTERN="$OURCYGPATTERN|($GROOVY_CYGPATTERN)"
302+
OURCYGPATTERN="$OURCYGPATTERN|($GROOVY_CYGPATTERN)"
303303
fi
304304
# Now convert the arguments
305-
ARGUMENTS=""
305+
ARGUMENTS=""
306306
for arg in "$@" ; do
307-
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
308-
if [ $CHECK -ne 0 ] ; then
309-
convArg=`cygpath --path --ignore --mixed -- "$arg"`
310-
else
311-
convArg=$arg
312-
fi
313-
ARGUMENTS="$ARGUMENTS $convArg"
307+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
308+
if [ $CHECK -ne 0 ] ; then
309+
convArg=`cygpath --path --ignore --mixed -- "$arg"`
310+
else
311+
convArg=$arg
312+
fi
313+
ARGUMENTS="$ARGUMENTS $convArg"
314314
done
315315
fi
316316

@@ -323,19 +323,19 @@ startGrails() {
323323
shift
324324
if [ -n "$GRAILS_OPTS" ]
325325
then
326-
GRAILS_OPTS="$GRAILS_OPTS"
326+
GRAILS_OPTS="$GRAILS_OPTS"
327327
else
328-
GRAILS_OPTS="-server -Xmx768M -Xms64M -Dfile.encoding=UTF-8"
329-
if [ "$GRAILS_NO_PERMGEN" != "1" ]; then
330-
GRAILS_OPTS="$GRAILS_OPTS -XX:PermSize=32m -XX:MaxPermSize=256m"
331-
fi
328+
GRAILS_OPTS="-server -Xmx768M -Xms64M -Dfile.encoding=UTF-8"
329+
if [ "$GRAILS_NO_PERMGEN" != "1" ]; then
330+
GRAILS_OPTS="$GRAILS_OPTS -XX:PermSize=32m -XX:MaxPermSize=256m"
331+
fi
332332
fi
333333
JAVA_OPTS="$GRAILS_OPTS $JAVA_OPTS $AGENT"
334334
# Start the Profiler or the JVM
335335
if $useprofiler; then
336336
runProfiler
337337
else
338-
if [ $# -eq 0 ] ; then # no argument given
338+
if [ $# -eq 0 ] ; then # no argument given
339339
exec "$JAVACMD" $JAVA_OPTS \
340340
-classpath "$STARTER_CLASSPATH" \
341341
-Dgrails.home="$GRAILS_HOME" \
@@ -345,7 +345,7 @@ startGrails() {
345345
--main $CLASS \
346346
--conf "$STARTER_CONF" \
347347
--classpath "$CP"
348-
else
348+
else
349349
exec "$JAVACMD" $JAVA_OPTS \
350350
-classpath "$STARTER_CLASSPATH" \
351351
-Dgrails.home="$GRAILS_HOME" \
@@ -356,7 +356,7 @@ startGrails() {
356356
--conf "$STARTER_CONF" \
357357
--classpath "$CP" \
358358
"${ARGUMENTS}"
359-
fi
359+
fi
360360
fi
361361
}
362362

‎grailsw.bat‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,17 @@ set SPRINGLOADED_PARAMS="profile=grails;cacheDir=%GRAILS_AGENT_CACHE_DIR%"
6565
if not exist "%GRAILS_AGENT_CACHE_DIR%" mkdir "%GRAILS_AGENT_CACHE_DIR%"
6666

6767
if "%GRAILS_NO_PERMGEN%" == "" (
68-
type "%JAVA_HOME%\include\classfile_constants.h" 2>nul | findstr /R /C:"#define JVM_CLASSFILE_MAJOR_VERSION 5[23]" >nul
69-
if not errorlevel 1 set GRAILS_NO_PERMGEN=1
68+
type "%JAVA_HOME%\include\classfile_constants.h" 2>nul | findstr /R /C:"#define JVM_CLASSFILE_MAJOR_VERSION 5[23]" >nul
69+
if not errorlevel 1 set GRAILS_NO_PERMGEN=1
7070
)
7171

7272
set AGENT_STRING=-javaagent:wrapper/springloaded-1.2.7.RELEASE.jar -Xverify:none -Dspringloaded.synchronize=true -Djdk.reflect.allowGetCallerClass=true -Dspringloaded=\"%SPRINGLOADED_PARAMS%\"
7373
set DISABLE_RELOADING=
7474
if "%GRAILS_OPTS%" == "" (
75-
set GRAILS_OPTS=-server -Xmx768M -Xms64M -Dfile.encoding=UTF-8
76-
if not "%GRAILS_NO_PERMGEN%" == "1" (
77-
set GRAILS_OPTS=-server -Xmx768M -Xms64M -XX:PermSize=32m -XX:MaxPermSize=256m -Dfile.encoding=UTF-8
78-
)
75+
set GRAILS_OPTS=-server -Xmx768M -Xms64M -Dfile.encoding=UTF-8
76+
if not "%GRAILS_NO_PERMGEN%" == "1" (
77+
set GRAILS_OPTS=-server -Xmx768M -Xms64M -XX:PermSize=32m -XX:MaxPermSize=256m -Dfile.encoding=UTF-8
78+
)
7979
)
8080

8181
@rem Get command-line arguments, handling Windows variants
@@ -90,44 +90,44 @@ set INTERACTIVE=true
9090
if "x%~1" == "x" goto execute
9191
set CURR_ARG=%~1
9292
if "%CURR_ARG:~0,2%" == "-D" (
93-
set CMD_LINE_ARGS=%CMD_LINE_ARGS% %~1=%~2
94-
shift
95-
shift
96-
goto win9xME_args_slurp
93+
set CMD_LINE_ARGS=%CMD_LINE_ARGS% %~1=%~2
94+
shift
95+
shift
96+
goto win9xME_args_slurp
9797
)
9898
if "x%~1" == "x-cp" (
99-
set CP=%~2
100-
shift
101-
shift
102-
goto win9xME_args_slurp
99+
set CP=%~2
100+
shift
101+
shift
102+
goto win9xME_args_slurp
103103
)
104104
if "x%~1" == "x-debug" (
105-
set JAVA_OPTS=%JAVA_OPTS% -Xdebug -Xnoagent -Dgrails.full.stacktrace=true -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
106-
shift
107-
goto win9xME_args_slurp
105+
set JAVA_OPTS=%JAVA_OPTS% -Xdebug -Xnoagent -Dgrails.full.stacktrace=true -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
106+
shift
107+
goto win9xME_args_slurp
108108
)
109109
if "x%~1" == "x-classpath" (
110-
set CP=%~2
111-
shift
112-
shift
113-
goto win9xME_args_slurp
110+
set CP=%~2
111+
shift
112+
shift
113+
goto win9xME_args_slurp
114114
)
115115
if "x%~1" == "x-reloading" (
116-
set AGENT=%AGENT_STRING%
117-
shift
118-
goto win9xME_args_slurp
116+
set AGENT=%AGENT_STRING%
117+
shift
118+
goto win9xME_args_slurp
119119
)
120120
if "x%~1" == "xrun-app" (
121-
set AGENT=%AGENT_STRING%
122-
set INTERACTIVE=
123-
set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
124-
shift
125-
goto win9xME_args_slurp
121+
set AGENT=%AGENT_STRING%
122+
set INTERACTIVE=
123+
set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
124+
shift
125+
goto win9xME_args_slurp
126126
)
127127
if "x%~1" == "x-noreloading" (
128-
set DISABLE_RELOADING=true
129-
shift
130-
goto win9xME_args_slurp
128+
set DISABLE_RELOADING=true
129+
shift
130+
goto win9xME_args_slurp
131131
)
132132
set INTERACTIVE=
133133
set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
@@ -152,11 +152,11 @@ set CP=%CP%;%CLASSPATH%
152152
:after_classpath
153153

154154
if "x%DISABLE_RELOADING%" == "xtrue" (
155-
set AGENT=
155+
set AGENT=
156156
) else (
157-
if "x%INTERACTIVE%" == "xtrue" (
158-
set AGENT=%AGENT_STRING%
159-
)
157+
if "x%INTERACTIVE%" == "xtrue" (
158+
set AGENT=%AGENT_STRING%
159+
)
160160
)
161161

162162
set STARTER_MAIN_CLASS=org.grails.wrapper.GrailsWrapper

0 commit comments

Comments
 (0)