Move Vaadin UI microservice example to own repo

ripla · Mar 11, 2015 · cd3237c · cd3237c
1 parent 59d2f05
commit cd3237c
Show file tree

Hide file tree

Showing 26 changed files with 109 additions and 422 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 *.iml
 *.idea
-*/target
+target
diff --git a/Procfile b/Procfile
diff --git a/eureka-server/pom.xml b/eureka-server/pom.xml
diff --git a/eureka-server/src/main/java/org/vaadin/risto/microservices/student/EurekaApplication.java b/eureka-server/src/main/java/org/vaadin/risto/microservices/student/EurekaApplication.java
diff --git a/eureka-server/src/main/resources/application.yml b/eureka-server/src/main/resources/application.yml
diff --git a/eureka-server/src/main/resources/bootstrap.yml b/eureka-server/src/main/resources/bootstrap.yml
diff --git a/memcached-docker/Dockerfile b/memcached-docker/Dockerfile
diff --git a/pom.xml b/pom.xml
@@ -1,58 +1,118 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.vaadin.risto.microservices</groupId>
-	<artifactId>example-parent</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<packaging>pom</packaging>
-
-	<name>Microservices example</name>
-	<description>Microservices example with Spring and Vaadni</description>
+    <groupId>org.vaadin.risto.microservices</groupId>
+    <artifactId>ui</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
+    <name>UI</name>
+    <description>Example microservice UI</description>
+
     <parent>
-        <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-starter-parent</artifactId>
-        <version>1.0.0.RELEASE</version>
+        <groupId>org.vaadin.risto.microservices</groupId>
+        <artifactId>example-parent</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
 
-    <modules>
-        <module>eureka-server</module>
-        <module>students-rest-microservice</module>
-        <module>ui</module>
-    </modules>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
-	</properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-starter-parent</artifactId>
-                <version>1.0.0.RELEASE</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
+    <properties>
+        <vaadin.version>7.4.0</vaadin.version>
+        <vaadin4spring.version>0.0.4.RELEASE</vaadin4spring.version>
+        <start-class>org.vaadin.risto.microservices.Application</start-class>
+    </properties>
+
+    <repositories>
+        <repository>
+            <id>vaadin-addons</id>
+            <url>http://maven.vaadin.com/vaadin-addons</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.vaadin.spring</groupId>
+            <artifactId>spring-boot-vaadin</artifactId>
+            <version>${vaadin4spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-themes</artifactId>
+            <version>${vaadin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-server</artifactId>
+            <version>${vaadin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-client-compiled</artifactId>
+            <version>${vaadin.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.vaadin</groupId>
+            <artifactId>viritin</artifactId>
+            <version>1.27</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-hystrix</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-eureka</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.hateoas</groupId>
+            <artifactId>spring-hateoas</artifactId>
+            <version>0.16.0.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.2</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>de.javakaffee.msm</groupId>
+            <artifactId>memcached-session-manager</artifactId>
+            <version>1.8.3</version>
+        </dependency>
+        <dependency>
+            <groupId>de.javakaffee.msm</groupId>
+            <artifactId>memcached-session-manager-tc8</artifactId>
+            <version>1.8.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <groupId>com.vaadin</groupId>
+                <artifactId>vaadin-maven-plugin</artifactId>
+                <version>${vaadin.version}</version>
             </plugin>
-		</plugins>
-	</build>
+        </plugins>
+    </build>
+
 </project>
diff --git a/...adin/risto/microservices/Application.java → ...adin/risto/microservices/Application.java b/...adin/risto/microservices/Application.java → ...adin/risto/microservices/Application.java
diff --git a/...rvices/ApplicationCloudConfiguration.java → ...rvices/ApplicationCloudConfiguration.java b/...rvices/ApplicationCloudConfiguration.java → ...rvices/ApplicationCloudConfiguration.java
diff --git a/...ervices/rest/student/StudentResource.java → ...ervices/rest/student/StudentResource.java b/...ervices/rest/student/StudentResource.java → ...ervices/rest/student/StudentResource.java
diff --git a/...rvices/rest/student/StudentResources.java → ...rvices/rest/student/StudentResources.java b/...rvices/rest/student/StudentResources.java → ...rvices/rest/student/StudentResources.java
diff --git a/...services/rest/student/StudentsClient.java → ...services/rest/student/StudentsClient.java b/...services/rest/student/StudentsClient.java → ...services/rest/student/StudentsClient.java
diff --git a/...icroservices/ui/HateoasLinkConverter.java → ...icroservices/ui/HateoasLinkConverter.java b/...icroservices/ui/HateoasLinkConverter.java → ...icroservices/ui/HateoasLinkConverter.java
diff --git a/...isto/microservices/ui/MicroserviceUI.java → ...isto/microservices/ui/MicroserviceUI.java b/...isto/microservices/ui/MicroserviceUI.java → ...isto/microservices/ui/MicroserviceUI.java
diff --git a/ui/src/main/resources/application.yml → src/main/resources/application.yml b/ui/src/main/resources/application.yml → src/main/resources/application.yml
diff --git a/ui/src/main/resources/bootstrap.yml → src/main/resources/bootstrap.yml b/ui/src/main/resources/bootstrap.yml → src/main/resources/bootstrap.yml
diff --git a/students-rest-microservice/pom.xml b/students-rest-microservice/pom.xml
diff --git a/students-rest-microservice/src/main/java/org/vaadin/risto/microservices/student/Student.java b/students-rest-microservice/src/main/java/org/vaadin/risto/microservices/student/Student.java
diff --git a/...microservice/src/main/java/org/vaadin/risto/microservices/student/StudentApplication.java b/...microservice/src/main/java/org/vaadin/risto/microservices/student/StudentApplication.java
diff --git a/...-microservice/src/main/java/org/vaadin/risto/microservices/student/StudentRepository.java b/...-microservice/src/main/java/org/vaadin/risto/microservices/student/StudentRepository.java