You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/06/27 12:31:41 UTC
[incubator-linkis] branch dev-1.2.0 updated: Optimize CS module, merge cs-cache/search/ha/persistencce and other modules into cs-server module
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.2.0 by this push:
new dbcb0d313 Optimize CS module, merge cs-cache/search/ha/persistencce and other modules into cs-server module
new 7f8cd82a4 Merge pull request #2353 from WeDataSphere/dev-1.2.0-cs-optimize
dbcb0d313 is described below
commit dbcb0d313c3268b3807677a2eb428887d41fb435
Author: peacewong <wp...@gmail.com>
AuthorDate: Mon Jun 27 19:37:02 2022 +0800
Optimize CS module, merge cs-cache/search/ha/persistencce and other modules into cs-server module
---
.../linkis-context-service/linkis-cs-cache/pom.xml | 82 --------------------
.../linkis-cs-highavailable/pom.xml | 87 ----------------------
.../linkis-cs-persistence/pom.xml | 85 ---------------------
.../linkis-cs-search/pom.xml | 75 -------------------
.../linkis-cs-server/pom.xml | 53 +++----------
.../java/org/apache/linkis/cs/ContextSearch.java | 0
.../org/apache/linkis/cs/DefaultContextSearch.java | 0
.../cs/condition/AbstractCommonCondition.java | 0
.../linkis/cs/condition/AtomicCondition.java | 0
.../linkis/cs/condition/BinaryLogicCondition.java | 0
.../org/apache/linkis/cs/condition/Condition.java | 0
.../apache/linkis/cs/condition/ConditionType.java | 0
.../linkis/cs/condition/UnaryLogicCondition.java | 0
.../condition/construction/AndConditionParser.java | 0
.../condition/construction/ConditionBuilder.java | 0
.../construction/ConditionBuilderImpl.java | 0
.../cs/condition/construction/ConditionParser.java | 0
.../construction/ContainsConditionParser.java | 0
.../construction/ContextScopeConditionParser.java | 0
.../construction/ContextTypeConditionParser.java | 0
.../ContextValueTypeConditionParser.java | 0
.../construction/NearestConditionParser.java | 0
.../condition/construction/NotConditionParser.java | 0
.../condition/construction/OrConditionParser.java | 0
.../construction/RegexConditionParser.java | 0
.../linkis/cs/condition/impl/AndCondition.java | 0
.../cs/condition/impl/ContainsCondition.java | 0
.../cs/condition/impl/ContextScopeCondition.java | 0
.../cs/condition/impl/ContextTypeCondition.java | 0
.../condition/impl/ContextValueTypeCondition.java | 0
.../linkis/cs/condition/impl/NearestCondition.java | 0
.../linkis/cs/condition/impl/NotCondition.java | 0
.../linkis/cs/condition/impl/OrCondition.java | 0
.../linkis/cs/condition/impl/RegexCondition.java | 0
.../cs/contextcache/ContextCacheService.java | 0
.../contextcache/DefaultContextCacheService.java | 0
.../linkis/cs/contextcache/cache/ContextCache.java | 0
.../cache/DefaultContextAddListener.java | 0
.../cs/contextcache/cache/DefaultContextCache.java | 0
.../cs/contextcache/cache/csid/ContextIDValue.java | 0
.../cache/csid/ContextIDValueGenerator.java | 0
.../csid/impl/ContextIDValueGeneratorImpl.java | 0
.../cache/csid/impl/ContextIDValueImpl.java | 0
.../cache/cskey/ContextKeyValueContext.java | 0
.../cache/cskey/ContextValueMapSet.java | 0
.../cache/cskey/impl/ContextValueMapSetImpl.java | 0
.../cskey/impl/DefaultContextKeyValueContext.java | 0
.../cache/guava/ContextIDRemoveListener.java | 0
.../cs/contextcache/cleaner/AUTOCleaner.java | 0
.../cs/contextcache/conf/ContextCacheConf.java | 0
.../contextcache/index/ContextInvertedIndex.java | 0
.../index/ContextInvertedIndexSet.java | 0
.../index/ContextInvertedIndexSetImpl.java | 0
.../index/DefaultContextInvertedIndex.java | 0
.../cs/contextcache/metric/ClassIntrospector.java | 0
.../cs/contextcache/metric/ContextCacheMetric.java | 0
.../cs/contextcache/metric/ContextIDMetric.java | 0
.../metric/DefaultContextCacheMetric.java | 0
.../metric/DefaultContextIDMetric.java | 0
.../linkis/cs/contextcache/metric/Metrtic.java | 0
.../linkis/cs/contextcache/metric/ObjectInfo.java | 0
.../cs/contextcache/metric/SizeEstimator.java | 0
.../contextcache/parser/ContextKeyValueParser.java | 0
.../parser/DefaultContextKeyValueParser.java | 0
.../cs/contextcache/utils/ContextCacheUtils.java | 0
.../cs/exception/ContextSearchFailedException.java | 0
.../cs/execution/AbstractConditionExecution.java | 0
.../linkis/cs/execution/ConditionExecution.java | 0
.../fetcher/AbstractContextCacheFetcher.java | 0
.../cs/execution/fetcher/ContextCacheFetcher.java | 0
.../fetcher/ContextTypeContextSearchFetcher.java | 0
.../fetcher/IterateContextCacheFetcher.java | 0
.../cs/execution/impl/AndConditionExecution.java | 0
.../impl/BinaryLogicConditionExecution.java | 0
.../execution/impl/ContainsConditionExecution.java | 0
.../impl/ContextScopeConditionExecution.java | 0
.../impl/ContextTypeConditionExecution.java | 0
.../impl/ContextValueTypeConditionExecution.java | 0
.../execution/impl/NearestConditionExecution.java | 0
.../cs/execution/impl/NotConditionExecution.java | 0
.../cs/execution/impl/OrConditionExecution.java | 0
.../cs/execution/impl/RegexConditionExecution.java | 0
.../impl/UnaryLogicConditionExecution.java | 0
.../matcher/AbstractContextSearchMatcher.java | 0
.../matcher/AndLogicContextSearchMatcher.java | 0
.../matcher/BinaryLogicContextSearchMatcher.java | 0
.../matcher/ConditionMatcherResolver.java | 0
.../matcher/ContainsContextSearchMatcher.java | 0
.../matcher/ContextScopeContextSearchMatcher.java | 0
.../cs/execution/matcher/ContextSearchMatcher.java | 0
.../matcher/ContextTypeContextSearchMatcher.java | 0
.../ContextValueTypeContextSearchMatcher.java | 0
.../matcher/NearestLogicContextSearchMatcher.java | 0
.../matcher/NotLogicContextSearchMatcher.java | 0
.../matcher/OrLogicContextSearchMatcher.java | 0
.../matcher/RegexContextSearchMatcher.java | 0
.../execution/matcher/SkipContextSearchMather.java | 0
.../matcher/UnaryLogicContextSearchMatcher.java | 0
.../ruler/AbstractContextSearchRuler.java | 0
.../ruler/CommonListContextSearchRuler.java | 0
.../cs/execution/ruler/ContextSearchRuler.java | 0
.../execution/ruler/NearestContextSearchRuler.java | 0
.../cs/highavailable/AbstractContextHAManager.java | 0
.../linkis/cs/highavailable/ContextHAManager.java | 0
.../cs/highavailable/DefaultContextHAManager.java | 0
.../conf/ContextHighAvailableConf.java | 0
.../cs/highavailable/exception/CSErrorCode.java | 0
.../highavailable/ha/BackupInstanceGenerator.java | 0
.../cs/highavailable/ha/ContextHAChecker.java | 0
.../cs/highavailable/ha/ContextHAIDGenerator.java | 0
.../ha/impl/BackupInstanceGeneratorImpl.java | 0
.../ha/impl/ContextHACheckerImpl.java | 0
.../ha/impl/ContextHAIDGeneratorImpl.java | 0
.../pluggable/HAContextPersistenceManagerImpl.java | 0
.../highavailable/proxy/MethodInterceptorImpl.java | 0
.../linkis/cs/optimize/ConditionOptimizer.java | 0
.../linkis/cs/optimize/OptimizedCondition.java | 0
.../cs/optimize/cost/ConditionCostCalculator.java | 0
.../apache/linkis/cs/optimize/dfs/BinaryTree.java | 0
.../linkis/cs/optimize/dfs/MinCostBinaryTree.java | 0
.../org/apache/linkis/cs/optimize/dfs/Node.java | 0
.../optimize/impl/CostBasedConditionOptimizer.java | 0
.../cs/persistence/ContextPersistenceBeans.java | 0
.../cs/persistence/ContextPersistenceManager.java | 0
.../persistence/ContextPersistenceManagerImpl.java | 0
.../linkis/cs/persistence/annotation/Ignore.java | 0
.../linkis/cs/persistence/annotation/Tuning.java | 0
.../persistence/aop/PersistenceTuningAspect.java | 0
.../cs/persistence/conf/PersistenceConf.java | 0
.../cs/persistence/dao/ContextHistoryMapper.java | 0
.../persistence/dao/ContextIDListenerMapper.java | 0
.../linkis/cs/persistence/dao/ContextIDMapper.java | 0
.../persistence/dao/ContextKeyListenerMapper.java | 0
.../cs/persistence/dao/ContextMapMapper.java | 0
.../persistence/dao/impl/contextHistoryMapper.xml | 0
.../dao/impl/contextIDListenerMapper.xml | 0
.../cs/persistence/dao/impl/contextIDMapper.xml | 0
.../dao/impl/contextKeyListenerMapper.xml | 0
.../cs/persistence/dao/impl/contextMapMapper.xml | 0
.../cs/persistence/entity/ExtraFieldClass.java | 0
.../entity/PersistenceContextHistory.java | 0
.../persistence/entity/PersistenceContextID.java | 0
.../entity/PersistenceContextIDListener.java | 0
.../persistence/entity/PersistenceContextKey.java | 0
.../entity/PersistenceContextKeyListener.java | 0
.../entity/PersistenceContextKeyValue.java | 0
.../entity/PersistenceContextValue.java | 0
.../cs/persistence/exception/ThrowingFunction.java | 0
.../persistence/ContextHistoryPersistence.java | 0
.../persistence/ContextIDListenerPersistence.java | 0
.../persistence/ContextIDPersistence.java | 0
.../persistence/ContextKeyListenerPersistence.java | 0
.../persistence/ContextMapPersistence.java | 0
.../persistence/ContextMetricsPersistence.java | 0
.../KeywordContextHistoryPersistence.java | 0
.../persistence/TransactionManager.java | 0
.../impl/ContextHistoryPersistenceImpl.java | 0
.../impl/ContextIDListenerPersistenceImpl.java | 0
.../persistence/impl/ContextIDPersistenceImpl.java | 0
.../impl/ContextKeyListenerPersistenceImpl.java | 0
.../impl/ContextMapPersistenceImpl.java | 0
.../impl/ContextMetricsPersistenceImpl.java | 0
.../impl/KeywordContextHistoryPersistenceImpl.java | 0
.../persistence/impl/TransactionManagerImpl.java | 0
.../cs/persistence/util/PersistenceUtils.java | 0
.../src/main/resources/cs_ddl.sql | 0
.../ha/instancealias/InstanceAliasConverter.scala | 0
.../ha/instancealias/InstanceAliasManager.scala | 0
.../impl/DefaultInstanceAliasConverter.scala | 0
.../impl/InstanceAliasManagerImpl.scala | 0
.../impl/RouteLabelInstanceAliasConverter.scala | 0
.../test/java/org/apache/linkis/cs/AndTest.java | 0
.../java/org/apache/linkis/cs/ContainsTest.java | 0
.../org/apache/linkis/cs/ContextScopeTest.java | 0
.../org/apache/linkis/cs/ContextSearchTest.java | 0
.../java/org/apache/linkis/cs/ContextTypeTest.java | 0
.../test/java/org/apache/linkis/cs/RegexTest.java | 0
.../cs/contextcache/test/csid/TestContextID.java | 0
.../contextcache/test/keyword/TestContextKey.java | 0
.../test/keyword/TestContextKeyValue.java | 0
.../test/keyword/TestContextKeyValueParser.java | 0
.../test/keyword/TestContextValue.java | 0
.../test/service/TestContextCacheService.java | 0
.../org/apache/linkis/cs/csid/TestContextID.java | 0
.../highavailable/test/TestContextHAManager.java | 0
.../cs/highavailable/test/haid/TestHAID.java | 0
.../test/persist/TestPersistence.java | 0
.../apache/linkis/cs/keyword/TestContextKey.java | 0
.../linkis/cs/keyword/TestContextKeyValue.java | 0
.../apache/linkis/cs/keyword/TestContextValue.java | 0
.../org/apache/linkis/cs/parser/ApiJsonTest.java | 0
.../linkis/cs/persistence/AContextHistory.java | 0
.../apache/linkis/cs/persistence/AContextID.java | 0
.../linkis/cs/persistence/AContextIDListener.java | 0
.../apache/linkis/cs/persistence/AContextKey.java | 0
.../linkis/cs/persistence/AContextKeyListener.java | 0
.../linkis/cs/persistence/AContextKeyValue.java | 0
.../linkis/cs/persistence/AContextValue.java | 0
.../linkis/cs/persistence/ContextHistoryTest.java | 0
.../cs/persistence/ContextIDListenerTest.java | 0
.../linkis/cs/persistence/ContextIDTest.java | 0
.../cs/persistence/ContextKeyListenerTest.java | 0
.../linkis/cs/persistence/ContextMapTest.java | 0
.../linkis/cs/persistence/ExtraFieldClassTest.java | 0
.../linkis/cs/persistence/MapTypeAdapter.java | 0
.../apache/linkis/cs/persistence/ProxyMethodA.java | 0
.../apache/linkis/cs/persistence/ProxyTest.java | 0
.../org/apache/linkis/cs/persistence/Scan.java | 0
.../src/test/resources/application.yml | 0
.../src/test/resources/linkis.properties | 0
.../src/test/resources/log4j2.xml | 0
.../linkis-context-service/pom.xml | 4 -
212 files changed, 12 insertions(+), 374 deletions(-)
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/pom.xml
deleted file mode 100644
index 35f6d0980..000000000
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/pom.xml
+++ /dev/null
@@ -1,82 +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="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>linkis</artifactId>
- <groupId>org.apache.linkis</groupId>
- <version>1.1.2</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>linkis-cs-cache</artifactId>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-cs-common</artifactId>
- <version>${linkis.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-cs-persistence</artifactId>
- <version>${linkis.version}</version>
-
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-module</artifactId>
- <version>${linkis.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-cs-listener</artifactId>
- <version>${linkis.version}</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
- <finalName>${project.artifactId}-${project.version}</finalName>
- </build>
-</project>
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/pom.xml
deleted file mode 100644
index 2243e8bf2..000000000
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/pom.xml
+++ /dev/null
@@ -1,87 +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="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>linkis</artifactId>
- <groupId>org.apache.linkis</groupId>
- <version>1.1.2</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>linkis-cs-highavailable</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-cs-common</artifactId>
- <version>${linkis.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-rpc</artifactId>
- <version>${linkis.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-cs-persistence</artifactId>
- <version>${linkis.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-label-common</artifactId>
- <version>${linkis.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-instance-label-client</artifactId>
- <version>${linkis.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
- <finalName>${project.artifactId}-${project.version}</finalName>
- </build>
-</project>
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/pom.xml
deleted file mode 100644
index efb57f4f2..000000000
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/pom.xml
+++ /dev/null
@@ -1,85 +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="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>linkis</artifactId>
- <groupId>org.apache.linkis</groupId>
- <version>1.1.2</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>linkis-cs-persistence</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-cs-common</artifactId>
- <version>${linkis.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-mybatis</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-module</artifactId>
- <version>${linkis.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- <version>3.1.1</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
- <finalName>${project.artifactId}-${project.version}</finalName>
- </build>
-</project>
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/pom.xml
deleted file mode 100644
index 5171b79a1..000000000
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/pom.xml
+++ /dev/null
@@ -1,75 +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="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>linkis</artifactId>
- <groupId>org.apache.linkis</groupId>
- <version>1.1.2</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>linkis-cs-search</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-cs-common</artifactId>
- <version>${linkis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-cs-cache</artifactId>
- <version>${linkis.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-rpc</artifactId>
- <version>${linkis.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
- <finalName>${project.artifactId}-${project.version}</finalName>
- </build>
-</project>
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
index 8a3de62ba..efcc1a1ec 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
@@ -43,59 +43,19 @@
</dependency>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-cs-cache</artifactId>
- <version>${linkis.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-module</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-cs-listener</artifactId>
<version>${linkis.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-cs-persistence</artifactId>
- <version>${linkis.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-module</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.linkis</groupId>
- <artifactId>linkis-cs-highavailable</artifactId>
+ <artifactId>linkis-instance-label-client</artifactId>
<version>${linkis.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-rpc</artifactId>
- </exclusion>
- </exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-cs-search</artifactId>
- <version>${linkis.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-rpc</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.linkis</groupId>
@@ -114,6 +74,17 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.linkis</groupId>
+ <artifactId>linkis-mybatis</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ <version>3.1.1</version>
+ </dependency>
+
</dependencies>
<build>
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/ContextSearch.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/ContextSearch.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/ContextSearch.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/ContextSearch.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/DefaultContextSearch.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/DefaultContextSearch.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/DefaultContextSearch.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/DefaultContextSearch.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/AbstractCommonCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AbstractCommonCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/AbstractCommonCondition.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AbstractCommonCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/AtomicCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AtomicCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/AtomicCondition.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AtomicCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/BinaryLogicCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/BinaryLogicCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/BinaryLogicCondition.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/BinaryLogicCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/Condition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/Condition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/Condition.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/Condition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/ConditionType.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/ConditionType.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/ConditionType.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/ConditionType.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/UnaryLogicCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/UnaryLogicCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/UnaryLogicCondition.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/UnaryLogicCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/AndConditionParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/AndConditionParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/AndConditionParser.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/AndConditionParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilder.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilder.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilder.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilder.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilderImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilderImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilderImpl.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilderImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/ConditionParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/ConditionParser.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/ContainsConditionParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContainsConditionParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/ContainsConditionParser.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContainsConditionParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/ContextScopeConditionParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextScopeConditionParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/ContextScopeConditionParser.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextScopeConditionParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/ContextTypeConditionParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextTypeConditionParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/ContextTypeConditionParser.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextTypeConditionParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/ContextValueTypeConditionParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextValueTypeConditionParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/ContextValueTypeConditionParser.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextValueTypeConditionParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/NearestConditionParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NearestConditionParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/NearestConditionParser.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NearestConditionParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/NotConditionParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NotConditionParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/NotConditionParser.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NotConditionParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/OrConditionParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/OrConditionParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/OrConditionParser.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/OrConditionParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/RegexConditionParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/RegexConditionParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/RegexConditionParser.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/RegexConditionParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/impl/AndCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/AndCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/impl/AndCondition.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/AndCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/impl/ContainsCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContainsCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/impl/ContainsCondition.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContainsCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/impl/ContextScopeCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextScopeCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/impl/ContextScopeCondition.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextScopeCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/impl/ContextTypeCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextTypeCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/impl/ContextTypeCondition.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextTypeCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/impl/ContextValueTypeCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextValueTypeCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/impl/ContextValueTypeCondition.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextValueTypeCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/impl/NearestCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NearestCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/impl/NearestCondition.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NearestCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/impl/NotCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NotCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/impl/NotCondition.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NotCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/impl/OrCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/OrCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/impl/OrCondition.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/OrCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/impl/RegexCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/RegexCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/impl/RegexCondition.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/RegexCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/ContextCacheService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/ContextCacheService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/ContextCacheService.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/ContextCacheService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/DefaultContextCacheService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/DefaultContextCacheService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/DefaultContextCacheService.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/DefaultContextCacheService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/ContextCache.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/ContextCache.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/ContextCache.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/ContextCache.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextAddListener.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextAddListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextAddListener.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextAddListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValue.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValueGenerator.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValueGenerator.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValueGenerator.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValueGenerator.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueGeneratorImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueGeneratorImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueGeneratorImpl.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueGeneratorImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextKeyValueContext.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextKeyValueContext.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextKeyValueContext.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextKeyValueContext.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextValueMapSet.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextValueMapSet.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextValueMapSet.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextValueMapSet.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cleaner/AUTOCleaner.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cleaner/AUTOCleaner.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cleaner/AUTOCleaner.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cleaner/AUTOCleaner.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/conf/ContextCacheConf.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/conf/ContextCacheConf.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/conf/ContextCacheConf.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/conf/ContextCacheConf.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndex.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndex.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndex.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndex.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSet.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSet.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSet.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSet.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSetImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSetImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSetImpl.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSetImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/index/DefaultContextInvertedIndex.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/DefaultContextInvertedIndex.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/index/DefaultContextInvertedIndex.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/DefaultContextInvertedIndex.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/metric/ClassIntrospector.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ClassIntrospector.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/metric/ClassIntrospector.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ClassIntrospector.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextCacheMetric.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextCacheMetric.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextCacheMetric.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextCacheMetric.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextIDMetric.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextIDMetric.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextIDMetric.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextIDMetric.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextCacheMetric.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextCacheMetric.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextCacheMetric.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextCacheMetric.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextIDMetric.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextIDMetric.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextIDMetric.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextIDMetric.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/metric/Metrtic.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/Metrtic.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/metric/Metrtic.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/Metrtic.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/metric/ObjectInfo.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ObjectInfo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/metric/ObjectInfo.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ObjectInfo.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/metric/SizeEstimator.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/SizeEstimator.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/metric/SizeEstimator.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/SizeEstimator.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/parser/ContextKeyValueParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/ContextKeyValueParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/parser/ContextKeyValueParser.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/ContextKeyValueParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/utils/ContextCacheUtils.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/utils/ContextCacheUtils.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/utils/ContextCacheUtils.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/utils/ContextCacheUtils.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/exception/ContextSearchFailedException.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/exception/ContextSearchFailedException.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/exception/ContextSearchFailedException.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/exception/ContextSearchFailedException.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/AbstractConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/AbstractConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/AbstractConditionExecution.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/AbstractConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/ConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/ConditionExecution.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/fetcher/AbstractContextCacheFetcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/AbstractContextCacheFetcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/fetcher/AbstractContextCacheFetcher.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/AbstractContextCacheFetcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextCacheFetcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextCacheFetcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextCacheFetcher.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextCacheFetcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextTypeContextSearchFetcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextTypeContextSearchFetcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextTypeContextSearchFetcher.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextTypeContextSearchFetcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/fetcher/IterateContextCacheFetcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/IterateContextCacheFetcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/fetcher/IterateContextCacheFetcher.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/IterateContextCacheFetcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/AndConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/AndConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/AndConditionExecution.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/AndConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/BinaryLogicConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/BinaryLogicConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/BinaryLogicConditionExecution.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/BinaryLogicConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/ContainsConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContainsConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/ContainsConditionExecution.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContainsConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/ContextScopeConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextScopeConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/ContextScopeConditionExecution.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextScopeConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/ContextTypeConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextTypeConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/ContextTypeConditionExecution.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextTypeConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/ContextValueTypeConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextValueTypeConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/ContextValueTypeConditionExecution.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextValueTypeConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/NearestConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NearestConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/NearestConditionExecution.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NearestConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/NotConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NotConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/NotConditionExecution.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NotConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/OrConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/OrConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/OrConditionExecution.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/OrConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/RegexConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/RegexConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/RegexConditionExecution.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/RegexConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/UnaryLogicConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/UnaryLogicConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/impl/UnaryLogicConditionExecution.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/UnaryLogicConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/AbstractContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AbstractContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/AbstractContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AbstractContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/AndLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AndLogicContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/AndLogicContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AndLogicContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/BinaryLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/BinaryLogicContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/BinaryLogicContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/BinaryLogicContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/ConditionMatcherResolver.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ConditionMatcherResolver.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/ConditionMatcherResolver.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ConditionMatcherResolver.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/ContainsContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContainsContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/ContainsContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContainsContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/ContextScopeContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextScopeContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/ContextScopeContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextScopeContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/ContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/ContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/ContextTypeContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextTypeContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/ContextTypeContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextTypeContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/ContextValueTypeContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextValueTypeContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/ContextValueTypeContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextValueTypeContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/NearestLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NearestLogicContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/NearestLogicContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NearestLogicContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/NotLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NotLogicContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/NotLogicContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NotLogicContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/OrLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/OrLogicContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/OrLogicContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/OrLogicContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/RegexContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/RegexContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/RegexContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/RegexContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/SkipContextSearchMather.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/SkipContextSearchMather.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/SkipContextSearchMather.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/SkipContextSearchMather.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/UnaryLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/UnaryLogicContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/matcher/UnaryLogicContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/UnaryLogicContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/ruler/AbstractContextSearchRuler.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/AbstractContextSearchRuler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/ruler/AbstractContextSearchRuler.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/AbstractContextSearchRuler.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/ruler/CommonListContextSearchRuler.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/CommonListContextSearchRuler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/ruler/CommonListContextSearchRuler.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/CommonListContextSearchRuler.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/ruler/ContextSearchRuler.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/ContextSearchRuler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/ruler/ContextSearchRuler.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/ContextSearchRuler.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/AbstractContextHAManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/AbstractContextHAManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/AbstractContextHAManager.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/AbstractContextHAManager.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ContextHAManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ContextHAManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ContextHAManager.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ContextHAManager.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/conf/ContextHighAvailableConf.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/conf/ContextHighAvailableConf.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/conf/ContextHighAvailableConf.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/conf/ContextHighAvailableConf.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/exception/CSErrorCode.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/exception/CSErrorCode.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/exception/CSErrorCode.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/exception/CSErrorCode.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/BackupInstanceGenerator.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/BackupInstanceGenerator.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/BackupInstanceGenerator.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/BackupInstanceGenerator.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAChecker.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAChecker.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAChecker.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAChecker.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAIDGenerator.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAIDGenerator.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAIDGenerator.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAIDGenerator.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/pluggable/HAContextPersistenceManagerImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/pluggable/HAContextPersistenceManagerImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/pluggable/HAContextPersistenceManagerImpl.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/pluggable/HAContextPersistenceManagerImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/optimize/ConditionOptimizer.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/ConditionOptimizer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/optimize/ConditionOptimizer.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/ConditionOptimizer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/optimize/OptimizedCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/OptimizedCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/optimize/OptimizedCondition.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/OptimizedCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/optimize/cost/ConditionCostCalculator.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/cost/ConditionCostCalculator.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/optimize/cost/ConditionCostCalculator.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/cost/ConditionCostCalculator.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/optimize/dfs/BinaryTree.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/BinaryTree.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/optimize/dfs/BinaryTree.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/BinaryTree.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/optimize/dfs/MinCostBinaryTree.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/MinCostBinaryTree.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/optimize/dfs/MinCostBinaryTree.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/MinCostBinaryTree.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/optimize/dfs/Node.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/Node.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/optimize/dfs/Node.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/Node.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/optimize/impl/CostBasedConditionOptimizer.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/impl/CostBasedConditionOptimizer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/optimize/impl/CostBasedConditionOptimizer.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/impl/CostBasedConditionOptimizer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceBeans.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceBeans.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceBeans.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceBeans.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManager.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManager.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManagerImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManagerImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManagerImpl.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManagerImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/annotation/Ignore.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Ignore.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/annotation/Ignore.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Ignore.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/annotation/Tuning.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Tuning.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/annotation/Tuning.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Tuning.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/aop/PersistenceTuningAspect.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/aop/PersistenceTuningAspect.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/aop/PersistenceTuningAspect.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/aop/PersistenceTuningAspect.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/conf/PersistenceConf.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/conf/PersistenceConf.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/conf/PersistenceConf.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/conf/PersistenceConf.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapper.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapper.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapper.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapper.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapper.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapper.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDMapper.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDMapper.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDMapper.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapper.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapper.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapper.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/dao/ContextMapMapper.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextMapMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/dao/ContextMapMapper.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextMapMapper.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextHistoryMapper.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextHistoryMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextHistoryMapper.xml
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextHistoryMapper.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextIDListenerMapper.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextIDListenerMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextIDListenerMapper.xml
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextIDListenerMapper.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextIDMapper.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextIDMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextIDMapper.xml
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextIDMapper.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextKeyListenerMapper.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextKeyListenerMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextKeyListenerMapper.xml
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextKeyListenerMapper.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextMapMapper.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextMapMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextMapMapper.xml
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/impl/contextMapMapper.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/entity/ExtraFieldClass.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/ExtraFieldClass.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/entity/ExtraFieldClass.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/ExtraFieldClass.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextHistory.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextHistory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextHistory.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextHistory.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextID.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextID.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextID.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextID.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextIDListener.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextIDListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextIDListener.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextIDListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKey.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKey.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKey.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKey.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyListener.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyListener.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyValue.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextValue.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/exception/ThrowingFunction.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/exception/ThrowingFunction.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/exception/ThrowingFunction.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/exception/ThrowingFunction.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextHistoryPersistence.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextHistoryPersistence.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextHistoryPersistence.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextHistoryPersistence.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDListenerPersistence.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDListenerPersistence.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDListenerPersistence.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDListenerPersistence.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDPersistence.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDPersistence.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDPersistence.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDPersistence.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextKeyListenerPersistence.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextKeyListenerPersistence.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextKeyListenerPersistence.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextKeyListenerPersistence.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMapPersistence.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMapPersistence.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMapPersistence.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMapPersistence.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMetricsPersistence.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMetricsPersistence.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMetricsPersistence.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMetricsPersistence.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/KeywordContextHistoryPersistence.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/KeywordContextHistoryPersistence.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/KeywordContextHistoryPersistence.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/KeywordContextHistoryPersistence.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/TransactionManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/TransactionManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/TransactionManager.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/TransactionManager.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextHistoryPersistenceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextHistoryPersistenceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextHistoryPersistenceImpl.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextHistoryPersistenceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDListenerPersistenceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDListenerPersistenceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDListenerPersistenceImpl.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDListenerPersistenceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDPersistenceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDPersistenceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDPersistenceImpl.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDPersistenceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextKeyListenerPersistenceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextKeyListenerPersistenceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextKeyListenerPersistenceImpl.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextKeyListenerPersistenceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMapPersistenceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMapPersistenceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMapPersistenceImpl.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMapPersistenceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMetricsPersistenceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMetricsPersistenceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMetricsPersistenceImpl.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMetricsPersistenceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/KeywordContextHistoryPersistenceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/KeywordContextHistoryPersistenceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/KeywordContextHistoryPersistenceImpl.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/KeywordContextHistoryPersistenceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/TransactionManagerImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/TransactionManagerImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/TransactionManagerImpl.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/TransactionManagerImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/util/PersistenceUtils.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/util/PersistenceUtils.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/org/apache/linkis/cs/persistence/util/PersistenceUtils.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/util/PersistenceUtils.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/resources/cs_ddl.sql b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/cs_ddl.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/resources/cs_ddl.sql
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/cs_ddl.sql
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasConverter.scala b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasConverter.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasConverter.scala
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasConverter.scala
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasManager.scala b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasManager.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasManager.scala
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasManager.scala
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/DefaultInstanceAliasConverter.scala b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/DefaultInstanceAliasConverter.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/DefaultInstanceAliasConverter.scala
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/DefaultInstanceAliasConverter.scala
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/AndTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/AndTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/AndTest.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/AndTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/ContainsTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContainsTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/ContainsTest.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContainsTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/ContextScopeTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextScopeTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/ContextScopeTest.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextScopeTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/ContextSearchTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextSearchTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/ContextSearchTest.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextSearchTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/ContextTypeTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextTypeTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/ContextTypeTest.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextTypeTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/RegexTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/RegexTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/RegexTest.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/RegexTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/org/apache/linkis/cs/contextcache/test/csid/TestContextID.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/csid/TestContextID.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/org/apache/linkis/cs/contextcache/test/csid/TestContextID.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/csid/TestContextID.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKey.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKey.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKey.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKey.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValue.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValueParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValueParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValueParser.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValueParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextValue.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/org/apache/linkis/cs/contextcache/test/service/TestContextCacheService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/service/TestContextCacheService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/org/apache/linkis/cs/contextcache/test/service/TestContextCacheService.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/service/TestContextCacheService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/csid/TestContextID.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/csid/TestContextID.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/csid/TestContextID.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/csid/TestContextID.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/java/org/apache/linkis/cs/highavailable/test/TestContextHAManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/TestContextHAManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/java/org/apache/linkis/cs/highavailable/test/TestContextHAManager.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/TestContextHAManager.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/java/org/apache/linkis/cs/highavailable/test/haid/TestHAID.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/haid/TestHAID.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/java/org/apache/linkis/cs/highavailable/test/haid/TestHAID.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/haid/TestHAID.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/java/org/apache/linkis/cs/highavailable/test/persist/TestPersistence.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/persist/TestPersistence.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/java/org/apache/linkis/cs/highavailable/test/persist/TestPersistence.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/persist/TestPersistence.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/keyword/TestContextKey.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKey.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/keyword/TestContextKey.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKey.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/keyword/TestContextKeyValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKeyValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/keyword/TestContextKeyValue.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKeyValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/keyword/TestContextValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/keyword/TestContextValue.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/parser/ApiJsonTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/parser/ApiJsonTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/org/apache/linkis/cs/parser/ApiJsonTest.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/parser/ApiJsonTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/AContextHistory.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextHistory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/AContextHistory.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextHistory.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/AContextID.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextID.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/AContextID.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextID.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/AContextIDListener.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextIDListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/AContextIDListener.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextIDListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/AContextKey.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKey.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/AContextKey.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKey.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/AContextKeyListener.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/AContextKeyListener.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/AContextKeyValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/AContextKeyValue.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/AContextValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/AContextValue.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/ContextHistoryTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextHistoryTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/ContextHistoryTest.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextHistoryTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/ContextIDListenerTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDListenerTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/ContextIDListenerTest.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDListenerTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/ContextIDTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/ContextIDTest.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/ContextKeyListenerTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextKeyListenerTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/ContextKeyListenerTest.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextKeyListenerTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/ContextMapTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextMapTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/ContextMapTest.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextMapTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/ExtraFieldClassTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ExtraFieldClassTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/ExtraFieldClassTest.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ExtraFieldClassTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/MapTypeAdapter.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/MapTypeAdapter.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/MapTypeAdapter.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/MapTypeAdapter.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/ProxyMethodA.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyMethodA.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/ProxyMethodA.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyMethodA.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/ProxyTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/ProxyTest.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/Scan.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/Scan.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/test/java/org/apache/linkis/cs/persistence/Scan.java
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/Scan.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/resources/application.yml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/application.yml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/resources/application.yml
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/application.yml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/resources/linkis.properties b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/linkis.properties
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/resources/linkis.properties
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/linkis.properties
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/resources/log4j2.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/log4j2.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/resources/log4j2.xml
rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/log4j2.xml
diff --git a/linkis-public-enhancements/linkis-context-service/pom.xml b/linkis-public-enhancements/linkis-context-service/pom.xml
index 16caf0c08..c04418a91 100644
--- a/linkis-public-enhancements/linkis-context-service/pom.xml
+++ b/linkis-public-enhancements/linkis-context-service/pom.xml
@@ -36,10 +36,6 @@
<module>linkis-cs-common</module>
<module>linkis-cs-listener</module>
<module>linkis-cs-client</module>
- <module>linkis-cs-cache</module>
- <module>linkis-cs-persistence</module>
- <module>linkis-cs-highavailable</module>
- <module>linkis-cs-search</module>
<module>linkis-cs-server</module>
</modules>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org