diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 5166fe90f..000000000 --- a/docker-compose.yml +++ /dev/null @@ -1,12 +0,0 @@ -mysql: - image: mysql:5.7 - ports: - - "3306:3306" - environment: - - MYSQL_ROOT_PASSWORD= - - MYSQL_ALLOW_EMPTY_PASSWORD=true - - MYSQL_USER=petclinic - - MYSQL_PASSWORD=petclinic - - MYSQL_DATABASE=petclinic - volumes: - - "./conf.d:/etc/mysql/conf.d:ro" diff --git a/src/main/java/org/springframework/cheapy/CheapyApplication.java b/src/main/java/org/springframework/cheapy/CheapyApplication.java index 2912ee3d8..3df17e2bb 100644 --- a/src/main/java/org/springframework/cheapy/CheapyApplication.java +++ b/src/main/java/org/springframework/cheapy/CheapyApplication.java @@ -20,7 +20,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; /** - * PetClinic Spring Boot Application. + * Cheapy Spring Boot Application. * * @author Dave Syer * diff --git a/src/main/java/org/springframework/cheapy/system/CacheConfiguration.java b/src/main/java/org/springframework/cheapy/system/CacheConfiguration.java index d5df44632..e52087fb7 100755 --- a/src/main/java/org/springframework/cheapy/system/CacheConfiguration.java +++ b/src/main/java/org/springframework/cheapy/system/CacheConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration; class CacheConfiguration { @Bean - public JCacheManagerCustomizer petclinicCacheConfigurationCustomizer() { + public JCacheManagerCustomizer cheapyCacheConfigurationCustomizer() { return cm -> { cm.createCache("vets", cacheConfiguration()); }; diff --git a/src/main/java/org/springframework/cheapy/system/CrashController.java b/src/main/java/org/springframework/cheapy/system/CrashController.java index 4fb7e15f5..fe9c6d322 100644 --- a/src/main/java/org/springframework/cheapy/system/CrashController.java +++ b/src/main/java/org/springframework/cheapy/system/CrashController.java @@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.GetMapping; @Controller public class CrashController { - @GetMapping("/oups") + @GetMapping(value="/oups") public String triggerException() { throw new RuntimeException( "Expected: controller used to showcase what " + "happens when an exception is thrown"); diff --git a/src/main/less/petclinic.less b/src/main/less/cheapy.less similarity index 100% rename from src/main/less/petclinic.less rename to src/main/less/cheapy.less diff --git a/src/main/resources/db/mysql/cheapy_db_setup_mysql.txt b/src/main/resources/db/mysql/cheapy_db_setup_mysql.txt index 29bb601fe..d1ec8149b 100644 --- a/src/main/resources/db/mysql/cheapy_db_setup_mysql.txt +++ b/src/main/resources/db/mysql/cheapy_db_setup_mysql.txt @@ -1,5 +1,5 @@ ================================================================================ -=== Spring PetClinic sample application - MySQL Configuration === +=== Spring Cheapy sample application - MySQL Configuration === ================================================================================ @author Sam Brannen @@ -18,15 +18,15 @@ mysql_1_eedb4818d817 | MySQL init process done. Ready for start up. ... -2) (Once only) create the PetClinic database and user by executing the "db/mysql/user.sql" +2) (Once only) create the Cheapy database and user by executing the "db/mysql/user.sql" scripts. You can connect to the database running in the docker container using `mysql -u root -h localhost --protocol tcp`, but you don't need to run the script there - because the petclinic user is already set up if you use the provided `docker-compose.yaml`. + because the cheapy user is already set up if you use the provided `docker-compose.yaml`. 3) Run the app with `spring.profiles.active=mysql` (e.g. as a System property via the command line, but any way that sets that property in a Spring Boot app should work). -N.B. the "petclinic" database has to exist for the app to work with the JDBC URL value +N.B. the "cheapy" database has to exist for the app to work with the JDBC URL value as it is configured by default. This condition is taken care of automatically by the docker-compose configuration provided, or by the `user.sql` script if you run that as root. diff --git a/src/main/resources/static/resources/images/bar3.jpg b/src/main/resources/static/resources/images/bar3.jpg new file mode 100644 index 000000000..d1b62b01e Binary files /dev/null and b/src/main/resources/static/resources/images/bar3.jpg differ diff --git a/src/main/webapp/WEB-INF/jsp/error.jsp b/src/main/webapp/WEB-INF/jsp/error.jsp new file mode 100644 index 000000000..3534ac497 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/error.jsp @@ -0,0 +1,15 @@ +<%@ page session="false" trimDirectiveWhitespaces="true" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> + + + + +

Algo malo ha pasado...

+ + + + +

${exception.message}

+ + diff --git a/src/main/webapp/WEB-INF/jsp/exception.jsp b/src/main/webapp/WEB-INF/jsp/exception.jsp deleted file mode 100644 index d030d595d..000000000 --- a/src/main/webapp/WEB-INF/jsp/exception.jsp +++ /dev/null @@ -1,14 +0,0 @@ -<%@ page session="false" trimDirectiveWhitespaces="true" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %> - - - - - - -

Something happened...

- -

${exception.message}

- - diff --git a/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp b/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp index d7e9e1ab9..c88a4c589 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp @@ -4,19 +4,19 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %> +<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> - +

New Owner

- - - - - + + + + +
@@ -31,4 +31,4 @@
- + diff --git a/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp b/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp index 4c93fb198..fd57e3541 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp @@ -3,12 +3,12 @@ <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %> +<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%> - +

Find Owners

@@ -37,4 +37,4 @@ Add Owner - + diff --git a/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp b/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp index 375906c45..98011c4d2 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp @@ -2,9 +2,9 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %> +<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> - +

Owner Information

@@ -33,4 +33,4 @@ Edit Owner - + diff --git a/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp b/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp index a4b161b9d..f4ef33da5 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp @@ -3,9 +3,9 @@ <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %> +<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> - +

Owners

@@ -41,4 +41,4 @@
- + diff --git a/src/main/webapp/WEB-INF/jsp/users/createOwnerForm.jsp b/src/main/webapp/WEB-INF/jsp/users/createOwnerForm.jsp index 941156611..f811bda81 100644 --- a/src/main/webapp/WEB-INF/jsp/users/createOwnerForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/users/createOwnerForm.jsp @@ -4,21 +4,21 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %> +<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> - +

New Owner

- - - - - - - + + + + + + +
@@ -33,4 +33,4 @@
- + diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/src/main/webapp/WEB-INF/jsp/welcome.jsp index 0cae0d52e..fc2db8671 100644 --- a/src/main/webapp/WEB-INF/jsp/welcome.jsp +++ b/src/main/webapp/WEB-INF/jsp/welcome.jsp @@ -1,11 +1,11 @@ <%@ page session="false" trimDirectiveWhitespaces="true" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %> +<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> - +

@@ -19,4 +19,4 @@
- + diff --git a/src/main/webapp/WEB-INF/tags/bodyHeader.tag b/src/main/webapp/WEB-INF/tags/bodyHeader.tag index cd14d874c..db45d11d0 100644 --- a/src/main/webapp/WEB-INF/tags/bodyHeader.tag +++ b/src/main/webapp/WEB-INF/tags/bodyHeader.tag @@ -1,7 +1,7 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %> +<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> <%@ attribute name="menuName" required="true" rtexprvalue="true" - description="Name of the active menu: home, owners, vets or error" %> + description="Name of the active menu: home, ofertas, contactanos, login" %> - + diff --git a/src/main/webapp/WEB-INF/tags/htmlHeader.tag b/src/main/webapp/WEB-INF/tags/htmlHeader.tag index 2417673ea..a259211ab 100644 --- a/src/main/webapp/WEB-INF/tags/htmlHeader.tag +++ b/src/main/webapp/WEB-INF/tags/htmlHeader.tag @@ -1,7 +1,7 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%-- -PetClinic :: a Spring Framework demonstration +Cheapy :: a Spring Framework demonstration --%> @@ -17,8 +17,8 @@ PetClinic :: a Spring Framework demonstration Cheapy : eat fast, eat cheapy <%-- CSS generated from LESS --%> - - + + <%-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --%> diff --git a/src/main/webapp/WEB-INF/tags/layout.tag b/src/main/webapp/WEB-INF/tags/layout.tag index 870c735b2..b5b93d21e 100644 --- a/src/main/webapp/WEB-INF/tags/layout.tag +++ b/src/main/webapp/WEB-INF/tags/layout.tag @@ -1,25 +1,25 @@ <%@ tag trimDirectiveWhitespaces="true" %> -<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %> +<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> <%@ attribute name="pageName" required="true" %> <%@ attribute name="customScript" required="false" fragment="true"%> - + - +
- +
- + diff --git a/src/main/webapp/WEB-INF/tags/menu.tag b/src/main/webapp/WEB-INF/tags/menu.tag index 2d0eeff56..144904a60 100644 --- a/src/main/webapp/WEB-INF/tags/menu.tag +++ b/src/main/webapp/WEB-INF/tags/menu.tag @@ -1,11 +1,11 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags"%> +<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags"%> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%> <%@ attribute name="name" required="true" rtexprvalue="true" - description="Name of the active menu: home, owners, vets or error"%> + description="Name of the active menu: home, ofertas, contactanos, login"%>