diff --git a/.gitignore b/.gitignore index 8cdbd1ff4..33a6a411c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,36 @@ -target/* -.settings/* -.classpath +#.gitignore .project +.sts4-cache/ +_site/ + +test-output/ + +# MacOS +.DS_Store + +# Maven +target/* +.classpath +.settings/* + +# IDEA .idea *.iml -/target -.sts4-cache/ -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json -_site/ +*.log + +# vim +*~ +*.swp +*.swo +*.swn +*.swl +*.swm +*.swj +*.swk + + + + + + + diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index c6feb8bb6..000000000 Binary files a/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index 25cc8af3c..000000000 --- a/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.3/apache-maven-3.3.3-bin.zip diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c0f28cfa4..000000000 --- a/.travis.yml +++ /dev/null @@ -1,2 +0,0 @@ -language: java -jdk: oraclejdk8 diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 559c53805..000000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "type": "java", - "name": "Debug (Launch)-PetClinicApplication", - "request": "launch", - "cwd": "${workspaceFolder}", - "console": "internalConsole", - "stopOnEntry": false, - "mainClass": "org.springframework.samples.petclinic.PetClinicApplication", - "projectName": "spring-petclinic", - "args": "" - }, - { - "type": "java", - "name": "Debug (Attach)", - "request": "attach", - "hostName": "localhost", - "port": 0 - } - ] -} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index c5f3f6b9c..000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "java.configuration.updateBuildConfiguration": "interactive" -} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index fabd5c416..000000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [ - { - "label": "verify", - "type": "shell", - "command": "mvn -B verify", - "group": "build" - }, - { - "label": "test", - "type": "shell", - "command": "mvn -B test", - "group": "test" - } - ] -} diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 0f4a7fc30..000000000 --- a/docker-compose.yml +++ /dev/null @@ -1,9 +0,0 @@ -mysql: - image: mysql:5.7 - ports: - - "3306:3306" - environment: - - MYSQL_ROOT_PASSWORD=petclinic - - MYSQL_DATABASE=petclinic - volumes: - - "./conf.d:/etc/mysql/conf.d:ro" diff --git a/mvnw b/mvnw deleted file mode 100755 index fc7efd17d..000000000 --- a/mvnw +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# 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 -# -# http://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. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # - # Look for the Apple JDKs first to preserve the existing behaviour, and then look - # for the new JDKs provided by Oracle. - # - if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then - # - # Apple JDKs - # - export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home - fi - - if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then - # - # Apple JDKs - # - export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home - fi - - if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then - # - # Oracle JDKs - # - export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home - fi - - if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then - # - # Apple JDKs - # - export JAVA_HOME=`/usr/libexec/java_home` - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - 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 - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Migwn, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - # TODO classpath? -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - 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" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` -fi - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - local basedir=$(pwd) - local wdir=$(pwd) - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - wdir=$(cd "$wdir/.."; pwd) - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CMD_LINE_ARGS - diff --git a/mvnw.cmd b/mvnw.cmd deleted file mode 100644 index 0d49a2de0..000000000 --- a/mvnw.cmd +++ /dev/null @@ -1,145 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -set MAVEN_CMD_LINE_ARGS=%MAVEN_CONFIG% %* - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" - -set WRAPPER_JAR=""%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS% -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml index 0469ceaf7..2c8b7574d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,216 +1,22 @@ - 4.0.0 - org.springframework.samples - spring-petclinic - 2.0.0.BUILD-SNAPSHOT + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.0.4.RELEASE - - petclinic + org.springframework.samples + udc-petclinic + pom + 1.0.0-SNAPSHOT + UDC :: Petclinic - - - - 1.8 - UTF-8 - UTF-8 - - - 3.3.6 - 1.11.4 - 2.2.4 - 1.8.0 - - 0.8.1 - - - - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-cache - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-test - test - - - - - org.hsqldb - hsqldb - runtime - - - mysql - mysql-connector-java - runtime - - - - - javax.cache - cache-api - - - org.ehcache - ehcache - - - - - org.webjars - webjars-locator-core - - - org.webjars - jquery - ${webjars-jquery.version} - - - org.webjars - jquery-ui - ${webjars-jquery-ui.version} - - - org.webjars - bootstrap - ${webjars-bootstrap.version} - - - - - org.springframework.boot - spring-boot-devtools - true - - - - - - + org.springframework.boot - spring-boot-maven-plugin - - - - - build-info - - - - ${project.build.sourceEncoding} - ${project.reporting.outputEncoding} - ${maven.compiler.source} - ${maven.compiler.target} - - - - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - - prepare-agent - - - - report - prepare-package - - report - - - - - - - - pl.project13.maven - git-commit-id-plugin - - - - revision - - - - - true - yyyy-MM-dd'T'HH:mm:ssZ - true - ${project.build.outputDirectory}/git.properties - - false - - - - - ro.isdc.wro4j - wro4j-maven-plugin - ${wro4j.version} - - - generate-resources - - run - - - - - ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory - ${project.build.directory}/classes/static/resources/css - ${basedir}/src/main/wro/wro.xml - ${basedir}/src/main/wro/wro.properties - ${basedir}/src/main/less - - - - org.webjars - bootstrap - ${webjars-bootstrap.version} - - - - - - - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + spring-boot-starter-parent + 2.0.4.RELEASE + + + udc-backend + diff --git a/sonar-project.properties b/sonar-project.properties deleted file mode 100755 index d84ed7c2d..000000000 --- a/sonar-project.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Required metadata -sonar.projectKey=java-sonar-runner-simple -sonar.projectName=Simple Java project analyzed with the SonarQube Runner -sonar.projectVersion=1.0 - -# Comma-separated paths to directories with sources (required) -sonar.sources=src - -# Language -sonar.language=java - -# Encoding of the source files -sonar.sourceEncoding=UTF-8 \ No newline at end of file diff --git a/test b/test new file mode 100644 index 000000000..9daeafb98 --- /dev/null +++ b/test @@ -0,0 +1 @@ +test diff --git a/udc-backend/pom.xml b/udc-backend/pom.xml new file mode 100644 index 000000000..3cf4c0404 --- /dev/null +++ b/udc-backend/pom.xml @@ -0,0 +1,216 @@ + + + 4.0.0 + + org.springframework.samples + udc-backend + 1.0.0-SNAPSHOT + UDC :: Petclinic :: Backend + + + org.springframework.samples + udc-petclinic + 1.0.0-SNAPSHOT + + + + + 1.8 + UTF-8 + UTF-8 + + + 3.3.6 + 1.11.4 + 2.2.4 + 1.8.0 + + 0.8.1 + + + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-cache + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-test + test + + + + + org.hsqldb + hsqldb + runtime + + + mysql + mysql-connector-java + runtime + + + + + javax.cache + cache-api + + + org.ehcache + ehcache + + + + + org.webjars + webjars-locator-core + + + org.webjars + jquery + ${webjars-jquery.version} + + + org.webjars + jquery-ui + ${webjars-jquery-ui.version} + + + org.webjars + bootstrap + ${webjars-bootstrap.version} + + + + + org.springframework.boot + spring-boot-devtools + true + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + build-info + + + + ${project.build.sourceEncoding} + ${project.reporting.outputEncoding} + ${maven.compiler.source} + ${maven.compiler.target} + + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + + prepare-agent + + + + report + prepare-package + + report + + + + + + + + pl.project13.maven + git-commit-id-plugin + + + + revision + + + + + true + yyyy-MM-dd'T'HH:mm:ssZ + true + ${project.build.outputDirectory}/git.properties + + false + + + + + ro.isdc.wro4j + wro4j-maven-plugin + ${wro4j.version} + + + generate-resources + + run + + + + + ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory + + ${project.build.directory}/classes/static/resources/css + udc-backend/src/main/wro/wro.xml + udc-backend/src/main/wro/wro.properties + ${basedir}/src/main/less + + + + org.webjars + bootstrap + ${webjars-bootstrap.version} + + + + + + + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + diff --git a/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java similarity index 94% rename from src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java index 83b118095..f9cfc8f31 100644 --- a/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic; +package main.java.org.springframework.samples.petclinic; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java similarity index 95% rename from src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java index 86cc21092..177fb321e 100644 --- a/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.model; +package main.java.org.springframework.samples.petclinic.model; import java.io.Serializable; diff --git a/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java similarity index 95% rename from src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java index d66c97ae7..4becea667 100644 --- a/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.model; +package main.java.org.springframework.samples.petclinic.model; import javax.persistence.Column; import javax.persistence.MappedSuperclass; diff --git a/src/main/java/org/springframework/samples/petclinic/model/Person.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/model/Person.java similarity index 95% rename from src/main/java/org/springframework/samples/petclinic/model/Person.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/model/Person.java index 5d23523bd..195bb79b0 100644 --- a/src/main/java/org/springframework/samples/petclinic/model/Person.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/model/Person.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.model; +package main.java.org.springframework.samples.petclinic.model; import javax.persistence.Column; import javax.persistence.MappedSuperclass; diff --git a/src/main/java/org/springframework/samples/petclinic/model/package-info.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/model/package-info.java similarity index 55% rename from src/main/java/org/springframework/samples/petclinic/model/package-info.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/model/package-info.java index 78294d130..4060bedbb 100644 --- a/src/main/java/org/springframework/samples/petclinic/model/package-info.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/model/package-info.java @@ -1,5 +1,5 @@ /** * The classes in this package represent utilities used by the domain. */ -package org.springframework.samples.petclinic.model; +package main.java.org.springframework.samples.petclinic.model; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/Owner.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/owner/Owner.java similarity index 98% rename from src/main/java/org/springframework/samples/petclinic/owner/Owner.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/owner/Owner.java index 89aad2c2c..7293116c7 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/Owner.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/owner/Owner.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package main.java.org.springframework.samples.petclinic.owner; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java similarity index 98% rename from src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java index 5d11bff4c..157cc24ef 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package main.java.org.springframework.samples.petclinic.owner; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java similarity index 97% rename from src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java index 068f5245d..e152b9320 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package main.java.org.springframework.samples.petclinic.owner; import java.util.Collection; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/Pet.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/owner/Pet.java similarity index 95% rename from src/main/java/org/springframework/samples/petclinic/owner/Pet.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/owner/Pet.java index c225b8d8a..f29ee770c 100755 --- a/src/main/java/org/springframework/samples/petclinic/owner/Pet.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/owner/Pet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package main.java.org.springframework.samples.petclinic.owner; import java.time.LocalDate; import java.util.ArrayList; @@ -36,7 +36,7 @@ import org.springframework.beans.support.MutableSortDefinition; import org.springframework.beans.support.PropertyComparator; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.samples.petclinic.model.NamedEntity; -import org.springframework.samples.petclinic.visit.Visit; +import main.java.org.springframework.samples.petclinic.visit.Visit; /** * Simple business object representing a pet. diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetController.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/owner/PetController.java similarity index 98% rename from src/main/java/org/springframework/samples/petclinic/owner/PetController.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/owner/PetController.java index e0c1feeed..41b043398 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/PetController.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/owner/PetController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package main.java.org.springframework.samples.petclinic.owner; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetRepository.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/owner/PetRepository.java similarity index 96% rename from src/main/java/org/springframework/samples/petclinic/owner/PetRepository.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/owner/PetRepository.java index b0ec5db23..bcaa4a55d 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/PetRepository.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/owner/PetRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package main.java.org.springframework.samples.petclinic.owner; import java.util.List; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetType.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/owner/PetType.java similarity index 93% rename from src/main/java/org/springframework/samples/petclinic/owner/PetType.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/owner/PetType.java index ac827b310..fdfb73728 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/PetType.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/owner/PetType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package main.java.org.springframework.samples.petclinic.owner; import javax.persistence.Entity; import javax.persistence.Table; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetTypeFormatter.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/owner/PetTypeFormatter.java similarity index 97% rename from src/main/java/org/springframework/samples/petclinic/owner/PetTypeFormatter.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/owner/PetTypeFormatter.java index 78451ca28..dacebd941 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/PetTypeFormatter.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/owner/PetTypeFormatter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package main.java.org.springframework.samples.petclinic.owner; import java.text.ParseException; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetValidator.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/owner/PetValidator.java similarity index 96% rename from src/main/java/org/springframework/samples/petclinic/owner/PetValidator.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/owner/PetValidator.java index 1a3d92e9e..0c5f35080 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/PetValidator.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/owner/PetValidator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package main.java.org.springframework.samples.petclinic.owner; import org.springframework.util.StringUtils; import org.springframework.validation.Errors; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java similarity index 92% rename from src/main/java/org/springframework/samples/petclinic/owner/VisitController.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java index 19e42c78e..9441c2876 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package main.java.org.springframework.samples.petclinic.owner; -import org.springframework.samples.petclinic.visit.Visit; -import org.springframework.samples.petclinic.visit.VisitRepository; +import main.java.org.springframework.samples.petclinic.visit.Visit; +import main.java.org.springframework.samples.petclinic.visit.VisitRepository; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; import org.springframework.web.bind.WebDataBinder; diff --git a/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java similarity index 95% rename from src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java index f5f659482..d92e7f5c7 100755 --- a/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.system; +package main.java.org.springframework.samples.petclinic.system; import org.springframework.boot.autoconfigure.cache.JCacheManagerCustomizer; import org.springframework.cache.annotation.EnableCaching; diff --git a/src/main/java/org/springframework/samples/petclinic/system/CrashController.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/system/CrashController.java similarity index 94% rename from src/main/java/org/springframework/samples/petclinic/system/CrashController.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/system/CrashController.java index 2f5e7a348..f8e19771d 100644 --- a/src/main/java/org/springframework/samples/petclinic/system/CrashController.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/system/CrashController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.system; +package main.java.org.springframework.samples.petclinic.system; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java similarity index 78% rename from src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java index 00430a790..5cd34df02 100644 --- a/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.system; +package main.java.org.springframework.samples.petclinic.system; import org.springframework.stereotype.Controller; diff --git a/src/main/java/org/springframework/samples/petclinic/vet/Specialty.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/vet/Specialty.java similarity index 87% rename from src/main/java/org/springframework/samples/petclinic/vet/Specialty.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/vet/Specialty.java index 5691c2434..38e4a0eac 100644 --- a/src/main/java/org/springframework/samples/petclinic/vet/Specialty.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/vet/Specialty.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.vet; +package main.java.org.springframework.samples.petclinic.vet; import java.io.Serializable; import javax.persistence.Entity; import javax.persistence.Table; -import org.springframework.samples.petclinic.model.NamedEntity; +import main.java.org.springframework.samples.petclinic.model.NamedEntity; /** * Models a {@link Vet Vet's} specialty (for example, dentistry). diff --git a/src/main/java/org/springframework/samples/petclinic/vet/Vet.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/vet/Vet.java similarity index 94% rename from src/main/java/org/springframework/samples/petclinic/vet/Vet.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/vet/Vet.java index 43aecc41e..237b24d08 100644 --- a/src/main/java/org/springframework/samples/petclinic/vet/Vet.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/vet/Vet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.vet; +package main.java.org.springframework.samples.petclinic.vet; import java.util.ArrayList; import java.util.Collections; @@ -31,7 +31,7 @@ import javax.xml.bind.annotation.XmlElement; import org.springframework.beans.support.MutableSortDefinition; import org.springframework.beans.support.PropertyComparator; -import org.springframework.samples.petclinic.model.Person; +import main.java.org.springframework.samples.petclinic.model.Person; /** * Simple JavaBean domain object representing a veterinarian. diff --git a/src/main/java/org/springframework/samples/petclinic/vet/VetController.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/vet/VetController.java similarity index 96% rename from src/main/java/org/springframework/samples/petclinic/vet/VetController.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/vet/VetController.java index c54b3b92d..b2012e244 100644 --- a/src/main/java/org/springframework/samples/petclinic/vet/VetController.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/vet/VetController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.vet; +package main.java.org.springframework.samples.petclinic.vet; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java similarity index 96% rename from src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java index 20863ce76..4513a7d79 100644 --- a/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.vet; +package main.java.org.springframework.samples.petclinic.vet; import java.util.Collection; diff --git a/src/main/java/org/springframework/samples/petclinic/vet/Vets.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/vet/Vets.java similarity index 95% rename from src/main/java/org/springframework/samples/petclinic/vet/Vets.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/vet/Vets.java index f5b24c3fc..bb3c0454c 100644 --- a/src/main/java/org/springframework/samples/petclinic/vet/Vets.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/vet/Vets.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.vet; +package main.java.org.springframework.samples.petclinic.vet; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/springframework/samples/petclinic/visit/Visit.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/visit/Visit.java similarity index 96% rename from src/main/java/org/springframework/samples/petclinic/visit/Visit.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/visit/Visit.java index ab6e3319c..5735c0ab0 100755 --- a/src/main/java/org/springframework/samples/petclinic/visit/Visit.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/visit/Visit.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.visit; +package main.java.org.springframework.samples.petclinic.visit; import java.time.LocalDate; diff --git a/src/main/java/org/springframework/samples/petclinic/visit/VisitRepository.java b/udc-backend/src/main/java/org/springframework/samples/petclinic/visit/VisitRepository.java similarity index 96% rename from src/main/java/org/springframework/samples/petclinic/visit/VisitRepository.java rename to udc-backend/src/main/java/org/springframework/samples/petclinic/visit/VisitRepository.java index c7853d170..ab04602ec 100644 --- a/src/main/java/org/springframework/samples/petclinic/visit/VisitRepository.java +++ b/udc-backend/src/main/java/org/springframework/samples/petclinic/visit/VisitRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.visit; +package main.java.org.springframework.samples.petclinic.visit; import java.util.List; diff --git a/src/main/less/header.less b/udc-backend/src/main/less/header.less similarity index 100% rename from src/main/less/header.less rename to udc-backend/src/main/less/header.less diff --git a/src/main/less/petclinic.less b/udc-backend/src/main/less/petclinic.less similarity index 100% rename from src/main/less/petclinic.less rename to udc-backend/src/main/less/petclinic.less diff --git a/src/main/less/responsive.less b/udc-backend/src/main/less/responsive.less similarity index 100% rename from src/main/less/responsive.less rename to udc-backend/src/main/less/responsive.less diff --git a/src/main/less/typography.less b/udc-backend/src/main/less/typography.less similarity index 100% rename from src/main/less/typography.less rename to udc-backend/src/main/less/typography.less diff --git a/src/main/resources/application-mysql.properties b/udc-backend/src/main/resources/application-mysql.properties similarity index 100% rename from src/main/resources/application-mysql.properties rename to udc-backend/src/main/resources/application-mysql.properties diff --git a/src/main/resources/application.properties b/udc-backend/src/main/resources/application.properties similarity index 100% rename from src/main/resources/application.properties rename to udc-backend/src/main/resources/application.properties diff --git a/src/main/resources/banner.txt b/udc-backend/src/main/resources/banner.txt similarity index 100% rename from src/main/resources/banner.txt rename to udc-backend/src/main/resources/banner.txt diff --git a/src/main/resources/db/hsqldb/data.sql b/udc-backend/src/main/resources/db/hsqldb/data.sql similarity index 100% rename from src/main/resources/db/hsqldb/data.sql rename to udc-backend/src/main/resources/db/hsqldb/data.sql diff --git a/src/main/resources/db/hsqldb/schema.sql b/udc-backend/src/main/resources/db/hsqldb/schema.sql similarity index 100% rename from src/main/resources/db/hsqldb/schema.sql rename to udc-backend/src/main/resources/db/hsqldb/schema.sql diff --git a/src/main/resources/db/mysql/data.sql b/udc-backend/src/main/resources/db/mysql/data.sql similarity index 100% rename from src/main/resources/db/mysql/data.sql rename to udc-backend/src/main/resources/db/mysql/data.sql diff --git a/src/main/resources/db/mysql/petclinic_db_setup_mysql.txt b/udc-backend/src/main/resources/db/mysql/petclinic_db_setup_mysql.txt similarity index 100% rename from src/main/resources/db/mysql/petclinic_db_setup_mysql.txt rename to udc-backend/src/main/resources/db/mysql/petclinic_db_setup_mysql.txt diff --git a/src/main/resources/db/mysql/schema.sql b/udc-backend/src/main/resources/db/mysql/schema.sql similarity index 100% rename from src/main/resources/db/mysql/schema.sql rename to udc-backend/src/main/resources/db/mysql/schema.sql diff --git a/src/main/resources/messages/messages.properties b/udc-backend/src/main/resources/messages/messages.properties similarity index 100% rename from src/main/resources/messages/messages.properties rename to udc-backend/src/main/resources/messages/messages.properties diff --git a/src/main/resources/messages/messages_de.properties b/udc-backend/src/main/resources/messages/messages_de.properties similarity index 100% rename from src/main/resources/messages/messages_de.properties rename to udc-backend/src/main/resources/messages/messages_de.properties diff --git a/src/main/resources/messages/messages_en.properties b/udc-backend/src/main/resources/messages/messages_en.properties similarity index 100% rename from src/main/resources/messages/messages_en.properties rename to udc-backend/src/main/resources/messages/messages_en.properties diff --git a/src/main/resources/static/resources/fonts/montserrat-webfont.eot b/udc-backend/src/main/resources/static/resources/fonts/montserrat-webfont.eot similarity index 100% rename from src/main/resources/static/resources/fonts/montserrat-webfont.eot rename to udc-backend/src/main/resources/static/resources/fonts/montserrat-webfont.eot diff --git a/src/main/resources/static/resources/fonts/montserrat-webfont.svg b/udc-backend/src/main/resources/static/resources/fonts/montserrat-webfont.svg similarity index 100% rename from src/main/resources/static/resources/fonts/montserrat-webfont.svg rename to udc-backend/src/main/resources/static/resources/fonts/montserrat-webfont.svg diff --git a/src/main/resources/static/resources/fonts/montserrat-webfont.ttf b/udc-backend/src/main/resources/static/resources/fonts/montserrat-webfont.ttf similarity index 100% rename from src/main/resources/static/resources/fonts/montserrat-webfont.ttf rename to udc-backend/src/main/resources/static/resources/fonts/montserrat-webfont.ttf diff --git a/src/main/resources/static/resources/fonts/montserrat-webfont.woff b/udc-backend/src/main/resources/static/resources/fonts/montserrat-webfont.woff similarity index 100% rename from src/main/resources/static/resources/fonts/montserrat-webfont.woff rename to udc-backend/src/main/resources/static/resources/fonts/montserrat-webfont.woff diff --git a/src/main/resources/static/resources/fonts/varela_round-webfont.eot b/udc-backend/src/main/resources/static/resources/fonts/varela_round-webfont.eot similarity index 100% rename from src/main/resources/static/resources/fonts/varela_round-webfont.eot rename to udc-backend/src/main/resources/static/resources/fonts/varela_round-webfont.eot diff --git a/src/main/resources/static/resources/fonts/varela_round-webfont.svg b/udc-backend/src/main/resources/static/resources/fonts/varela_round-webfont.svg similarity index 100% rename from src/main/resources/static/resources/fonts/varela_round-webfont.svg rename to udc-backend/src/main/resources/static/resources/fonts/varela_round-webfont.svg diff --git a/src/main/resources/static/resources/fonts/varela_round-webfont.ttf b/udc-backend/src/main/resources/static/resources/fonts/varela_round-webfont.ttf similarity index 100% rename from src/main/resources/static/resources/fonts/varela_round-webfont.ttf rename to udc-backend/src/main/resources/static/resources/fonts/varela_round-webfont.ttf diff --git a/src/main/resources/static/resources/fonts/varela_round-webfont.woff b/udc-backend/src/main/resources/static/resources/fonts/varela_round-webfont.woff similarity index 100% rename from src/main/resources/static/resources/fonts/varela_round-webfont.woff rename to udc-backend/src/main/resources/static/resources/fonts/varela_round-webfont.woff diff --git a/src/main/resources/static/resources/images/favicon.png b/udc-backend/src/main/resources/static/resources/images/favicon.png similarity index 100% rename from src/main/resources/static/resources/images/favicon.png rename to udc-backend/src/main/resources/static/resources/images/favicon.png diff --git a/src/main/resources/static/resources/images/pets.png b/udc-backend/src/main/resources/static/resources/images/pets.png similarity index 100% rename from src/main/resources/static/resources/images/pets.png rename to udc-backend/src/main/resources/static/resources/images/pets.png diff --git a/src/main/resources/static/resources/images/platform-bg.png b/udc-backend/src/main/resources/static/resources/images/platform-bg.png similarity index 100% rename from src/main/resources/static/resources/images/platform-bg.png rename to udc-backend/src/main/resources/static/resources/images/platform-bg.png diff --git a/src/main/resources/static/resources/images/spring-logo-dataflow-mobile.png b/udc-backend/src/main/resources/static/resources/images/spring-logo-dataflow-mobile.png similarity index 100% rename from src/main/resources/static/resources/images/spring-logo-dataflow-mobile.png rename to udc-backend/src/main/resources/static/resources/images/spring-logo-dataflow-mobile.png diff --git a/src/main/resources/static/resources/images/spring-logo-dataflow.png b/udc-backend/src/main/resources/static/resources/images/spring-logo-dataflow.png similarity index 100% rename from src/main/resources/static/resources/images/spring-logo-dataflow.png rename to udc-backend/src/main/resources/static/resources/images/spring-logo-dataflow.png diff --git a/src/main/resources/static/resources/images/spring-pivotal-logo.png b/udc-backend/src/main/resources/static/resources/images/spring-pivotal-logo.png similarity index 100% rename from src/main/resources/static/resources/images/spring-pivotal-logo.png rename to udc-backend/src/main/resources/static/resources/images/spring-pivotal-logo.png diff --git a/src/main/resources/templates/error.html b/udc-backend/src/main/resources/templates/error.html similarity index 100% rename from src/main/resources/templates/error.html rename to udc-backend/src/main/resources/templates/error.html diff --git a/src/main/resources/templates/fragments/inputField.html b/udc-backend/src/main/resources/templates/fragments/inputField.html similarity index 100% rename from src/main/resources/templates/fragments/inputField.html rename to udc-backend/src/main/resources/templates/fragments/inputField.html diff --git a/src/main/resources/templates/fragments/layout.html b/udc-backend/src/main/resources/templates/fragments/layout.html similarity index 100% rename from src/main/resources/templates/fragments/layout.html rename to udc-backend/src/main/resources/templates/fragments/layout.html diff --git a/src/main/resources/templates/fragments/selectField.html b/udc-backend/src/main/resources/templates/fragments/selectField.html similarity index 100% rename from src/main/resources/templates/fragments/selectField.html rename to udc-backend/src/main/resources/templates/fragments/selectField.html diff --git a/src/main/resources/templates/owners/createOrUpdateOwnerForm.html b/udc-backend/src/main/resources/templates/owners/createOrUpdateOwnerForm.html similarity index 100% rename from src/main/resources/templates/owners/createOrUpdateOwnerForm.html rename to udc-backend/src/main/resources/templates/owners/createOrUpdateOwnerForm.html diff --git a/src/main/resources/templates/owners/findOwners.html b/udc-backend/src/main/resources/templates/owners/findOwners.html similarity index 100% rename from src/main/resources/templates/owners/findOwners.html rename to udc-backend/src/main/resources/templates/owners/findOwners.html diff --git a/src/main/resources/templates/owners/ownerDetails.html b/udc-backend/src/main/resources/templates/owners/ownerDetails.html similarity index 100% rename from src/main/resources/templates/owners/ownerDetails.html rename to udc-backend/src/main/resources/templates/owners/ownerDetails.html diff --git a/src/main/resources/templates/owners/ownersList.html b/udc-backend/src/main/resources/templates/owners/ownersList.html similarity index 100% rename from src/main/resources/templates/owners/ownersList.html rename to udc-backend/src/main/resources/templates/owners/ownersList.html diff --git a/src/main/resources/templates/pets/createOrUpdatePetForm.html b/udc-backend/src/main/resources/templates/pets/createOrUpdatePetForm.html similarity index 100% rename from src/main/resources/templates/pets/createOrUpdatePetForm.html rename to udc-backend/src/main/resources/templates/pets/createOrUpdatePetForm.html diff --git a/src/main/resources/templates/pets/createOrUpdateVisitForm.html b/udc-backend/src/main/resources/templates/pets/createOrUpdateVisitForm.html similarity index 100% rename from src/main/resources/templates/pets/createOrUpdateVisitForm.html rename to udc-backend/src/main/resources/templates/pets/createOrUpdateVisitForm.html diff --git a/src/main/resources/templates/vets/vetList.html b/udc-backend/src/main/resources/templates/vets/vetList.html similarity index 100% rename from src/main/resources/templates/vets/vetList.html rename to udc-backend/src/main/resources/templates/vets/vetList.html diff --git a/src/main/resources/templates/welcome.html b/udc-backend/src/main/resources/templates/welcome.html similarity index 100% rename from src/main/resources/templates/welcome.html rename to udc-backend/src/main/resources/templates/welcome.html diff --git a/src/main/wro/wro.properties b/udc-backend/src/main/wro/wro.properties similarity index 100% rename from src/main/wro/wro.properties rename to udc-backend/src/main/wro/wro.properties diff --git a/src/main/wro/wro.xml b/udc-backend/src/main/wro/wro.xml similarity index 100% rename from src/main/wro/wro.xml rename to udc-backend/src/main/wro/wro.xml diff --git a/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java similarity index 95% rename from src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java rename to udc-backend/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java index 3f48c0d4a..99988b731 100644 --- a/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java +++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic; +package test.java.org.springframework.samples.petclinic; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java similarity index 95% rename from src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java rename to udc-backend/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java index 7da0d3dea..971f952f1 100644 --- a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java +++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.model; +package test.java.org.springframework.samples.petclinic.model; import java.util.Locale; import java.util.Set; diff --git a/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java similarity index 99% rename from src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java rename to udc-backend/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java index 7fccb3b04..8f558c26f 100644 --- a/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java +++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.owner; +package test.java.org.springframework.samples.petclinic.owner; import static org.hamcrest.Matchers.hasProperty; import static org.hamcrest.Matchers.is; diff --git a/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java similarity index 98% rename from src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java rename to udc-backend/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java index f95d7c87c..0e5cce9f8 100755 --- a/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java +++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.owner; +package test.java.org.springframework.samples.petclinic.owner; import static org.mockito.BDDMockito.given; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; diff --git a/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java similarity index 96% rename from src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java rename to udc-backend/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java index 4e8e36c14..306338b09 100644 --- a/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java +++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.owner; +package test.java.org.springframework.samples.petclinic.owner; import java.text.ParseException; import java.util.ArrayList; diff --git a/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java similarity index 97% rename from src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java rename to udc-backend/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java index 08d61360e..044ace0a6 100644 --- a/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java +++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.owner; +package test.java.org.springframework.samples.petclinic.owner; import static org.mockito.BDDMockito.given; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; diff --git a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java similarity index 99% rename from src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java rename to udc-backend/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java index 9f12151d9..ca247c192 100644 --- a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java +++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.service; +package test.java.org.springframework.samples.petclinic.service; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java similarity index 96% rename from src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java rename to udc-backend/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java index 44dc6b1c2..0eb130a4a 100644 --- a/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java +++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.service; +package test.java.org.springframework.samples.petclinic.service; import java.util.Collection; diff --git a/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java similarity index 95% rename from src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java rename to udc-backend/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java index 3f108bfe9..1c2377f3b 100644 --- a/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java +++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.system; +package test.java.org.springframework.samples.petclinic.system; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java similarity index 97% rename from src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java rename to udc-backend/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java index bd20ca79a..f860c8224 100644 --- a/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java +++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.vet; +package test.java.org.springframework.samples.petclinic.vet; import static org.hamcrest.xml.HasXPath.hasXPath; import static org.mockito.BDDMockito.given; diff --git a/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java b/udc-backend/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java similarity index 95% rename from src/test/java/org/springframework/samples/petclinic/vet/VetTests.java rename to udc-backend/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java index de3a7b9bb..ed15c61de 100644 --- a/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java +++ b/udc-backend/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.vet; +package test.java.org.springframework.samples.petclinic.vet; import org.junit.Test; diff --git a/src/test/jmeter/petclinic_test_plan.jmx b/udc-backend/src/test/jmeter/petclinic_test_plan.jmx similarity index 100% rename from src/test/jmeter/petclinic_test_plan.jmx rename to udc-backend/src/test/jmeter/petclinic_test_plan.jmx