diff --git a/booking-faces/pom.xml b/booking-faces/pom.xml index 791437d..b8e5d7b 100644 --- a/booking-faces/pom.xml +++ b/booking-faces/pom.xml @@ -5,40 +5,15 @@ org.springframework.webflow.samples booking-faces war - Hotel Booking : Spring MVC + Web Flow + JSF/PrimeFaces + Hotel Booking : Spring Web Flow with JSF 1.0.0.BUILD-SNAPSHOT - - 2.4.4.RELEASE - 4.3.1.RELEASE - 4.0.1.RELEASE - 1.6.1 - 2.2.12 - 5.0 - - - - - spring - Spring Repository - http://repo.spring.io/release - true - true - - - primefaces-repository - Prime Technology Maven Repository - http://repository.primefaces.org - default - - - org.springframework spring-framework-bom - ${spring-framework-version} + 4.3.13.RELEASE pom import @@ -70,23 +45,23 @@ org.springframework.webflow spring-faces - ${webflow-version} + 2.4.7.RELEASE org.springframework.security spring-security-web - ${springsecurity-version} + 4.2.4.RELEASE org.springframework.security spring-security-config - ${springsecurity-version} + 4.2.4.RELEASE org.hsqldb hsqldb - 1.8.0.10 + 2.4.0 runtime @@ -98,71 +73,50 @@ com.sun.faces jsf-api - ${mojarra-version} + 2.2.16 com.sun.faces jsf-impl - ${mojarra-version} + 2.2.16 - org.primefaces primefaces - ${primefaces-version} + 6.1 org.slf4j slf4j-api - ${slf4j-version} + 1.7.25 org.slf4j jcl-over-slf4j - ${slf4j-version} + 1.7.25 org.slf4j - slf4j-log4j12 - ${slf4j-version} - runtime + jul-to-slf4j + 1.7.25 - log4j - log4j - 1.2.15 - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - runtime + ch.qos.logback + logback-classic + 1.2.3 @@ -175,29 +129,26 @@ org.hibernate hibernate-validator - 4.0.2.GA + 4.3.2.Final - + javax.xml.bind jaxb-api - 2.1 + 2.2.3 + org.easymock easymock - 2.5.2 + 3.4 test junit junit - 3.8.2 + 4.12 test @@ -207,13 +158,21 @@ + + + spring + Spring Repository + http://repo.spring.io/snapshot + + + booking-faces org.apache.maven.plugins maven-war-plugin - 2.4 + 3.1.0 false @@ -221,16 +180,16 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 + 3.7.0 - 1.6 - 1.6 + 1.8 + 1.8 org.apache.maven.plugins maven-surefire-plugin - 2.12 + 2.20.1 junit:junit @@ -239,20 +198,15 @@ - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.2 - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.9 + org.eclipse.jetty + jetty-maven-plugin + 9.4.8.v20171121 - true - false - 2.0 + + /${project.artifactId} + - + diff --git a/booking-faces/src/main/java/org/springframework/webflow/samples/booking/config/DispatcherServletInitializer.java b/booking-faces/src/main/java/org/springframework/webflow/samples/booking/config/DispatcherServletInitializer.java index a73d6db..63fd218 100644 --- a/booking-faces/src/main/java/org/springframework/webflow/samples/booking/config/DispatcherServletInitializer.java +++ b/booking-faces/src/main/java/org/springframework/webflow/samples/booking/config/DispatcherServletInitializer.java @@ -1,15 +1,14 @@ package org.springframework.webflow.samples.booking.config; -import javax.faces.webapp.FacesServlet; import javax.servlet.Filter; import javax.servlet.ServletContext; import javax.servlet.ServletException; -import javax.servlet.ServletRegistration; + +import com.sun.faces.config.ConfigureListener; import org.springframework.web.filter.CharacterEncodingFilter; import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer; -import com.sun.faces.config.ConfigureListener; public class DispatcherServletInitializer extends AbstractAnnotationConfigDispatcherServletInitializer { diff --git a/booking-faces/src/main/resources/log4j.xml b/booking-faces/src/main/resources/log4j.xml deleted file mode 100644 index 4c3ff1c..0000000 --- a/booking-faces/src/main/resources/log4j.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/booking-faces/src/main/resources/logback.xml b/booking-faces/src/main/resources/logback.xml new file mode 100644 index 0000000..1202bc6 --- /dev/null +++ b/booking-faces/src/main/resources/logback.xml @@ -0,0 +1,20 @@ + + + + + + + %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + + + + \ No newline at end of file diff --git a/booking-faces/src/main/webapp/WEB-INF/classes/log4j.properties b/booking-faces/src/main/webapp/WEB-INF/classes/log4j.properties deleted file mode 100755 index 992d816..0000000 --- a/booking-faces/src/main/webapp/WEB-INF/classes/log4j.properties +++ /dev/null @@ -1,11 +0,0 @@ -log4j.rootCategory=INFO, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n - -# Enable web flow logging -log4j.category.org.springframework.webflow=DEBUG -log4j.category.org.springframework.faces=DEBUG -log4j.category.org.springframework.binding=DEBUG -log4j.category.org.springframework.transaction=DEBUG \ No newline at end of file diff --git a/booking-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml b/booking-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml index fe286ec..33fe411 100644 --- a/booking-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml +++ b/booking-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml @@ -103,7 +103,6 @@

