iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/eugenp/tutorials into task/BAEL-8840

This commit is contained in:
Dhawal Kapil 2018-09-07 00:36:17 +05:30
parent 297f5f6cd3 e8a4138d15
commit 761ce57e00
12 changed files with 61 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
parent-boot-1/pom.xml
View File

@ -37,16 +37,17 @@
</dependencies> </dependencies>
<build> <build>
<plugins> <pluginManagement>
<plugin> <plugins>
<groupId>org.springframework.boot</groupId> <plugin>
<artifactId>spring-boot-maven-plugin</artifactId> <groupId>org.springframework.boot</groupId>
<version>1.5.15.RELEASE</version> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> <version>1.5.15.RELEASE</version>
</plugins> </plugin>
</plugins>
</pluginManagement>
</build> </build>
<properties> <properties>
<rest-assured.version>3.1.0</rest-assured.version> <rest-assured.version>3.1.0</rest-assured.version>
</properties> </properties>

16
parent-boot-2/pom.xml
View File

@ -36,13 +36,15 @@
</dependencies> </dependencies>
<build> <build>
<plugins> <pluginManagement>
<plugin> <plugins>
<groupId>org.springframework.boot</groupId> <plugin>
<artifactId>spring-boot-maven-plugin</artifactId> <groupId>org.springframework.boot</groupId>
<version>2.0.4.RELEASE</version> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> <version>2.0.4.RELEASE</version>
</plugins> </plugin>
</plugins>
</pluginManagement>
</build> </build>
<profiles> <profiles>

2
pom.xml
View File

@ -579,6 +579,7 @@
<module>testing-modules/mockserver</module> <module>testing-modules/mockserver</module>
<module>testing-modules/test-containers</module> <module>testing-modules/test-containers</module>
<module>undertow</module> <module>undertow</module>
<module>vaadin</module>
<module>vertx-and-rxjava</module> <module>vertx-and-rxjava</module>
<module>saas</module> <module>saas</module>
<module>deeplearning4j</module> <module>deeplearning4j</module>
@ -1126,6 +1127,7 @@
<module>testing-modules/mockserver</module> <module>testing-modules/mockserver</module>
<module>testing-modules/test-containers</module> <module>testing-modules/test-containers</module>
<module>undertow</module> <module>undertow</module>
<module>vaadin</module>
<module>vertx-and-rxjava</module> <module>vertx-and-rxjava</module>
<module>saas</module> <module>saas</module>
<module>deeplearning4j</module> <module>deeplearning4j</module>

64
vaadin-spring/pom.xml
View File

@ -1,64 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung</groupId>
<artifactId>vaadin-spring</artifactId>
<version>0.1.0</version>
<parent>
<artifactId>parent-boot-2</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../parent-boot-2</relativePath>
</parent>
<properties>
<java.version>1.8</java.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-bom</artifactId>
<version>10.0.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>

13
vaadin-spring/src/main/resources/logback.xml
View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
</pattern>
</encoder>
</appender>
<root level="INFO">
<appender-ref ref="STDOUT" />
</root>
</configuration>

1
vaadin/README.md
View File

@ -1,3 +1,4 @@
## Relevant articles: ## Relevant articles:
- [Introduction to Vaadin](http://www.baeldung.com/vaadin) - [Introduction to Vaadin](http://www.baeldung.com/vaadin)
- [Sample Application with Spring Boot and Vaadin](https://www.baeldung.com/spring-boot-vaadin)

57
vaadin/pom.xml
View File

@ -8,21 +8,30 @@
<packaging>war</packaging> <packaging>war</packaging>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<name>Vaadin</name> <name>Vaadin</name>
<prerequisites>
<maven>3</maven>
</prerequisites>
<parent> <parent>
<artifactId>parent-boot-2</artifactId>
<groupId>com.baeldung</groupId> <groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId> <version>0.0.1-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version> <relativePath>../parent-boot-2</relativePath>
</parent> </parent>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-bom</artifactId>
<version>${vaadin.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -41,6 +50,25 @@
<groupId>com.vaadin</groupId> <groupId>com.vaadin</groupId>
<artifactId>vaadin-themes</artifactId> <artifactId>vaadin-themes</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-spring-boot-starter</artifactId>
<version>${vaadin-spring-boot-starter.version}</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -97,21 +125,13 @@
<scanIntervalSeconds>2</scanIntervalSeconds> <scanIntervalSeconds>2</scanIntervalSeconds>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins> </plugins>
</build> </build>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-bom</artifactId>
<version>${vaadin.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<repositories> <repositories>
<repository> <repository>
<id>vaadin-addons</id> <id>vaadin-addons</id>
@ -166,6 +186,7 @@
<servlet.version>3.0.1</servlet.version> <servlet.version>3.0.1</servlet.version>
<vaadin.version>7.7.10</vaadin.version> <vaadin.version>7.7.10</vaadin.version>
<vaadin.plugin.version>8.0.6</vaadin.plugin.version> <vaadin.plugin.version>8.0.6</vaadin.plugin.version>
<vaadin-spring-boot-starter.version>10.0.1</vaadin-spring-boot-starter.version>
<jetty.plugin.version>9.3.9.v20160517</jetty.plugin.version> <jetty.plugin.version>9.3.9.v20160517</jetty.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>

0
vaadin-spring/src/main/java/com/baeldung/Application.java → vaadin/src/main/java/com/baeldung/Application.java
View File

0
vaadin-spring/src/main/java/com/baeldung/Employee.java → vaadin/src/main/java/com/baeldung/Employee.java
View File

0
vaadin-spring/src/main/java/com/baeldung/EmployeeEditor.java → vaadin/src/main/java/com/baeldung/EmployeeEditor.java
View File

0
vaadin-spring/src/main/java/com/baeldung/EmployeeRepository.java → vaadin/src/main/java/com/baeldung/EmployeeRepository.java
View File

0
vaadin-spring/src/main/java/com/baeldung/MainView.java → vaadin/src/main/java/com/baeldung/MainView.java
View File