Update dependencies

This commit is contained in:
Rossen Stoyanchev
2018-02-02 22:42:05 -05:00
parent f2312608cb
commit e68b92bc8a
29 changed files with 439 additions and 1064 deletions

View File

@@ -8,20 +8,12 @@
<packaging>war</packaging>
<version>1.0.0-BUILD-SNAPSHOT</version>
<properties>
<java-version>1.6</java-version>
<springwebflow-version>2.4.4.RELEASE</springwebflow-version>
<springsecurity-version>4.0.1.RELEASE</springsecurity-version>
<primefaces-version>4.0</primefaces-version>
<org.slf4j-version>1.7.5</org.slf4j-version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>4.3.1.RELEASE</version>
<version>4.3.13.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -46,69 +38,46 @@
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.webflow</groupId>
<artifactId>spring-binding</artifactId>
<version>${springwebflow-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.webflow</groupId>
<artifactId>spring-js</artifactId>
<version>${springwebflow-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.webflow</groupId>
<artifactId>spring-webflow</artifactId>
<version>${springwebflow-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.webflow</groupId>
<artifactId>spring-faces</artifactId>
<version>${springwebflow-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>${springsecurity-version}</version>
<version>2.4.7.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>${springsecurity-version}</version>
<version>4.2.4.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>${springsecurity-version}</version>
<version>4.2.4.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId>
<version>${springsecurity-version}</version>
<version>4.2.4.RELEASE</version>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${org.slf4j-version}</version>
<version>1.7.25</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${org.slf4j-version}</version>
<scope>runtime</scope>
<version>1.7.25</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${org.slf4j-version}</version>
<scope>runtime</scope>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.25</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<scope>runtime</scope>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
</dependency>
<!-- JSF-303 Dependency Injection -->
<dependency>
@@ -119,159 +88,88 @@
<!-- Servlet -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
<!-- Sun Mojarra JSF 2 runtime -->
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>2.2.12</version>
<version>2.2.16</version>
</dependency>
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
<version>2.2.12</version>
<version>2.2.16</version>
</dependency>
<!-- Apache MyFaces JSF 2 runtime -->
<!--<dependency>-->
<!--<groupId>org.apache.myfaces.core</groupId>-->
<!--<artifactId>myfaces-api</artifactId>-->
<!--<version>2.2.8</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.myfaces.core</groupId>-->
<!--<artifactId>myfaces-impl</artifactId>-->
<!--<version>2.2.8</version>-->
<!--</dependency>-->
<!-- Apache MyFaces JSF 2 runtime
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>2.2.8</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>2.2.8</version>
</dependency>
-->
<!-- PrimeFaces component library -->
<dependency>
<groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId>
<version>${primefaces-version}</version>
<version>6.1</version>
</dependency>
<!-- File uploads -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.2.1</version>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.4</version>
<version>2.5</version>
</dependency>
<!-- JSR 303 validation -->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.0.0.GA</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>4.3.0.Final</version>
</dependency>
<!-- Test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
<scope>test</scope>
<version>4.3.2.Final</version>
</dependency>
</dependencies>
<repositories>
<repositories>
<repository>
<id>spring</id>
<name>Spring Repository</name>
<url>http://repo.spring.io/milestone</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
<repository>
<id>jboss</id>
<name>JBoss Repository</name>
<url>https://repository.jboss.org/nexus/content/repositories/releases</url>
<snapshots><enabled>false</enabled></snapshots>
</repository>
<repository>
<id>java.net</id>
<name>Java.net Repository</name>
<url>http://download.java.net/maven/2/</url>
<snapshots><enabled>false</enabled></snapshots>
</repository>
<repository>
<id>primefaces</id>
<name>Prime Technology Repository</name>
<url>http://repository.primefaces.org</url>
<layout>default</layout>
<url>http://repo.spring.io/snapshot</url>
</repository>
</repositories>
<build>
<finalName>primefaces-showcase</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<configuration>
<source>${java-version}</source>
<target>${java-version}</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.2</version>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.0.0.v20130308</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.9</version>
<version>9.4.8.v20171121</version>
<configuration>
<downloadSources>true</downloadSources>
<downloadJavadocs>false</downloadJavadocs>
<wtpversion>2.0</wtpversion>
<sourceExcludes>
<sourceExclude>**/.svn/**</sourceExclude>
</sourceExcludes>
<webApp>
<contextPath>/${project.artifactId}</contextPath>
</webApp>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>install</id>
<phase>install</phase>
<goals>
<goal>sources</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
<version>1.0-beta-1</version>
</plugin>
</plugins>
</build>
</project>

View File

@@ -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.");

View File

@@ -1,41 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
<appender name="console" class="org.apache.log4j.ConsoleAppender">
<param name="Target" value="System.out" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p: %c - %m%n" />
</layout>
</appender>
<logger name="org.springframework.samples.webflow">
<level value="debug" />
</logger>
<logger name="org.springframework.web">
<level value="info" />
</logger>
<logger name="org.springframework.binding">
<level value="debug" />
</logger>
<logger name="org.springframework.webflow">
<level value="debug" />
</logger>
<logger name="org.springframework.security">
<level value="info" />
</logger>
<logger name="org.primefaces">
<level value="debug" />
</logger>
<root>
<priority value="info" />
<appender-ref ref="console" />
</root>
</log4j:configuration>

View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<layout class="ch.qos.logback.classic.PatternLayout">
<Pattern>
%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
</Pattern>
</layout>
</appender>
<logger name="org.springframework.samples" level="debug">
<appender-ref ref="STDOUT" />
</logger>
<root level="info">
<appender-ref ref="STDOUT" />
</root>
</configuration>

View File

@@ -20,8 +20,10 @@
<ui:define name="content">
<h:form enctype="multipart/form-data">
<p:fileUpload fileUploadListener="#{fileUploadController.handleFileUpload}"
allowTypes="/(\.|\/)(gif|jpe?g|png)$/" description="Images"/>
<p:commandButton value="Exit" action="exit" />
mode="advanced" dragDropSupport="false"
update="messages" sizeLimit="100000" allowTypes="/(\.|\/)(gif|jpe?g|png)$/" />
<p:growl id="messages" showDetail="true" />
<p:commandButton value="Exit" action="exit" />
</h:form>
</ui:define>

View File

@@ -21,16 +21,16 @@
<p:messages id="messages" />
<p:menu style="width:250px">
<p:submenu label="Select your favorite phone">
<p:menuitem value="Android" action="android" update="confirmContent" oncomplete="confirmDialog.show()" />
<p:menuitem value="BlackBerry" action="blackberry" update="confirmContent" oncomplete="confirmDialog.show()" />
<p:menuitem value="iPhone" action="iphone" update="confirmContent" oncomplete="confirmDialog.show()" />
<p:menuitem value="Android" action="android" update="confirmContent" oncomplete="PF('dlg').show()" />
<p:menuitem value="BlackBerry" action="blackberry" update="confirmContent" oncomplete="PF('dlg').show()" />
<p:menuitem value="iPhone" action="iphone" update="confirmContent" oncomplete="PF('dlg').show()" />
</p:submenu>
</p:menu>
<p:dialog widgetVar="confirmDialog" header="Confirmation" modal="true" width="300">
<p:dialog id="confirmDialog" header="Confirmation" modal="true" width="300" widgetVar="dlg">
<p:outputPanel id="confirmContent">
<p><h:outputText value="Is ${selectedPhone} you favorite phone?" /></p>
<p:commandButton value="Yes" action="confirm" update="messages" oncomplete="confirmDialog.hide()" />
<p:commandButton value="No" action="cancel" update="messages" oncomplete="confirmDialog.hide()" />
<p:commandButton value="Yes" action="confirm" update="messages" oncomplete="PF('dlg').hide()" />
<p:commandButton value="No" action="cancel" update="messages" oncomplete="PF('dlg').hide()" />
</p:outputPanel>
</p:dialog>
<p:commandButton value="Exit" action="exit" />

View File

@@ -26,15 +26,15 @@
</h:panelGroup>
<br/>
<div>
<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()" />
<p:commandButton value="Exit" action="exit" /><br/>
<hr/>
<pre>
<span class="alt">&lt;p:poll widgetVar="poller" interval="1" update="contentPanel" autoStart="false"/&gt;</span>
<span class="alt">&lt;p:commandButton value="Start" action="start" update="contentPanel" onclick="poller.start()"/&gt;</span>
<span class="alt">&lt;p:commandButton value="Stop" action="stop" update="contentPanel" onclick="poller.stop()"/&gt;</span>
<span class="alt">&lt;p:poll interval="1" autoStart="false" update="contentPanel" widgetVar="poller" /&gt;</span>
<span class="alt">&lt;p:commandButton value="Start" action="start" update="contentPanel" onclick="PF('poller').start()"/&gt;</span>
<span class="alt">&lt;p:commandButton value="Stop" action="stop" update="contentPanel" onclick="PF('poller').stop()"/&gt;</span>
</pre>
</div>
</h:form>

View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
<!--
<!--
SPRING ROOT WEB APPLICATION CONTEXT
-->
@@ -84,6 +84,11 @@
<url-pattern>/app/*</url-pattern>
</servlet-mapping>
<context-param>
<param-name>primefaces.UPLOADER</param-name>
<param-value>commons</param-value>
</context-param>
<filter>
<filter-name>PrimeFaces FileUpload Filter</filter-name>
<filter-class>org.primefaces.webapp.filter.FileUploadFilter</filter-class>