You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@amoro.apache.org by na...@apache.org on 2024/09/03 12:37:11 UTC
(amoro) branch master updated: [Amoro-3162] Pull module amoro-ams-server as amoro-ams directly (#3162)
This is an automated email from the ASF dual-hosted git repository.
nathanma pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git
The following commit(s) were added to refs/heads/master by this push:
new ef274b177 [Amoro-3162] Pull module amoro-ams-server as amoro-ams directly (#3162)
ef274b177 is described below
commit ef274b1770c3d3785dc0532202138039d9ef0225
Author: majin1102 <ma...@gmail.com>
AuthorDate: Tue Sep 3 20:37:06 2024 +0800
[Amoro-3162] Pull module amoro-ams-server as amoro-ams directly (#3162)
* Pull module amoro-ams-server as amoro-ams directly
* Modify README.md for the new module location
---------
Co-authored-by: majin.nathan <ma...@bytedance.com>
---
.github/labeler.yml | 4 +-
.github/workflows/docker-images.yml | 2 +-
.gitignore | 4 +-
README.md | 10 +-
amoro-ams/amoro-ams-server/pom.xml | 505 ---------------------
amoro-ams/pom.xml | 481 +++++++++++++++++++-
.../apache/amoro/server/AmoroManagementConf.java | 0
.../amoro/server/AmoroManagementConfValidator.java | 0
.../apache/amoro/server/AmoroServiceConstants.java | 0
.../apache/amoro/server/AmoroServiceContainer.java | 0
.../org/apache/amoro/server/AmsServiceMetrics.java | 0
.../amoro/server/DefaultOptimizingService.java | 0
.../java/org/apache/amoro/server/Environments.java | 0
.../amoro/server/HighAvailabilityContainer.java | 0
.../apache/amoro/server/RestCatalogService.java | 0
.../amoro/server/TableManagementService.java | 0
.../amoro/server/catalog/CatalogBuilder.java | 0
.../amoro/server/catalog/CatalogService.java | 0
.../apache/amoro/server/catalog/CatalogType.java | 0
.../amoro/server/catalog/ExternalCatalog.java | 0
.../amoro/server/catalog/InternalCatalog.java | 0
.../server/catalog/InternalIcebergCatalogImpl.java | 0
.../server/catalog/InternalMixedCatalogImpl.java | 0
.../amoro/server/catalog/MixedHiveCatalogImpl.java | 0
.../apache/amoro/server/catalog/ServerCatalog.java | 0
.../amoro/server/dashboard/APITokenManager.java | 0
.../amoro/server/dashboard/DashboardServer.java | 0
.../dashboard/MixedAndIcebergTableDescriptor.java | 0
.../server/dashboard/PlatformFileManager.java | 0
.../server/dashboard/ServerTableDescriptor.java | 0
.../server/dashboard/ServerTableProperties.java | 0
.../reverser/IcebergTableMetaExtract.java | 0
.../component/reverser/IcebergTypeToSparkType.java | 0
.../dashboard/controller/CatalogController.java | 0
.../controller/HealthCheckController.java | 0
.../dashboard/controller/LoginController.java | 0
.../dashboard/controller/OptimizerController.java | 0
.../controller/PlatformFileInfoController.java | 0
.../dashboard/controller/SettingController.java | 0
.../dashboard/controller/TableController.java | 0
.../dashboard/controller/TerminalController.java | 0
.../dashboard/controller/VersionController.java | 0
.../amoro/server/dashboard/model/ApiTokens.java | 0
.../dashboard/model/CatalogRegisterInfo.java | 0
.../server/dashboard/model/CatalogSettingInfo.java | 0
.../server/dashboard/model/HiveTableInfo.java | 0
.../dashboard/model/KafkaClusterSimpleInfo.java | 0
.../server/dashboard/model/LatestSessionInfo.java | 0
.../amoro/server/dashboard/model/LogInfo.java | 0
.../dashboard/model/OptimizerInstanceInfo.java | 0
.../dashboard/model/OptimizerResourceInfo.java | 0
.../server/dashboard/model/PlatformFileInfo.java | 0
.../amoro/server/dashboard/model/SessionInfo.java | 0
.../amoro/server/dashboard/model/SnapshotInfo.java | 0
.../amoro/server/dashboard/model/SqlExample.java | 0
.../amoro/server/dashboard/model/SqlResult.java | 0
.../amoro/server/dashboard/model/SqlStatus.java | 0
.../server/dashboard/model/TableBasicInfo.java | 0
.../amoro/server/dashboard/model/TableMeta.java | 0
.../server/dashboard/model/TableOperation.java | 0
.../dashboard/model/TableOptimizingInfo.java | 0
.../server/dashboard/model/TableStatistics.java | 0
.../server/dashboard/model/UpgradeHiveMeta.java | 0
.../server/dashboard/model/UpgradeRunningInfo.java | 0
.../server/dashboard/model/UpgradeStatus.java | 0
.../amoro/server/dashboard/model/VersionInfo.java | 0
.../server/dashboard/response/ErrorResponse.java | 0
.../server/dashboard/response/OkResponse.java | 0
.../server/dashboard/response/PageResult.java | 0
.../amoro/server/dashboard/response/Response.java | 0
.../amoro/server/dashboard/utils/AmsUtil.java | 0
.../amoro/server/dashboard/utils/CommonUtil.java | 0
.../dashboard/utils/DesensitizationUtil.java | 0
.../server/dashboard/utils/OptimizingUtil.java | 0
.../dashboard/utils/ParamSignatureCalculator.java | 0
.../server/dashboard/utils/PropertiesUtil.java | 0
.../server/dashboard/utils/TableStatCollector.java | 0
.../amoro/server/events/LoggingEventListener.java | 0
.../server/exception/AlreadyExistsException.java | 0
.../server/exception/AmoroRuntimeException.java | 0
.../server/exception/BlockerConflictException.java | 0
.../amoro/server/exception/ForbiddenException.java | 0
.../server/exception/IllegalMetadataException.java | 0
.../exception/IllegalTaskStateException.java | 0
.../server/exception/LoadingPluginException.java | 0
.../server/exception/ObjectNotExistsException.java | 0
.../exception/OptimizingClosedException.java | 0
.../exception/OptimizingCommitException.java | 0
.../server/exception/PersistenceException.java | 0
.../server/exception/PluginAuthException.java | 0
.../server/exception/PluginRetryAuthException.java | 0
.../server/exception/SignatureCheckException.java | 0
.../server/exception/TaskNotFoundException.java | 0
.../server/exception/TaskRuntimeException.java | 0
.../amoro/server/exception/UndefinedException.java | 0
.../server/manager/AbstractPluginManager.java | 0
.../server/manager/AbstractResourceContainer.java | 0
.../amoro/server/manager/ClassLoaderContext.java | 0
.../apache/amoro/server/manager/EventsManager.java | 0
.../org/apache/amoro/server/manager/ExecUtil.java | 0
.../server/manager/FlinkOptimizerContainer.java | 0
.../manager/KubernetesOptimizerContainer.java | 0
.../server/manager/LocalOptimizerContainer.java | 0
.../apache/amoro/server/manager/MetricManager.java | 0
.../amoro/server/manager/PluginConfiguration.java | 0
.../apache/amoro/server/manager/PluginManager.java | 0
.../server/manager/SparkOptimizerContainer.java | 0
.../amoro/server/metrics/MetricRegistry.java | 0
.../amoro/server/optimizing/KeyedTableCommit.java | 0
.../amoro/server/optimizing/MetricsSummary.java | 0
.../server/optimizing/OptimizerGroupMetrics.java | 0
.../amoro/server/optimizing/OptimizingProcess.java | 0
.../server/optimizing/OptimizingProcessMeta.java | 0
.../amoro/server/optimizing/OptimizingQueue.java | 0
.../amoro/server/optimizing/OptimizingStatus.java | 0
.../server/optimizing/OptimizingTaskMeta.java | 0
.../amoro/server/optimizing/OptimizingType.java | 0
.../amoro/server/optimizing/SchedulingPolicy.java | 0
.../amoro/server/optimizing/TaskRuntime.java | 0
.../server/optimizing/UnKeyedTableCommit.java | 0
.../maintainer/AutoCreateIcebergTagAction.java | 0
.../maintainer/IcebergTableMaintainer.java | 0
.../maintainer/MixedTableMaintainer.java | 0
.../optimizing/maintainer/TableMaintainer.java | 0
.../optimizing/plan/AbstractPartitionPlan.java | 0
.../optimizing/plan/CommonPartitionEvaluator.java | 0
.../optimizing/plan/IcebergPartitionPlan.java | 0
.../optimizing/plan/MixedHivePartitionPlan.java | 0
.../optimizing/plan/MixedIcebergPartitionPlan.java | 0
.../optimizing/plan/OptimizingEvaluator.java | 0
.../server/optimizing/plan/OptimizingPlanner.java | 0
.../server/optimizing/plan/PartitionEvaluator.java | 0
.../server/optimizing/plan/TaskDescriptor.java | 0
.../scan/IcebergTableFileScanHelper.java | 0
.../optimizing/scan/KeyedTableFileScanHelper.java | 0
.../optimizing/scan/TableFileScanHelper.java | 0
.../scan/UnkeyedTableFileScanHelper.java | 0
.../amoro/server/persistence/NestedSqlSession.java | 0
.../amoro/server/persistence/PersistentBase.java | 0
.../persistence/SqlSessionFactoryProvider.java | 0
.../server/persistence/StatedPersistentBase.java | 0
.../server/persistence/TaskFilesPersistence.java | 0
.../persistence/converter/JsonObjectConverter.java | 0
.../converter/List2StringConverter.java | 0
.../persistence/converter/Long2TsConverter.java | 0
.../persistence/converter/Map2StringConverter.java | 0
.../converter/MapLong2StringConverter.java | 0
.../converter/Object2ByteArrayConvert.java | 0
.../server/persistence/mapper/ApiTokensMapper.java | 0
.../persistence/mapper/CatalogMetaMapper.java | 0
.../server/persistence/mapper/OptimizerMapper.java | 0
.../persistence/mapper/OptimizingMapper.java | 0
.../persistence/mapper/PlatformFileMapper.java | 0
.../server/persistence/mapper/ResourceMapper.java | 0
.../persistence/mapper/TableBlockerMapper.java | 0
.../server/persistence/mapper/TableMetaMapper.java | 0
.../amoro/server/resource/ContainerMetadata.java | 0
.../amoro/server/resource/OptimizerInstance.java | 0
.../amoro/server/resource/OptimizerManager.java | 0
.../amoro/server/resource/OptimizerThread.java | 0
.../amoro/server/resource/QuotaProvider.java | 0
.../amoro/server/resource/ResourceContainers.java | 0
.../amoro/server/table/BasicTableSnapshot.java | 0
.../amoro/server/table/DefaultTableService.java | 0
.../amoro/server/table/KeyedTableSnapshot.java | 0
.../amoro/server/table/RuntimeHandlerChain.java | 0
.../amoro/server/table/TableConfigurations.java | 0
.../apache/amoro/server/table/TableManager.java | 0
.../apache/amoro/server/table/TableMetadata.java | 0
.../amoro/server/table/TableOptimizingMetrics.java | 0
.../table/TableOrphanFilesCleaningMetrics.java | 0
.../apache/amoro/server/table/TableRuntime.java | 0
.../amoro/server/table/TableRuntimeHandler.java | 0
.../amoro/server/table/TableRuntimeMeta.java | 0
.../apache/amoro/server/table/TableService.java | 0
.../apache/amoro/server/table/TableSnapshot.java | 0
.../amoro/server/table/TableSummaryMetrics.java | 0
.../amoro/server/table/blocker/TableBlocker.java | 0
.../server/table/executor/AsyncTableExecutors.java | 0
.../server/table/executor/BaseTableExecutor.java | 0
.../table/executor/BlockerExpiringExecutor.java | 0
.../DanglingDeleteFilesCleaningExecutor.java | 0
.../table/executor/DataExpiringExecutor.java | 0
.../table/executor/HiveCommitSyncExecutor.java | 0
.../table/executor/OptimizingCommitExecutor.java | 0
.../table/executor/OptimizingExpiringExecutor.java | 0
.../executor/OrphanFilesCleaningExecutor.java | 0
.../table/executor/SnapshotsExpiringExecutor.java | 0
.../executor/TableRuntimeRefreshExecutor.java | 0
.../table/executor/TagsAutoCreatingExecutor.java | 0
.../internal/IcebergInternalTableOperations.java | 0
.../table/internal/InternalIcebergCreator.java | 0
.../table/internal/InternalIcebergHandler.java | 0
.../internal/InternalMixedIcebergCreator.java | 0
.../internal/InternalMixedIcebergHandler.java | 0
.../table/internal/InternalTableConstants.java | 0
.../table/internal/InternalTableCreator.java | 0
.../table/internal/InternalTableHandler.java | 0
.../MixedIcebergInternalTableStoreOperations.java | 0
.../amoro/server/terminal/ExecutionResult.java | 0
.../amoro/server/terminal/ExecutionStatus.java | 0
.../amoro/server/terminal/JDBCResultSet.java | 0
.../amoro/server/terminal/SimpleResultSet.java | 0
.../amoro/server/terminal/SparkContextUtil.java | 0
.../amoro/server/terminal/StatementResult.java | 0
.../amoro/server/terminal/TerminalManager.java | 0
.../amoro/server/terminal/TerminalSession.java | 0
.../server/terminal/TerminalSessionContext.java | 0
.../server/terminal/TerminalSessionFactory.java | 0
.../server/terminal/kyuubi/KyuubiSession.java | 0
.../kyuubi/KyuubiTerminalSessionFactory.java | 0
.../server/terminal/local/LocalSessionFactory.java | 0
.../terminal/local/LocalTerminalSession.java | 0
.../apache/amoro/server/utils/CompressUtil.java | 0
.../apache/amoro/server/utils/FlinkClientUtil.java | 0
.../amoro/server/utils/HiveLocationUtil.java | 0
.../amoro/server/utils/IcebergTableUtil.java | 0
.../amoro/server/utils/InternalTableUtil.java | 0
.../amoro/server/utils/PreconditionUtils.java | 0
.../server/utils/StructuredOptionsSplitter.java | 0
.../amoro/server/utils/ThriftServiceProxy.java | 0
.../services/org.apache.amoro.events.EventListener | 0
.../org.apache.amoro.resource.ResourceContainer | 0
...he.amoro.table.descriptor.FormatTableDescriptor | 0
.../src/main/resources/derby/ams-derby-init.sql | 0
.../src/main/resources/log4j2.xml | 0
.../src/main/resources/mysql/ams-mysql-init.sql | 0
.../resources/mysql/upgrade-0.3.0-to-0.3.1.sql | 0
.../resources/mysql/upgrade-0.3.1-to-0.3.2.sql | 0
.../resources/mysql/upgrade-0.3.2-to-0.4.0.sql | 0
.../resources/mysql/upgrade-0.4.0-to-0.4.1.sql | 0
.../resources/mysql/upgrade-0.4.1-to-0.5.0.sql | 0
.../resources/mysql/upgrade-0.5.0-to-0.5.1.sql | 0
.../resources/mysql/upgrade-0.5.1-to-0.6.0.sql | 0
.../resources/mysql/upgrade-0.6.1-to-0.7.0.sql | 0
.../src/main/resources/mysql/upgrade.sql | 0
.../main/resources/postgres/ams-postgres-init.sql | 0
.../resources/postgres/upgrade-0.5.1-to-0.6.0.sql | 0
.../resources/postgres/upgrade-0.6.1-to-0.7.0.sql | 0
.../src/main/resources/postgres/upgrade.sql | 0
.../org/apache/amoro/server/AmsEnvironment.java | 0
.../amoro/server/RestCatalogServiceTestBase.java | 0
.../server/TestAmoroManagementConfValidator.java | 0
.../apache/amoro/server/TestAmsServiceMetrics.java | 0
.../amoro/server/TestDefaultOptimizingService.java | 0
.../server/TestInternalIcebergCatalogService.java | 0
.../server/TestInternalMixedCatalogService.java | 0
.../amoro/server/catalog/TableCatalogTestBase.java | 0
.../amoro/server/catalog/TestServerCatalog.java | 0
.../TestIcebergServerTableDescriptor.java | 0
.../utils/TestParamSignatureCalculator.java | 0
.../server/dashboard/utils/TestPropertiesUtil.java | 0
.../server/manager/TestAbstractPluginManager.java | 0
.../manager/TestFlinkOptimizerContainer.java | 0
.../manager/TestSparkOptimizerContainer.java | 0
.../amoro/server/metrics/MockedMetricReporter.java | 0
.../amoro/server/metrics/TestMetricRegistry.java | 0
.../server/optimizing/AbstractOptimizingTest.java | 0
.../server/optimizing/BaseOptimizingChecker.java | 0
.../server/optimizing/OptimizingTestHelpers.java | 0
.../optimizing/TestIcebergHadoopOptimizing.java | 0
.../server/optimizing/TestMixedHiveOptimizing.java | 0
.../optimizing/TestMixedIcebergOptimizing.java | 0
.../optimizing/TestOptimizingIntegration.java | 0
.../server/optimizing/TestOptimizingQueue.java | 0
.../optimizing/commit/TestMixIcebergCommit.java | 0
.../optimizing/commit/TestUnKeyedTableCommit.java | 0
.../optimizing/flow/CompleteOptimizingFlow.java | 0
.../amoro/server/optimizing/flow/DataReader.java | 0
.../optimizing/flow/RandomRecordGenerator.java | 0
.../flow/TestKeyedContinuousOptimizing.java | 0
.../flow/TestUnKeyedContinuousOptimizing.java | 0
.../flow/checker/AbstractHiveChecker.java | 0
.../flow/checker/AbstractSceneCountChecker.java | 0
.../flow/checker/DataConcurrencyChecker.java | 0
.../checker/FullOptimizingMove2HiveChecker.java | 0
.../checker/FullOptimizingWrite2HiveChecker.java | 0
.../flow/checker/MajorOptimizingChecker.java | 0
.../flow/checker/MinorOptimizingCheck.java | 0
.../flow/checker/OptimizingCountChecker.java | 0
.../flow/view/AbstractTableDataView.java | 0
.../optimizing/flow/view/KeyedTableDataView.java | 0
.../server/optimizing/flow/view/MatchResult.java | 0
.../server/optimizing/flow/view/TableDataView.java | 0
.../optimizing/flow/view/UnKeyedTableDataView.java | 0
.../maintainer/TestAutoCreateIcebergTagAction.java | 0
.../optimizing/maintainer/TestDataExpire.java | 0
.../optimizing/maintainer/TestDataExpireHive.java | 0
.../maintainer/TestDataExpireIceberg.java | 0
.../optimizing/maintainer/TestOrphanFileClean.java | 0
.../maintainer/TestOrphanFileCleanHive.java | 0
.../maintainer/TestOrphanFileCleanIceberg.java | 0
.../optimizing/maintainer/TestSnapshotExpire.java | 0
.../maintainer/TestSnapshotExpireHive.java | 0
.../maintainer/TestSnapshotExpireIceberg.java | 0
.../optimizing/plan/MixedTablePlanTestBase.java | 0
.../plan/TestHiveKeyedPartitionPlan.java | 0
.../plan/TestHiveOptimizingEvaluator.java | 0
.../plan/TestHiveUnkeyedPartitionPlan.java | 0
.../optimizing/plan/TestIcebergPartitionPlan.java | 0
.../optimizing/plan/TestKeyedPartitionPlan.java | 0
.../optimizing/plan/TestOptimizingEvaluator.java | 0
.../optimizing/plan/TestOptimizingPlanner.java | 0
.../optimizing/plan/TestUnkeyedPartitionPlan.java | 0
.../scan/TableFileScanHelperTestBase.java | 0
.../scan/TestHiveKeyedTableFileScanHelper.java | 0
.../scan/TestHiveUnkeyedTableFileScanHelper.java | 0
.../scan/TestIcebergTableFileScanHelper.java | 0
.../scan/TestKeyedTableFileScanHelper.java | 0
.../scan/TestUnkeyedTableFileScanHelper.java | 0
.../server/persistence/TestNestedSqlSession.java | 0
.../server/persistence/TestPersistentBase.java | 0
.../persistence/TestStatedPersistentBase.java | 0
.../amoro/server/table/AMSTableTestBase.java | 0
.../amoro/server/table/DerbyPersistence.java | 0
.../amoro/server/table/TableServiceTestBase.java | 0
.../amoro/server/table/TestCatalogService.java | 0
.../amoro/server/table/TestDatabaseService.java | 0
.../server/table/TestTableRuntimeHandler.java | 0
.../server/table/TestTableRuntimeManager.java | 0
.../amoro/server/table/TestTableService.java | 0
.../server/table/TestTableSummaryMetrics.java | 0
.../server/table/executor/ExecutorTestBase.java | 0
.../executor/TestBlockerExpiringExecutor.java | 0
.../apache/amoro/server/util/TestCompressUtil.java | 0
.../amoro/server/util/TestConfigurationUtil.java | 0
.../amoro/server/util/TestIcebergTableUtil.java | 0
.../org.apache.amoro.metrics.MetricReporter | 0
...er.manager.TestAbstractPluginManager$TestPlugin | 0
.../src/test/resources/config.yaml | 0
.../src/test/resources/flink-conf.yaml | 0
.../src/test/resources/log4j2.xml | 0
.../org.mockito.plugins.MockMaker | 0
charts/amoro/values.yaml | 4 +-
{amoro-ams/dist => dist}/pom.xml | 4 +-
.../dist => dist}/src/main/amoro-bin/bin/ams.sh | 0
.../src/main/amoro-bin/bin/load-config.sh | 0
.../src/main/amoro-bin/bin/optimizer.sh | 0
.../src/main/amoro-bin/conf/config.yaml | 0
.../src/main/amoro-bin/conf/jvm.properties | 0
.../src/main/amoro-bin/conf/log4j2.xml | 0
.../src/main/amoro-bin/conf/optimize/log4j2.xml | 0
.../amoro-bin/conf/plugins/event-listeners.yaml | 0
.../amoro-bin/conf/plugins/metric-reporters.yaml | 0
.../dist => dist}/src/main/assemblies/bin.xml | 26 +-
docker/amoro/Dockerfile | 2 +-
docker/build.sh | 4 +-
docs/admin-guides/deployment.md | 2 +-
pom.xml | 1 +
tools/releasing/create_binary_release.sh | 2 +-
350 files changed, 505 insertions(+), 546 deletions(-)
diff --git a/.github/labeler.yml b/.github/labeler.yml
index cda0eca53..9bc75d6f0 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -32,7 +32,7 @@
"type:build":
- "**/*pom.xml"
- - "amoro-ams/dist/**/*"
+ - "dist/**/*"
- "docker/**/*"
- "charts/**/"
@@ -45,7 +45,7 @@
"module:ams-server":
- "amoro-ams/amoro-ams-api/**/*"
- - "amoro-ams/amoro-ams-server/**/*"
+ - "amoro-ams/**/*"
"module:ams-dashboard":
- "amoro-web/**/*"
diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml
index 43b9508a0..3bb7158db 100644
--- a/.github/workflows/docker-images.yml
+++ b/.github/workflows/docker-images.yml
@@ -86,7 +86,7 @@ jobs:
echo "MVN_HADOOP=-Phadoop2" >> $GITHUB_ENV
- name: Build dist module with Maven
- run: mvn clean package -pl 'amoro-ams/dist' -am -e ${MVN_HADOOP} -DskipTests -B -ntp
+ run: mvn clean package -pl 'dist' -am -e ${MVN_HADOOP} -DskipTests -B -ntp
- name: Build and Push Amoro Docker Image
uses: docker/build-push-action@v4
diff --git a/.gitignore b/.gitignore
index e7a2dc320..435bca0a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,5 +70,5 @@ conf/
amoro-web/src/main/resources/static/
amoro-web/node/
-!amoro-ams/dist/src/main/amoro-bin/bin/
-!amoro-ams/dist/src/main/amoro-bin/conf/
+!dist/src/main/amoro-bin/bin/
+!dist/src/main/amoro-bin/conf/
diff --git a/README.md b/README.md
index 9fbf3b58d..dae677828 100644
--- a/README.md
+++ b/README.md
@@ -95,15 +95,13 @@ Amoro support multiple processing engines for Mixed format as below:
Amoro contains modules as below:
-- `amoro-core` contains core abstractions and common implementation for other modules
+- `amoro-common` contains core abstractions and common implementation for other modules
+- `amoro-ams` is amoro management service module
+- `amoro-web` is the dashboard frontend for ams
+- `amoro-optimizer` provides default optimizer implementation
- `amoro-iceberg-format` contains integration of Apache Iceberg format
- `amoro-hudi-format` contains integration of Apache Hudi format
- `amoro-paimon-format` contains integration of Apache Paimon format
-- `amoro-ams` is amoro management service module
- - `amoro-ams-api` contains ams thrift api and common interfaces
- - `amoro-ams-dashboard` is the dashboard frontend for ams
- - `amoro-ams-server` is the backend server for ams
- - `amoro-optimizer` provides default optimizer implementation
- `amoro-mixed-format` provides Mixed format implementation
- `amoro-mixed-format-hive` integrates with Apache Hive and implements Mixed Hive format
- `amoro-mixed-format-flink` provides Flink connectors for Mixed format tables (use amoro-flink-runtime for a shaded version)
diff --git a/amoro-ams/amoro-ams-server/pom.xml b/amoro-ams/amoro-ams-server/pom.xml
deleted file mode 100644
index f6c86ee5e..000000000
--- a/amoro-ams/amoro-ams-server/pom.xml
+++ /dev/null
@@ -1,505 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>org.apache.amoro</groupId>
- <artifactId>amoro-ams</artifactId>
- <version>0.8-SNAPSHOT</version>
- </parent>
-
- <artifactId>amoro-ams-server</artifactId>
- <packaging>jar</packaging>
- <name>Amoro Project AMS Server</name>
- <url>https://amoro.apache.org</url>
-
- <properties>
- <git-commit-id-plugin.fail-on-no-git-dir>false</git-commit-id-plugin.fail-on-no-git-dir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.amoro</groupId>
- <artifactId>amoro-iceberg-format</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.amoro</groupId>
- <artifactId>amoro-mixed-format-hive</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty.orbit</groupId>
- <artifactId>javax.servlet</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.amoro</groupId>
- <artifactId>amoro-web</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>io.fabric8</groupId>
- <artifactId>kubernetes-client</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-core_2.12</artifactId>
- <version>${terminal.spark.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.parquet</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.curator</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.rocksdb</groupId>
- <artifactId>rocksdbjni</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-sql_2.12</artifactId>
- <version>${terminal.spark.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.parquet</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.orc</groupId>
- <artifactId>orc-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.orc</groupId>
- <artifactId>orc-mapreduce</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.rocksdb</groupId>
- <artifactId>rocksdbjni</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-hive_2.12</artifactId>
- <version>${terminal.spark.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-metastore</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jodd</groupId>
- <artifactId>jodd-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.mybatis</groupId>
- <artifactId>mybatis</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- </dependency>
-
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- </dependency>
-
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </dependency>
-
- <dependency>
- <groupId>io.javalin</groupId>
- <artifactId>javalin</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
-
- <dependency>
- <!-- API bridge between log4j 1 and 2 -->
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.kyuubi</groupId>
- <artifactId>kyuubi-hive-jdbc-shaded</artifactId>
- </dependency>
-
- <!-- aws dependencies -->
- <dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>s3</artifactId>
- </dependency>
-
- <dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>glue</artifactId>
- </dependency>
-
- <dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>kms</artifactId>
- </dependency>
-
- <dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>dynamodb</artifactId>
- </dependency>
-
- <dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>sts</artifactId>
- </dependency>
-
- <dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>url-connection-client</artifactId>
- </dependency>
-
- <dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>s3-transfer-manager</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-aws</artifactId>
- </dependency>
-
- <!-- flink dependencies -->
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime-web</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-rpc-akka-loader</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-zookeeper-3</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- apache hudi dependencies -->
- <dependency>
- <groupId>org.apache.hudi</groupId>
- <artifactId>hudi-java-client</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.orc</groupId>
- <artifactId>orc-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- runtime dependencies -->
- <dependency>
- <groupId>org.apache.amoro</groupId>
- <artifactId>amoro-mixed-format-spark-${terminal.spark.major.version}</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.amoro</groupId>
- <artifactId>amoro-optimizer-standalone</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>org.apache.amoro</groupId>
- <artifactId>amoro-common</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.amoro</groupId>
- <artifactId>amoro-iceberg-format</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.amoro</groupId>
- <artifactId>amoro-mixed-format-hive</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.amoro</groupId>
- <artifactId>amoro-paimon-format</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.amoro</groupId>
- <artifactId>amoro-paimon-format</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-test</artifactId>
- <version>${curator.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.iceberg</groupId>
- <artifactId>iceberg-data</artifactId>
- <version>${iceberg.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>pl.project13.maven</groupId>
- <artifactId>git-commit-id-plugin</artifactId>
- <version>4.0.0</version>
- <executions>
- <execution>
- <id>get-the-git-infos</id>
- <goals>
- <goal>revision</goal>
- </goals>
- <phase>initialize</phase>
- </execution>
- </executions>
- <configuration>
- <failOnNoGitDirectory>${git-commit-id-plugin.fail-on-no-git-dir}</failOnNoGitDirectory>
- <failOnUnableToExtractRepoInfo>${git-commit-id-plugin.fail-on-no-git-dir}</failOnUnableToExtractRepoInfo>
- <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
- <generateGitPropertiesFile>true</generateGitPropertiesFile>
- <generateGitPropertiesFilename>
- ${project.build.outputDirectory}/amoro/git.properties
- </generateGitPropertiesFilename>
- <includeOnlyProperties>
- <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
- <includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
- <includeOnlyProperty>^git.commit.time$</includeOnlyProperty>
- </includeOnlyProperties>
- <commitIdGenerationMode>full</commitIdGenerationMode>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>
- ${project.build.directory}/amoro-ams-server-dependency/lib
- </outputDirectory>
- <includeScope>runtime</includeScope>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>support-paimon-format</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.amoro</groupId>
- <artifactId>amoro-paimon-format</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>support-hudi-format</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.amoro</groupId>
- <artifactId>amoro-hudi-format</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>support-all-formats</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.amoro</groupId>
- <artifactId>amoro-paimon-format</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.amoro</groupId>
- <artifactId>amoro-hudi-format</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>fail-on-no-git-dir</id>
- <properties>
- <git-commit-id-plugin.fail-on-no-git-dir>true</git-commit-id-plugin.fail-on-no-git-dir>
- </properties>
- </profile>
- </profiles>
-</project>
diff --git a/amoro-ams/pom.xml b/amoro-ams/pom.xml
index 9a1503cad..7b5bf17f2 100644
--- a/amoro-ams/pom.xml
+++ b/amoro-ams/pom.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,9 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
+<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>
@@ -28,13 +30,476 @@
</parent>
<artifactId>amoro-ams</artifactId>
- <packaging>pom</packaging>
- <name>Amoro Project AMS Parent</name>
+ <packaging>jar</packaging>
+ <name>Amoro Project AMS Server</name>
<url>https://amoro.apache.org</url>
- <modules>
- <module>amoro-ams-server</module>
- <module>dist</module>
- </modules>
+ <properties>
+ <git-commit-id-plugin.fail-on-no-git-dir>false</git-commit-id-plugin.fail-on-no-git-dir>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.amoro</groupId>
+ <artifactId>amoro-iceberg-format</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.amoro</groupId>
+ <artifactId>amoro-mixed-format-hive</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.amoro</groupId>
+ <artifactId>amoro-web</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-client</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-core_2.12</artifactId>
+ <version>${terminal.spark.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.parquet</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.rocksdb</groupId>
+ <artifactId>rocksdbjni</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-sql_2.12</artifactId>
+ <version>${terminal.spark.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.parquet</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.orc</groupId>
+ <artifactId>orc-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.orc</groupId>
+ <artifactId>orc-mapreduce</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.rocksdb</groupId>
+ <artifactId>rocksdbjni</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-hive_2.12</artifactId>
+ <version>${terminal.spark.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-metastore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jodd</groupId>
+ <artifactId>jodd-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.javalin</groupId>
+ <artifactId>javalin</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <!-- API bridge between log4j 1 and 2 -->
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.kyuubi</groupId>
+ <artifactId>kyuubi-hive-jdbc-shaded</artifactId>
+ </dependency>
+
+ <!-- aws dependencies -->
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>s3</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>glue</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>kms</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>dynamodb</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>sts</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>url-connection-client</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>s3-transfer-manager</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-aws</artifactId>
+ </dependency>
+
+ <!-- flink dependencies -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-runtime-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-rpc-akka-loader</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-shaded-zookeeper-3</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- apache hudi dependencies -->
+ <dependency>
+ <groupId>org.apache.hudi</groupId>
+ <artifactId>hudi-java-client</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.orc</groupId>
+ <artifactId>orc-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- runtime dependencies -->
+ <dependency>
+ <groupId>org.apache.amoro</groupId>
+ <artifactId>amoro-mixed-format-spark-${terminal.spark.major.version}</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.amoro</groupId>
+ <artifactId>amoro-optimizer-standalone</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.apache.amoro</groupId>
+ <artifactId>amoro-common</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.amoro</groupId>
+ <artifactId>amoro-iceberg-format</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.amoro</groupId>
+ <artifactId>amoro-mixed-format-hive</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.amoro</groupId>
+ <artifactId>amoro-paimon-format</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.amoro</groupId>
+ <artifactId>amoro-paimon-format</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-test</artifactId>
+ <version>${curator.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.iceberg</groupId>
+ <artifactId>iceberg-data</artifactId>
+ <version>${iceberg.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ <version>4.0.0</version>
+ <executions>
+ <execution>
+ <id>get-the-git-infos</id>
+ <goals>
+ <goal>revision</goal>
+ </goals>
+ <phase>initialize</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <failOnNoGitDirectory>${git-commit-id-plugin.fail-on-no-git-dir}</failOnNoGitDirectory>
+ <failOnUnableToExtractRepoInfo>${git-commit-id-plugin.fail-on-no-git-dir}</failOnUnableToExtractRepoInfo>
+ <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+ <generateGitPropertiesFile>true</generateGitPropertiesFile>
+ <generateGitPropertiesFilename>
+ ${project.build.outputDirectory}/amoro/git.properties
+ </generateGitPropertiesFilename>
+ <includeOnlyProperties>
+ <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+ <includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
+ <includeOnlyProperty>^git.commit.time$</includeOnlyProperty>
+ </includeOnlyProperties>
+ <commitIdGenerationMode>full</commitIdGenerationMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>
+ ${project.build.directory}/amoro-ams-dependency/lib
+ </outputDirectory>
+ <includeScope>runtime</includeScope>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>support-paimon-format</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.amoro</groupId>
+ <artifactId>amoro-paimon-format</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>support-hudi-format</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.amoro</groupId>
+ <artifactId>amoro-hudi-format</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>support-all-formats</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.amoro</groupId>
+ <artifactId>amoro-paimon-format</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.amoro</groupId>
+ <artifactId>amoro-hudi-format</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>fail-on-no-git-dir</id>
+ <properties>
+ <git-commit-id-plugin.fail-on-no-git-dir>true</git-commit-id-plugin.fail-on-no-git-dir>
+ </properties>
+ </profile>
+ </profiles>
</project>
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmoroManagementConf.java b/amoro-ams/src/main/java/org/apache/amoro/server/AmoroManagementConf.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmoroManagementConf.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/AmoroManagementConf.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmoroManagementConfValidator.java b/amoro-ams/src/main/java/org/apache/amoro/server/AmoroManagementConfValidator.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmoroManagementConfValidator.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/AmoroManagementConfValidator.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmoroServiceConstants.java b/amoro-ams/src/main/java/org/apache/amoro/server/AmoroServiceConstants.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmoroServiceConstants.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/AmoroServiceConstants.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmoroServiceContainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/AmoroServiceContainer.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmoroServiceContainer.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/AmoroServiceContainer.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmsServiceMetrics.java b/amoro-ams/src/main/java/org/apache/amoro/server/AmsServiceMetrics.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/AmsServiceMetrics.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/AmsServiceMetrics.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java b/amoro-ams/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/Environments.java b/amoro-ams/src/main/java/org/apache/amoro/server/Environments.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/Environments.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/Environments.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/HighAvailabilityContainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/HighAvailabilityContainer.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/HighAvailabilityContainer.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/HighAvailabilityContainer.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/RestCatalogService.java b/amoro-ams/src/main/java/org/apache/amoro/server/RestCatalogService.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/RestCatalogService.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/RestCatalogService.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/TableManagementService.java b/amoro-ams/src/main/java/org/apache/amoro/server/TableManagementService.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/TableManagementService.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/TableManagementService.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/CatalogBuilder.java b/amoro-ams/src/main/java/org/apache/amoro/server/catalog/CatalogBuilder.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/CatalogBuilder.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/catalog/CatalogBuilder.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/CatalogService.java b/amoro-ams/src/main/java/org/apache/amoro/server/catalog/CatalogService.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/CatalogService.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/catalog/CatalogService.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/CatalogType.java b/amoro-ams/src/main/java/org/apache/amoro/server/catalog/CatalogType.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/CatalogType.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/catalog/CatalogType.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/ExternalCatalog.java b/amoro-ams/src/main/java/org/apache/amoro/server/catalog/ExternalCatalog.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/ExternalCatalog.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/catalog/ExternalCatalog.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalCatalog.java b/amoro-ams/src/main/java/org/apache/amoro/server/catalog/InternalCatalog.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalCatalog.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/catalog/InternalCatalog.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalIcebergCatalogImpl.java b/amoro-ams/src/main/java/org/apache/amoro/server/catalog/InternalIcebergCatalogImpl.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalIcebergCatalogImpl.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/catalog/InternalIcebergCatalogImpl.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalMixedCatalogImpl.java b/amoro-ams/src/main/java/org/apache/amoro/server/catalog/InternalMixedCatalogImpl.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalMixedCatalogImpl.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/catalog/InternalMixedCatalogImpl.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/MixedHiveCatalogImpl.java b/amoro-ams/src/main/java/org/apache/amoro/server/catalog/MixedHiveCatalogImpl.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/MixedHiveCatalogImpl.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/catalog/MixedHiveCatalogImpl.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/ServerCatalog.java b/amoro-ams/src/main/java/org/apache/amoro/server/catalog/ServerCatalog.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/ServerCatalog.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/catalog/ServerCatalog.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/APITokenManager.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/APITokenManager.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/APITokenManager.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/APITokenManager.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/PlatformFileManager.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/PlatformFileManager.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/PlatformFileManager.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/PlatformFileManager.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/ServerTableDescriptor.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/ServerTableDescriptor.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/ServerTableDescriptor.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/ServerTableDescriptor.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/ServerTableProperties.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/ServerTableProperties.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/ServerTableProperties.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/ServerTableProperties.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTableMetaExtract.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTableMetaExtract.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTableMetaExtract.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTableMetaExtract.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTypeToSparkType.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTypeToSparkType.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTypeToSparkType.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTypeToSparkType.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/CatalogController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/CatalogController.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/CatalogController.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/CatalogController.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/HealthCheckController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/HealthCheckController.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/HealthCheckController.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/HealthCheckController.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/LoginController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/LoginController.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/LoginController.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/LoginController.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerController.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerController.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerController.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/PlatformFileInfoController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/PlatformFileInfoController.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/PlatformFileInfoController.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/PlatformFileInfoController.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/SettingController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/SettingController.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/SettingController.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/SettingController.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TerminalController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/TerminalController.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TerminalController.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/TerminalController.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/VersionController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/VersionController.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/VersionController.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/VersionController.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/ApiTokens.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/ApiTokens.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/ApiTokens.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/ApiTokens.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/CatalogRegisterInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/CatalogRegisterInfo.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/CatalogRegisterInfo.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/CatalogRegisterInfo.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/CatalogSettingInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/CatalogSettingInfo.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/CatalogSettingInfo.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/CatalogSettingInfo.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/HiveTableInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/HiveTableInfo.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/HiveTableInfo.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/HiveTableInfo.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/KafkaClusterSimpleInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/KafkaClusterSimpleInfo.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/KafkaClusterSimpleInfo.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/KafkaClusterSimpleInfo.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/LatestSessionInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/LatestSessionInfo.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/LatestSessionInfo.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/LatestSessionInfo.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/LogInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/LogInfo.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/LogInfo.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/LogInfo.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerInstanceInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerInstanceInfo.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerInstanceInfo.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerInstanceInfo.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerResourceInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerResourceInfo.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerResourceInfo.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerResourceInfo.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/PlatformFileInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/PlatformFileInfo.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/PlatformFileInfo.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/PlatformFileInfo.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SessionInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/SessionInfo.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SessionInfo.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/SessionInfo.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SnapshotInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/SnapshotInfo.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SnapshotInfo.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/SnapshotInfo.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SqlExample.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/SqlExample.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SqlExample.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/SqlExample.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SqlResult.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/SqlResult.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SqlResult.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/SqlResult.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SqlStatus.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/SqlStatus.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SqlStatus.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/SqlStatus.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableBasicInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/TableBasicInfo.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableBasicInfo.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/TableBasicInfo.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableMeta.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/TableMeta.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableMeta.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/TableMeta.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableOperation.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/TableOperation.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableOperation.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/TableOperation.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableOptimizingInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/TableOptimizingInfo.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableOptimizingInfo.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/TableOptimizingInfo.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableStatistics.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/TableStatistics.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableStatistics.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/TableStatistics.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeHiveMeta.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeHiveMeta.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeHiveMeta.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeHiveMeta.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeRunningInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeRunningInfo.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeRunningInfo.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeRunningInfo.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeStatus.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeStatus.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeStatus.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeStatus.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/VersionInfo.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/VersionInfo.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/VersionInfo.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/model/VersionInfo.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/ErrorResponse.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/response/ErrorResponse.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/ErrorResponse.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/response/ErrorResponse.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/OkResponse.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/response/OkResponse.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/OkResponse.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/response/OkResponse.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/PageResult.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/response/PageResult.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/PageResult.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/response/PageResult.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/Response.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/response/Response.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/Response.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/response/Response.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/AmsUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/AmsUtil.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/AmsUtil.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/AmsUtil.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/CommonUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/CommonUtil.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/CommonUtil.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/CommonUtil.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/DesensitizationUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/DesensitizationUtil.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/DesensitizationUtil.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/DesensitizationUtil.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/OptimizingUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/OptimizingUtil.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/OptimizingUtil.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/OptimizingUtil.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/ParamSignatureCalculator.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/ParamSignatureCalculator.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/ParamSignatureCalculator.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/ParamSignatureCalculator.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/PropertiesUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/PropertiesUtil.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/PropertiesUtil.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/PropertiesUtil.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/TableStatCollector.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/TableStatCollector.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/TableStatCollector.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/dashboard/utils/TableStatCollector.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/events/LoggingEventListener.java b/amoro-ams/src/main/java/org/apache/amoro/server/events/LoggingEventListener.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/events/LoggingEventListener.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/events/LoggingEventListener.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/AlreadyExistsException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/AlreadyExistsException.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/AlreadyExistsException.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/AlreadyExistsException.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/AmoroRuntimeException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/AmoroRuntimeException.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/AmoroRuntimeException.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/AmoroRuntimeException.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/BlockerConflictException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/BlockerConflictException.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/BlockerConflictException.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/BlockerConflictException.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/ForbiddenException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/ForbiddenException.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/ForbiddenException.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/ForbiddenException.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/IllegalMetadataException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/IllegalMetadataException.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/IllegalMetadataException.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/IllegalMetadataException.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/IllegalTaskStateException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/IllegalTaskStateException.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/IllegalTaskStateException.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/IllegalTaskStateException.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/LoadingPluginException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/LoadingPluginException.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/LoadingPluginException.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/LoadingPluginException.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/ObjectNotExistsException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/ObjectNotExistsException.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/ObjectNotExistsException.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/ObjectNotExistsException.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/OptimizingClosedException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/OptimizingClosedException.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/OptimizingClosedException.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/OptimizingClosedException.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/OptimizingCommitException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/OptimizingCommitException.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/OptimizingCommitException.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/OptimizingCommitException.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/PersistenceException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/PersistenceException.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/PersistenceException.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/PersistenceException.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/PluginAuthException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/PluginAuthException.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/PluginAuthException.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/PluginAuthException.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/PluginRetryAuthException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/PluginRetryAuthException.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/PluginRetryAuthException.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/PluginRetryAuthException.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/SignatureCheckException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/SignatureCheckException.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/SignatureCheckException.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/SignatureCheckException.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/TaskNotFoundException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/TaskNotFoundException.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/TaskNotFoundException.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/TaskNotFoundException.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/TaskRuntimeException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/TaskRuntimeException.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/TaskRuntimeException.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/TaskRuntimeException.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/UndefinedException.java b/amoro-ams/src/main/java/org/apache/amoro/server/exception/UndefinedException.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/UndefinedException.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/exception/UndefinedException.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/AbstractPluginManager.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/AbstractPluginManager.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/AbstractPluginManager.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/AbstractPluginManager.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/AbstractResourceContainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/AbstractResourceContainer.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/AbstractResourceContainer.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/AbstractResourceContainer.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/ClassLoaderContext.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/ClassLoaderContext.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/ClassLoaderContext.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/ClassLoaderContext.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/EventsManager.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/EventsManager.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/EventsManager.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/EventsManager.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/ExecUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/ExecUtil.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/ExecUtil.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/ExecUtil.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/FlinkOptimizerContainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/FlinkOptimizerContainer.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/FlinkOptimizerContainer.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/FlinkOptimizerContainer.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/KubernetesOptimizerContainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/KubernetesOptimizerContainer.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/KubernetesOptimizerContainer.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/KubernetesOptimizerContainer.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/LocalOptimizerContainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/LocalOptimizerContainer.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/LocalOptimizerContainer.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/LocalOptimizerContainer.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/MetricManager.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/MetricManager.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/MetricManager.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/MetricManager.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/PluginConfiguration.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/PluginConfiguration.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/PluginConfiguration.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/PluginConfiguration.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/PluginManager.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/PluginManager.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/PluginManager.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/PluginManager.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/SparkOptimizerContainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/SparkOptimizerContainer.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/SparkOptimizerContainer.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/manager/SparkOptimizerContainer.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/metrics/MetricRegistry.java b/amoro-ams/src/main/java/org/apache/amoro/server/metrics/MetricRegistry.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/metrics/MetricRegistry.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/metrics/MetricRegistry.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/KeyedTableCommit.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/KeyedTableCommit.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/KeyedTableCommit.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/KeyedTableCommit.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/MetricsSummary.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/MetricsSummary.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/MetricsSummary.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/MetricsSummary.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizerGroupMetrics.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizerGroupMetrics.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizerGroupMetrics.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizerGroupMetrics.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcess.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcess.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcess.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcess.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcessMeta.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcessMeta.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcessMeta.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcessMeta.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingQueue.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingQueue.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingQueue.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingQueue.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingStatus.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingStatus.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingStatus.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingStatus.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingTaskMeta.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingTaskMeta.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingTaskMeta.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingTaskMeta.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingType.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingType.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingType.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/OptimizingType.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/SchedulingPolicy.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/SchedulingPolicy.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/SchedulingPolicy.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/SchedulingPolicy.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/TaskRuntime.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/TaskRuntime.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/TaskRuntime.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/TaskRuntime.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/UnKeyedTableCommit.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/UnKeyedTableCommit.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/UnKeyedTableCommit.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/UnKeyedTableCommit.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/AutoCreateIcebergTagAction.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/maintainer/AutoCreateIcebergTagAction.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/AutoCreateIcebergTagAction.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/maintainer/AutoCreateIcebergTagAction.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/IcebergTableMaintainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/maintainer/IcebergTableMaintainer.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/IcebergTableMaintainer.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/maintainer/IcebergTableMaintainer.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/MixedTableMaintainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/maintainer/MixedTableMaintainer.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/MixedTableMaintainer.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/maintainer/MixedTableMaintainer.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/TableMaintainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/maintainer/TableMaintainer.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/TableMaintainer.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/maintainer/TableMaintainer.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/AbstractPartitionPlan.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/AbstractPartitionPlan.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/AbstractPartitionPlan.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/AbstractPartitionPlan.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/CommonPartitionEvaluator.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/CommonPartitionEvaluator.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/CommonPartitionEvaluator.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/CommonPartitionEvaluator.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/IcebergPartitionPlan.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/IcebergPartitionPlan.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/IcebergPartitionPlan.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/IcebergPartitionPlan.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/MixedHivePartitionPlan.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/MixedHivePartitionPlan.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/MixedHivePartitionPlan.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/MixedHivePartitionPlan.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/MixedIcebergPartitionPlan.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/MixedIcebergPartitionPlan.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/MixedIcebergPartitionPlan.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/MixedIcebergPartitionPlan.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingEvaluator.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingEvaluator.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingEvaluator.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingEvaluator.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingPlanner.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingPlanner.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingPlanner.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingPlanner.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/PartitionEvaluator.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/PartitionEvaluator.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/PartitionEvaluator.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/PartitionEvaluator.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/TaskDescriptor.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/TaskDescriptor.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/TaskDescriptor.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/plan/TaskDescriptor.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/IcebergTableFileScanHelper.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/scan/IcebergTableFileScanHelper.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/IcebergTableFileScanHelper.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/scan/IcebergTableFileScanHelper.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/KeyedTableFileScanHelper.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/scan/KeyedTableFileScanHelper.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/KeyedTableFileScanHelper.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/scan/KeyedTableFileScanHelper.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelper.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelper.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelper.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelper.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/UnkeyedTableFileScanHelper.java b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/scan/UnkeyedTableFileScanHelper.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/UnkeyedTableFileScanHelper.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/optimizing/scan/UnkeyedTableFileScanHelper.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/NestedSqlSession.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/NestedSqlSession.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/NestedSqlSession.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/NestedSqlSession.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/PersistentBase.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/PersistentBase.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/PersistentBase.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/PersistentBase.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/SqlSessionFactoryProvider.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/SqlSessionFactoryProvider.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/SqlSessionFactoryProvider.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/SqlSessionFactoryProvider.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/StatedPersistentBase.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/StatedPersistentBase.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/StatedPersistentBase.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/StatedPersistentBase.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/TaskFilesPersistence.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/TaskFilesPersistence.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/TaskFilesPersistence.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/TaskFilesPersistence.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/JsonObjectConverter.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/JsonObjectConverter.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/JsonObjectConverter.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/JsonObjectConverter.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/List2StringConverter.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/List2StringConverter.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/List2StringConverter.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/List2StringConverter.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/Long2TsConverter.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/Long2TsConverter.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/Long2TsConverter.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/Long2TsConverter.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/Map2StringConverter.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/Map2StringConverter.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/Map2StringConverter.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/Map2StringConverter.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/MapLong2StringConverter.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/MapLong2StringConverter.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/MapLong2StringConverter.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/MapLong2StringConverter.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/Object2ByteArrayConvert.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/Object2ByteArrayConvert.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/Object2ByteArrayConvert.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/converter/Object2ByteArrayConvert.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/ApiTokensMapper.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/ApiTokensMapper.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/ApiTokensMapper.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/ApiTokensMapper.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/CatalogMetaMapper.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/CatalogMetaMapper.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/CatalogMetaMapper.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/CatalogMetaMapper.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizerMapper.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizerMapper.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizerMapper.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizerMapper.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizingMapper.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizingMapper.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizingMapper.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizingMapper.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/PlatformFileMapper.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/PlatformFileMapper.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/PlatformFileMapper.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/PlatformFileMapper.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/ResourceMapper.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/ResourceMapper.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/ResourceMapper.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/ResourceMapper.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/TableBlockerMapper.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/TableBlockerMapper.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/TableBlockerMapper.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/TableBlockerMapper.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/TableMetaMapper.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/TableMetaMapper.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/TableMetaMapper.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/TableMetaMapper.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/ContainerMetadata.java b/amoro-ams/src/main/java/org/apache/amoro/server/resource/ContainerMetadata.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/ContainerMetadata.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/resource/ContainerMetadata.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/OptimizerInstance.java b/amoro-ams/src/main/java/org/apache/amoro/server/resource/OptimizerInstance.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/OptimizerInstance.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/resource/OptimizerInstance.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/OptimizerManager.java b/amoro-ams/src/main/java/org/apache/amoro/server/resource/OptimizerManager.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/OptimizerManager.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/resource/OptimizerManager.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/OptimizerThread.java b/amoro-ams/src/main/java/org/apache/amoro/server/resource/OptimizerThread.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/OptimizerThread.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/resource/OptimizerThread.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/QuotaProvider.java b/amoro-ams/src/main/java/org/apache/amoro/server/resource/QuotaProvider.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/QuotaProvider.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/resource/QuotaProvider.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/ResourceContainers.java b/amoro-ams/src/main/java/org/apache/amoro/server/resource/ResourceContainers.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/ResourceContainers.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/resource/ResourceContainers.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/BasicTableSnapshot.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/BasicTableSnapshot.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/BasicTableSnapshot.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/BasicTableSnapshot.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/DefaultTableService.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/DefaultTableService.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/DefaultTableService.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/DefaultTableService.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/KeyedTableSnapshot.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/KeyedTableSnapshot.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/KeyedTableSnapshot.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/KeyedTableSnapshot.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/RuntimeHandlerChain.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/RuntimeHandlerChain.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/RuntimeHandlerChain.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/RuntimeHandlerChain.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableConfigurations.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableConfigurations.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableConfigurations.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableConfigurations.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableManager.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableManager.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableManager.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableManager.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableMetadata.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableMetadata.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableMetadata.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableMetadata.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableOptimizingMetrics.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableOptimizingMetrics.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableOptimizingMetrics.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableOptimizingMetrics.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableOrphanFilesCleaningMetrics.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableOrphanFilesCleaningMetrics.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableOrphanFilesCleaningMetrics.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableOrphanFilesCleaningMetrics.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableRuntime.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableRuntime.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableRuntime.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableRuntime.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableRuntimeHandler.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableRuntimeHandler.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableRuntimeHandler.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableRuntimeHandler.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableRuntimeMeta.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableRuntimeMeta.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableRuntimeMeta.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableRuntimeMeta.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableService.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableService.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableService.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableService.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableSnapshot.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableSnapshot.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableSnapshot.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableSnapshot.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableSummaryMetrics.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableSummaryMetrics.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableSummaryMetrics.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/TableSummaryMetrics.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/blocker/TableBlocker.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/blocker/TableBlocker.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/blocker/TableBlocker.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/blocker/TableBlocker.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/AsyncTableExecutors.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/AsyncTableExecutors.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/AsyncTableExecutors.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/AsyncTableExecutors.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/BaseTableExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/BaseTableExecutor.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/BaseTableExecutor.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/BaseTableExecutor.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/BlockerExpiringExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/BlockerExpiringExecutor.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/BlockerExpiringExecutor.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/BlockerExpiringExecutor.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/DanglingDeleteFilesCleaningExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/DanglingDeleteFilesCleaningExecutor.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/DanglingDeleteFilesCleaningExecutor.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/DanglingDeleteFilesCleaningExecutor.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/DataExpiringExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/DataExpiringExecutor.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/DataExpiringExecutor.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/DataExpiringExecutor.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/HiveCommitSyncExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/HiveCommitSyncExecutor.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/HiveCommitSyncExecutor.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/HiveCommitSyncExecutor.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/OptimizingCommitExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/OptimizingCommitExecutor.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/OptimizingCommitExecutor.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/OptimizingCommitExecutor.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/OptimizingExpiringExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/OptimizingExpiringExecutor.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/OptimizingExpiringExecutor.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/OptimizingExpiringExecutor.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/OrphanFilesCleaningExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/OrphanFilesCleaningExecutor.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/OrphanFilesCleaningExecutor.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/OrphanFilesCleaningExecutor.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/SnapshotsExpiringExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/SnapshotsExpiringExecutor.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/SnapshotsExpiringExecutor.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/SnapshotsExpiringExecutor.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/TableRuntimeRefreshExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/TableRuntimeRefreshExecutor.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/TableRuntimeRefreshExecutor.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/TableRuntimeRefreshExecutor.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/TagsAutoCreatingExecutor.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/TagsAutoCreatingExecutor.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/TagsAutoCreatingExecutor.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/executor/TagsAutoCreatingExecutor.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/IcebergInternalTableOperations.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/internal/IcebergInternalTableOperations.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/IcebergInternalTableOperations.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/internal/IcebergInternalTableOperations.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergCreator.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergCreator.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergCreator.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergCreator.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergHandler.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergHandler.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergHandler.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergHandler.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergCreator.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergCreator.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergCreator.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergCreator.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergHandler.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergHandler.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergHandler.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergHandler.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalTableConstants.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalTableConstants.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalTableConstants.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalTableConstants.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalTableCreator.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalTableCreator.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalTableCreator.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalTableCreator.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalTableHandler.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalTableHandler.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalTableHandler.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/internal/InternalTableHandler.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/MixedIcebergInternalTableStoreOperations.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/internal/MixedIcebergInternalTableStoreOperations.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/MixedIcebergInternalTableStoreOperations.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/table/internal/MixedIcebergInternalTableStoreOperations.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/ExecutionResult.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/ExecutionResult.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/ExecutionResult.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/ExecutionResult.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/ExecutionStatus.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/ExecutionStatus.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/ExecutionStatus.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/ExecutionStatus.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/JDBCResultSet.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/JDBCResultSet.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/JDBCResultSet.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/JDBCResultSet.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/SimpleResultSet.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/SimpleResultSet.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/SimpleResultSet.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/SimpleResultSet.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/SparkContextUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/SparkContextUtil.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/SparkContextUtil.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/SparkContextUtil.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/StatementResult.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/StatementResult.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/StatementResult.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/StatementResult.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalManager.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/TerminalManager.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalManager.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/TerminalManager.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalSession.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/TerminalSession.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalSession.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/TerminalSession.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalSessionContext.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/TerminalSessionContext.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalSessionContext.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/TerminalSessionContext.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalSessionFactory.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/TerminalSessionFactory.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalSessionFactory.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/TerminalSessionFactory.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiSession.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiSession.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiSession.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiSession.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiTerminalSessionFactory.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiTerminalSessionFactory.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiTerminalSessionFactory.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiTerminalSessionFactory.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/local/LocalSessionFactory.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/local/LocalSessionFactory.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/local/LocalSessionFactory.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/local/LocalSessionFactory.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/local/LocalTerminalSession.java b/amoro-ams/src/main/java/org/apache/amoro/server/terminal/local/LocalTerminalSession.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/local/LocalTerminalSession.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/terminal/local/LocalTerminalSession.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/CompressUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/utils/CompressUtil.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/CompressUtil.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/utils/CompressUtil.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/FlinkClientUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/utils/FlinkClientUtil.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/FlinkClientUtil.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/utils/FlinkClientUtil.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/HiveLocationUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/utils/HiveLocationUtil.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/HiveLocationUtil.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/utils/HiveLocationUtil.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/IcebergTableUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/utils/IcebergTableUtil.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/IcebergTableUtil.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/utils/IcebergTableUtil.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/InternalTableUtil.java b/amoro-ams/src/main/java/org/apache/amoro/server/utils/InternalTableUtil.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/InternalTableUtil.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/utils/InternalTableUtil.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/PreconditionUtils.java b/amoro-ams/src/main/java/org/apache/amoro/server/utils/PreconditionUtils.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/PreconditionUtils.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/utils/PreconditionUtils.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/StructuredOptionsSplitter.java b/amoro-ams/src/main/java/org/apache/amoro/server/utils/StructuredOptionsSplitter.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/StructuredOptionsSplitter.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/utils/StructuredOptionsSplitter.java
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/ThriftServiceProxy.java b/amoro-ams/src/main/java/org/apache/amoro/server/utils/ThriftServiceProxy.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/ThriftServiceProxy.java
rename to amoro-ams/src/main/java/org/apache/amoro/server/utils/ThriftServiceProxy.java
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/META-INF/services/org.apache.amoro.events.EventListener b/amoro-ams/src/main/resources/META-INF/services/org.apache.amoro.events.EventListener
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/resources/META-INF/services/org.apache.amoro.events.EventListener
rename to amoro-ams/src/main/resources/META-INF/services/org.apache.amoro.events.EventListener
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/META-INF/services/org.apache.amoro.resource.ResourceContainer b/amoro-ams/src/main/resources/META-INF/services/org.apache.amoro.resource.ResourceContainer
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/resources/META-INF/services/org.apache.amoro.resource.ResourceContainer
rename to amoro-ams/src/main/resources/META-INF/services/org.apache.amoro.resource.ResourceContainer
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/META-INF/services/org.apache.amoro.table.descriptor.FormatTableDescriptor b/amoro-ams/src/main/resources/META-INF/services/org.apache.amoro.table.descriptor.FormatTableDescriptor
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/resources/META-INF/services/org.apache.amoro.table.descriptor.FormatTableDescriptor
rename to amoro-ams/src/main/resources/META-INF/services/org.apache.amoro.table.descriptor.FormatTableDescriptor
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/derby/ams-derby-init.sql b/amoro-ams/src/main/resources/derby/ams-derby-init.sql
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/resources/derby/ams-derby-init.sql
rename to amoro-ams/src/main/resources/derby/ams-derby-init.sql
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/log4j2.xml b/amoro-ams/src/main/resources/log4j2.xml
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/resources/log4j2.xml
rename to amoro-ams/src/main/resources/log4j2.xml
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/ams-mysql-init.sql b/amoro-ams/src/main/resources/mysql/ams-mysql-init.sql
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/resources/mysql/ams-mysql-init.sql
rename to amoro-ams/src/main/resources/mysql/ams-mysql-init.sql
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.3.0-to-0.3.1.sql b/amoro-ams/src/main/resources/mysql/upgrade-0.3.0-to-0.3.1.sql
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.3.0-to-0.3.1.sql
rename to amoro-ams/src/main/resources/mysql/upgrade-0.3.0-to-0.3.1.sql
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.3.1-to-0.3.2.sql b/amoro-ams/src/main/resources/mysql/upgrade-0.3.1-to-0.3.2.sql
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.3.1-to-0.3.2.sql
rename to amoro-ams/src/main/resources/mysql/upgrade-0.3.1-to-0.3.2.sql
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.3.2-to-0.4.0.sql b/amoro-ams/src/main/resources/mysql/upgrade-0.3.2-to-0.4.0.sql
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.3.2-to-0.4.0.sql
rename to amoro-ams/src/main/resources/mysql/upgrade-0.3.2-to-0.4.0.sql
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql b/amoro-ams/src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql
rename to amoro-ams/src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql b/amoro-ams/src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql
rename to amoro-ams/src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.5.0-to-0.5.1.sql b/amoro-ams/src/main/resources/mysql/upgrade-0.5.0-to-0.5.1.sql
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.5.0-to-0.5.1.sql
rename to amoro-ams/src/main/resources/mysql/upgrade-0.5.0-to-0.5.1.sql
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.5.1-to-0.6.0.sql b/amoro-ams/src/main/resources/mysql/upgrade-0.5.1-to-0.6.0.sql
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.5.1-to-0.6.0.sql
rename to amoro-ams/src/main/resources/mysql/upgrade-0.5.1-to-0.6.0.sql
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.6.1-to-0.7.0.sql b/amoro-ams/src/main/resources/mysql/upgrade-0.6.1-to-0.7.0.sql
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.6.1-to-0.7.0.sql
rename to amoro-ams/src/main/resources/mysql/upgrade-0.6.1-to-0.7.0.sql
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade.sql b/amoro-ams/src/main/resources/mysql/upgrade.sql
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade.sql
rename to amoro-ams/src/main/resources/mysql/upgrade.sql
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/postgres/ams-postgres-init.sql b/amoro-ams/src/main/resources/postgres/ams-postgres-init.sql
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/resources/postgres/ams-postgres-init.sql
rename to amoro-ams/src/main/resources/postgres/ams-postgres-init.sql
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/postgres/upgrade-0.5.1-to-0.6.0.sql b/amoro-ams/src/main/resources/postgres/upgrade-0.5.1-to-0.6.0.sql
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/resources/postgres/upgrade-0.5.1-to-0.6.0.sql
rename to amoro-ams/src/main/resources/postgres/upgrade-0.5.1-to-0.6.0.sql
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/postgres/upgrade-0.6.1-to-0.7.0.sql b/amoro-ams/src/main/resources/postgres/upgrade-0.6.1-to-0.7.0.sql
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/resources/postgres/upgrade-0.6.1-to-0.7.0.sql
rename to amoro-ams/src/main/resources/postgres/upgrade-0.6.1-to-0.7.0.sql
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/postgres/upgrade.sql b/amoro-ams/src/main/resources/postgres/upgrade.sql
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/main/resources/postgres/upgrade.sql
rename to amoro-ams/src/main/resources/postgres/upgrade.sql
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/AmsEnvironment.java b/amoro-ams/src/test/java/org/apache/amoro/server/AmsEnvironment.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/AmsEnvironment.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/AmsEnvironment.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java b/amoro-ams/src/test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestAmoroManagementConfValidator.java b/amoro-ams/src/test/java/org/apache/amoro/server/TestAmoroManagementConfValidator.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestAmoroManagementConfValidator.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/TestAmoroManagementConfValidator.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestAmsServiceMetrics.java b/amoro-ams/src/test/java/org/apache/amoro/server/TestAmsServiceMetrics.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestAmsServiceMetrics.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/TestAmsServiceMetrics.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestDefaultOptimizingService.java b/amoro-ams/src/test/java/org/apache/amoro/server/TestDefaultOptimizingService.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestDefaultOptimizingService.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/TestDefaultOptimizingService.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestInternalIcebergCatalogService.java b/amoro-ams/src/test/java/org/apache/amoro/server/TestInternalIcebergCatalogService.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestInternalIcebergCatalogService.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/TestInternalIcebergCatalogService.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestInternalMixedCatalogService.java b/amoro-ams/src/test/java/org/apache/amoro/server/TestInternalMixedCatalogService.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestInternalMixedCatalogService.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/TestInternalMixedCatalogService.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/catalog/TableCatalogTestBase.java b/amoro-ams/src/test/java/org/apache/amoro/server/catalog/TableCatalogTestBase.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/catalog/TableCatalogTestBase.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/catalog/TableCatalogTestBase.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/catalog/TestServerCatalog.java b/amoro-ams/src/test/java/org/apache/amoro/server/catalog/TestServerCatalog.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/catalog/TestServerCatalog.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/catalog/TestServerCatalog.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/TestIcebergServerTableDescriptor.java b/amoro-ams/src/test/java/org/apache/amoro/server/dashboard/TestIcebergServerTableDescriptor.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/TestIcebergServerTableDescriptor.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/dashboard/TestIcebergServerTableDescriptor.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/utils/TestParamSignatureCalculator.java b/amoro-ams/src/test/java/org/apache/amoro/server/dashboard/utils/TestParamSignatureCalculator.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/utils/TestParamSignatureCalculator.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/dashboard/utils/TestParamSignatureCalculator.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/utils/TestPropertiesUtil.java b/amoro-ams/src/test/java/org/apache/amoro/server/dashboard/utils/TestPropertiesUtil.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/utils/TestPropertiesUtil.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/dashboard/utils/TestPropertiesUtil.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/manager/TestAbstractPluginManager.java b/amoro-ams/src/test/java/org/apache/amoro/server/manager/TestAbstractPluginManager.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/manager/TestAbstractPluginManager.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/manager/TestAbstractPluginManager.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/manager/TestFlinkOptimizerContainer.java b/amoro-ams/src/test/java/org/apache/amoro/server/manager/TestFlinkOptimizerContainer.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/manager/TestFlinkOptimizerContainer.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/manager/TestFlinkOptimizerContainer.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/manager/TestSparkOptimizerContainer.java b/amoro-ams/src/test/java/org/apache/amoro/server/manager/TestSparkOptimizerContainer.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/manager/TestSparkOptimizerContainer.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/manager/TestSparkOptimizerContainer.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/metrics/MockedMetricReporter.java b/amoro-ams/src/test/java/org/apache/amoro/server/metrics/MockedMetricReporter.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/metrics/MockedMetricReporter.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/metrics/MockedMetricReporter.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/metrics/TestMetricRegistry.java b/amoro-ams/src/test/java/org/apache/amoro/server/metrics/TestMetricRegistry.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/metrics/TestMetricRegistry.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/metrics/TestMetricRegistry.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/AbstractOptimizingTest.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/AbstractOptimizingTest.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/AbstractOptimizingTest.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/AbstractOptimizingTest.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/BaseOptimizingChecker.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/BaseOptimizingChecker.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/BaseOptimizingChecker.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/BaseOptimizingChecker.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/OptimizingTestHelpers.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/OptimizingTestHelpers.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/OptimizingTestHelpers.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/OptimizingTestHelpers.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestIcebergHadoopOptimizing.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/TestIcebergHadoopOptimizing.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestIcebergHadoopOptimizing.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/TestIcebergHadoopOptimizing.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestMixedHiveOptimizing.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/TestMixedHiveOptimizing.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestMixedHiveOptimizing.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/TestMixedHiveOptimizing.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestMixedIcebergOptimizing.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/TestMixedIcebergOptimizing.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestMixedIcebergOptimizing.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/TestMixedIcebergOptimizing.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingIntegration.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingIntegration.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingIntegration.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingIntegration.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingQueue.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingQueue.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingQueue.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingQueue.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/commit/TestMixIcebergCommit.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/commit/TestMixIcebergCommit.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/commit/TestMixIcebergCommit.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/commit/TestMixIcebergCommit.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/commit/TestUnKeyedTableCommit.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/commit/TestUnKeyedTableCommit.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/commit/TestUnKeyedTableCommit.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/commit/TestUnKeyedTableCommit.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/CompleteOptimizingFlow.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/CompleteOptimizingFlow.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/CompleteOptimizingFlow.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/CompleteOptimizingFlow.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/DataReader.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/DataReader.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/DataReader.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/DataReader.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/RandomRecordGenerator.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/RandomRecordGenerator.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/RandomRecordGenerator.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/RandomRecordGenerator.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/TestUnKeyedContinuousOptimizing.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/TestUnKeyedContinuousOptimizing.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/TestUnKeyedContinuousOptimizing.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/TestUnKeyedContinuousOptimizing.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractHiveChecker.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractHiveChecker.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractHiveChecker.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractHiveChecker.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractSceneCountChecker.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractSceneCountChecker.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractSceneCountChecker.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractSceneCountChecker.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/DataConcurrencyChecker.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/DataConcurrencyChecker.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/DataConcurrencyChecker.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/DataConcurrencyChecker.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingMove2HiveChecker.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingMove2HiveChecker.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingMove2HiveChecker.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingMove2HiveChecker.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingWrite2HiveChecker.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingWrite2HiveChecker.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingWrite2HiveChecker.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingWrite2HiveChecker.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MajorOptimizingChecker.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MajorOptimizingChecker.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MajorOptimizingChecker.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MajorOptimizingChecker.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MinorOptimizingCheck.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MinorOptimizingCheck.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MinorOptimizingCheck.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MinorOptimizingCheck.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/OptimizingCountChecker.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/OptimizingCountChecker.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/OptimizingCountChecker.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/checker/OptimizingCountChecker.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/AbstractTableDataView.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/view/AbstractTableDataView.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/AbstractTableDataView.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/view/AbstractTableDataView.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/KeyedTableDataView.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/view/KeyedTableDataView.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/KeyedTableDataView.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/view/KeyedTableDataView.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/MatchResult.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/view/MatchResult.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/MatchResult.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/view/MatchResult.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/TableDataView.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/view/TableDataView.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/TableDataView.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/view/TableDataView.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/UnKeyedTableDataView.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/view/UnKeyedTableDataView.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/UnKeyedTableDataView.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/view/UnKeyedTableDataView.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestAutoCreateIcebergTagAction.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestAutoCreateIcebergTagAction.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestAutoCreateIcebergTagAction.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestAutoCreateIcebergTagAction.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpire.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpire.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpire.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpire.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireHive.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireHive.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireHive.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireHive.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireIceberg.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireIceberg.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireIceberg.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireIceberg.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileClean.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileClean.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileClean.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileClean.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanHive.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanHive.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanHive.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanHive.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanIceberg.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanIceberg.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanIceberg.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanIceberg.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpire.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpire.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpire.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpire.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireHive.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireHive.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireHive.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireHive.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireIceberg.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireIceberg.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireIceberg.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireIceberg.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/MixedTablePlanTestBase.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/MixedTablePlanTestBase.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/MixedTablePlanTestBase.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/MixedTablePlanTestBase.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveKeyedPartitionPlan.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveKeyedPartitionPlan.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveKeyedPartitionPlan.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveKeyedPartitionPlan.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveOptimizingEvaluator.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveOptimizingEvaluator.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveOptimizingEvaluator.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveOptimizingEvaluator.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveUnkeyedPartitionPlan.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveUnkeyedPartitionPlan.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveUnkeyedPartitionPlan.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveUnkeyedPartitionPlan.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestIcebergPartitionPlan.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestIcebergPartitionPlan.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestIcebergPartitionPlan.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestIcebergPartitionPlan.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestKeyedPartitionPlan.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestKeyedPartitionPlan.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestKeyedPartitionPlan.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestKeyedPartitionPlan.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingEvaluator.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingEvaluator.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingEvaluator.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingEvaluator.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingPlanner.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingPlanner.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingPlanner.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingPlanner.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestUnkeyedPartitionPlan.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestUnkeyedPartitionPlan.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestUnkeyedPartitionPlan.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/plan/TestUnkeyedPartitionPlan.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelperTestBase.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelperTestBase.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelperTestBase.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelperTestBase.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveKeyedTableFileScanHelper.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveKeyedTableFileScanHelper.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveKeyedTableFileScanHelper.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveKeyedTableFileScanHelper.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveUnkeyedTableFileScanHelper.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveUnkeyedTableFileScanHelper.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveUnkeyedTableFileScanHelper.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveUnkeyedTableFileScanHelper.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestIcebergTableFileScanHelper.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TestIcebergTableFileScanHelper.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestIcebergTableFileScanHelper.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TestIcebergTableFileScanHelper.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestKeyedTableFileScanHelper.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TestKeyedTableFileScanHelper.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestKeyedTableFileScanHelper.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TestKeyedTableFileScanHelper.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestUnkeyedTableFileScanHelper.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TestUnkeyedTableFileScanHelper.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestUnkeyedTableFileScanHelper.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/optimizing/scan/TestUnkeyedTableFileScanHelper.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/persistence/TestNestedSqlSession.java b/amoro-ams/src/test/java/org/apache/amoro/server/persistence/TestNestedSqlSession.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/persistence/TestNestedSqlSession.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/persistence/TestNestedSqlSession.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/persistence/TestPersistentBase.java b/amoro-ams/src/test/java/org/apache/amoro/server/persistence/TestPersistentBase.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/persistence/TestPersistentBase.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/persistence/TestPersistentBase.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/persistence/TestStatedPersistentBase.java b/amoro-ams/src/test/java/org/apache/amoro/server/persistence/TestStatedPersistentBase.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/persistence/TestStatedPersistentBase.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/persistence/TestStatedPersistentBase.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/AMSTableTestBase.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/AMSTableTestBase.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/AMSTableTestBase.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/table/AMSTableTestBase.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/DerbyPersistence.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/DerbyPersistence.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/DerbyPersistence.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/table/DerbyPersistence.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TableServiceTestBase.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/TableServiceTestBase.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TableServiceTestBase.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/table/TableServiceTestBase.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestCatalogService.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/TestCatalogService.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestCatalogService.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/table/TestCatalogService.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestDatabaseService.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/TestDatabaseService.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestDatabaseService.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/table/TestDatabaseService.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableRuntimeHandler.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableRuntimeHandler.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableRuntimeHandler.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableRuntimeHandler.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableRuntimeManager.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableRuntimeManager.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableRuntimeManager.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableRuntimeManager.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableService.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableService.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableService.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableService.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableSummaryMetrics.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableSummaryMetrics.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableSummaryMetrics.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/table/TestTableSummaryMetrics.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/executor/ExecutorTestBase.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/executor/ExecutorTestBase.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/executor/ExecutorTestBase.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/table/executor/ExecutorTestBase.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/executor/TestBlockerExpiringExecutor.java b/amoro-ams/src/test/java/org/apache/amoro/server/table/executor/TestBlockerExpiringExecutor.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/executor/TestBlockerExpiringExecutor.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/table/executor/TestBlockerExpiringExecutor.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/util/TestCompressUtil.java b/amoro-ams/src/test/java/org/apache/amoro/server/util/TestCompressUtil.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/util/TestCompressUtil.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/util/TestCompressUtil.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/util/TestConfigurationUtil.java b/amoro-ams/src/test/java/org/apache/amoro/server/util/TestConfigurationUtil.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/util/TestConfigurationUtil.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/util/TestConfigurationUtil.java
diff --git a/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/util/TestIcebergTableUtil.java b/amoro-ams/src/test/java/org/apache/amoro/server/util/TestIcebergTableUtil.java
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/util/TestIcebergTableUtil.java
rename to amoro-ams/src/test/java/org/apache/amoro/server/util/TestIcebergTableUtil.java
diff --git a/amoro-ams/amoro-ams-server/src/test/resources/META-INF/services/org.apache.amoro.metrics.MetricReporter b/amoro-ams/src/test/resources/META-INF/services/org.apache.amoro.metrics.MetricReporter
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/resources/META-INF/services/org.apache.amoro.metrics.MetricReporter
rename to amoro-ams/src/test/resources/META-INF/services/org.apache.amoro.metrics.MetricReporter
diff --git a/amoro-ams/amoro-ams-server/src/test/resources/META-INF/services/org.apache.amoro.server.manager.TestAbstractPluginManager$TestPlugin b/amoro-ams/src/test/resources/META-INF/services/org.apache.amoro.server.manager.TestAbstractPluginManager$TestPlugin
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/resources/META-INF/services/org.apache.amoro.server.manager.TestAbstractPluginManager$TestPlugin
rename to amoro-ams/src/test/resources/META-INF/services/org.apache.amoro.server.manager.TestAbstractPluginManager$TestPlugin
diff --git a/amoro-ams/amoro-ams-server/src/test/resources/config.yaml b/amoro-ams/src/test/resources/config.yaml
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/resources/config.yaml
rename to amoro-ams/src/test/resources/config.yaml
diff --git a/amoro-ams/amoro-ams-server/src/test/resources/flink-conf.yaml b/amoro-ams/src/test/resources/flink-conf.yaml
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/resources/flink-conf.yaml
rename to amoro-ams/src/test/resources/flink-conf.yaml
diff --git a/amoro-ams/amoro-ams-server/src/test/resources/log4j2.xml b/amoro-ams/src/test/resources/log4j2.xml
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/resources/log4j2.xml
rename to amoro-ams/src/test/resources/log4j2.xml
diff --git a/amoro-ams/amoro-ams-server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/amoro-ams/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
similarity index 100%
rename from amoro-ams/amoro-ams-server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
rename to amoro-ams/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/charts/amoro/values.yaml b/charts/amoro/values.yaml
index c906887b8..74e71e6fe 100644
--- a/charts/amoro/values.yaml
+++ b/charts/amoro/values.yaml
@@ -178,12 +178,12 @@ amoroConf:
## kyuubiJdbcUrl: jdbc:hive2://127.0.0.1:10009/
## @param amoroDefaults The value (templated string) is used for conf.yaml file
- ## ref: https://github.com/apache/amoro/blob/master/amoro-ams/dist/src/main/amoro-bin/conf/config.yaml
+ ## ref: https://github.com/apache/amoro/blob/master/dist/src/main/amoro-bin/conf/config.yaml
##
amoroDefaults: ~
##
## @param log4j2 The value (templated string) is used for conf/log4j2.xml file
- ## ref: https://github.com/apache/amoro/blob/master/amoro-ams/dist/src/main/amoro-bin/conf/log4j2.xml
+ ## ref: https://github.com/apache/amoro/blob/master/dist/src/main/amoro-bin/conf/log4j2.xml
log4j2: ~
## Configure the container of optimizer that allows you to submit optimizer by AMS
diff --git a/amoro-ams/dist/pom.xml b/dist/pom.xml
similarity index 97%
rename from amoro-ams/dist/pom.xml
rename to dist/pom.xml
index d334e7d56..6a71a7da2 100644
--- a/amoro-ams/dist/pom.xml
+++ b/dist/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.amoro</groupId>
- <artifactId>amoro-ams</artifactId>
+ <artifactId>amoro-parent</artifactId>
<version>0.8-SNAPSHOT</version>
</parent>
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>org.apache.amoro</groupId>
- <artifactId>amoro-ams-server</artifactId>
+ <artifactId>amoro-ams</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/amoro-ams/dist/src/main/amoro-bin/bin/ams.sh b/dist/src/main/amoro-bin/bin/ams.sh
similarity index 100%
rename from amoro-ams/dist/src/main/amoro-bin/bin/ams.sh
rename to dist/src/main/amoro-bin/bin/ams.sh
diff --git a/amoro-ams/dist/src/main/amoro-bin/bin/load-config.sh b/dist/src/main/amoro-bin/bin/load-config.sh
similarity index 100%
rename from amoro-ams/dist/src/main/amoro-bin/bin/load-config.sh
rename to dist/src/main/amoro-bin/bin/load-config.sh
diff --git a/amoro-ams/dist/src/main/amoro-bin/bin/optimizer.sh b/dist/src/main/amoro-bin/bin/optimizer.sh
similarity index 100%
rename from amoro-ams/dist/src/main/amoro-bin/bin/optimizer.sh
rename to dist/src/main/amoro-bin/bin/optimizer.sh
diff --git a/amoro-ams/dist/src/main/amoro-bin/conf/config.yaml b/dist/src/main/amoro-bin/conf/config.yaml
similarity index 100%
rename from amoro-ams/dist/src/main/amoro-bin/conf/config.yaml
rename to dist/src/main/amoro-bin/conf/config.yaml
diff --git a/amoro-ams/dist/src/main/amoro-bin/conf/jvm.properties b/dist/src/main/amoro-bin/conf/jvm.properties
similarity index 100%
rename from amoro-ams/dist/src/main/amoro-bin/conf/jvm.properties
rename to dist/src/main/amoro-bin/conf/jvm.properties
diff --git a/amoro-ams/dist/src/main/amoro-bin/conf/log4j2.xml b/dist/src/main/amoro-bin/conf/log4j2.xml
similarity index 100%
rename from amoro-ams/dist/src/main/amoro-bin/conf/log4j2.xml
rename to dist/src/main/amoro-bin/conf/log4j2.xml
diff --git a/amoro-ams/dist/src/main/amoro-bin/conf/optimize/log4j2.xml b/dist/src/main/amoro-bin/conf/optimize/log4j2.xml
similarity index 100%
rename from amoro-ams/dist/src/main/amoro-bin/conf/optimize/log4j2.xml
rename to dist/src/main/amoro-bin/conf/optimize/log4j2.xml
diff --git a/amoro-ams/dist/src/main/amoro-bin/conf/plugins/event-listeners.yaml b/dist/src/main/amoro-bin/conf/plugins/event-listeners.yaml
similarity index 100%
rename from amoro-ams/dist/src/main/amoro-bin/conf/plugins/event-listeners.yaml
rename to dist/src/main/amoro-bin/conf/plugins/event-listeners.yaml
diff --git a/amoro-ams/dist/src/main/amoro-bin/conf/plugins/metric-reporters.yaml b/dist/src/main/amoro-bin/conf/plugins/metric-reporters.yaml
similarity index 100%
rename from amoro-ams/dist/src/main/amoro-bin/conf/plugins/metric-reporters.yaml
rename to dist/src/main/amoro-bin/conf/plugins/metric-reporters.yaml
diff --git a/amoro-ams/dist/src/main/assemblies/bin.xml b/dist/src/main/assemblies/bin.xml
similarity index 77%
rename from amoro-ams/dist/src/main/assemblies/bin.xml
rename to dist/src/main/assemblies/bin.xml
index f8bfdd3da..ca4a02741 100644
--- a/amoro-ams/dist/src/main/assemblies/bin.xml
+++ b/dist/src/main/assemblies/bin.xml
@@ -30,7 +30,7 @@
<files>
<file>
<source>
- ../../amoro-optimizer/amoro-optimizer-flink/target/amoro-optimizer-flink-${project.version}-jar-with-dependencies.jar
+ ../amoro-optimizer/amoro-optimizer-flink/target/amoro-optimizer-flink-${project.version}-jar-with-dependencies.jar
</source>
<outputDirectory>plugin/optimizer/flink</outputDirectory>
<destName>optimizer-job.jar</destName>
@@ -38,7 +38,7 @@
</file>
<file>
<source>
- ../../amoro-optimizer/amoro-optimizer-spark/target/amoro-optimizer-spark-${project.version}-jar-with-dependencies.jar
+ ../amoro-optimizer/amoro-optimizer-spark/target/amoro-optimizer-spark-${project.version}-jar-with-dependencies.jar
</source>
<outputDirectory>plugin/optimizer/spark</outputDirectory>
<destName>optimizer-job.jar</destName>
@@ -46,16 +46,16 @@
</file>
<file>
<source>
- ../../amoro-metrics/amoro-metrics-prometheus/target/amoro-metrics-prometheus-${project.version}-jar-with-dependencies.jar
+ ../amoro-metrics/amoro-metrics-prometheus/target/amoro-metrics-prometheus-${project.version}-jar-with-dependencies.jar
</source>
<outputDirectory>plugin/metric-reporters</outputDirectory>
<destName>prometheus-reporter.jar</destName>
<fileMode>0644</fileMode>
</file>
<file>
- <source>../amoro-ams-server/target/amoro-ams-server-${project.version}.jar</source>
+ <source>../amoro-ams/target/amoro-ams-${project.version}.jar</source>
<outputDirectory>lib/</outputDirectory>
- <destName>amoro-ams-server-${project.version}.jar</destName>
+ <destName>amoro-ams-${project.version}.jar</destName>
<fileMode>0644</fileMode>
</file>
<file>
@@ -64,26 +64,26 @@
<fileMode>0644</fileMode>
</file>
<file>
- <source>../../LICENSE-binary</source>
+ <source>../LICENSE-binary</source>
<outputDirectory/>
<destName>LICENSE</destName>
<fileMode>0644</fileMode>
</file>
<file>
- <source>../../NOTICE-binary</source>
+ <source>../NOTICE-binary</source>
<outputDirectory/>
<destName>NOTICE</destName>
<fileMode>0644</fileMode>
</file>
<file>
- <source>../../DISCLAIMER</source>
+ <source>../DISCLAIMER</source>
<outputDirectory/>
<fileMode>0644</fileMode>
</file>
</files>
<fileSets>
<fileSet>
- <directory>../../licenses-binary</directory>
+ <directory>../licenses-binary</directory>
<outputDirectory>licenses</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>
@@ -99,22 +99,22 @@
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
- <directory>../amoro-ams-server/src/main/resources/mysql</directory>
+ <directory>../amoro-ams/src/main/resources/mysql</directory>
<outputDirectory>conf/mysql</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
- <directory>../amoro-ams-server/src/main/resources/postgres</directory>
+ <directory>../amoro-ams/src/main/resources/postgres</directory>
<outputDirectory>conf/postgres</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
- <directory>../amoro-ams-server/src/main/resources/derby</directory>
+ <directory>../amoro-ams/src/main/resources/derby</directory>
<outputDirectory>conf/derby</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
- <directory>../amoro-ams-server/target/amoro-ams-server-dependency/lib</directory>
+ <directory>../amoro-ams/target/amoro-ams-dependency/lib</directory>
<outputDirectory>lib/</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>
diff --git a/docker/amoro/Dockerfile b/docker/amoro/Dockerfile
index fac2b5e3a..71de9fdd3 100644
--- a/docker/amoro/Dockerfile
+++ b/docker/amoro/Dockerfile
@@ -32,7 +32,7 @@ ADD . /workspace/amoro
WORKDIR /workspace/amoro
RUN AMORO_VERSION=`cat pom.xml | grep 'amoro-parent' -C 3 | grep -Eo '<version>.*</version>' | awk -F'[><]' '{print $3}'` \
- && cp amoro-ams/dist/target/*.tar.gz /usr/local \
+ && cp dist/target/*.tar.gz /usr/local \
&& tar -xzvf /usr/local/apache-amoro-${AMORO_VERSION}-bin.tar.gz -C /usr/local \
&& rm /usr/local/amoro-${AMORO_VERSION}/plugin/optimizer/flink -rf \
&& rm /usr/local/amoro-${AMORO_VERSION}/plugin/optimizer/spark -rf \
diff --git a/docker/build.sh b/docker/build.sh
index e31031bb8..99fe3143e 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -203,10 +203,10 @@ function build_amoro() {
local IMAGE_TAG=$AMORO_TAG
print_image $IMAGE_REF $IMAGE_TAG
- local DIST_FILE=${PROJECT_HOME}/amoro-ams/dist/target/apache-amoro-${AMORO_VERSION}-bin.tar.gz
+ local DIST_FILE=${PROJECT_HOME}/dist/target/apache-amoro-${AMORO_VERSION}-bin.tar.gz
if [ ! -f "${DIST_FILE}" ]; then
- local BUILD_CMD="mvn clean package -am -e -pl amoro-ams/dist -DskipTests "
+ local BUILD_CMD="mvn clean package -am -e -pl dist -DskipTests "
echo "Amoro dist package is not exists in ${DIST_FILE}"
echo "please check file or run '$BUILD_CMD' first"
exit 1
diff --git a/docs/admin-guides/deployment.md b/docs/admin-guides/deployment.md
index 30fb903fa..40fef87be 100644
--- a/docs/admin-guides/deployment.md
+++ b/docs/admin-guides/deployment.md
@@ -50,7 +50,7 @@ $ git clone https://github.com/apache/amoro.git
$ cd amoro
$ base_dir=$(pwd)
$ mvn clean package -DskipTests
-$ cd amoro-ams/dist/target/
+$ cd dist/target/
$ ls
amoro-x.y.z-bin.zip # AMS release package
diff --git a/pom.xml b/pom.xml
index 787f1de75..8ed0a923d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,7 @@
<module>amoro-mixed-format</module>
<module>amoro-hudi-format</module>
<module>amoro-paimon-format</module>
+ <module>dist</module>
</modules>
<scm>
diff --git a/tools/releasing/create_binary_release.sh b/tools/releasing/create_binary_release.sh
index cad448d3c..ea82fd9f0 100644
--- a/tools/releasing/create_binary_release.sh
+++ b/tools/releasing/create_binary_release.sh
@@ -68,7 +68,7 @@ make_binary_release() {
$MVN clean package ${HADOOP_PROFILE} -Pno-extended-disk-storage -pl ':dist' -am -Dgpg.skip -Dcheckstyle.skip=true -DskipTests
local TARGET_FILE="apache-amoro-${RELEASE_VERSION}-bin-${HADOOP_VERSION}.tar.gz"
- cp amoro-ams/dist/target/apache-amoro-${RELEASE_VERSION}-bin.tar.gz ${RELEASE_DIR}/${TARGET_FILE}
+ cp dist/target/apache-amoro-${RELEASE_VERSION}-bin.tar.gz ${RELEASE_DIR}/${TARGET_FILE}
cd ${RELEASE_DIR}
# Sign sha the tgz