Structure Modification

Author: silentbalanceyh

pom.xml

@@ -10,11 +10,12 @@
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <artifactId>zero-entry</artifactId>
-    <name>Zero.Core.Entry.POM.${zero.version}</name>
+    <name>Zero.Entry.POM.${zero.version}</name>
     <modules>
-        <module>zero-focus</module>
-        <module>zero-import</module>
-        <module>zero-mini</module>
+        <module>zero-entry-bootstrap-core</module>
+        <module>zero-entry-bootstrap-extension</module>
+        <module>zero-entry-bootstrap-osgi</module>
+        <module>zero-entry-bootstrap-import</module>
     </modules>
     <build>
         <plugins>

zero-mini/.gitignore zero-entry-bootstrap-core/.gitignore

@@ -8,9 +8,8 @@
         <artifactId>zero-entry</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
-
-    <name>Zero.Entry.Stack.Mini</name>
-    <artifactId>zero-mini</artifactId>
+    <name>Zero.Entry.BootStrap.Core</name>
+    <artifactId>zero-entry-bootstrap-core</artifactId>
     <dependencies>
         <dependency>
             <groupId>io.netty</groupId>
@@ -20,7 +19,7 @@
         <!-- Switch to Up -->
         <dependency>
             <groupId>io.zerows</groupId>
-            <artifactId>zero-core-entry-standalone</artifactId>
+            <artifactId>zero-core-entry-facade</artifactId>
         </dependency>
     </dependencies>
 </project>

zero-mini/pom.xml zero-entry-bootstrap-core/pom.xml

@@ -9,8 +9,8 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>zero-focus</artifactId>
-    <name>Zero.Entry.Stack.Scaffold</name>
+    <artifactId>zero-entry-bootstrap-extension</artifactId>
+    <name>Zero.Entry.BootStrap.Extension</name>
 
     <dependencies>
         <dependency>

zero-mini/src/main/resources/META-INF/services/io.horizon.spi.BootIo zero-entry-bootstrap-core/src/main/resources/META-INF/services/io.horizon.spi.BootIo

@@ -8,9 +8,9 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>zero-import</artifactId>
+    <artifactId>zero-entry-bootstrap-import</artifactId>
     <packaging>pom</packaging>
-    <name>Zero.Entry.Stack.Import</name>
+    <name>Zero.Entry.BootStrap.Import</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>17</java.version>
@@ -21,7 +21,7 @@
         <!-- Switch to Up -->
         <dependency>
             <groupId>io.zerows</groupId>
-            <artifactId>zero-core-entry-standalone</artifactId>
+            <artifactId>zero-core-entry-facade</artifactId>
         </dependency>
     </dependencies>
     <dependencyManagement>
@@ -62,12 +62,12 @@
             <!-- Business Scaffold -->
             <dependency>
                 <groupId>io.zerows</groupId>
-                <artifactId>zero-focus</artifactId>
+                <artifactId>zero-entry-bootstrap-extension</artifactId>
                 <version>${zero.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.zerows</groupId>
-                <artifactId>zero-mini</artifactId>
+                <artifactId>zero-entry-bootstrap-core</artifactId>
                 <version>${zero.version}</version>
             </dependency>
         </dependencies>

zero-focus/pom.xml zero-entry-bootstrap-extension/pom.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         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.zerows</groupId>
+        <artifactId>zero-entry</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>zero-entry-bootstrap-osgi</artifactId>
+    <name>Zero.Entry.BootStrap.OSGI</name>
+    <packaging>bundle</packaging>
+    <dependencies>
+        <dependency>
+            <groupId>io.zerows</groupId>
+            <artifactId>zero-core-runtime-metadata</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            <!-- SPI Required -->
+                            io.zerows.core.metadata.osgi.spi.*;-split-package:=merge-first,
+
+                            io.zerows.core.entry.module.*,
+                        </Export-Package>
+                        <Import-Package>
+                            *;resolution:=optional,
+                        </Import-Package>
+                        <Embed-Transitive>true</Embed-Transitive>
+                        <!--
+                        在 JDK 9 之后，OSGI的打包会引起部分警告信息：
+                        [WARNING] Osgi io.zerows:zero-ams:bundle:1.0-SNAPSHOT :
+                        Classes found in the wrong directory: {META-INF/versions/9/module-info.class=module-info.class}
+                        此错误信息在编译的时候不会有问题，但在IDEA识别时会阻拦IDEA的运行，如直接导致IDEA中无法启动应用，因此，
+                        需要在打包的时候忽略此错误信息，具体配置如下：
+                        -->
+                        <_fixupmessages>
+                            "Classes found in the wrong directory";restrict:=error;is:=ignore
+                        </_fixupmessages>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven.plugin.compiler}</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <!--<compilerArgs>
+                        <arg>-verbose</arg>
+                        <arg>-Xlint:all,-options,-path</arg>
+                    </compilerArgs>-->
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <!-- <includeScope>compile</includeScope> -->
+                            <type>jar</type>
+                            <includeTypes>jar</includeTypes>
+                            <!-- 存放服务依赖的jar包，存放在服务相同目录的lib文件夹下 -->
+                            <outputDirectory>
+                                target/lib
+                            </outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

