maven config ok

vertigo-io · Sep 5, 2020 · 534310c · 534310c
1 parent 44ca5e0
commit 534310c
Show file tree

Hide file tree

Showing 19 changed files with 76 additions and 46 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,12 +6,13 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0-RC</version>
 	</parent>
 
 	<artifactId>vertigo-samples</artifactId>
 	<name>vertigo-samples</name>
 	<packaging>pom</packaging>
+	<version>3.0.0-RC</version>
 
 	<properties>
 		<maven.compiler.source>11</maven.compiler.source>
@@ -23,22 +24,16 @@
 	</properties>
 
 	<modules>
-		<module>sample-hello-world</module>
+		<module>sample-account</module>
 		<module>sample-component</module>
-		<module>sample-store</module>
-		<module>sample-vega</module>
-
-		<module>sample-ifttt</module>
-		<module>sample-mail</module>
-		<module>sample-twitter</module>
-<!-- 		<module>sample-notifications</module>
-		
-		<module>sample-gutenberg</module>
- -->	
- 		<module>sample-dao</module>
+		<module>sample-config</module>
+		<module>sample-aop-modules</module>
 		<module>sample-crystal</module>
 		<module>sample-crystal-full</module>
-		<module>sample-account</module>
+		<module>sample-dao</module>
+		<module>sample-dao-full</module>
+		<module>sample-hello-world</module>
+		<module>sample-notifications</module>
 		<module>sample-quarto</module>
  	</modules>
 

diff --git a/sample-account/pom.xml b/sample-account/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0-RC</version>
 	</parent>
 
 	<artifactId>vertigo-sample-account</artifactId>

diff --git a/sample-aop-modules/01-sample-gutenberg-corrige/pom.xml b/sample-aop-modules/01-sample-gutenberg-corrige/pom.xml
@@ -4,8 +4,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
 		<groupId>io.vertigo</groupId>
-		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<artifactId>sample-aop-modules</artifactId>
+		<version>3.0.0-RC</version>
 	</parent>
 
   <artifactId>vertigo-sample-gutenberg-corrige</artifactId>

diff --git a/sample-aop-modules/01-sample-gutenberg/pom.xml b/sample-aop-modules/01-sample-gutenberg/pom.xml
@@ -4,8 +4,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
 		<groupId>io.vertigo</groupId>
-		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<artifactId>sample-aop-modules</artifactId>
+		<version>3.0.0-RC</version>
 	</parent>
 
   <artifactId>vertigo-sample-gutenberg-exo</artifactId>

diff --git a/sample-aop-modules/02-sample-ifttt/pom.xml b/sample-aop-modules/02-sample-ifttt/pom.xml
@@ -5,8 +5,8 @@
 
 	<parent>
 		<groupId>io.vertigo</groupId>
-		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<artifactId>sample-aop-modules</artifactId>
+		<version>3.0.0-RC</version>
 	</parent>
 
   	<artifactId>vertigo-sample-ifttt-exo</artifactId>

diff --git a/sample-aop-modules/02-sample-mail/pom.xml b/sample-aop-modules/02-sample-mail/pom.xml
@@ -5,8 +5,8 @@
 
 	<parent>
 		<groupId>io.vertigo</groupId>
-		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<artifactId>sample-aop-modules</artifactId>
+		<version>3.0.0-RC</version>
 	</parent>
 
   	<artifactId>vertigo-sample-mail-exo</artifactId>

diff --git a/sample-aop-modules/02-sample-notifications-corrige/pom.xml b/sample-aop-modules/02-sample-notifications-corrige/pom.xml
@@ -5,8 +5,8 @@
 
 	<parent>
 		<groupId>io.vertigo</groupId>
-		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<artifactId>sample-aop-modules</artifactId>
+		<version>3.0.0-RC</version>
 	</parent>
 
   	<artifactId>vertigo-sample-notifications-corrige</artifactId>

diff --git a/sample-aop-modules/02-sample-twitter/pom.xml b/sample-aop-modules/02-sample-twitter/pom.xml
@@ -5,8 +5,8 @@
 
 	<parent>
 		<groupId>io.vertigo</groupId>
-		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<artifactId>sample-aop-modules</artifactId>
+		<version>3.0.0-RC</version>
 	</parent>
 
   	<artifactId>vertigo-sample-twitter-exo</artifactId>