-

@@ -112,7 +111,6 @@

-

diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml index 2a7e677..f94fd95 100644 --- a/booking-mvc/pom.xml +++ b/booking-mvc/pom.xml @@ -8,34 +8,12 @@ Hotel Booking : Spring MVC + Web Flow + JSP 1.0.0.BUILD-SNAPSHOT - - 2.4.4.RELEASE - 4.3.1.RELEASE - 4.0.1.RELEASE - 1.7.5 - 2.1.3.RELEASE - 2.1.1.RELEASE - 2.1.2.RELEASE - 2.1.1.RELEASE - 2.2.2 - - - - - spring - Spring Repository - http://repo.spring.io/snapshot - true - true - - - org.springframework spring-framework-bom - ${spring-framework-version} + 4.3.13.RELEASE pom import @@ -43,34 +21,6 @@ - - - - org.thymeleaf - thymeleaf - ${thymeleaf-version} - - - org.thymeleaf - thymeleaf-spring4 - ${thymeleaf-version} - - - org.thymeleaf.extras - thymeleaf-extras-tiles2-spring4 - ${thymeleaf-extras-tiles2-version} - - - org.thymeleaf.extras - thymeleaf-extras-springsecurity4 - ${thymeleaf-extras-springsecurity4-version} - - - org.thymeleaf.extras - thymeleaf-extras-conditionalcomments - ${thymeleaf-extras-conditionalcomments-version} - - org.springframework @@ -101,7 +51,7 @@ org.springframework.webflow spring-webflow - ${webflow-version} + 2.4.7.RELEASE commons-logging @@ -112,7 +62,7 @@ org.springframework.webflow spring-js - ${webflow-version} + 2.4.7.RELEASE commons-logging @@ -123,43 +73,86 @@ org.springframework.security spring-security-web - ${springsecurity-version} + 4.2.4.RELEASE org.springframework.security spring-security-taglibs - ${springsecurity-version} + 4.2.4.RELEASE org.springframework.security spring-security-config - ${springsecurity-version} - - + 4.2.4.RELEASE + + + + org.thymeleaf + thymeleaf + 2.1.5.RELEASE + + + org.thymeleaf + thymeleaf-spring4 + 2.1.5.RELEASE + + + org.thymeleaf.extras + thymeleaf-extras-tiles2-spring4 + 2.1.1.RELEASE + + + org.thymeleaf.extras + thymeleaf-extras-springsecurity4 + 2.1.2.RELEASE + + + org.thymeleaf.extras + thymeleaf-extras-conditionalcomments + 2.1.2.RELEASE + + + + org.apache.tiles + tiles-core + 2.2.2 + + + org.apache.tiles + tiles-api + 2.2.2 + + + org.apache.tiles + tiles-template + 2.2.2 + + + org.apache.tiles + tiles-servlet + 2.2.2 + + + org.apache.tiles + tiles-jsp + 2.2.2 + org.slf4j slf4j-api - ${slf4j-version} + 1.7.25 org.slf4j jcl-over-slf4j - ${slf4j-version} + 1.7.25 - org.slf4j - slf4j-log4j12 - ${slf4j-version} - runtime + ch.qos.logback + logback-classic + 1.2.3 - - log4j - log4j - 1.2.16 - runtime - - org.hsqldb @@ -172,7 +165,6 @@ hibernate-entitymanager 3.6.9.Final - javax.servlet @@ -191,51 +183,18 @@ jstl 1.2 - - - - org.apache.tiles - tiles-core - ${tiles-version} - - - org.apache.tiles - tiles-api - ${tiles-version} - - - org.apache.tiles - tiles-template - ${tiles-version} - - - org.apache.tiles - tiles-servlet - ${tiles-version} - - - org.apache.tiles - tiles-jsp - ${tiles-version} - - org.hibernate hibernate-validator - 4.3.0.Final + 4.3.2.Final - + javax.xml.bind jaxb-api - 2.1 + 2.2.3 - joda-time @@ -253,13 +212,13 @@ org.easymock easymock - 3.1 + 3.4 test junit junit - 4.11 + 4.12 test @@ -269,13 +228,21 @@ + + + spring + Spring Repository + http://repo.spring.io/snapshot + + + booking-mvc org.apache.maven.plugins maven-war-plugin - 2.4 + 3.1.0 false @@ -283,16 +250,16 @@ org.apache.maven.plugins maven-compiler-plugin - 3.0 + 3.7.0 - 1.6 - 1.6 + 1.8 + 1.8 org.apache.maven.plugins maven-surefire-plugin - 2.14 + 2.20.1 junit:junit @@ -300,24 +267,14 @@ - - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.2 - org.eclipse.jetty jetty-maven-plugin - 9.0.0.v20130308 - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.9 + 9.4.8.v20171121 - true - false - 2.0 + + /${project.artifactId} + diff --git a/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebMvcConfig.java b/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebMvcConfig.java index 38cf3e4..9c4980b 100644 --- a/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebMvcConfig.java +++ b/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebMvcConfig.java @@ -94,7 +94,7 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter { @Bean public ServletContextTemplateResolver templateResolver() { ServletContextTemplateResolver templateResolver = new ServletContextTemplateResolver(); - templateResolver.setPrefix("/WEB-INF/"); + templateResolver.setPrefix("/WEB-INF"); templateResolver.setTemplateMode("HTML5"); return templateResolver; } diff --git a/booking-mvc/src/main/resources/log4j.xml b/booking-mvc/src/main/resources/log4j.xml deleted file mode 100644 index d8ab4b0..0000000 --- a/booking-mvc/src/main/resources/log4j.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/booking-mvc/src/main/resources/logback.xml b/booking-mvc/src/main/resources/logback.xml new file mode 100644 index 0000000..1202bc6 --- /dev/null +++ b/booking-mvc/src/main/resources/logback.xml @@ -0,0 +1,20 @@ + + + + + + + %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + + + + \ No newline at end of file diff --git a/booking-mvc/src/main/webapp/WEB-INF/classes/log4j.properties b/booking-mvc/src/main/webapp/WEB-INF/classes/log4j.properties deleted file mode 100755 index 992d816..0000000 --- a/booking-mvc/src/main/webapp/WEB-INF/classes/log4j.properties +++ /dev/null @@ -1,11 +0,0 @@ -log4j.rootCategory=INFO, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n - -# Enable web flow logging -log4j.category.org.springframework.webflow=DEBUG -log4j.category.org.springframework.faces=DEBUG -log4j.category.org.springframework.binding=DEBUG -log4j.category.org.springframework.transaction=DEBUG \ No newline at end of file diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml b/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml index a6a7e9a..5c18a0e 100644 --- a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml +++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml @@ -7,7 +7,7 @@ - + diff --git a/booking-portlet-faces/pom.xml b/booking-portlet-faces/pom.xml index 18c79b5..9132497 100644 --- a/booking-portlet-faces/pom.xml +++ b/booking-portlet-faces/pom.xml @@ -8,29 +8,12 @@ Hotel Booking : Spring Portlet MVC + Web Flow + JSF 1.0.0.BUILD-SNAPSHOT - - 2.4.2.RELEASE - 4.3.1.RELEASE - 1.7.5 - 2.2.6 - - - - - spring - Spring Repository - http://repo.spring.io/milestone - true - true - - - org.springframework spring-framework-bom - ${spring-framework-version} + 4.3.13.RELEASE pom import @@ -59,90 +42,60 @@ org.springframework spring-webmvc-portlet - - org.springframework.webflow - spring-binding - ${springwebflow-version} - - - org.springframework.webflow - spring-webflow - ${springwebflow-version} - org.springframework.webflow spring-faces - ${springwebflow-version} + 2.4.7.RELEASE org.hsqldb hsqldb - 1.8.0.10 + 2.4.0 runtime org.hibernate hibernate-entitymanager - 3.5.0-Final + 3.6.9.Final com.sun.faces jsf-api - ${mojarra-version} + 2.2.16 com.sun.faces jsf-impl - ${mojarra-version} + 2.2.16 org.slf4j slf4j-api - ${slf4j-version} + 1.7.25 org.slf4j jcl-over-slf4j - ${slf4j-version} + 1.7.25 org.slf4j - slf4j-log4j12 - ${slf4j-version} - runtime + jul-to-slf4j + 1.7.25 - log4j - log4j - 1.2.15 - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - runtime + ch.qos.logback + logback-classic + 1.2.3 javax.servlet - servlet-api - 2.5 + javax.servlet-api + 3.0.1 provided @@ -157,67 +110,38 @@ hibernate-validator 4.0.2.GA - - - javax.xml.bind - jaxb-api - 2.1 - - + - org.easymock - easymock - 2.5.2 - test + org.hibernate + hibernate-validator + 4.3.2.Final + - junit - junit - 3.8.2 - test - - - org.springframework - spring-test - test + javax.xml.bind + jaxb-api + 2.2.3 + + + spring + Spring Repository + http://repo.spring.io/snapshot + + + booking-portlet-faces org.apache.maven.plugins maven-compiler-plugin - 2.3.2 + 3.7.0 - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12 - - junit:junit - - **/*Tests.java - - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.8 - - true - false - 2.0 + 1.8 + 1.8 diff --git a/booking-portlet-faces/src/main/resources/log4j.xml b/booking-portlet-faces/src/main/resources/log4j.xml deleted file mode 100644 index ee75d5d..0000000 --- a/booking-portlet-faces/src/main/resources/log4j.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/booking-portlet-faces/src/main/resources/logback.xml b/booking-portlet-faces/src/main/resources/logback.xml new file mode 100644 index 0000000..1202bc6 --- /dev/null +++ b/booking-portlet-faces/src/main/resources/logback.xml @@ -0,0 +1,20 @@ + + + + + + + %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + + + + \ No newline at end of file diff --git a/booking-portlet-mvc/pom.xml b/booking-portlet-mvc/pom.xml index 514905e..907cd8c 100644 --- a/booking-portlet-mvc/pom.xml +++ b/booking-portlet-mvc/pom.xml @@ -8,28 +8,12 @@ Hotel Booking : Spring Portlet MVC + Web Flow + JSP 1.0.0.BUILD-SNAPSHOT - - 2.4.2.RELEASE - 4.3.1.RELEASE - 1.7.5 - - - - - spring - Spring Repository - http://repo.spring.io/milestone - true - true - - - org.springframework spring-framework-bom - ${spring-framework-version} + 4.3.13.RELEASE pom import @@ -58,87 +42,62 @@ org.springframework spring-webmvc-portlet - - org.springframework.webflow - spring-binding - ${springwebflow-version} - org.springframework.webflow spring-webflow - ${springwebflow-version} + 2.4.7.RELEASE org.springframework.webflow spring-js - ${springwebflow-version} + 2.4.7.RELEASE org.slf4j slf4j-api - ${slf4j-version} + 1.7.25 org.slf4j jcl-over-slf4j - ${slf4j-version} + 1.7.25 org.slf4j - slf4j-log4j12 - ${slf4j-version} - runtime + jul-to-slf4j + 1.7.25 - log4j - log4j - 1.2.15 - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - runtime + ch.qos.logback + logback-classic + 1.2.3 org.hsqldb hsqldb - 1.8.0.10 + 2.4.0 runtime org.hibernate hibernate-entitymanager - 3.5.0-Final + 3.6.9.Final javax.servlet - servlet-api - 2.5 + javax.servlet-api + 3.0.1 provided - javax.portlet - portlet-api - 2.0 + javax.servlet.jsp + jsp-api + 2.1 provided - + javax.servlet jstl @@ -148,83 +107,48 @@ org.hibernate hibernate-validator - 4.3.0.Final + 4.3.2.Final - - - javax.xml.bind - jaxb-api - 2.1 - - + + + javax.xml.bind + jaxb-api + 2.2.3 + + joda-time joda-time - 1.6 + 2.2 joda-time joda-time-jsptags - 1.0.2 + 1.1.1 runtime - - - - org.easymock - easymock - 2.5.2 - test - - - junit - junit - 3.8.2 - test - - - org.springframework - spring-test - test + + + spring + Spring Repository + http://repo.spring.io/snapshot + + + booking-portlet-mvc org.apache.maven.plugins maven-compiler-plugin - 2.3.2 + 3.7.0 - 1.6 - 1.6 + 1.8 + 1.8 - - org.apache.maven.plugins - maven-surefire-plugin - 2.12 - - junit:junit - - **/*Tests.java - - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.8 - - true - false - 2.0 - - diff --git a/booking-portlet-mvc/src/main/resources/log4j.xml b/booking-portlet-mvc/src/main/resources/log4j.xml deleted file mode 100644 index b4e9ad1..0000000 --- a/booking-portlet-mvc/src/main/resources/log4j.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/booking-portlet-mvc/src/main/resources/logback.xml b/booking-portlet-mvc/src/main/resources/logback.xml new file mode 100644 index 0000000..1202bc6 --- /dev/null +++ b/booking-portlet-mvc/src/main/resources/logback.xml @@ -0,0 +1,20 @@ + + + + + + + %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + + + + \ No newline at end of file diff --git a/primefaces-showcase/pom.xml b/primefaces-showcase/pom.xml index d84e704..7569353 100644 --- a/primefaces-showcase/pom.xml +++ b/primefaces-showcase/pom.xml @@ -8,20 +8,12 @@ war 1.0.0-BUILD-SNAPSHOT - - 1.6 - 2.4.4.RELEASE - 4.0.1.RELEASE - 4.0 - 1.7.5 - - org.springframework spring-framework-bom - 4.3.1.RELEASE + 4.3.13.RELEASE pom import @@ -46,69 +38,46 @@ org.springframework spring-webmvc - - org.springframework.webflow - spring-binding - ${springwebflow-version} - - - org.springframework.webflow - spring-js - ${springwebflow-version} - - - org.springframework.webflow - spring-webflow - ${springwebflow-version} - org.springframework.webflow spring-faces - ${springwebflow-version} - - - org.springframework.security - spring-security-core - ${springsecurity-version} + 2.4.7.RELEASE org.springframework.security spring-security-config - ${springsecurity-version} + 4.2.4.RELEASE org.springframework.security spring-security-web - ${springsecurity-version} + 4.2.4.RELEASE org.springframework.security spring-security-taglibs - ${springsecurity-version} + 4.2.4.RELEASE org.slf4j slf4j-api - ${org.slf4j-version} + 1.7.25 org.slf4j jcl-over-slf4j - ${org.slf4j-version} - runtime + 1.7.25 org.slf4j - slf4j-log4j12 - ${org.slf4j-version} - runtime + jul-to-slf4j + 1.7.25 - log4j - log4j - 1.2.16 - runtime + ch.qos.logback + logback-classic + 1.2.3 @@ -119,159 +88,88 @@ javax.servlet - servlet-api - 2.5 + javax.servlet-api + 3.0.1 provided - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - jstl - 1.2 - com.sun.faces jsf-api - 2.2.12 + 2.2.16 com.sun.faces jsf-impl - 2.2.12 + 2.2.16 - - - - - - - - - - - + org.primefaces primefaces - ${primefaces-version} + 6.1 commons-fileupload commons-fileupload - 1.2.1 + 1.3.2 commons-io commons-io - 1.4 + 2.5 - - javax.validation - validation-api - 1.0.0.GA - org.hibernate hibernate-validator - 4.3.0.Final - - - - junit - junit - 4.7 - test + 4.3.2.Final - + spring Spring Repository - http://repo.spring.io/milestone - true - true - - - jboss - JBoss Repository - https://repository.jboss.org/nexus/content/repositories/releases - false - - - java.net - Java.net Repository - http://download.java.net/maven/2/ - false - - - primefaces - Prime Technology Repository - http://repository.primefaces.org - default + http://repo.spring.io/snapshot + primefaces-showcase org.apache.maven.plugins maven-compiler-plugin + 3.7.0 - ${java-version} - ${java-version} + 1.8 + 1.8 - - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.2 - org.eclipse.jetty jetty-maven-plugin - 9.0.0.v20130308 - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.9 + 9.4.8.v20171121 - true - false - 2.0 - - **/.svn/** - + + /${project.artifactId} + - - org.apache.maven.plugins - maven-dependency-plugin - - - install - install - - sources - - - - - - org.codehaus.mojo - tomcat-maven-plugin - 1.0-beta-1 - diff --git a/primefaces-showcase/src/main/java/org/springframework/samples/webflow/upload/FileUploadController.java b/primefaces-showcase/src/main/java/org/springframework/samples/webflow/upload/FileUploadController.java index 682018a..81a5414 100644 --- a/primefaces-showcase/src/main/java/org/springframework/samples/webflow/upload/FileUploadController.java +++ b/primefaces-showcase/src/main/java/org/springframework/samples/webflow/upload/FileUploadController.java @@ -6,6 +6,7 @@ import javax.faces.context.FacesContext; import org.primefaces.event.FileUploadEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.stereotype.Component; @Component @@ -13,6 +14,7 @@ public class FileUploadController { private Logger logger = LoggerFactory.getLogger(FileUploadController.class); + public void handleFileUpload(FileUploadEvent event) { logger.info("Uploaded: {}", event.getFile().getFileName()); FacesMessage msg = new FacesMessage("Successful", event.getFile().getFileName() + " is uploaded."); diff --git a/primefaces-showcase/src/main/resources/log4j.xml b/primefaces-showcase/src/main/resources/log4j.xml deleted file mode 100644 index 50a9cbe..0000000 --- a/primefaces-showcase/src/main/resources/log4j.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/primefaces-showcase/src/main/resources/logback.xml b/primefaces-showcase/src/main/resources/logback.xml new file mode 100644 index 0000000..1202bc6 --- /dev/null +++ b/primefaces-showcase/src/main/resources/logback.xml @@ -0,0 +1,20 @@ + + + + + + + %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + + + + \ No newline at end of file diff --git a/primefaces-showcase/src/main/webapp/WEB-INF/flows/file-upload/view.xhtml b/primefaces-showcase/src/main/webapp/WEB-INF/flows/file-upload/view.xhtml index 2056a28..2a32971 100644 --- a/primefaces-showcase/src/main/webapp/WEB-INF/flows/file-upload/view.xhtml +++ b/primefaces-showcase/src/main/webapp/WEB-INF/flows/file-upload/view.xhtml @@ -20,8 +20,10 @@ - + mode="advanced" dragDropSupport="false" + update="messages" sizeLimit="100000" allowTypes="/(\.|\/)(gif|jpe?g|png)$/" /> + + diff --git a/primefaces-showcase/src/main/webapp/WEB-INF/flows/modal-dialog-in-view/view.xhtml b/primefaces-showcase/src/main/webapp/WEB-INF/flows/modal-dialog-in-view/view.xhtml index 6aae7ba..67ed57c 100644 --- a/primefaces-showcase/src/main/webapp/WEB-INF/flows/modal-dialog-in-view/view.xhtml +++ b/primefaces-showcase/src/main/webapp/WEB-INF/flows/modal-dialog-in-view/view.xhtml @@ -21,16 +21,16 @@ - - - + + + - +

