update to generate for latest releases

DominoKit · Mar 29, 2021 · 85261ad · 85261ad
1 parent eda6f9d
commit 85261ad
Show file tree

Hide file tree

Showing 60 changed files with 302 additions and 10,612 deletions.
diff --git a/README.md b/README.md
@@ -1,11 +1,10 @@
 # domino-cli
-CLI tool to generate domino projects and modules.
+CLI tools to generate domino projects and modules.
 
 ### How to install:
 
-navigate to [releases](https://github.com/DominoKit/domino-cli/releases) then download and install tour preferred package.
+navigate to [releases](https://github.com/DominoKit/domino-cli/releases) then download and install your preferred package.
 
-**npm** users can install the cli tool by executing `npm i dominokit`
 
 ### Usage :
 
@@ -17,12 +16,12 @@ e.g : to generate and application with name `sample` and groupId `org.dominokit.
 
 `dominokit gen app -n sample -g org.dominokit.samples` 
 
-for more help about the generate app command execute `dominokit gen app help`
+for more help about the generated app command execute `dominokit gen app help`
 
 
 - ##### Generate a module template 
 
-once an application template is generated, we cd inside the generated application e.g `cd sample`.
+once an application template is generated, we `cd` inside the generated application e.g `cd sample`.
 
 then to generate a new module with the name `layout` and sub-package `layout` we execute the command below
 

diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ apply plugin: 'maven'
 apply plugin: "com.install4j.gradle"
 
 group = 'org.dominokit'
-version = '0.5.0'
+version = '1.0.0-RC1'
 
 description = "Domino CLI"
 
@@ -36,8 +36,8 @@ dependencies {
     // https://mvnrepository.com/artifact/org.apache.velocity/velocity-tools
     compile group: 'org.apache.velocity', name: 'velocity-tools', version: '2.0'
 
-    implementation group: 'org.dominokit.jackson', name: 'jackson-apt', version: '1.0-SNAPSHOT'
-    annotationProcessor group: 'org.dominokit.jackson', name: 'jackson-apt-processor', version: '1.0-SNAPSHOT'
+    implementation group: 'org.dominokit', name: 'domino-jackson', version: '1.0.0-RC2'
+    annotationProcessor group: 'org.dominokit', name: 'domino-jackson-processor', version: '1.0.0-RC2'
 
     // https://mvnrepository.com/artifact/org.apache.maven/maven-model-builder
     compile group: 'org.apache.maven', name: 'maven-model-builder', version: '3.6.1'

diff --git a/domino-cli.install4j b/domino-cli.install4j
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="8.0.1" transformSequenceNumber="8">
   <directoryPresets config="build/libs/domino-cli-fat.jar" />
-  <application name="dominokit-cli" applicationId="0518-2014-5243-3779" mediaDir="build/install4j" shortName="dominokit-cli" publisher="Dominokit" publisherWeb="www.dominokit.org" version="0.5.0" macVolumeId="6cb917d1c585346b" javaMinVersion="1.8.0" jdkMode="jdk" jdkName="JDK 1.8" />
+  <application name="dominokit-cli" applicationId="0518-2014-5243-3779" mediaDir="build/install4j" shortName="dominokit-cli" publisher="Dominokit" publisherWeb="www.dominokit.org" version="1.0.0-RC1" macVolumeId="6cb917d1c585346b" javaMinVersion="1.8.0" jdkMode="jdk" jdkName="JDK 1.8" />
   <files>
     <mountPoints>
       <mountPoint id="60" />

diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
   "main": "index.js",
   "preferGlobal": true,
   "repository": "",
-  "version": "0.5.0",
+  "version": "1.0.0-RC1",
   "jdeploy": {
     "jar": "build/libs/domino-cli-fat.jar"
   },

diff --git a/src/main/java/org/dominokit/cli/commands/DescriptorsGenerator.java b/src/main/java/org/dominokit/cli/commands/DescriptorsGenerator.java
@@ -3,7 +3,7 @@
 import org.apache.commons.io.FileUtils;
 import org.dominokit.cli.structure.folders.Folder;
 import org.dominokit.cli.structure.folders.Folder_MapperImpl;
-import org.dominokit.jacksonapt.DefaultJsonSerializationContext;
+import org.dominokit.jackson.DefaultJsonSerializationContext;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/src/main/java/org/dominokit/cli/model/Project.java b/src/main/java/org/dominokit/cli/model/Project.java
@@ -1,7 +1,7 @@
 package org.dominokit.cli.model;
 
 import org.apache.velocity.VelocityContext;
-import org.dominokit.jacksonapt.annotation.JSONMapper;
+import org.dominokit.jackson.annotation.JSONMapper;
 
 @JSONMapper
 public class Project implements IsContext {

diff --git a/src/main/java/org/dominokit/cli/structure/files/TemplateFile.java b/src/main/java/org/dominokit/cli/structure/files/TemplateFile.java
@@ -1,7 +1,7 @@
 package org.dominokit.cli.structure.files;
 
 import org.dominokit.cli.model.IsContext;
-import org.dominokit.jacksonapt.annotation.JSONMapper;
+import org.dominokit.jackson.annotation.JSONMapper;
 
 import java.io.IOException;
 import java.nio.file.Files;

diff --git a/src/main/java/org/dominokit/cli/structure/folders/Folder.java b/src/main/java/org/dominokit/cli/structure/folders/Folder.java
@@ -3,7 +3,7 @@
 import org.dominokit.cli.model.IsContext;
 import org.dominokit.cli.structure.files.ProjectFile;
 import org.dominokit.cli.structure.files.TemplateFile;
-import org.dominokit.jacksonapt.annotation.JSONMapper;
+import org.dominokit.jackson.annotation.JSONMapper;
 
 import java.io.IOException;
 import java.nio.file.Files;

diff --git a/src/main/resources/app/gwt/basic/__name__-server/src/main/webapp/favicon.ico b/src/main/resources/app/gwt/basic/__name__-server/src/main/webapp/favicon.ico
diff --git a/src/main/resources/app/gwt/basic/__name__-server/src/main/webapp/favicon.png b/src/main/resources/app/gwt/basic/__name__-server/src/main/webapp/favicon.png
diff --git a/src/main/resources/app/gwt/basic/pom.xml b/src/main/resources/app/gwt/basic/pom.xml
@@ -13,15 +13,15 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <domino.ui.version>1.0-SNAPSHOT</domino.ui.version>
+        <domino.ui.version>1.0.0-RC1</domino.ui.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>com.google.gwt</groupId>
                 <artifactId>gwt</artifactId>
-                <version>2.8.2</version>
+                <version>2.9.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -52,9 +52,8 @@
                     <!-- Unless you use annotation processors, then upgrade to 3.5.1 at a minimum -->
                     <version>3.5.1</version>
                     <configuration>
-                        <source>
-                        1.8</source>
-                        <target>1.8</target>
+                        <source>${maven.compiler.source}</source>
+                        <target>${maven.compiler.target}</target>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -65,10 +64,10 @@
                 <plugin>
                     <groupId>net.ltgt.gwt.maven</groupId>
                     <artifactId>gwt-maven-plugin</artifactId>
-                    <version>1.0-rc-9</version>
+                    <version>1.0.0</version>
                     <extensions>true</extensions>
                     <configuration>
-                        <sourceLevel>1.8</sourceLevel>
+                        <sourceLevel>${maven.compiler.source}</sourceLevel>
                         <failOnError>true</failOnError>
                     </configuration>
                 </plugin>

diff --git a/src/main/resources/app/gwt/mvp/__name__-backend/pom.xml b/src/main/resources/app/gwt/mvp/__name__-backend/pom.xml
@@ -27,20 +27,24 @@
             <version>${vertx.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.dominokit.domino.api</groupId>
-            <artifactId>domino-api-client</artifactId>
+            <groupId>org.dominokit</groupId>
+            <artifactId>domino-mvp-api-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.dominokit.domino.api</groupId>
-            <artifactId>domino-api-server</artifactId>
+            <groupId>org.dominokit</groupId>
+            <artifactId>domino-mvp-api-server</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.dominokit.domino.logging</groupId>
-            <artifactId>domino-remote-logging</artifactId>
+            <groupId>org.dominokit</groupId>
+            <artifactId>domino-mvp-remote-logging</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.dominokit.domino.logging</groupId>
-            <artifactId>domino-log4j-server-logging</artifactId>
+            <groupId>org.dominokit</groupId>
+            <artifactId>domino-mvp-log4j-server-logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dominokit</groupId>
+            <artifactId>domino-mvp-resteasy-plugin</artifactId>
         </dependency>
     </dependencies>
 
@@ -125,7 +129,7 @@
                                 <systemProperty>
                                     <key>domino.webroot.location</key>
                                     <value>
-                                        ${basedir}/../${name}-frontend/target/${name}-frontend-${version}/${name}
+                                        ${basedir}/../${name}-frontend/target/${name}-frontend-${version}/${moduleShortName}
                                     </value>
                                 </systemProperty>
                             </systemProperties>
@@ -148,7 +152,7 @@
                             <systemProperties>
                                 <systemProperty>
                                     <key>domino.webroot.location</key>
-                                    <value>${basedir}/../target/gwt/launcherDir/${name}
+                                    <value>${basedir}/../target/gwt/launcherDir/${moduleShortName}
                                     </value>
                                 </systemProperty>
                             </systemProperties>

diff --git a/...resources/app/gwt/mvp/__name__-backend/src/main/resources/__moduleShortName__/favicon.ico b/...resources/app/gwt/mvp/__name__-backend/src/main/resources/__moduleShortName__/favicon.ico
diff --git a/...app/gwt/mvp/__name__-backend/src/main/resources/__moduleShortName__/favicon.png b/...app/gwt/mvp/__name__-backend/src/main/resources/__moduleShortName__/favicon.png
diff --git a/src/main/resources/app/gwt/mvp/__name__-frontend/pom.xml b/src/main/resources/app/gwt/mvp/__name__-frontend/pom.xml
@@ -28,24 +28,24 @@
             <artifactId>gwt-dev</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.dominokit.domino.api</groupId>
-            <artifactId>domino-api-shared</artifactId>
+            <groupId>org.dominokit</groupId>
+            <artifactId>domino-mvp-api-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.dominokit.domino.impl</groupId>
-            <artifactId>domino-gwt</artifactId>
+            <groupId>org.dominokit</groupId>
+            <artifactId>domino-mvp-api-shared</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.dominokit.domino</groupId>
-            <artifactId>domino-gwt-view</artifactId>
+            <groupId>org.dominokit</groupId>
+            <artifactId>domino-mvp-gwt</artifactId>
         </dependency>
         <dependency>
             <groupId>org.dominokit</groupId>
-            <artifactId>domino-ui</artifactId>
+            <artifactId>domino-mvp-gwt-view</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.dominokit.domino.api</groupId>
-            <artifactId>domino-api-client</artifactId>
+            <groupId>org.dominokit</groupId>
+            <artifactId>domino-ui</artifactId>
         </dependency>
     </dependencies>
     <build>

diff --git a/...esources/app/gwt/mvp/__name__-frontend/src/main/java.__rootPackage__/AppClientModule.java b/...esources/app/gwt/mvp/__name__-frontend/src/main/java.__rootPackage__/AppClientModule.java
@@ -7,7 +7,7 @@
 import org.dominokit.domino.api.client.ClientApp;
 import org.dominokit.domino.gwt.client.app.DominoGWT;
 import org.dominokit.domino.view.GwtView;
-import org.dominokit.domino.rest.DominoRestConfig;
+import org.dominokit.rest.DominoRestConfig;
 
 import java.util.logging.Logger;
 

diff --git a/src/main/resources/app/gwt/mvp/pom.xml b/src/main/resources/app/gwt/mvp/pom.xml
@@ -25,51 +25,42 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <domino.history.version>1.0-rc.4-SNAPSHOT</domino.history.version>
-        <vertx.version>3.8.1</vertx.version>
-        <jackson.version>1.0-SNAPSHOT</jackson.version>
+        <vertx.version>3.9.0</vertx.version>
+        <domino.history.version>1.0.0-RC2</domino.history.version>
+        <domino.rest.version>1.0.0-RC1</domino.rest.version>
+        <domino.ui.version>1.0.0-RC1</domino.ui.version>
+        <domino.jackson.version>1.0.0-RC2</domino.jackson.version>
+        <domino.mvp.version>1.0.0-RC1</domino.mvp.version>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>sonatype-snapshots-repo</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>fail</checksumPolicy>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.dominokit.domino</groupId>
-                <artifactId>domino</artifactId>
-                <version>1.0-rc.5-SNAPSHOT</version>
+                <groupId>org.dominokit</groupId>
+                <artifactId>domino-mvp</artifactId>
+                <version>${domino.mvp.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>com.google.gwt</groupId>
                 <artifactId>gwt</artifactId>
-                <version>2.8.2</version>
+                <version>2.9.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.dominokit</groupId>
                 <artifactId>domino-ui</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>${domino.ui.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
-            <version>1.1.0.Final</version>
+            <version>1.0.0.GA</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -86,7 +77,7 @@
         <dependency>
             <groupId>com.google.auto.service</groupId>
             <artifactId>auto-service</artifactId>
-            <version>1.0-rc4</version>
+            <version>1.0-rc7</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -106,10 +97,10 @@
                 <plugin>
                     <groupId>net.ltgt.gwt.maven</groupId>
                     <artifactId>gwt-maven-plugin</artifactId>
-                    <version>1.0-rc-9</version>
+                    <version>1.0.0</version>
                     <extensions>true</extensions>
                     <configuration>
-                        <sourceLevel>1.8</sourceLevel>
+                        <sourceLevel>${maven.compiler.source}</sourceLevel>
                         <failOnError>true</failOnError>
                     </configuration>
                 </plugin>

diff --git a/src/main/resources/app/j2cl/basic/__name__-client/pom.xml b/src/main/resources/app/j2cl/basic/__name__-client/pom.xml
@@ -27,17 +27,6 @@
       <artifactId>jsinterop-annotations</artifactId>
       <version>2.0.0</version>
     </dependency>
-    <!-- https://mvnrepository.com/artifact/com.google.elemental2/elemental2-core -->
-    <dependency>
-      <groupId>com.google.elemental2</groupId>
-      <artifactId>elemental2-core</artifactId>
-      <version>1.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.elemental2</groupId>
-      <artifactId>elemental2-dom</artifactId>
-      <version>1.0.0</version>
-    </dependency>
   </dependencies>
 
   <build>
@@ -78,9 +67,6 @@
           </execution>
         </executions>
         <configuration>
-          <externs>
-            <extern>${project.basedir}/src/main/externs/svg.js</extern>
-          </externs>
           <defines>
             <locale>en_US</locale>
           </defines>
@@ -95,7 +81,7 @@
     <pluginRepository>
       <id>vertispan-releases</id>
       <name>Vertispan hosted artifacts-releases</name>
-      <url>https://repo.vertispan.com/j2cl</url>
+      <url>https://repo.vertispan.com/j2cl/</url>
       <releases>
         <enabled>true</enabled>
       </releases>