diff --git a/gradlew.bat b/gradlew.bat index ac1b06f938..107acd32c4 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,89 @@ -@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 -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -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 execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -: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 %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@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 +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +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 execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +: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 %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/images/folder.png b/images/folder.png index 137d0375bf..cf43ed6efb 100644 Binary files a/images/folder.png and b/images/folder.png differ diff --git a/images/mappings-separated.png b/images/mappings-separated.png index dc4556f81c..e0c2c40c84 100644 Binary files a/images/mappings-separated.png and b/images/mappings-separated.png differ diff --git a/images/mappings.png b/images/mappings.png index e50843369e..05fc5d9231 100644 Binary files a/images/mappings.png and b/images/mappings.png differ diff --git a/images/state-machine.png b/images/state-machine.png index e085d1fd17..8abcaa8382 100644 Binary files a/images/state-machine.png and b/images/state-machine.png differ diff --git a/images/test-matches.png b/images/test-matches.png index cf17181149..6bc129b647 100644 Binary files a/images/test-matches.png and b/images/test-matches.png differ diff --git a/images/test-no-match.png b/images/test-no-match.png index 21ccabb2c6..e3faf13c65 100644 Binary files a/images/test-no-match.png and b/images/test-no-match.png differ diff --git a/images/test-response.png b/images/test-response.png index 7cc3187988..f9c95cada3 100644 Binary files a/images/test-response.png and b/images/test-response.png differ diff --git a/images/test.png b/images/test.png index de15018de0..1f67da40e7 100644 Binary files a/images/test.png and b/images/test.png differ diff --git a/perf-test/gradle/wrapper/gradle-wrapper.jar b/perf-test/gradle/wrapper/gradle-wrapper.jar index c44b679acd..7d7e5b68e4 100644 Binary files a/perf-test/gradle/wrapper/gradle-wrapper.jar and b/perf-test/gradle/wrapper/gradle-wrapper.jar differ diff --git a/perf-test/gradlew.bat b/perf-test/gradlew.bat index e95643d6a2..f9553162f1 100644 --- a/perf-test/gradlew.bat +++ b/perf-test/gradlew.bat @@ -1,84 +1,84 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@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= - -@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 - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_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=%* - -: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% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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= + +@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 + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_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=%* + +: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% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/sample-war/src/main/webapp/WEB-INF/wiremock/__files/mytest.json b/sample-war/src/main/webapp/WEB-INF/wiremock/__files/mytest.json index 993a37d26c..df7939c226 100644 --- a/sample-war/src/main/webapp/WEB-INF/wiremock/__files/mytest.json +++ b/sample-war/src/main/webapp/WEB-INF/wiremock/__files/mytest.json @@ -1,3 +1,3 @@ -{ - "working": "YES" +{ + "working": "YES" } \ No newline at end of file diff --git a/sample-war/src/main/webapp/WEB-INF/wiremock/mappings/mytest-mapping.json b/sample-war/src/main/webapp/WEB-INF/wiremock/mappings/mytest-mapping.json index 06f70a2c99..f4a728ee8d 100644 --- a/sample-war/src/main/webapp/WEB-INF/wiremock/mappings/mytest-mapping.json +++ b/sample-war/src/main/webapp/WEB-INF/wiremock/mappings/mytest-mapping.json @@ -1,14 +1,14 @@ -{ - "request": { - "method": "GET", - "urlPattern": "/api/mytest" - }, - "response": { - "status": 200, - "bodyFileName": "mytest.json", - "headers": { - "Content-Type": "application/json", - "Cache-Control": "max-age=86400" - } - } -} +{ + "request": { + "method": "GET", + "urlPattern": "/api/mytest" + }, + "response": { + "status": 200, + "bodyFileName": "mytest.json", + "headers": { + "Content-Type": "application/json", + "Cache-Control": "max-age=86400" + } + } +} diff --git a/src/main/resources/assets/recorder/images/wiremock-concept-icon-01.png b/src/main/resources/assets/recorder/images/wiremock-concept-icon-01.png index 48f1589673..1edbab6003 100644 Binary files a/src/main/resources/assets/recorder/images/wiremock-concept-icon-01.png and b/src/main/resources/assets/recorder/images/wiremock-concept-icon-01.png differ diff --git a/src/main/resources/assets/swagger-ui/swagger-ui-dist/favicon-16x16.png b/src/main/resources/assets/swagger-ui/swagger-ui-dist/favicon-16x16.png index 8b194e617a..1e3ef3fb58 100644 Binary files a/src/main/resources/assets/swagger-ui/swagger-ui-dist/favicon-16x16.png and b/src/main/resources/assets/swagger-ui/swagger-ui-dist/favicon-16x16.png differ diff --git a/src/main/resources/assets/swagger-ui/swagger-ui-dist/favicon-32x32.png b/src/main/resources/assets/swagger-ui/swagger-ui-dist/favicon-32x32.png index 249737fe44..fc391b82c7 100644 Binary files a/src/main/resources/assets/swagger-ui/swagger-ui-dist/favicon-32x32.png and b/src/main/resources/assets/swagger-ui/swagger-ui-dist/favicon-32x32.png differ diff --git a/src/test/resources/remoteloader/__files/favicon3.png b/src/test/resources/remoteloader/__files/favicon3.png index 31827d7c80..3f692ee2cb 100644 Binary files a/src/test/resources/remoteloader/__files/favicon3.png and b/src/test/resources/remoteloader/__files/favicon3.png differ diff --git a/webapp/wiremock/src/assets/img/favicon3.png b/webapp/wiremock/src/assets/img/favicon3.png index 31827d7c80..3f692ee2cb 100644 Binary files a/webapp/wiremock/src/assets/img/favicon3.png and b/webapp/wiremock/src/assets/img/favicon3.png differ diff --git a/webapp/wiremock/src/assets/img/wiremock-concept-icon-01.png b/webapp/wiremock/src/assets/img/wiremock-concept-icon-01.png index 48f1589673..1edbab6003 100644 Binary files a/webapp/wiremock/src/assets/img/wiremock-concept-icon-01.png and b/webapp/wiremock/src/assets/img/wiremock-concept-icon-01.png differ