zero-focus/src/main/entry/io/mature/boot/argument/ArgAtom.java zero-entry-bootstrap-extension/src/main/entry/io/mature/boot/argument/ArgAtom.java

@@ -0,0 +1,36 @@
+package io.zerows.core.entry.osgi;
+
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+
+/**
+ * @author lang : 2024-04-17
+ */
+public abstract class AbstractContainerBundle extends DependencyActivatorBase {
+
+    @Override
+    public void init(final BundleContext context, final DependencyManager dm) throws Exception {
+        final Bundle bundle = context.getBundle();
+        // 依赖服务必须启动，否则此处的内容会不生效
+        OEnvironment.initialize(bundle);
+
+        // 子类处理
+        this.initModule(context, dm);
+    }
+
+    @Override
+    public void destroy(final BundleContext context, final DependencyManager dm) throws Exception {
+        // 子类可重写此方法实现销毁
+        this.destroyModule(context, dm);
+    }
+
+    protected void initModule(final BundleContext context, final DependencyManager dm) throws Exception {
+        // 子类可重写此方法实现初始化
+    }
+
+    protected void destroyModule(final BundleContext context, final DependencyManager dm) throws Exception {
+        // 子类可重写此方法实现销毁
+    }
+}

zero-focus/src/main/entry/io/mature/boot/argument/ArgIn.java zero-entry-bootstrap-extension/src/main/entry/io/mature/boot/argument/ArgIn.java

@@ -0,0 +1,49 @@
+package io.zerows.core.entry.osgi;
+
+import io.horizon.eon.VMessage;
+import io.horizon.eon.em.Environment;
+import io.horizon.eon.em.app.OsType;
+import io.horizon.eon.spec.VBoot;
+import io.horizon.runtime.Macrocosm;
+import io.horizon.util.HUt;
+import io.vertx.up.util.Ut;
+import org.osgi.framework.Bundle;
+
+import java.util.Properties;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * @author lang : 2024-04-17
+ */
+public class OEnvironment {
+    /**
+     * 环境变量初始化验证，内置启动会被直接调用
+     */
+    public static void initialize(final Bundle bundle) {
+        /*
+         * 判断是否开启了开发环境，如果开启了开发环境，那么就会读取 .env.development 文件
+         * 加载文件中的环境变量到系统层（只适用于开发）
+         */
+        if (HUt.ioExist(VBoot._ENV_DEVELOPMENT)) {
+            // 1. 环境变量设置
+            final OsType os = HUt.envOs();
+            Ut.Log.boot(OEnvironment.class).warn(VMessage.KEnvironment.DEVELOPMENT,
+                os.name(), VBoot._ENV_DEVELOPMENT);
+            final Properties properties = HUt.ioProperties(VBoot._ENV_DEVELOPMENT);
+            // 1.1. 环境变量注入
+            if (!properties.containsKey(Macrocosm.ZERO_ENV)) {
+                properties.put(Macrocosm.ZERO_ENV, Environment.Development.name());
+            }
+            /*
+             * 开发环境需要带上启动参数，否则会报错，这里是为了解决 JDK 9 以上版本的问题
+             * --add-opens java.base/java.util=ALL-UNNAMED
+             * --add-opens java.base/java.lang=ALL-UNNAMED
+             */
+            final ConcurrentMap<String, String> written = HUt.envOut(properties);
+
+            // 2. 环境变量打印
+            final String environments = HUt.envString(written);
+            Ut.Log.boot(OEnvironment.class).warn(VMessage.KEnvironment.ENV, environments);
+        }
+    }
+}

zero-focus/src/main/entry/io/mature/boot/argument/ArgLoad.java zero-entry-bootstrap-extension/src/main/entry/io/mature/boot/argument/ArgLoad.java

@@ -0,0 +1 @@
+io.zerows.core.metadata.osgi.spi.HorizonIoLoad

zero-focus/src/main/entry/io/mature/boot/argument/ArgMenu.java zero-entry-bootstrap-extension/src/main/entry/io/mature/boot/argument/ArgMenu.java

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# 检查环境变量 ZERO_HOME
+if [ -z "$ZERO_HOME" ]; then
+  echo "ZERO_HOME 环境变量未设置！"
+  exit 1
+fi
+mvn clean package install -Dquickly -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.compile.fork=true -T 1C

zero-focus/src/main/entry/io/mature/boot/argument/ArgVar.java zero-entry-bootstrap-extension/src/main/entry/io/mature/boot/argument/ArgVar.java

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+./zoc-build.sh
+echo "Zero OSGI Development..."
+cp -rf target/*.jar $ZERO_HOME/develop/libs/bundles/

zero-focus/src/main/entry/io/mature/boot/routine/EngrossAtom.java zero-entry-bootstrap-extension/src/main/entry/io/mature/boot/routine/EngrossAtom.java

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+./zoc-build.sh
+echo "Zero OSGI Dispatch..."
+if [ "core" == "$1" ]; then
+  cp -rf target/*.jar $ZERO_HOME/bundles/infix
+elif [ "extension" == "$1" ]; then
+  cp -rf target/*.jar $ZERO_HOME/bundles/extension
+else
+  cp -rf target/*.jar $ZERO_HOME/bundles/core
+fi