Skip to content

Commit 7a96484

Browse files
ThoughtscriptKevinGilmore
Thoughtscript
authored and
KevinGilmore
committed
BAEL-86 (eugenp#1535)
* BAEL-86 * Added Themes and Beans * Improvements and fully tested locally
1 parent caab782 commit 7a96484

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+384
-1203
lines changed

‎spring-dispatcher-servlet/README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## Relevant articles:
2+
3+
- [Spring DispatcherServlet](http://www.baeldung.com/spring-dispatcher-servlet)

‎spring-dispatcher-servlet/pom.xml‎

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,96 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<?xml version="1.0"?>
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
53
<modelVersion>4.0.0</modelVersion>
6-
4+
<groupId>com.baeldung</groupId>
75
<artifactId>spring-dispatcher-servlet</artifactId>
86
<packaging>war</packaging>
9-
10-
<parent>
11-
<groupId>com.baeldung</groupId>
12-
<artifactId>parent-modules</artifactId>
13-
<version>1.0.0-SNAPSHOT</version>
14-
<relativePath>..</relativePath>
15-
</parent>
16-
7+
<version>1.0.0</version>
8+
<name>spring-dispatcher-servlet</name>
9+
<properties>
10+
<springframework.version>4.3.7.RELEASE</springframework.version>
11+
</properties>
1712
<dependencies>
13+
<dependency>
14+
<groupId>org.springframework</groupId>
15+
<artifactId>spring-core</artifactId>
16+
<version>${springframework.version}</version>
17+
</dependency>
1818
<dependency>
19-
<groupId>javax.servlet</groupId>
20-
<artifactId>javax.servlet-api</artifactId>
21-
<version>${javax.servlet.version}</version>
22-
<scope>provided</scope>
19+
<groupId>org.springframework</groupId>
20+
<artifactId>spring-web</artifactId>
21+
<version>${springframework.version}</version>
2322
</dependency>
2423
<dependency>
2524
<groupId>org.springframework</groupId>
2625
<artifactId>spring-webmvc</artifactId>
27-
<version>${org.springframework.version}</version>
28-
<exclusions>
29-
<exclusion>
30-
<artifactId>commons-logging</artifactId>
31-
<groupId>commons-logging</groupId>
32-
</exclusion>
33-
</exclusions>
26+
<version>${springframework.version}</version>
27+
</dependency>
28+
<dependency>
29+
<groupId>javax.servlet</groupId>
30+
<artifactId>javax.servlet-api</artifactId>
31+
<version>3.1.0</version>
3432
</dependency>
3533
<dependency>
36-
<groupId>org.thymeleaf</groupId>
37-
<artifactId>thymeleaf-spring4</artifactId>
38-
<version>${thymeleaf.version}</version>
34+
<groupId>javax.servlet.jsp.jstl</groupId>
35+
<artifactId>jstl-api</artifactId>
36+
<version>1.2</version>
3937
</dependency>
4038
<dependency>
41-
<groupId>org.slf4j</groupId>
42-
<artifactId>slf4j-api</artifactId>
43-
<version>${org.slf4j.version}</version>
39+
<groupId>javax.servlet.jsp</groupId>
40+
<artifactId>javax.servlet.jsp-api</artifactId>
41+
<version>2.3.1</version>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.codehaus.jackson</groupId>
45+
<artifactId>jackson-mapper-asl</artifactId>
46+
<version>1.9.13</version>
47+
</dependency>
48+
<dependency>
49+
<groupId>javax.servlet</groupId>
50+
<artifactId>jstl</artifactId>
51+
<version>1.2</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>com.fasterxml.jackson.core</groupId>
55+
<artifactId>jackson-databind</artifactId>
56+
<version>2.5.0</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>commons-fileupload</groupId>
60+
<artifactId>commons-fileupload</artifactId>
61+
<version>1.3</version>
4462
</dependency>
45-
4663
</dependencies>
47-
4864
<build>
49-
<plugins>
50-
<plugin>
51-
<groupId>org.apache.maven.plugins</groupId>
52-
<artifactId>maven-compiler-plugin</artifactId>
53-
<version>${maven-compiler-plugin.version}</version>
54-
<configuration>
55-
<source>1.8</source>
56-
<target>1.8</target>
57-
</configuration>
58-
</plugin>
59-
<plugin>
60-
<groupId>org.apache.maven.plugins</groupId>
61-
<artifactId>maven-war-plugin</artifactId>
62-
<version>${maven-war-plugin.version}</version>
63-
<configuration>
64-
<failOnMissingWebXml>false</failOnMissingWebXml>
65-
</configuration>
66-
</plugin>
67-
<plugin>
68-
<groupId>org.eclipse.jetty</groupId>
69-
<artifactId>jetty-maven-plugin</artifactId>
70-
<version>${jetty-maven-plugin.version}</version>
71-
<configuration>
72-
<webApp>
73-
<contextPath>/</contextPath>
74-
</webApp>
75-
</configuration>
76-
</plugin>
77-
</plugins>
65+
<pluginManagement>
66+
<plugins>
67+
<plugin>
68+
<artifactId>maven-compiler-plugin</artifactId>
69+
<version>3.1</version>
70+
<configuration>
71+
<source>1.8</source>
72+
<target>1.8</target>
73+
</configuration>
74+
</plugin>
75+
<plugin>
76+
<groupId>org.apache.tomcat.maven</groupId>
77+
<artifactId>tomcat8-maven-plugin</artifactId>
78+
<version>3.0-r1655215</version>
79+
<configuration>
80+
<path>/springdispatcherservlet</path>
81+
</configuration>
82+
</plugin>
83+
<plugin>
84+
<groupId>org.apache.maven.plugins</groupId>
85+
<artifactId>maven-war-plugin</artifactId>
86+
<version>3.0.0</version>
87+
<configuration>
88+
<warSourceDirectory>src/main/webapp</warSourceDirectory>
89+
<failOnMissingWebXml>false</failOnMissingWebXml>
90+
</configuration>
91+
</plugin>
92+
</plugins>
93+
</pluginManagement>
94+
<finalName>springdispatcherservlet</finalName>
7895
</build>
79-
80-
<properties>
81-
<!-- Spring -->
82-
<org.springframework.version>4.3.4.RELEASE</org.springframework.version>
83-
<thymeleaf.version>3.0.2.RELEASE</thymeleaf.version>
84-
85-
<!-- logging -->
86-
<org.slf4j.version>1.7.21</org.slf4j.version>
87-
88-
<!-- various -->
89-
<javax.servlet.version>3.1.0</javax.servlet.version>
90-
91-
<!-- Maven plugins -->
92-
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
93-
<maven-war-plugin.version>3.0.0</maven-war-plugin.version>
94-
<jetty-maven-plugin.version>9.3.14.v20161028</jetty-maven-plugin.version>
95-
</properties>
96-
</project>
96+
</project>

‎spring-dispatcher-servlet/src/main/java/com/baeldung/spring/dispatcher/servlet/DispatcherServletApplication.java‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎spring-dispatcher-servlet/src/main/java/com/baeldung/spring/dispatcher/servlet/RootConfiguration.java‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎spring-dispatcher-servlet/src/main/java/com/baeldung/spring/dispatcher/servlet/WebConfiguration.java‎

Lines changed: 0 additions & 129 deletions
This file was deleted.

0 commit comments

Comments
 (0)