Merge pull request #115 from adrienlauer/seed-runnable

Add core SeedRunner and its SPI (retrofitted to CLI runner)
seedstack · Sep 6, 2015 · cba6dd9 · cba6dd9
2 parents 79d8d3e + c684bcd
commit cba6dd9
Show file tree

Hide file tree

Showing 59 changed files with 149 additions and 57 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-bom</artifactId>

diff --git a/cache-support/pom.xml b/cache-support/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-cache-support</artifactId>

diff --git a/cli-support/core/pom.xml b/cli-support/core/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-cli-support</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-cli-support-core</artifactId>

diff --git a/cli-support/core/src/main/java/org/seedstack/seed/cli/SeedRunner.java b/cli-support/core/src/main/java/org/seedstack/seed/cli/SeedRunner.java
@@ -31,6 +31,7 @@
 import org.seedstack.seed.core.api.Application;
 import org.seedstack.seed.core.api.SeedException;
 import org.seedstack.seed.core.internal.CorePlugin;
+import org.seedstack.seed.core.spi.SeedRunnable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -48,10 +49,12 @@
  * @author epo.jemba@ext.mpsa.com
  * @author adrien.lauer@mpsa.com
  */
-public final class SeedRunner {
+public class SeedRunner implements SeedRunnable {
     private static final Logger LOGGER = LoggerFactory.getLogger(SeedRunner.class);
 
-    private SeedRunner() {
+    @Override
+    public int run(String[] args) throws Exception {
+        return execute(args);
     }
 
     /**

diff --git a/...upport/core/src/main/resources/META-INF/services/org.seedstack.seed.core.spi.SeedRunnable b/...upport/core/src/main/resources/META-INF/services/org.seedstack.seed.core.spi.SeedRunnable
@@ -0,0 +1 @@
+org.seedstack.seed.cli.SeedRunner
diff --git a/cli-support/pom.xml b/cli-support/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-cli-support</artifactId>

diff --git a/cli-support/test/pom.xml b/cli-support/test/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-cli-support</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-cli-support-test</artifactId>

diff --git a/core-support/core/pom.xml b/core-support/core/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-core-support</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-core-support-core</artifactId>

diff --git a/core-support/core/src/main/java/org/seedstack/seed/core/SeedRunner.java b/core-support/core/src/main/java/org/seedstack/seed/core/SeedRunner.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2013-2015 by The SeedStack authors. All rights reserved.
+ *
+ * This file is part of SeedStack, An enterprise-oriented full development stack.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.seedstack.seed.core;
+
+import com.google.common.collect.Lists;
+import org.seedstack.seed.core.api.CoreErrorCode;
+import org.seedstack.seed.core.api.SeedException;
+import org.seedstack.seed.core.internal.CorePlugin;
+import org.seedstack.seed.core.spi.SeedRunnable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.ServiceLoader;
+
+public class SeedRunner {
+    private static final Logger LOGGER = LoggerFactory.getLogger(SeedRunner.class);
+
+    public static void main(String[] args) {
+        List<SeedRunnable> entryPointServices = Lists.newArrayList(ServiceLoader.load(SeedRunnable.class));
+        int returnCode = 0;
+
+        if (entryPointServices.size() < 1) {
+            throw SeedException.createNew(CoreErrorCode.MISSING_SEED_ENTRY_POINT);
+        } else if (entryPointServices.size() > 1) {
+            throw SeedException.createNew(CoreErrorCode.MULTIPLE_SEED_ENTRY_POINTS);
+        }
+
+        try {
+            returnCode = entryPointServices.get(0).run(args);
+        } catch (SeedException e) {
+            handleException(e);
+            e.printStackTrace(System.err);
+        } catch (Exception e) {
+            handleException(e);
+            SeedException.wrap(e, CoreErrorCode.UNEXPECTED_EXCEPTION).printStackTrace(System.err);
+        }
+
+        // no java.lang.Error handling is done
+
+        System.exit(returnCode);
+    }
+
+    private static void handleException(Exception e) {
+        LOGGER.error("An exception occurred during CLI application startup, collecting diagnostic information");
+        CorePlugin.getDiagnosticManager().dumpDiagnosticReport(e);
+    }
+}
diff --git a/core-support/pom.xml b/core-support/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-core-support</artifactId>

diff --git a/core-support/specs/pom.xml b/core-support/specs/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-core-support</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-core-support-specs</artifactId>

diff --git a/core-support/specs/src/main/java/org/seedstack/seed/core/api/CoreErrorCode.java b/core-support/specs/src/main/java/org/seedstack/seed/core/api/CoreErrorCode.java
@@ -21,5 +21,7 @@ public enum CoreErrorCode implements ErrorCode {
     UNABLE_TO_LOAD_SEED_BOOTSTRAP,
     UNEXPECTED_EXCEPTION,
     UNABLE_TO_CREATE_DIAGNOSTIC_COLLECTOR,
+    MISSING_SEED_ENTRY_POINT,
+    MULTIPLE_SEED_ENTRY_POINTS,
     RETROW_EXCEPTION_AFTER_DIAGNOSTIC_FAILURE
 }
diff --git a/core-support/specs/src/main/java/org/seedstack/seed/core/spi/SeedRunnable.java b/core-support/specs/src/main/java/org/seedstack/seed/core/spi/SeedRunnable.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2013-2015 by The SeedStack authors. All rights reserved.
+ *
+ * This file is part of SeedStack, An enterprise-oriented full development stack.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.seedstack.seed.core.spi;
+
+/**
+ * This interface defines a Seed executable entry point. It must be declared as a {@link java.util.ServiceLoader} service
+ * in META-INF/services to be detected.
+ *
+ * @author adrien.lauer@gmail.com
+ */
+public interface SeedRunnable {
+    /**
+     * The entry-point method that is executed upon startup.
+     *
+     * @param args the arguments.
+     * @return the return code.
+     */
+    int run(String[] args) throws Exception;
+}
diff --git a/crypto-support/pom.xml b/crypto-support/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-crypto-support</artifactId>

diff --git a/doc/pom.xml b/doc/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-doc</artifactId>

diff --git a/el-support/pom.xml b/el-support/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-el-support</artifactId>

diff --git a/integrationtest-support/core/pom.xml b/integrationtest-support/core/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
         <groupId>org.seedstack.seed</groupId>
 		<artifactId>seed-integrationtest-support</artifactId>
-		<version>2.0.1-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>seed-integrationtest-support-core</artifactId>

diff --git a/integrationtest-support/pom.xml b/integrationtest-support/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
 	<artifactId>seed-integrationtest-support</artifactId>

diff --git a/integrationtest-support/web/pom.xml b/integrationtest-support/web/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.seedstack.seed</groupId>
 		<artifactId>seed-integrationtest-support</artifactId>
-		<version>2.0.1-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>seed-integrationtest-support-web</artifactId>

diff --git a/jms-support/core/pom.xml b/jms-support/core/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-jms-support</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
 	<artifactId>seed-jms-support-core</artifactId>

diff --git a/jms-support/pom.xml b/jms-support/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
 	<artifactId>seed-jms-support</artifactId>

diff --git a/jms-support/specs/pom.xml b/jms-support/specs/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-jms-support</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-jms-support-specs</artifactId>

diff --git a/mail-support/core/pom.xml b/mail-support/core/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-mail-support</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-mail-support-core</artifactId>

diff --git a/mail-support/pom.xml b/mail-support/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-mail-support</artifactId>

diff --git a/mail-support/test/pom.xml b/mail-support/test/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-mail-support</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-mail-support-test</artifactId>

diff --git a/metrics-support/pom.xml b/metrics-support/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-metrics-support</artifactId>

diff --git a/persistence-support/elasticsearch/pom.xml b/persistence-support/elasticsearch/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-persistence-support</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-persistence-support-elasticsearch</artifactId>

diff --git a/persistence-support/inmemory/pom.xml b/persistence-support/inmemory/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-persistence-support</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-persistence-support-inmemory</artifactId>

diff --git a/persistence-support/jdbc/pom.xml b/persistence-support/jdbc/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-persistence-support</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-persistence-support-jdbc</artifactId>

diff --git a/persistence-support/jpa/pom.xml b/persistence-support/jpa/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-persistence-support</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-persistence-support-jpa</artifactId>

diff --git a/persistence-support/mongodb/pom.xml b/persistence-support/mongodb/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-persistence-support</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-persistence-support-mongodb</artifactId>

diff --git a/persistence-support/neo4j/pom.xml b/persistence-support/neo4j/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-persistence-support</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-persistence-support-neo4j</artifactId>

diff --git a/persistence-support/pom.xml b/persistence-support/pom.xml
@@ -9,18 +9,23 @@
     file, You can obtain one at http://mozilla.org/MPL/2.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">
+<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>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-persistence-support</artifactId>
     <packaging>pom</packaging>
 
+    <properties>
+        <it.excluded-categories>org.seedstack.seed.it.internal.categories.NotSelfContained</it.excluded-categories>
+    </properties>
+
     <dependencyManagement>
         <dependencies>
             <dependency>

diff --git a/persistence-support/redis/pom.xml b/persistence-support/redis/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-persistence-support</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-persistence-support-redis</artifactId>