diff --git a/sample-aop-modules/pom.xml b/sample-aop-modules/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<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>
+
+	<parent>
+		<groupId>io.vertigo</groupId>
+		<artifactId>vertigo-samples</artifactId>
+		<version>3.0.0-RC</version>
+	</parent>
+
+	<artifactId>sample-aop-modules</artifactId>
+	<name>sample-aop-modules</name>
+	<packaging>pom</packaging>
+	<version>3.0.0-RC</version>
+
+	<modules>
+		<module>01-sample-gutenberg</module>
+		<module>01-sample-gutenberg-corrige</module>
+		<module>02-sample-ifttt</module>
+		<module>02-sample-mail</module>
+		<module>02-sample-notifications-corrige</module>
+		<module>02-sample-twitter</module>
+ 	</modules>
+
+</project>
diff --git a/sample-component/pom.xml b/sample-component/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.vertigo</groupId>
     <artifactId>vertigo-samples</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.0.0-RC</version>
   </parent>
 
   <artifactId>vertigo-sample-component</artifactId>

diff --git a/sample-config/pom.xml b/sample-config/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-samples</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>3.0.0-RC</version>
 	</parent>
 
 	<artifactId>vertigo-sample-config</artifactId>
@@ -21,19 +21,24 @@
 		</dependency>		
 		<dependency>
 			<groupId>io.vertigo</groupId>
-			<artifactId>vertigo-vega-api</artifactId>
+			<artifactId>vertigo-vega</artifactId>
 			<version>${vertigo.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.vertigo</groupId>
-			<artifactId>vertigo-vega-impl</artifactId>
+			<artifactId>vertigo-vega</artifactId>
 			<version>${vertigo.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.1.0</version>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-server</artifactId>
+			<version>9.4.31.v20200723</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty.websocket</groupId>
+			<artifactId>websocket-server</artifactId>
+			<version>9.4.31.v20200723</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/sample-config/src/main/java/io/vertigo/samples/config/ConfigRun.java b/sample-config/src/main/java/io/vertigo/samples/config/ConfigRun.java
@@ -1,10 +1,12 @@
 package io.vertigo.samples.config;
 
-import io.vertigo.app.AutoCloseableApp;
-import io.vertigo.app.config.NodeConfig;
-import io.vertigo.app.config.ModuleConfig;
 import io.vertigo.commons.CommonsFeatures;
+import io.vertigo.connectors.javalin.JavalinFeatures;
+import io.vertigo.core.node.AutoCloseableNode;
+import io.vertigo.core.node.config.ModuleConfig;
+import io.vertigo.core.node.config.NodeConfig;
 import io.vertigo.core.param.Param;
+import io.vertigo.datamodel.DataModelFeatures;
 import io.vertigo.vega.VegaFeatures;
 
 /***
@@ -21,15 +23,17 @@ public class ConfigRun {
 
 	public static void main(final String[] args) {
 		final NodeConfig nodeConfig = NodeConfig.builder()
+				.addModule(new JavalinFeatures().withEmbeddedServer(Param.of("port", "8080")).build())
 				.addModule(new CommonsFeatures().build())
-				.addModule(new VegaFeatures().withWebServices().withWebServicesEmbeddedServer(Param.of("port", "8080")).build())
+				.addModule(new DataModelFeatures().build())
+				.addModule(new VegaFeatures().withWebServices().withJavalinWebServerPlugin().build())
 				//-----Declaration of a module named 'Hello' which contains a webservice component.
 				.addModule(ModuleConfig.builder("Hello")
 						.addComponent(HelloWebServices.class)
 						.build())
 				.build();
 
-		try (AutoCloseableApp app = new AutoCloseableApp(nodeConfig)) {
+		try (AutoCloseableNode node = new AutoCloseableNode(nodeConfig)) {
 			//do whatever you want
 		}
 	}

diff --git a/sample-crystal-full/pom.xml b/sample-crystal-full/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0-RC</version>
 	</parent>
 
 	<artifactId>vertigo-sample-crystal-full</artifactId>

diff --git a/sample-crystal/pom.xml b/sample-crystal/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0-RC</version>
 	</parent>
 
 	<artifactId>vertigo-sample-crystal</artifactId>

diff --git a/sample-dao-full/pom.xml b/sample-dao-full/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0-RC</version>
 	</parent>
 
 	<artifactId>vertigo-sample-dao-full</artifactId>

diff --git a/sample-dao/pom.xml b/sample-dao/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0-RC</version>
 	</parent>
 
 	<artifactId>vertigo-sample-dao</artifactId>

diff --git a/sample-hello-world/pom.xml b/sample-hello-world/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0-RC</version>
 	</parent>
 
 	<artifactId>vertigo-sample-hello-world</artifactId>

diff --git a/sample-notifications/pom.xml b/sample-notifications/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0-RC</version>
 	</parent>
 
   	<artifactId>vertigo-sample-notifications</artifactId>

diff --git a/sample-quarto/pom.xml b/sample-quarto/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0-RC</version>
 	</parent>
 
 	<artifactId>vertigo-sample-quarto</artifactId>