This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch package_folder in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 3d495eb5053dba2e5874f1f52481095f81cbb643 Author: qiaojialin <[email protected]> AuthorDate: Mon Jul 22 10:10:07 2019 +0800 generate sbin,conf,lib,tools in root folder when packaging --- iotdb-cli/cli/{bin => sbin}/start-client.bat | 0 iotdb-cli/cli/{bin => sbin}/start-client.sh | 0 iotdb-cli/cli/{bin => tools}/export-csv.bat | 0 iotdb-cli/cli/{bin => tools}/export-csv.sh | 0 iotdb-cli/cli/{bin => tools}/import-csv.bat | 0 iotdb-cli/cli/{bin => tools}/import-csv.sh | 0 iotdb-cli/pom.xml | 33 +++++++++++ iotdb/pom.xml | 83 +++++++++++++--------------- 8 files changed, 71 insertions(+), 45 deletions(-) diff --git a/iotdb-cli/cli/bin/start-client.bat b/iotdb-cli/cli/sbin/start-client.bat similarity index 100% rename from iotdb-cli/cli/bin/start-client.bat rename to iotdb-cli/cli/sbin/start-client.bat diff --git a/iotdb-cli/cli/bin/start-client.sh b/iotdb-cli/cli/sbin/start-client.sh similarity index 100% rename from iotdb-cli/cli/bin/start-client.sh rename to iotdb-cli/cli/sbin/start-client.sh diff --git a/iotdb-cli/cli/bin/export-csv.bat b/iotdb-cli/cli/tools/export-csv.bat similarity index 100% rename from iotdb-cli/cli/bin/export-csv.bat rename to iotdb-cli/cli/tools/export-csv.bat diff --git a/iotdb-cli/cli/bin/export-csv.sh b/iotdb-cli/cli/tools/export-csv.sh similarity index 100% rename from iotdb-cli/cli/bin/export-csv.sh rename to iotdb-cli/cli/tools/export-csv.sh diff --git a/iotdb-cli/cli/bin/import-csv.bat b/iotdb-cli/cli/tools/import-csv.bat similarity index 100% rename from iotdb-cli/cli/bin/import-csv.bat rename to iotdb-cli/cli/tools/import-csv.bat diff --git a/iotdb-cli/cli/bin/import-csv.sh b/iotdb-cli/cli/tools/import-csv.sh similarity index 100% rename from iotdb-cli/cli/bin/import-csv.sh rename to iotdb-cli/cli/tools/import-csv.sh diff --git a/iotdb-cli/pom.xml b/iotdb-cli/pom.xml index eb54169..464808a 100644 --- a/iotdb-cli/pom.xml +++ b/iotdb-cli/pom.xml @@ -103,6 +103,39 @@ <outputDirectory>${project.basedir}/cli/lib</outputDirectory> </configuration> </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.8</version> + <executions> + <execution> + <id>copy</id> + <phase>package</phase> + <configuration> + <target> + <echo>ANT TASK - copying client files....</echo> + <copy todir="${maven.multiModuleProjectDirectory}/lib/" overwrite="true" flatten="true"> + <fileset dir="${project.basedir}/cli/lib" includes="*.jar"> + <include name="*.jar"/> + </fileset> + </copy> + <copy todir="${maven.multiModuleProjectDirectory}/sbin/" overwrite="true" flatten="true"> + <fileset dir="${project.basedir}/cli/sbin" includes="*"> + <include name="*"/> + </fileset> + </copy> + <copy todir="${maven.multiModuleProjectDirectory}/tools/" overwrite="true" flatten="true"> + <fileset dir="${project.basedir}/cli/tools" includes="*"> + <include name="*"/> + </fileset> + </copy> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> <!--using `mvn test` to run UT, `mvn verify` to run ITs Reference: https://antoniogoncalves.org/2012/12/13/lets-turn-integration-tests-with-maven-to-a-first-class-citizen/--> <plugin> diff --git a/iotdb/pom.xml b/iotdb/pom.xml index e7cef47..7a00458 100644 --- a/iotdb/pom.xml +++ b/iotdb/pom.xml @@ -159,6 +159,44 @@ <outputDirectory>${project.basedir}/iotdb/lib</outputDirectory> </configuration> </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.8</version> + <executions> + <execution> + <id>copy</id> + <phase>package</phase> + <configuration> + <target> + <echo>ANT TASK - copying server files....</echo> + <copy todir="${maven.multiModuleProjectDirectory}/conf/" overwrite="true" flatten="true"> + <fileset dir="${project.basedir}/iotdb/conf" includes="*"> + <include name="*"/> + </fileset> + </copy> + <copy todir="${maven.multiModuleProjectDirectory}/lib/" overwrite="true" flatten="true"> + <fileset dir="${project.basedir}/iotdb/lib" includes="*.jar"> + <include name="*.jar"/> + </fileset> + </copy> + <copy todir="${maven.multiModuleProjectDirectory}/sbin/" overwrite="true" flatten="true"> + <fileset dir="${project.basedir}/iotdb/sbin" includes="*"> + <include name="*"/> + </fileset> + </copy> + <copy todir="${maven.multiModuleProjectDirectory}/tools/" overwrite="true" flatten="true"> + <fileset dir="${project.basedir}/iotdb/tools" includes="*"> + <include name="*"/> + </fileset> + </copy> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> <!--using `mvn test` to run UT, `mvn verify` to run ITs Reference: https://antoniogoncalves.org/2012/12/13/lets-turn-integration-tests-with-maven-to-a-first-class-citizen/--> <plugin> @@ -186,51 +224,6 @@ <skipITs>${iotdb.it.skip}</skipITs> </configuration> </plugin> - <!-- for TsFile Checker --> - <!--<plugin>--> - <!--<groupId>org.apache.maven.plugins</groupId>--> - <!--<artifactId>maven-assembly-plugin</artifactId>--> - <!--<version>2.5.5</version>--> - <!--<configuration>--> - <!--<archive>--> - <!--<manifest>--> - <!--<addClasspath>true</addClasspath>--> - <!--<mainClass>org.apache.iotdb.db.tools.TsFileChecker</mainClass>--> - <!--</manifest>--> - <!--</archive>--> - <!--<descriptorRefs>--> - <!--<descriptorRef>jar-with-dependencies</descriptorRef>--> - <!--</descriptorRefs>--> - <!--</configuration>--> - <!--<executions>--> - <!--<execution>--> - <!--<id>make-assembly</id>--> - <!--<phase>package</phase>--> - <!--<goals>--> - <!--<goal>single</goal>--> - <!--</goals>--> - <!--</execution>--> - <!--</executions>--> - <!--</plugin>--> - <!-- Might require this in Eclipse --> - <!--plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>3.0.0</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>${project.basedir}/target/generated-sources/antlr3</source> - </sources> - </configuration> - </execution> - </executions> -</plugin--> </plugins> </build> <profiles>
