Classification properties (#12764)

apache · Jun 21, 2024 · 7ee30fb · 7ee30fb
1 parent bce9631
commit 7ee30fb
Show file tree

Hide file tree

Showing 10 changed files with 1,891 additions and 2,062 deletions.
diff --git a/distribution/src/assembly/all.xml b/distribution/src/assembly/all.xml
@@ -57,15 +57,6 @@
         <fileSet>
             <outputDirectory>conf</outputDirectory>
             <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/conf</directory>
-            <excludes>
-                <exclude>**/*.sh</exclude>
-                <exclude>**/*.bat</exclude>
-                <exclude>**/iotdb-system.properties</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <outputDirectory>conf</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/target/conf</directory>
         </fileSet>
         <fileSet>
             <outputDirectory>sbin</outputDirectory>

diff --git a/distribution/src/assembly/confignode.xml b/distribution/src/assembly/confignode.xml
@@ -54,15 +54,6 @@
         <fileSet>
             <outputDirectory>conf</outputDirectory>
             <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/conf</directory>
-            <excludes>
-                <exclude>**/*.sh</exclude>
-                <exclude>**/*.bat</exclude>
-                <exclude>**/iotdb-system.properties</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <outputDirectory>conf</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/target/conf</directory>
         </fileSet>
         <!--    <fileSet>-->
         <!--      <directory>${maven.multiModuleProjectDirectory}/confignode/src/assembly/resources/tools</directory>-->

diff --git a/distribution/src/assembly/datanode.xml b/distribution/src/assembly/datanode.xml
@@ -45,15 +45,6 @@
         <fileSet>
             <outputDirectory>conf</outputDirectory>
             <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/conf</directory>
-            <excludes>
-                <exclude>**/*.sh</exclude>
-                <exclude>**/*.bat</exclude>
-                <exclude>**/iotdb-system.properties</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <outputDirectory>conf</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/target/conf</directory>
         </fileSet>
         <fileSet>
             <outputDirectory>sbin</outputDirectory>

diff --git a/iotdb-core/node-commons/pom.xml b/iotdb-core/node-commons/pom.xml
@@ -188,7 +188,7 @@
             <resource>
                 <directory>${project.basedir}/src/assembly/resources/conf</directory>
                 <includes>
-                    <include>iotdb-system.properties</include>
+                    <include>iotdb-system.properties.template</include>
                 </includes>
                 <filtering>false</filtering>
             </resource>
@@ -349,72 +349,5 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>generate-properties-unix</id>
-            <activation>
-                <os>
-                    <family>unix</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <version>3.1.0</version>
-                        <executions>
-                            <!-- Unix execution -->
-                            <execution>
-                                <id>generate-config-unix</id>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <executable>sh</executable>
-                                    <arguments>
-                                        <argument>${project.basedir}/src/assembly/resources/conf/generate_properties.sh</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>generate-properties-windows</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <version>3.1.0</version>
-                        <executions>
-                            <!-- Windows execution -->
-                            <execution>
-                                <id>generate-properties-windows</id>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <executable>cmd</executable>
-                                    <arguments>
-                                        <argument>/c</argument>
-                                        <argument>${project.basedir}\src\assembly\resources\conf\generate_properties.bat</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>
diff --git a/iotdb-core/node-commons/src/assembly/resources/conf/generate_properties.bat b/iotdb-core/node-commons/src/assembly/resources/conf/generate_properties.bat
diff --git a/iotdb-core/node-commons/src/assembly/resources/conf/generate_properties.sh b/iotdb-core/node-commons/src/assembly/resources/conf/generate_properties.sh