- - + + diff --git a/primefaces-showcase/src/main/webapp/WEB-INF/flows/poller/view.xhtml b/primefaces-showcase/src/main/webapp/WEB-INF/flows/poller/view.xhtml index 3e87d5b..bbc95d0 100644 --- a/primefaces-showcase/src/main/webapp/WEB-INF/flows/poller/view.xhtml +++ b/primefaces-showcase/src/main/webapp/WEB-INF/flows/poller/view.xhtml @@ -26,15 +26,15 @@
- - - + + + 
-<p:poll widgetVar="poller" interval="1" update="contentPanel" autoStart="false"/>
-<p:commandButton value="Start" action="start" update="contentPanel" onclick="poller.start()"/>
-<p:commandButton value="Stop" action="stop" update="contentPanel" onclick="poller.stop()"/>
+<p:poll interval="1" autoStart="false" update="contentPanel" widgetVar="poller" />
+<p:commandButton value="Start" action="start" update="contentPanel" onclick="PF('poller').start()"/>
+<p:commandButton value="Stop" action="stop" update="contentPanel" onclick="PF('poller').stop()"/>
diff --git a/primefaces-showcase/src/main/webapp/WEB-INF/web.xml b/primefaces-showcase/src/main/webapp/WEB-INF/web.xml index 6a5aec8..918742a 100644 --- a/primefaces-showcase/src/main/webapp/WEB-INF/web.xml +++ b/primefaces-showcase/src/main/webapp/WEB-INF/web.xml @@ -1,9 +1,9 @@ - - + - @@ -84,6 +84,11 @@ /app/* + + primefaces.UPLOADER + commons + + PrimeFaces FileUpload Filter org.primefaces.webapp.filter.FileUploadFilter diff --git a/webflow-showcase/pom.xml b/webflow-showcase/pom.xml index d6b7c88..2981dc6 100644 --- a/webflow-showcase/pom.xml +++ b/webflow-showcase/pom.xml @@ -8,19 +8,12 @@ war 1.0.0-BUILD-SNAPSHOT - - 1.6 - 2.4.4.RELEASE - 4.0.1.RELEASE - 1.7.5 - - org.springframework spring-framework-bom - 4.3.1.RELEASE + 4.3.13.RELEASE pom import @@ -53,25 +46,20 @@ org.springframework spring-orm - - org.springframework.webflow - spring-binding - ${springwebflow-version} - org.springframework.webflow spring-webflow - ${springwebflow-version} + 2.4.7.RELEASE org.springframework.webflow spring-js - ${springwebflow-version} - + 2.4.7.RELEASE + org.springframework.security spring-security-web - ${springsecurity-version} + 4.2.4.RELEASE org.springframework @@ -82,7 +70,7 @@ org.springframework.security spring-security-taglibs - ${springsecurity-version} + 4.2.4.RELEASE org.springframework @@ -93,7 +81,7 @@ org.springframework.security spring-security-config - ${springsecurity-version} + 4.2.4.RELEASE org.springframework @@ -105,61 +93,35 @@ org.slf4j slf4j-api - ${org.slf4j-version} + 1.7.25 org.slf4j jcl-over-slf4j - ${org.slf4j-version} - runtime + 1.7.25 - org.slf4j - slf4j-log4j12 - ${org.slf4j-version} - runtime - - - log4j - log4j - 1.2.15 - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - runtime + ch.qos.logback + logback-classic + 1.2.3 org.hsqldb hsqldb - 1.8.0.10 + 2.4.0 runtime org.hibernate hibernate-entitymanager - 3.5.0-Final + 3.6.9.Final javax.servlet - servlet-api - 2.5 + javax.servlet-api + 3.0.1 provided @@ -178,67 +140,38 @@ org.apache.tiles tiles-jsp 2.2.2 - - - - commons-logging - commons-logging-api - - - + org.hibernate hibernate-validator - 4.1.0.Beta1 + 4.3.2.Final + + + + javax.xml.bind + jaxb-api + 2.2.3 - - - javax.xml.bind - jaxb-api - 2.1 - joda-time joda-time - 1.6 + 2.2 joda-time joda-time-jsptags - 1.0.2 + 1.1.1 runtime - - - - junit - junit - 4.7 - test - - + - spring-milestone + spring Spring Repository - http://repo.spring.io/milestone - true - true - - - - - jboss - JBoss Maven Release Repository - https://repository.jboss.org/nexus/content/repositories/releases - false + http://repo.spring.io/snapshot @@ -247,47 +180,22 @@ org.apache.maven.plugins maven-compiler-plugin + 3.7.0 - ${java-version} - ${java-version} + 1.8 + 1.8 - org.apache.maven.plugins - maven-eclipse-plugin - 2.9 + org.eclipse.jetty + jetty-maven-plugin + 9.4.8.v20171121 - true - false - 2.0 - - **/.svn/** - + + /${project.artifactId} + - - org.apache.maven.plugins - maven-dependency-plugin - - - install - install - - sources - - - - - - org.codehaus.mojo - tomcat-maven-plugin - 1.0-beta-1 - - - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.2 - diff --git a/webflow-showcase/src/main/resources/log4j.xml b/webflow-showcase/src/main/resources/log4j.xml deleted file mode 100644 index bcbf3dd..0000000 --- a/webflow-showcase/src/main/resources/log4j.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/webflow-showcase/src/main/resources/logback.xml b/webflow-showcase/src/main/resources/logback.xml new file mode 100644 index 0000000..799e50e --- /dev/null +++ b/webflow-showcase/src/main/resources/logback.xml @@ -0,0 +1,24 @@ + + + + + + + %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + + + + + + + + \ No newline at end of file