Repository: tomee Updated Branches: refs/heads/master 4c835ca03 -> ab4cbe170
indentation adjustments Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/11df9990 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/11df9990 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/11df9990 Branch: refs/heads/master Commit: 11df9990756fc909d3452908a2b766be1399fd06 Parents: 58589f7 Author: Daniel Dias <[email protected]> Authored: Wed Dec 5 16:38:43 2018 -0200 Committer: Daniel Dias <[email protected]> Committed: Thu Dec 6 19:23:27 2018 -0200 ---------------------------------------------------------------------- .../org/superbiz/controller/HomeController.java | 7 +- .../superbiz/controller/PersonController.java | 70 +++---- .../main/java/org/superbiz/model/Address.java | 7 +- .../main/java/org/superbiz/model/Errors.java | 14 +- .../main/java/org/superbiz/model/Messages.java | 16 +- .../main/java/org/superbiz/model/Person.java | 4 +- .../superbiz/persistence/PersonProducer.java | 4 +- .../superbiz/persistence/PersonRepository.java | 2 +- .../src/main/resources/META-INF/persistence.xml | 2 +- .../src/main/webapp/WEB-INF/views/change.jsp | 207 ++++++++++--------- .../src/main/webapp/WEB-INF/views/home.jsp | 18 +- .../src/main/webapp/WEB-INF/views/insert.jsp | 201 +++++++++--------- .../src/main/webapp/WEB-INF/views/list.jsp | 122 +++++------ examples/mvc-cxf/src/main/webapp/index.jsp | 2 +- .../src/main/webapp/templates/footer.jsp | 18 +- .../mvc-cxf/src/main/webapp/templates/menu.jsp | 46 ++--- 16 files changed, 372 insertions(+), 368 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/11df9990/examples/mvc-cxf/src/main/java/org/superbiz/controller/HomeController.java ---------------------------------------------------------------------- diff --git a/examples/mvc-cxf/src/main/java/org/superbiz/controller/HomeController.java b/examples/mvc-cxf/src/main/java/org/superbiz/controller/HomeController.java index e8a96be..d1abe7f 100644 --- a/examples/mvc-cxf/src/main/java/org/superbiz/controller/HomeController.java +++ b/examples/mvc-cxf/src/main/java/org/superbiz/controller/HomeController.java @@ -9,7 +9,8 @@ import javax.ws.rs.Path; @Path("home") public class HomeController { - @GET - @View("home.jsp") - public void homePage() {} + @GET + @View("home.jsp") + public void homePage() { + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/11df9990/examples/mvc-cxf/src/main/java/org/superbiz/controller/PersonController.java ---------------------------------------------------------------------- diff --git a/examples/mvc-cxf/src/main/java/org/superbiz/controller/PersonController.java b/examples/mvc-cxf/src/main/java/org/superbiz/controller/PersonController.java index 0f8ff5a..9ebc0d6 100644 --- a/examples/mvc-cxf/src/main/java/org/superbiz/controller/PersonController.java +++ b/examples/mvc-cxf/src/main/java/org/superbiz/controller/PersonController.java @@ -11,47 +11,41 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import javax.inject.Inject; -import javax.mvc.Models; import javax.mvc.Controller; +import javax.mvc.Models; import javax.mvc.View; import javax.mvc.binding.BindingResult; -import javax.mvc.binding.ValidationError; import javax.validation.Valid; import javax.validation.executable.ExecutableType; import javax.validation.executable.ValidateOnExecution; import javax.ws.rs.BeanParam; -import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.POST; -import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.WebApplicationException; - import org.mvcspec.ozark.engine.Viewable; import org.superbiz.model.Errors; import org.superbiz.model.Messages; import org.superbiz.model.Person; import org.superbiz.persistence.PersonRepository; - - @Controller @Path("mvc") public class PersonController { private static final Supplier<WebApplicationException> NOT_FOUND_EXCEPTION = () -> new WebApplicationException(NOT_FOUND); - + @Inject private Models models; - + @Inject private Messages message; - - @Inject + + @Inject private Errors erros; - + @Inject private BindingResult bindingResult; @@ -61,7 +55,7 @@ public class PersonController { @GET @Path("new") public Viewable newElement() { - this.models.put("countries", getCountries()); + this.models.put("countries", getCountries()); return new Viewable("insert.jsp"); } @@ -74,16 +68,16 @@ public class PersonController { @POST @Path("add") - @ValidateOnExecution(type=ExecutableType.NONE) + @ValidateOnExecution(type = ExecutableType.NONE) public String add(@Valid @BeanParam Person person) { - if (bindingResult.isFailed()) { + if (bindingResult.isFailed()) { - this.getErros(); - this.models.put("countries", getCountries()); - this.models.put("person", person); - return "insert.jsp"; + this.getErros(); + this.models.put("countries", getCountries()); + this.models.put("person", person); + return "insert.jsp"; - } + } repository.save(person); message.setMessageRedirect("The " + person.getName() + " was successfully registered ! "); return "redirect:mvc/show"; @@ -91,16 +85,16 @@ public class PersonController { @POST @Path("update") - @ValidateOnExecution(type=ExecutableType.NONE) + @ValidateOnExecution(type = ExecutableType.NONE) public String update(@Valid @BeanParam Person person) { - if (bindingResult.isFailed()) { - - this.getErros(); - this.models.put("countries", getCountries()); - this.models.put("person", person); - return "change.jsp"; - - } + if (bindingResult.isFailed()) { + + this.getErros(); + this.models.put("countries", getCountries()); + this.models.put("person", person); + return "change.jsp"; + + } repository.save(person); message.setMessageRedirect("The " + person.getName() + " was changed successfully ! "); return "redirect:mvc/show"; @@ -126,19 +120,19 @@ public class PersonController { } private String getCountryName(String country) { - return new Locale(country,country).getDisplayCountry(Locale.ENGLISH); + return new Locale(country, country).getDisplayCountry(Locale.ENGLISH); } private List<String> getCountries() { - return Arrays.stream(Locale.getISOCountries()) - .map(country -> getCountryName(country)) - .sorted((a, b) -> a.compareTo(b)) - .collect(Collectors.toList()); + return Arrays.stream(Locale.getISOCountries()) + .map(country -> getCountryName(country)) + .sorted((a, b) -> a.compareTo(b)) + .collect(Collectors.toList()); } - + private void getErros() { - erros.setErrors( - bindingResult.getAllErrors().stream() - .collect(toList())); + erros.setErrors(bindingResult.getAllErrors() + .stream() + .collect(toList())); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/11df9990/examples/mvc-cxf/src/main/java/org/superbiz/model/Address.java ---------------------------------------------------------------------- diff --git a/examples/mvc-cxf/src/main/java/org/superbiz/model/Address.java b/examples/mvc-cxf/src/main/java/org/superbiz/model/Address.java index a53ba2c..aea3a37 100644 --- a/examples/mvc-cxf/src/main/java/org/superbiz/model/Address.java +++ b/examples/mvc-cxf/src/main/java/org/superbiz/model/Address.java @@ -11,12 +11,12 @@ import javax.ws.rs.FormParam; public class Address { @FormParam("country") - @NotEmpty(message="can not be empty") + @NotEmpty(message = "can not be empty") @MvcBinding private String country; @FormParam("state") - @NotEmpty(message="can not be empty") + @NotEmpty(message = "can not be empty") @MvcBinding private String state; @@ -37,8 +37,7 @@ public class Address { return false; } Address address = (Address) o; - return Objects.equals(country, address.country) && - Objects.equals(state, address.state); + return Objects.equals(country, address.country) && Objects.equals(state, address.state); } @Override http://git-wip-us.apache.org/repos/asf/tomee/blob/11df9990/examples/mvc-cxf/src/main/java/org/superbiz/model/Errors.java ---------------------------------------------------------------------- diff --git a/examples/mvc-cxf/src/main/java/org/superbiz/model/Errors.java b/examples/mvc-cxf/src/main/java/org/superbiz/model/Errors.java index 1e37d40..2ee0c54 100644 --- a/examples/mvc-cxf/src/main/java/org/superbiz/model/Errors.java +++ b/examples/mvc-cxf/src/main/java/org/superbiz/model/Errors.java @@ -12,7 +12,7 @@ import javax.mvc.binding.ParamError; @RequestScoped public class Errors { - private List<ParamError> errors = new ArrayList<>(); + private List<ParamError> errors = new ArrayList<>(); public void setErrors(List<ParamError> messages) { this.errors = messages; @@ -20,15 +20,15 @@ public class Errors { public String getErrors() { return errors.stream() - .map(ParamError::getMessage) - .collect(Collectors.joining("<br>")); + .map(ParamError::getMessage) + .collect(Collectors.joining("<br>")); } public String getMessage(String param) { return errors.stream() - .filter(v -> v.getParamName().equals(param)) - .map(ParamError::getMessage) - .findFirst() - .orElse(""); + .filter(v -> v.getParamName().equals(param)) + .map(ParamError::getMessage) + .findFirst() + .orElse(""); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/11df9990/examples/mvc-cxf/src/main/java/org/superbiz/model/Messages.java ---------------------------------------------------------------------- diff --git a/examples/mvc-cxf/src/main/java/org/superbiz/model/Messages.java b/examples/mvc-cxf/src/main/java/org/superbiz/model/Messages.java index 0344c31..3c09e75 100644 --- a/examples/mvc-cxf/src/main/java/org/superbiz/model/Messages.java +++ b/examples/mvc-cxf/src/main/java/org/superbiz/model/Messages.java @@ -9,15 +9,15 @@ import javax.mvc.RedirectScoped; @RedirectScoped public class Messages implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - private String messageRedirect; + private String messageRedirect; - public String getMessageRedirect() { - return messageRedirect; - } + public String getMessageRedirect() { + return messageRedirect; + } - public void setMessageRedirect(String messageRedirect) { - this.messageRedirect = messageRedirect; - } + public void setMessageRedirect(String messageRedirect) { + this.messageRedirect = messageRedirect; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/11df9990/examples/mvc-cxf/src/main/java/org/superbiz/model/Person.java ---------------------------------------------------------------------- diff --git a/examples/mvc-cxf/src/main/java/org/superbiz/model/Person.java b/examples/mvc-cxf/src/main/java/org/superbiz/model/Person.java index a016c31..ae57049 100644 --- a/examples/mvc-cxf/src/main/java/org/superbiz/model/Person.java +++ b/examples/mvc-cxf/src/main/java/org/superbiz/model/Person.java @@ -26,7 +26,7 @@ public class Person { private Long id; @FormParam("name") - @NotEmpty(message="can not be empty") + @NotEmpty(message = "can not be empty") @Size(min = 1, max = 20) @MvcBinding private String name; @@ -48,7 +48,7 @@ public class Person { @FormParam("description") @Column - @NotEmpty(message="can not be empty") + @NotEmpty(message = "can not be empty") @MvcBinding @Size(min = 10, max = 20) private String description; http://git-wip-us.apache.org/repos/asf/tomee/blob/11df9990/examples/mvc-cxf/src/main/java/org/superbiz/persistence/PersonProducer.java ---------------------------------------------------------------------- diff --git a/examples/mvc-cxf/src/main/java/org/superbiz/persistence/PersonProducer.java b/examples/mvc-cxf/src/main/java/org/superbiz/persistence/PersonProducer.java index 7a0e28e..4bfb622 100644 --- a/examples/mvc-cxf/src/main/java/org/superbiz/persistence/PersonProducer.java +++ b/examples/mvc-cxf/src/main/java/org/superbiz/persistence/PersonProducer.java @@ -20,6 +20,8 @@ public class PersonProducer { } public void closeEntityManager(@Disposes EntityManager manager) { - if (manager.isOpen()) { manager.close(); } + if (manager.isOpen()) { + manager.close(); + } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/11df9990/examples/mvc-cxf/src/main/java/org/superbiz/persistence/PersonRepository.java ---------------------------------------------------------------------- diff --git a/examples/mvc-cxf/src/main/java/org/superbiz/persistence/PersonRepository.java b/examples/mvc-cxf/src/main/java/org/superbiz/persistence/PersonRepository.java index 3d96a45..dd6d15c 100644 --- a/examples/mvc-cxf/src/main/java/org/superbiz/persistence/PersonRepository.java +++ b/examples/mvc-cxf/src/main/java/org/superbiz/persistence/PersonRepository.java @@ -7,7 +7,7 @@ import org.apache.deltaspike.data.api.Repository; import org.superbiz.model.Person; @Repository -public interface PersonRepository extends EntityRepository<Person, Long> { +public interface PersonRepository extends EntityRepository<Person, Long> { Optional<Person> findById(Long id); } http://git-wip-us.apache.org/repos/asf/tomee/blob/11df9990/examples/mvc-cxf/src/main/resources/META-INF/persistence.xml ---------------------------------------------------------------------- diff --git a/examples/mvc-cxf/src/main/resources/META-INF/persistence.xml b/examples/mvc-cxf/src/main/resources/META-INF/persistence.xml index 116c21d..6a9e49f 100644 --- a/examples/mvc-cxf/src/main/resources/META-INF/persistence.xml +++ b/examples/mvc-cxf/src/main/resources/META-INF/persistence.xml @@ -11,7 +11,7 @@ <class>org.superbiz.model.Address</class> <class>org.superbiz.model.Person</class> - + <properties> <property name="eclipselink.target-database" value="org.eclipse.persistence.platform.database.H2Platform"/> <property name="eclipselink.ddl-generation" value="create-tables"/> http://git-wip-us.apache.org/repos/asf/tomee/blob/11df9990/examples/mvc-cxf/src/main/webapp/WEB-INF/views/change.jsp ---------------------------------------------------------------------- diff --git a/examples/mvc-cxf/src/main/webapp/WEB-INF/views/change.jsp b/examples/mvc-cxf/src/main/webapp/WEB-INF/views/change.jsp index dde3417..0bc296b 100644 --- a/examples/mvc-cxf/src/main/webapp/WEB-INF/views/change.jsp +++ b/examples/mvc-cxf/src/main/webapp/WEB-INF/views/change.jsp @@ -1,112 +1,117 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %> +<%@ page contentType="text/html;charset=UTF-8" language="java"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <!DOCTYPE html> <html lang="en"> <head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>MVC 1.0 DEMO</title> +<meta charset="utf-8"> +<meta http-equiv="X-UA-Compatible" content="IE=edge"> +<meta name="viewport" content="width=device-width, initial-scale=1"> +<title>MVC 1.0 DEMO</title> </head> <body> -<div class="container"> - <c:if test="${error.errors.length() != 0}"> - <div class="row"> - <div class="col-md-12"> - <p class="alert alert-danger">${error.errors}</p> - </div> - </div> - </c:if> - <div class="row"> - <div class="col-md-4 col-md-offset-4"> - <form action="${mvc.basePath}/mvc/update" method="post"> - <h2>Change Registration</h2> - <div class="form-group"> - - <input type="text" name="id" value="${person.id}" hidden="true"> - - <label for="name">Name:</label> - <input id="name" name="name" class="form-control" autofocus value="${person.name}"> - <c:if test="${mvc.encoders.html(error.getMessage('name').length() != 0)}"> - <div class="row"> - <div class="col-md-12"> - <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("name"))}</p> - </div> - </div> - </c:if> - </div> - <div class="form-group"> - <label for="age">Age:</label> - <input type="number" id="age" name="age" class="form-control" value="${person.age}"> - <c:if test="${mvc.encoders.html(error.getMessage('age').length() != 0)}"> - <div class="row"> - <div class="col-md-12"> - <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("age"))}</p> - </div> - </div> - </c:if> - </div> - - <div class="form-group"> - <label for="state">State:</label> - <input type="text" id="state" name="state" class="form-control" value="${person.address.state}"> - <c:if test="${mvc.encoders.html(error.getMessage('state').length() != 0)}"> - <div class="row"> - <div class="col-md-12"> - <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("state"))}</p> - </div> - </div> - </c:if> - </div> - <div class="form-group"> - <label for="state">Application Server:</label> <br /> - <label class="radio-inline"><input type="radio" name="server" value="TomEE" class="form-check-input ">TomEE</label> - <label class="radio-inline"><input type="radio" name="server" value="Wildfly" class="form-check-input"/>Wildfly</label> - <label class="radio-inline"><input type="radio" name="server" value="Payara" class="form-check-input"/>Payara</label> - <c:if test="${mvc.encoders.html(error.getMessage('server').length() != 0)}"> - <div class="row"> - <div class="col-md-12"> - <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("server"))}</p> - </div> - </div> - </c:if> + <div class="container"> + <c:if test="${error.errors.length() != 0}"> + <div class="row"> + <div class="col-md-12"> + <p class="alert alert-danger">${error.errors}</p> </div> - <div class="form-group"> - <label for="country">Country:</label> - - <select id="country" name="country" class="form-control"> - <option value="${person.address.country}">${person.address.country}</option> - <c:forEach var="countries" items="${countries}"> - <option>${countries}</option> - </c:forEach> - </select> - <c:if test="${mvc.encoders.html(error.getMessage('country').length() != 0)}"> - <div class="row"> - <div class="col-md-12"> - <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("country"))}</p> - </div> - </div> - </c:if> - </div> - <div class="form-group"> - <label for="description">Description:</label> - <textarea type="" id="description" name="description" class="form-control">${person.description}</textarea> - <c:if test="${mvc.encoders.html(error.getMessage('description').length() != 0)}"> - <div class="row"> - <div class="col-md-12"> - <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("description"))}</p> - </div> - </div> - </c:if> - </div> - <button class="btn btn-primary btn-block" type="submit">Register</button> - </form> + </div> + </c:if> + <div class="row"> + <div class="col-md-4 col-md-offset-4"> + <form action="${mvc.basePath}/mvc/update" method="post"> + <h2>Change Registration</h2> + <div class="form-group"> + + <input type="text" name="id" value="${person.id}" hidden="true"> + + <label for="name">Name:</label> + <input id="name" name="name" class="form-control" autofocus value="${person.name}"> + <c:if test="${mvc.encoders.html(error.getMessage('name').length() != 0)}"> + <div class="row"> + <div class="col-md-12"> + <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("name"))}</p> + </div> + </div> + </c:if> + </div> + <div class="form-group"> + <label for="age">Age:</label> + <input type="number" id="age" name="age" class="form-control" value="${person.age}"> + <c:if test="${mvc.encoders.html(error.getMessage('age').length() != 0)}"> + <div class="row"> + <div class="col-md-12"> + <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("age"))}</p> + </div> + </div> + </c:if> + </div> + + <div class="form-group"> + <label for="state">State:</label> + <input type="text" id="state" name="state" class="form-control" value="${person.address.state}"> + <c:if test="${mvc.encoders.html(error.getMessage('state').length() != 0)}"> + <div class="row"> + <div class="col-md-12"> + <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("state"))}</p> + </div> + </div> + </c:if> + </div> + <div class="form-group"> + <label for="state">Application Server:</label> <br /> + <label class="radio-inline"> + <input type="radio" name="server" value="TomEE" class="form-check-input"/>TomEE</label> + <label class="radio-inline"> + <input type="radio" name="server" value="Wildfly" class="form-check-input"/>Wildfly</label> + <label class="radio-inline"> + <input type="radio" name="server" value="Payara" class="form-check-input"/>Payara</label> + + <c:if test="${mvc.encoders.html(error.getMessage('server').length() != 0)}"> + <div class="row"> + <div class="col-md-12"> + <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("server"))}</p> + </div> + </div> + </c:if> + </div> + <div class="form-group"> + <label for="country">Country:</label> + <select id="country" name="country" class="form-control"> + <option value="${person.address.country}">${person.address.country}</option> + <c:forEach var="countries" items="${countries}"> + <option>${countries}</option> + </c:forEach> + </select> + <c:if test="${mvc.encoders.html(error.getMessage('country').length() != 0)}"> + <div class="row"> + <div class="col-md-12"> + <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("country"))}</p> + </div> + </div> + </c:if> + </div> + <div class="form-group"> + <label for="description">Description:</label> + <textarea type="" id="description" + name="description" class="form-control">${person.description}</textarea> + <c:if + test="${mvc.encoders.html(error.getMessage('description').length() != 0)}"> + <div class="row"> + <div class="col-md-12"> + <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("description"))}</p> + </div> + </div> + </c:if> + </div> + <button class="btn btn-primary btn-block" type="submit">Register</button> + </form> + </div> </div> </div> -</div> -<br /> -<br /> -<jsp:include page="/templates/footer.jsp"></jsp:include> + <br /> + <br /> + <jsp:include page="/templates/footer.jsp"></jsp:include> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/11df9990/examples/mvc-cxf/src/main/webapp/WEB-INF/views/home.jsp ---------------------------------------------------------------------- diff --git a/examples/mvc-cxf/src/main/webapp/WEB-INF/views/home.jsp b/examples/mvc-cxf/src/main/webapp/WEB-INF/views/home.jsp index 0faca4d..f389806 100644 --- a/examples/mvc-cxf/src/main/webapp/WEB-INF/views/home.jsp +++ b/examples/mvc-cxf/src/main/webapp/WEB-INF/views/home.jsp @@ -1,4 +1,4 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ page contentType="text/html;charset=UTF-8" language="java"%> <!DOCTYPE html> <html> <head> @@ -6,15 +6,15 @@ <title>MVC 1.0 DEMO</title> </head> <body> - <jsp:include page="/templates/menu.jsp"></jsp:include> + <jsp:include page="/templates/menu.jsp"></jsp:include> - <h1 align="center">Be welcome!</h1> + <h1 align="center">Be welcome!</h1> - <div align="center"> - <img src="${pageContext.request.contextPath}/resources/images/tomee.png" class="img-responsive"/> - </div> - <br /> - <br /> - <jsp:include page="/templates/footer.jsp"></jsp:include> + <div align="center"> + <img src="${pageContext.request.contextPath}/resources/images/tomee.png" class="img-responsive" /> + </div> + <br/> + <br/> + <jsp:include page="/templates/footer.jsp"></jsp:include> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/11df9990/examples/mvc-cxf/src/main/webapp/WEB-INF/views/insert.jsp ---------------------------------------------------------------------- diff --git a/examples/mvc-cxf/src/main/webapp/WEB-INF/views/insert.jsp b/examples/mvc-cxf/src/main/webapp/WEB-INF/views/insert.jsp index 6d64357..4260d46 100644 --- a/examples/mvc-cxf/src/main/webapp/WEB-INF/views/insert.jsp +++ b/examples/mvc-cxf/src/main/webapp/WEB-INF/views/insert.jsp @@ -1,109 +1,114 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %> +<%@ page contentType="text/html;charset=UTF-8" language="java"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <!DOCTYPE html> <html lang="en"> <head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>MVC 1.0 DEMO</title> +<meta charset="utf-8"> +<meta http-equiv="X-UA-Compatible" content="IE=edge"> +<meta name="viewport" content="width=device-width, initial-scale=1"> +<title>MVC 1.0 DEMO</title> </head> <body> -<div class="container"> - <c:if test="${error.errors.length() != 0}"> - <div class="row"> - <div class="col-md-12"> - <p class="alert alert-danger">${error.errors}</p> - </div> - </div> - </c:if> - <div class="row"> - <div class="col-md-4 col-md-offset-4"> - <form action="add" method="post"> - <h2>New register</h2> - <div class="form-group"> - <label for="name">Name:</label> - <input id="name" name="name" class="form-control" autofocus value="${person.name}"> - <c:if test="${mvc.encoders.html(error.getMessage('name').length() != 0)}"> - <div class="row"> - <div class="col-md-12"> - <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("name"))}</p> - </div> - </div> - </c:if> - </div> - <div class="form-group"> - <label for="age">Age:</label> - <input type="number" id="age" name="age" class="form-control" value="${person.age}"> - <c:if test="${mvc.encoders.html(error.getMessage('age').length() != 0)}"> - <div class="row"> - <div class="col-md-12"> - <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("age"))}</p> - </div> - </div> - </c:if> - </div> - - <div class="form-group"> - <label for="state">State:</label> - <input type="text" id="state" name="state" class="form-control" value="${person.address.state}"> - <c:if test="${mvc.encoders.html(error.getMessage('state').length() != 0)}"> - <div class="row"> - <div class="col-md-12"> - <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("state"))}</p> - </div> - </div> - </c:if> - </div> - <div class="form-group"> - <label for="state">Application Server:</label> <br /> - <label class="radio-inline"><input type="radio" name="server" value="TomEE" class="form-check-input ">TomEE</label> - <label class="radio-inline"><input type="radio" name="server" value="Wildfly" class="form-check-input"/>Wildfly</label> - <label class="radio-inline"><input type="radio" name="server" value="Payara" class="form-check-input"/>Payara</label> - <c:if test="${mvc.encoders.html(error.getMessage('server').length() != 0)}"> - <div class="row"> - <div class="col-md-12"> - <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("server"))}</p> - </div> - </div> - </c:if> + <div class="container"> + <c:if test="${error.errors.length() != 0}"> + <div class="row"> + <div class="col-md-12"> + <p class="alert alert-danger">${error.errors}</p> </div> - <div class="form-group"> - <label for="country">Country:</label> - - <select id="country" name="country" class="form-control"> - <option value="${person.address.country}">${person.address.country}</option> - <c:forEach var="countries" items="${countries}"> - <option>${countries}</option> - </c:forEach> - </select> - <c:if test="${mvc.encoders.html(error.getMessage('country').length() != 0)}"> - <div class="row"> - <div class="col-md-12"> - <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("country"))}</p> - </div> - </div> - </c:if> - </div> - <div class="form-group"> - <label for="description">Description:</label> - <textarea type="" id="description" name="description" class="form-control">${person.description}</textarea> - <c:if test="${mvc.encoders.html(error.getMessage('description').length() != 0)}"> - <div class="row"> - <div class="col-md-12"> - <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("description"))}</p> - </div> - </div> - </c:if> - </div> - <button class="btn btn-primary btn-block" type="submit">Register</button> - </form> + </div> + </c:if> + <div class="row"> + <div class="col-md-4 col-md-offset-4"> + <form action="add" method="post"> + <h2>New register</h2> + <div class="form-group"> + <label for="name">Name:</label> + <input id="name" name="name" class="form-control" autofocus value="${person.name}"> + <c:if test="${mvc.encoders.html(error.getMessage('name').length() != 0)}"> + <div class="row"> + <div class="col-md-12"> + <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("name"))}</p> + </div> + </div> + </c:if> + </div> + <div class="form-group"> + <label for="age">Age:</label> + <input type="number" id="age" name="age" class="form-control" value="${person.age}"> + <c:if test="${mvc.encoders.html(error.getMessage('age').length() != 0)}"> + <div class="row"> + <div class="col-md-12"> + <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("age"))}</p> + </div> + </div> + </c:if> + </div> + + <div class="form-group"> + <label for="state">State:</label> + <input type="text" id="state" name="state" class="form-control" value="${person.address.state}"> + <c:if test="${mvc.encoders.html(error.getMessage('state').length() != 0)}"> + <div class="row"> + <div class="col-md-12"> + <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("state"))}</p> + </div> + </div> + </c:if> + </div> + <div class="form-group"> + <label for="state">Application Server:</label> <br/> + <label class="radio-inline"> + <input type="radio" name="server" value="TomEE" class="form-check-input"/>TomEE</label> + <label class="radio-inline"> + <input type="radio" name="server" value="Wildfly" class="form-check-input"/>Wildfly</label> + <label class="radio-inline"> + <input type="radio" name="server" value="Payara" class="form-check-input"/>Payara</label> + + <c:if test="${mvc.encoders.html(error.getMessage('server').length() != 0)}"> + <div class="row"> + <div class="col-md-12"> + <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("server"))}</p> + </div> + </div> + </c:if> + </div> + <div class="form-group"> + <label for="country">Country:</label> + <select + id="country" name="country" class="form-control"> + <option value="${person.address.country}">${person.address.country}</option> + <c:forEach var="countries" items="${countries}"> + <option>${countries}</option> + </c:forEach> + </select> + + <c:if test="${mvc.encoders.html(error.getMessage('country').length() != 0)}"> + <div class="row"> + <div class="col-md-12"> + <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("country"))}</p> + </div> + </div> + </c:if> + </div> + <div class="form-group"> + <label for="description">Description:</label> + <textarea type="" id="description" name="description" class="form-control">${person.description}</textarea> + <c:if test="${mvc.encoders.html(error.getMessage('description').length() != 0)}"> + <div class="row"> + <div class="col-md-12"> + <p class="alert alert-danger">${mvc.encoders.html(error.getMessage("description"))}</p> + </div> + </div> + </c:if> + </div> + <button class="btn btn-primary btn-block" type="submit">Register</button> + </form> + </div> </div> </div> -</div> -<br /> -<br /> -<jsp:include page="/templates/footer.jsp"></jsp:include> + <br /> + <br /> + <jsp:include page="/templates/footer.jsp"></jsp:include> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/11df9990/examples/mvc-cxf/src/main/webapp/WEB-INF/views/list.jsp ---------------------------------------------------------------------- diff --git a/examples/mvc-cxf/src/main/webapp/WEB-INF/views/list.jsp b/examples/mvc-cxf/src/main/webapp/WEB-INF/views/list.jsp index a0389c1..b06de65 100644 --- a/examples/mvc-cxf/src/main/webapp/WEB-INF/views/list.jsp +++ b/examples/mvc-cxf/src/main/webapp/WEB-INF/views/list.jsp @@ -1,72 +1,76 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %> + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>MVC 1.0 DEMO</title> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>MVC 1.0 DEMO</title> </head> <body> -<jsp:include page="/templates/menu.jsp"></jsp:include> + <jsp:include page="/templates/menu.jsp"></jsp:include> - -<div class="container"> - <c:if test="${message.messageRedirect != null}"> - <div class="row"> - <div class="col-md-12"> - <p class="alert alert-success" id="success-alert">${message.messageRedirect}</p> + <div class="container"> + <c:if test="${message.messageRedirect != null}"> + <div class="row"> + <div class="col-md-12"> + <p class="alert alert-success" id="success-alert">${message.messageRedirect}</p> + </div> + </div> + </c:if> + <div class="row"> + <a class="btn btn-primary" href="new">Add Registres</a> + <hr /> + <table id="tableData" + class="table table-bordered table-hover"> + <thead> + <tr> + <th>Name</th> + <th>Age</th> + <th>Country</th> + <th>State</th> + <th>Application Server</th> + <th>Description</th> + <th></th> + <th></th> + </tr> + </thead> + <tbody> + <tr> + <c:forEach items="${list}" var="person"> + <td>${person.name}</td> + <td>${person.age}</td> + <td>${person.address.country}</td> + <td>${person.address.state}</td> + <td>${person.server}</td> + <td>${person.description}</td> + <td><a href="update/${person.id}" class="btn btn-info">Edit</a></td> + <td><a href="remove/${person.id}"> + <spanclass ="glyphiconglyphicon-trash"></span>Delete </a></td> + </tr> + </c:forEach> + </tbody> + </table> </div> </div> - </c:if> - <div class="row"> - <a class="btn btn-primary" href="new">Add Registres</a> - <hr /> - <table id="tableData" class="table table-bordered table-hover"> - <thead> - <tr> - <th>Name</th> - <th>Age</th> - <th>Country</th> - <th>State</th> - <th>Application Server</th> - <th>Description</th> - <th></th> - <th></th> - </tr> - </thead> - <tbody> - <tr> - <c:forEach items="${list}" var="person"> - <td>${person.name}</td> - <td>${person.age}</td> - <td>${person.address.country}</td> - <td>${person.address.state}</td> - <td>${person.server}</td> - <td>${person.description}</td> - <td><a href="update/${person.id}" class="btn btn-info" >Edit</a></td> - <td><a href="remove/${person.id}"><span class="glyphicon glyphicon-trash"></span> Delete </a></td> - </tr> - </c:forEach> - </tbody> - </table> -</div> -</div> - - <br /> - <br /> - <script type="text/javascript"> - $(document).ready(function() { - $("#success-alert").hide(); - $().ready(function showAlert() { - $("#success-alert").fadeTo(2000, 500).slideUp(500, function() { - $("#success-alert").slideUp(500); - }); - }); - }); - </script> - <jsp:include page="/templates/footer.jsp"></jsp:include> + <br /> + <br /> + <script type="text/javascript"> + $(document).ready( + function () { + $("#success-alert").hide(); + $().ready( + function showAlert() { + $("#success-alert").fadeTo(2000, 500) + .slideUp(500, function () { + $("#success-alert") + .slideUp(500); + }); + }); + }); + </script> + <jsp:include page="/templates/footer.jsp"></jsp:include> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/11df9990/examples/mvc-cxf/src/main/webapp/index.jsp ---------------------------------------------------------------------- diff --git a/examples/mvc-cxf/src/main/webapp/index.jsp b/examples/mvc-cxf/src/main/webapp/index.jsp index 980157d..b943d37 100644 --- a/examples/mvc-cxf/src/main/webapp/index.jsp +++ b/examples/mvc-cxf/src/main/webapp/index.jsp @@ -1,4 +1,4 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ page contentType="text/html;charset=UTF-8" language="java"%> <!DOCTYPE html> <html> <head> http://git-wip-us.apache.org/repos/asf/tomee/blob/11df9990/examples/mvc-cxf/src/main/webapp/templates/footer.jsp ---------------------------------------------------------------------- diff --git a/examples/mvc-cxf/src/main/webapp/templates/footer.jsp b/examples/mvc-cxf/src/main/webapp/templates/footer.jsp index 45f547c..b7b153d 100644 --- a/examples/mvc-cxf/src/main/webapp/templates/footer.jsp +++ b/examples/mvc-cxf/src/main/webapp/templates/footer.jsp @@ -1,12 +1,12 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> + pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%> <!DOCTYPE html> <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<link href="${pageContext.request.contextPath}/resources/bootstrap/css/bootstrap.min.css" rel="stylesheet" - type="text/css" /> +<link + href="${pageContext.request.contextPath}/resources/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" /> <body> <footer align="center"> @@ -15,19 +15,17 @@ <div class="col-lg-12"> <ul class="list-inline"> <li> - <p class="copyright text-muted small">Copyright © Tomee 2018 . </p> + <p class="copyright text-muted small">Copyright © Tomee 2018 .</p> </li> </ul> </div> </div> </div> </footer> - <script type="text/javascript" src="${pageContext.request.contextPath}/resources/bootstrap/js/jquery.min.js"> - - </script> - - <script type="text/javascript" src="${pageContext.request.contextPath}/resources/bootstrap/js/bootstrap.min.js"> - + <script type="text/javascript" src="${pageContext.request.contextPath}/resources/bootstrap/js/jquery.min.js"> + </script> + + <script type="text/javascript" src="${pageContext.request.contextPath}/resources/bootstrap/js/bootstrap.min.js"> </script> </body> </html> http://git-wip-us.apache.org/repos/asf/tomee/blob/11df9990/examples/mvc-cxf/src/main/webapp/templates/menu.jsp ---------------------------------------------------------------------- diff --git a/examples/mvc-cxf/src/main/webapp/templates/menu.jsp b/examples/mvc-cxf/src/main/webapp/templates/menu.jsp index 2ca62ca..de564e1 100644 --- a/examples/mvc-cxf/src/main/webapp/templates/menu.jsp +++ b/examples/mvc-cxf/src/main/webapp/templates/menu.jsp @@ -1,36 +1,32 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%> <!DOCTYPE html> <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" - name="viewport" content="width=device-width, initial-scale=1"> + name="viewport" content="width=device-width, initial-scale=1"> <title>MVC 1.0 DEMO</title> -<link href="${pageContext.request.contextPath}/resources/bootstrap/css/bootstrap.min.css" rel="stylesheet" - type="text/css" /> +<link + href="${pageContext.request.contextPath}/resources/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css"/> </head> <body> - <div class="navbar navbar-inverse"> - <div class="container-fluid"> - <div class="navbar-header"> - <a class="navbar-brand" href="${mvc.basePath}/home">MVC 1.0 DEMO</a> - </div> - <div> - <ul class="nav navbar-nav"> - <li class="active"><a href="${mvc.basePath}/mvc/show">Peoples</a></li> - </ul> - </div> - </div> - </div> - <script type="text/javascript" src="${pageContext.request.contextPath}/resources/bootstrap/js/jquery.min.js"> - - </script> - - <script type="text/javascript" src="${pageContext.request.contextPath}/resources/bootstrap/js/bootstrap.min.js"> - + <div class="navbar navbar-inverse"> + <div class="container-fluid"> + <div class="navbar-header"> + <a class="navbar-brand" href="${mvc.basePath}/home">MVC 1.0 DEMO</a> + </div> + <div> + <ul class="nav navbar-nav"> + <li class="active"><a + href="${mvc.basePath}/mvc/show">Peoples</a></li> + </ul> + </div> + </div> + </div> + <script type="text/javascript" src="${pageContext.request.contextPath}/resources/bootstrap/js/jquery.min.js"> </script> - + <script type="text/javascript" src="${pageContext.request.contextPath}/resources/bootstrap/js/bootstrap.min.js"> + </script> </body> -</html> +</html> \ No newline at end of file
