This is an automated email from the ASF dual-hosted git repository. peacewong pushed a commit to branch dev-1.3.2 in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 840454b694615e44864665a98c99729f2d591863 Author: Jack Xu <[email protected]> AuthorDate: Tue Nov 15 15:02:00 2022 +0800 feat: merge the ecp code to linkis-application-manager --- docs/configuration/linkis-application-manager.md | 1 - .../linkis-computation-governance-common.md | 1 - .../main/scala/org/apache/linkis/rpc/Sender.scala | 2 - .../apache/linkis/rpc/conf/RPCConfiguration.scala | 13 - .../org/apache/linkis/rpc/utils/RPCUtils.scala | 14 - .../common/conf/GovernaceCommonConf.scala | 3 - .../linkis/ecm/server/conf/ECMConfiguration.scala | 3 - .../impl/LinuxProcessEngineConnLaunchService.scala | 4 +- .../linkis-engineconn-plugin-server/pom.xml | 222 --------------- .../src/main/assembly/distribution.xml | 296 -------------------- .../linkis-engineconn/pom.xml | 1 - .../linkis-manager/distribution.xml | 297 --------------------- .../linkis-application-manager/pom.xml | 22 ++ .../src/main/assembly/distribution.xml | 22 +- .../engineplugin/cache/EngineConnPluginCache.java | 0 .../cache/GuavaEngineConnPluginCache.java | 10 +- .../cache/config/EngineConnPluginCacheConfig.java | 0 .../DefaultRefreshPluginCacheContainer.java | 0 .../cache/refresh/PluginCacheRefresher.java | 0 .../cache/refresh/RefreshPluginCacheContainer.java | 0 .../cache/refresh/RefreshPluginCacheOperation.java | 0 .../refresh/RefreshableEngineConnPluginCache.java | 0 .../classloader/EngineConnPluginClassLoader.java | 0 .../loaders/CacheablesEngineConnPluginLoader.java | 0 .../loaders/DefaultEngineConnPluginLoader.java | 0 .../loader/loaders/EngineConnPluginsLoader.java | 0 .../loaders/EngineConnPluginsResourceLoader.java | 0 .../BmlEngineConnPluginResourceLoader.java | 0 .../LocalEngineConnPluginResourceLoader.java | 0 .../loader/loaders/resource/PluginResource.java | 0 .../loader/utils/EngineConnPluginUtils.java | 0 .../engineplugin/loader/utils/ExceptionHelper.java | 0 .../server/LinkisEngineConnPluginServer.java | 0 .../conf/EngineConnPluginSpringConfiguration.java | 0 .../server/dao/EngineConnBmlResourceDao.java | 0 .../dao/impl/EngineConnBmlResourceMapper.xml | 0 .../server/entity/EngineConnBmlResource.java | 0 .../server/restful/EnginePluginRestful.java | 4 +- .../server/service/EnginePluginAdminService.java | 0 .../service/impl/EnginePluginAdminServiceImpl.java | 0 .../linkis/engineplugin/vo/EnginePluginBMLVo.java | 0 .../apache/linkis/engineplugin/vo/PageViewVo.java | 0 .../manager/am/restful/EngineRestfulApi.java | 38 +-- .../loader/EngineConnPluginLoaderConf.scala | 0 .../conf/EngineConnPluginConfiguration.scala | 0 .../interceptor/EngineConnLaunchInterceptor.scala | 0 .../server/loader/EngineConnPluginsLoader.scala | 0 .../AbstractEngineConnBmlResourceGenerator.scala | 0 .../DefaultEngineConnBmlResourceGenerator.scala | 0 .../localize/EngineConnBmlResourceGenerator.scala | 0 .../service/DefaultEngineConnLaunchService.scala | 0 .../DefaultEngineConnResourceFactoryService.scala | 0 .../service/DefaultEngineConnResourceService.scala | 0 .../server/service/EngineConnLaunchService.scala | 0 .../service/EngineConnResourceFactoryService.scala | 0 .../server/service/EngineConnResourceService.scala | 0 .../linkis/manager/am/conf/AMConfiguration.scala | 3 - .../pointer/DefaultEngineConnPluginPointer.scala | 50 ---- .../am/pointer/EngineConnPluginPointer.scala | 27 -- .../engine/DefaultEngineAskEngineService.scala | 6 +- .../engine/DefaultEngineCreateService.scala | 12 +- .../loader/EngineConnPluginLoaderTest.java | 0 .../protocol/engine/EngineCreateRequest.java | 14 +- .../manager/common/entity/resource/Resource.scala | 12 +- .../manager/common/utils/ResourceUtils.scala | 4 +- .../linkis-manager/pom.xml | 65 ----- .../conf/linkis-cg-linkismanager.properties | 3 - linkis-dist/package/sbin/linkis-daemon.sh | 3 - linkis-dist/src/main/assembly/distribution.xml | 2 +- .../linkis/gateway/parser/GatewayParser.scala | 5 - 70 files changed, 86 insertions(+), 1073 deletions(-) diff --git a/docs/configuration/linkis-application-manager.md b/docs/configuration/linkis-application-manager.md index 543623f59..df7c361b6 100644 --- a/docs/configuration/linkis-application-manager.md +++ b/docs/configuration/linkis-application-manager.md @@ -15,7 +15,6 @@ |linkis-application-manager|wds.linkis.manager.am.stop.em.wait| 5m|stop.em.wait| |linkis-application-manager|wds.linkis.manager.am.em.label.init.wait|5m|label.init.wait| |linkis-application-manager|wds.linkis.manager.am.em.new.wait.mills|1000 * 60L| wait.mills| -|linkis-application-manager|wds.linkis.engineconn.application.name | linkis-cg-engineplugin| engineconn.application.name | |linkis-application-manager|wds.linkis.engineconn.debug.mode.enable|jdbc,es,presto,io_file,appconn,openlookeng,trino| debug.mode.enable| |linkis-application-manager|wds.linkis.multi.user.engine.user| |engine.user| |linkis-application-manager|wds.linkis.manager.am.engine.locker.max.time| 1000 * 60 * 5|locker.max.time| diff --git a/docs/configuration/linkis-computation-governance-common.md b/docs/configuration/linkis-computation-governance-common.md index f4b0a8588..0fc5900ef 100644 --- a/docs/configuration/linkis-computation-governance-common.md +++ b/docs/configuration/linkis-computation-governance-common.md @@ -10,7 +10,6 @@ |linkis-computation-governance-common|wds.linkis.python.code_parser.enabled| false |python.code_parser.enabled| |linkis-computation-governance-common|wds.linkis.scala.code_parser.enabled| false | scala.code_parser.enabled | |linkis-computation-governance-common|wds.linkis.engineconn.name| linkis-cg-engineconn | engineconn.name | -|linkis-computation-governance-common|wds.linkis.engineconn.plugin.spring.name| linkis-cg-engineplugin |engineconn.plugin.spring.name| |linkis-computation-governance-common|wds.linkis.engineconn.manager.name|linkis-cg-engineconnmanager | engineconn.manager.name | |linkis-computation-governance-common|wds.linkis.engineconn.port.range| - |engineconn.port.range| |linkis-computation-governance-common|wds.linkis.engineconn.manager.name| linkis-cg-linkismanager |engineconn.manager.name| diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/Sender.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/Sender.scala index f7bc86118..1ebdd0ec0 100644 --- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/Sender.scala +++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/Sender.scala @@ -86,8 +86,6 @@ object Sender { def getSender(serviceInstance: ServiceInstance): Sender = { if (RPCUtils.isPublicService(serviceInstance.getApplicationName)) { serviceInstance.setApplicationName(RPCConfiguration.PUBLIC_SERVICE_APPLICATION_NAME.getValue) - } else if (RPCUtils.isLinkisManageMerged(serviceInstance.getApplicationName)) { - serviceInstance.setApplicationName(RPCConfiguration.LINKIS_MANAGER_APPLICATION_NAME.getValue) } if (!serviceInstanceToSenders.containsKey(serviceInstance)) { serviceInstanceToSenders synchronized { diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala index 787f0a295..a68999254 100644 --- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala +++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala @@ -65,19 +65,6 @@ object RPCConfiguration { "cs,contextservice,data-source-manager,metadataQuery,metadatamanager,query,jobhistory,application,configuration,filesystem,udf,variable,microservice,errorcode,bml,datasource,basedata-manager" ).getValue.split(",") - val COMPUTATION_GOVERNANCE_APP_PREFIX: String = - CommonVars("linkis.gateway.conf.app.cg.prefix", "linkis-cg-").getValue - - val LINKIS_MANAGER_SERVICE_MERGED: CommonVars[Boolean] = - CommonVars("linkis.gateway.conf.app.merge.cg.manager", true) - - val LINKIS_MANAGER_APPLICATION_NAME: CommonVars[String] = - CommonVars("linkis.gateway.conf.app.cg.manager.name", "linkis-cg-linkismanager") - - val LINKIS_MANAGER_SERVICE_LIST: Array[String] = - CommonVars("linkis.gateway.conf.app.cg.manager.list", "linkisManager,engineplugin").getValue - .split(",") - val METADATAQUERY_SERVICE_APPLICATION_NAME: CommonVars[String] = CommonVars("wds.linkis.gateway.conf.publicservice.name", "linkis-ps-metadataquery") diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/utils/RPCUtils.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/utils/RPCUtils.scala index cec8f1d6c..e7d48305a 100644 --- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/utils/RPCUtils.scala +++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/utils/RPCUtils.scala @@ -102,18 +102,4 @@ object RPCUtils { } } - def isLinkisManageMerged(appName: String): Boolean = { - if (!RPCConfiguration.LINKIS_MANAGER_SERVICE_MERGED.getValue || StringUtils.isBlank(appName)) { - return false - } - val appNameLower = appName.toLowerCase() - if (appNameLower.startsWith(RPCConfiguration.COMPUTATION_GOVERNANCE_APP_PREFIX)) { - val serviceName = - appNameLower.replaceFirst(RPCConfiguration.COMPUTATION_GOVERNANCE_APP_PREFIX, "") - RPCConfiguration.LINKIS_MANAGER_SERVICE_LIST.exists(_.equalsIgnoreCase(serviceName)) - } else { - false - } - } - } diff --git a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/conf/GovernaceCommonConf.scala b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/conf/GovernaceCommonConf.scala index 0854598f3..5fdc9cf7f 100644 --- a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/conf/GovernaceCommonConf.scala +++ b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/conf/GovernaceCommonConf.scala @@ -35,9 +35,6 @@ object GovernanceCommonConf { val ENGINE_CONN_SPRING_NAME = CommonVars("wds.linkis.engineconn.name", "linkis-cg-engineconn") - val ENGINE_CONN_PLUGIN_SPRING_NAME = - CommonVars("wds.linkis.engineconn.plugin.spring.name", "linkis-cg-engineplugin") - val ENGINE_CONN_MANAGER_SPRING_NAME = CommonVars("wds.linkis.engineconn.manager.name", "linkis-cg-engineconnmanager") diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/conf/ECMConfiguration.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/conf/ECMConfiguration.scala index d673b2372..3f0077a82 100644 --- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/conf/ECMConfiguration.scala +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/conf/ECMConfiguration.scala @@ -82,9 +82,6 @@ object ECMConfiguration { val ECM_HEALTH_REPORT_DELAY: Long = CommonVars("wds.linkis.ecm.health.report.delay", 10).getValue - val ENGINECONN_PLUGIN_SPRING_NAME: String = - GovernanceCommonConf.ENGINE_CONN_PLUGIN_SPRING_NAME.getValue - val ECM_HOME_DIR: String = CommonVars("wds.linkis.ecm.home.dir", this.getClass.getResource("/").getPath).getValue diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/LinuxProcessEngineConnLaunchService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/LinuxProcessEngineConnLaunchService.scala index 6a6fbf436..ce24bc476 100644 --- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/LinuxProcessEngineConnLaunchService.scala +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/LinuxProcessEngineConnLaunchService.scala @@ -39,14 +39,14 @@ class LinuxProcessEngineConnLaunchService extends ProcessEngineConnLaunchService engineConnBuildRequest: EngineConnBuildRequest, sender: Sender ): EngineNode = { - Sender.getSender(ENGINECONN_PLUGIN_SPRING_NAME).ask(engineConnBuildRequest) match { + Sender.getSender(MANAGER_SERVICE_NAME).ask(engineConnBuildRequest) match { case request: EngineConnLaunchRequest if ENGINECONN_CREATE_DURATION._1 != 0L => launchEngineConn(request, ENGINECONN_CREATE_DURATION._1) } } override def launchEngineConn(engineConnBuildRequest: EngineConnBuildRequest): EngineNode = { - Sender.getSender(ENGINECONN_PLUGIN_SPRING_NAME).ask(engineConnBuildRequest) match { + Sender.getSender(MANAGER_SERVICE_NAME).ask(engineConnBuildRequest) match { case request: EngineConnLaunchRequest => launchEngineConn(request, ENGINECONN_CREATE_DURATION._1) } diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/pom.xml b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/pom.xml deleted file mode 100644 index 97d5a1c16..000000000 --- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/pom.xml +++ /dev/null @@ -1,222 +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";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.linkis</groupId> - <artifactId>linkis</artifactId> - <version>1.3.1</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - - <artifactId>linkis-engineconn-plugin-server</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.linkis</groupId> - <artifactId>linkis-rpc</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> - </exclusion> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - </exclusion> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - </exclusion> - - <exclusion> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.linkis</groupId> - <artifactId>linkis-storage</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.linkis</groupId> - <artifactId>linkis-common</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-jcl</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.linkis</groupId> - <artifactId>linkis-mybatis</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.linkis</groupId> - <artifactId>linkis-common</artifactId> - </exclusion> - - <exclusion> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.linkis</groupId> - <artifactId>linkis-storage</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.linkis</groupId> - <artifactId>linkis-engineconn-plugin-core</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.linkis</groupId> - <artifactId>linkis-common</artifactId> - </exclusion> - - <exclusion> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.linkis</groupId> - <artifactId>linkis-storage</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.linkis</groupId> - <artifactId>linkis-bml-client</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.linkis</groupId> - <artifactId>linkis-common</artifactId> - </exclusion> - - <exclusion> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.linkis</groupId> - <artifactId>linkis-storage</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.linkis</groupId> - <artifactId>linkis-common</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.json4s</groupId> - <artifactId>json4s-jackson_${scala.binary.version}</artifactId> - <version>${json4s.version}</version> - <scope>provided</scope> - </dependency> - - </dependencies> - - <build> - <finalName>${project.artifactId}-${project.version}</finalName> - <resources> - - <resource> - <directory>src/main/java</directory> - <includes> - <include>**/*.xml</include> - </includes> - </resource> - - <resource> - <directory>${basedir}/src/main/resources</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.yml</include> - </includes> - </resource> - </resources> - <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> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <inherited>false</inherited> - <configuration> - <skipAssembly>false</skipAssembly> - <finalName>out</finalName> - <appendAssemblyId>false</appendAssemblyId> - <attach>false</attach> - <descriptors> - <descriptor>src/main/assembly/distribution.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <descriptors> - <descriptor>src/main/assembly/distribution.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/assembly/distribution.xml b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/assembly/distribution.xml deleted file mode 100644 index 58cf63368..000000000 --- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/assembly/distribution.xml +++ /dev/null @@ -1,296 +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. - --> - -<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.1 https://maven.apache.org/xsd/assembly-2.1.1.xsd";> - <id>linkis-application-manager</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <baseDirectory>linkis-engineconn-plugin-server</baseDirectory> - - <dependencySets> - <dependencySet> - <!-- Enable access to all projects in the current multimodule build! <useAllReactorProjects>true</useAllReactorProjects> --> - <!-- Now, select which projects to include in this module-set. --> - <outputDirectory>lib</outputDirectory> - <useProjectArtifact>true</useProjectArtifact> - <useTransitiveDependencies>true</useTransitiveDependencies> - <unpack>false</unpack> - <useStrictFiltering>false</useStrictFiltering> - <useTransitiveFiltering>true</useTransitiveFiltering> - <excludes> - <exclude>antlr:antlr:jar</exclude> - <exclude>aopalliance:aopalliance:jar</exclude> - <exclude>asm:asm:jar</exclude> - <exclude>cglib:cglib:jar</exclude> - <exclude>com.amazonaws:aws-java-sdk-autoscaling:jar</exclude> - <exclude>com.amazonaws:aws-java-sdk-core:jar</exclude> - <exclude>com.amazonaws:aws-java-sdk-ec2:jar</exclude> - <exclude>com.amazonaws:aws-java-sdk-route53:jar</exclude> - <exclude>com.amazonaws:aws-java-sdk-sts:jar</exclude> - <exclude>com.amazonaws:jmespath-java:jar</exclude> - <exclude>com.fasterxml.jackson.core:jackson-annotations:jar</exclude> - <exclude>com.fasterxml.jackson.core:jackson-core:jar</exclude> - <exclude>com.fasterxml.jackson.core:jackson-databind:jar</exclude> - <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar</exclude> - <exclude>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar</exclude> - <exclude>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar</exclude> - <exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar</exclude> - <exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar</exclude> - <exclude>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar</exclude> - <exclude>com.fasterxml.jackson.module:jackson-module-parameter-names:jar</exclude> - <exclude>com.fasterxml.jackson.module:jackson-module-paranamer:jar</exclude> - <exclude>com.fasterxml.jackson.module:jackson-module-scala_2.11:jar</exclude> - <exclude>com.github.andrewoma.dexx:dexx-collections:jar</exclude> - <exclude>com.github.vlsi.compactmap:compactmap:jar</exclude> - <exclude>com.google.code.findbugs:annotations:jar</exclude> - <exclude>com.google.code.findbugs:jsr305:jar</exclude> - <exclude>com.google.code.gson:gson:jar</exclude> - <exclude>com.google.guava:guava:jar</exclude> - <exclude>com.google.inject:guice:jar</exclude> - <exclude>com.google.protobuf:protobuf-java:jar</exclude> - <exclude>com.netflix.archaius:archaius-core:jar</exclude> - <exclude>com.netflix.eureka:eureka-client:jar</exclude> - <exclude>com.netflix.eureka:eureka-core:jar</exclude> - <exclude>com.netflix.hystrix:hystrix-core:jar</exclude> - <exclude>com.netflix.netflix-commons:netflix-commons-util:jar</exclude> - <exclude>com.netflix.netflix-commons:netflix-eventbus:jar</exclude> - <exclude>com.netflix.netflix-commons:netflix-infix:jar</exclude> - <exclude>com.netflix.netflix-commons:netflix-statistics:jar</exclude> - <exclude>com.netflix.ribbon:ribbon:jar</exclude> - <exclude>com.netflix.ribbon:ribbon-core:jar</exclude> - <exclude>com.netflix.ribbon:ribbon-eureka:jar</exclude> - <exclude>com.netflix.ribbon:ribbon-httpclient:jar</exclude> - <exclude>com.netflix.ribbon:ribbon-loadbalancer:jar</exclude> - <exclude>com.netflix.ribbon:ribbon-transport:jar</exclude> - <exclude>com.netflix.servo:servo-core:jar</exclude> - <exclude>com.ning:async-http-client:jar</exclude> - <exclude>com.sun.jersey.contribs:jersey-apache-client4:jar</exclude> - <exclude>com.sun.jersey:jersey-client:jar</exclude> - <exclude>com.sun.jersey:jersey-core:jar</exclude> - <exclude>com.sun.jersey:jersey-json:jar</exclude> - <exclude>com.sun.jersey:jersey-server:jar</exclude> - <exclude>com.sun.jersey:jersey-servlet:jar</exclude> - <exclude>com.sun.xml.bind:jaxb-impl:jar</exclude> - <exclude>com.thoughtworks.paranamer:paranamer:jar</exclude> - <exclude>com.thoughtworks.xstream:xstream:jar</exclude> - <exclude>org.apache.linkis:linkis-common:jar</exclude> - <exclude>org.apache.linkis:linkis-module:jar</exclude> - <exclude>commons-beanutils:commons-beanutils:jar</exclude> - <exclude>commons-beanutils:commons-beanutils-core:jar</exclude> - <exclude>commons-cli:commons-cli:jar</exclude> - <exclude>commons-codec:commons-codec:jar</exclude> - <exclude>commons-collections:commons-collections:jar</exclude> - <exclude>commons-configuration:commons-configuration:jar</exclude> - <exclude>commons-daemon:commons-daemon:jar</exclude> - <exclude>commons-dbcp:commons-dbcp:jar</exclude> - <exclude>commons-digester:commons-digester:jar</exclude> - <exclude>commons-httpclient:commons-httpclient:jar</exclude> - <exclude>commons-io:commons-io:jar</exclude> - <exclude>commons-jxpath:commons-jxpath:jar</exclude> - <exclude>commons-lang:commons-lang:jar</exclude> - <exclude>commons-logging:commons-logging:jar</exclude> - <exclude>commons-net:commons-net:jar</exclude> - <exclude>commons-pool:commons-pool:jar</exclude> - <exclude>io.micrometer:micrometer-core:jar</exclude> - <exclude>io.netty:netty:jar</exclude> - <exclude>io.netty:netty-all:jar</exclude> - <exclude>io.netty:netty-buffer:jar</exclude> - <exclude>io.netty:netty-codec:jar</exclude> - <exclude>io.netty:netty-codec-http:jar</exclude> - <exclude>io.netty:netty-common:jar</exclude> - <exclude>io.netty:netty-handler:jar</exclude> - <exclude>io.netty:netty-transport:jar</exclude> - <exclude>io.netty:netty-transport-native-epoll:jar</exclude> - <exclude>io.reactivex:rxjava:jar</exclude> - <exclude>io.reactivex:rxnetty:jar</exclude> - <exclude>io.reactivex:rxnetty-contexts:jar</exclude> - <exclude>io.reactivex:rxnetty-servo:jar</exclude> - <exclude>javax.activation:activation:jar</exclude> - <exclude>javax.annotation:javax.annotation-api:jar</exclude> - <exclude>javax.inject:javax.inject:jar</exclude> - <exclude>javax.servlet:javax.servlet-api:jar</exclude> - <exclude>javax.servlet.jsp:jsp-api:jar</exclude> - <exclude>javax.validation:validation-api:jar</exclude> - <exclude>javax.websocket:javax.websocket-api:jar</exclude> - <exclude>javax.ws.rs:javax.ws.rs-api:jar</exclude> - <exclude>javax.xml.bind:jaxb-api:jar</exclude> - <exclude>javax.xml.stream:stax-api:jar</exclude> - <exclude>joda-time:joda-time:jar</exclude> - <exclude>log4j:log4j:jar</exclude> - <exclude>mysql:mysql-connector-java:jar</exclude> - <exclude>net.databinder.dispatch:dispatch-core_2.11:jar</exclude> - <exclude>net.databinder.dispatch:dispatch-json4s-jackson_2.11:jar</exclude> - <exclude>org.antlr:antlr-runtime:jar</exclude> - <exclude>org.antlr:stringtemplate:jar</exclude> - <exclude>org.apache.commons:commons-compress:jar</exclude> - <exclude>org.apache.commons:commons-math:jar</exclude> - <exclude>org.apache.commons:commons-math3:jar</exclude> - <exclude>org.apache.curator:curator-client:jar</exclude> - <exclude>org.apache.curator:curator-framework:jar</exclude> - <exclude>org.apache.curator:curator-recipes:jar</exclude> - <exclude>org.apache.directory.api:api-asn1-api:jar</exclude> - <exclude>org.apache.directory.api:api-util:jar</exclude> - <exclude>org.apache.directory.server:apacheds-i18n:jar</exclude> - <exclude>org.apache.directory.server:apacheds-kerberos-codec:jar</exclude> - <exclude>org.apache.hadoop:hadoop-annotations:jar</exclude> - <exclude>org.apache.hadoop:hadoop-auth:jar</exclude> - <exclude>org.apache.hadoop:hadoop-common:jar</exclude> - <exclude>org.apache.hadoop:hadoop-hdfs:jar</exclude> - <exclude>org.apache.htrace:htrace-core:jar</exclude> - <exclude>org.apache.httpcomponents:httpclient:jar</exclude> - <exclude>org.apache.httpcomponents:httpcore:jar</exclude> - <exclude>org.apache.logging.log4j:log4j-api:jar</exclude> - <exclude>org.apache.logging.log4j:log4j-core:jar</exclude> - <exclude>org.apache.logging.log4j:log4j-jul:jar</exclude> - <exclude>org.apache.logging.log4j:log4j-slf4j-impl:jar</exclude> - <exclude>org.apache.zookeeper:zookeeper:jar</exclude> - <exclude>org.aspectj:aspectjweaver:jar</exclude> - <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude> - <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude> - <exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude> - <exclude>org.codehaus.jackson:jackson-xc:jar</exclude> - <exclude>org.codehaus.jettison:jettison:jar</exclude> - <exclude>org.codehaus.woodstox:stax2-api:jar</exclude> - <exclude>org.codehaus.woodstox:woodstox-core-asl:jar</exclude> - <exclude>org.eclipse.jetty:jetty-annotations:jar</exclude> - <exclude>org.eclipse.jetty:jetty-client:jar</exclude> - <exclude>org.eclipse.jetty:jetty-continuation:jar</exclude> - <exclude>org.eclipse.jetty:jetty-http:jar</exclude> - <exclude>org.eclipse.jetty:jetty-io:jar</exclude> - <exclude>org.eclipse.jetty:jetty-jndi:jar</exclude> - <exclude>org.eclipse.jetty:jetty-plus:jar</exclude> - <exclude>org.eclipse.jetty:jetty-security:jar</exclude> - <exclude>org.eclipse.jetty:jetty-server:jar</exclude> - <exclude>org.eclipse.jetty:jetty-servlet:jar</exclude> - <exclude>org.eclipse.jetty:jetty-servlets:jar</exclude> - <exclude>org.eclipse.jetty:jetty-util:jar</exclude> - <exclude>org.eclipse.jetty:jetty-webapp:jar</exclude> - <exclude>org.eclipse.jetty:jetty-xml:jar</exclude> - <exclude>org.eclipse.jetty.websocket:javax-websocket-client-impl:jar</exclude> - <exclude>org.eclipse.jetty.websocket:javax-websocket-server-impl:jar</exclude> - <exclude>org.eclipse.jetty.websocket:websocket-api:jar</exclude> - <exclude>org.eclipse.jetty.websocket:websocket-client:jar</exclude> - <exclude>org.eclipse.jetty.websocket:websocket-common:jar</exclude> - <exclude>org.eclipse.jetty.websocket:websocket-server:jar</exclude> - <exclude>org.eclipse.jetty.websocket:websocket-servlet:jar</exclude> - <exclude>org.fusesource.leveldbjni:leveldbjni-all:jar</exclude> - <exclude>org.glassfish.hk2:class-model:jar</exclude> - <exclude>org.glassfish.hk2:config-types:jar</exclude> - <exclude>org.glassfish.hk2.external:aopalliance-repackaged:jar</exclude> - <exclude>org.glassfish.hk2.external:asm-all-repackaged:jar</exclude> - <exclude>org.glassfish.hk2.external:bean-validator:jar</exclude> - <exclude>org.glassfish.hk2.external:javax.inject:jar</exclude> - <exclude>org.glassfish.hk2:hk2:jar</exclude> - <exclude>org.glassfish.hk2:hk2-api:jar</exclude> - <exclude>org.glassfish.hk2:hk2-config:jar</exclude> - <exclude>org.glassfish.hk2:hk2-core:jar</exclude> - <exclude>org.glassfish.hk2:hk2-locator:jar</exclude> - <exclude>org.glassfish.hk2:hk2-runlevel:jar</exclude> - <exclude>org.glassfish.hk2:hk2-utils:jar</exclude> - <exclude>org.glassfish.hk2:osgi-resource-locator:jar</exclude> - <exclude>org.glassfish.hk2:spring-bridge:jar</exclude> - <exclude>org.glassfish.jersey.bundles:jaxrs-ri:jar</exclude> - <exclude>org.glassfish.jersey.bundles.repackaged:jersey-guava:jar</exclude> - <exclude>org.glassfish.jersey.containers:jersey-container-servlet:jar</exclude> - <exclude>org.glassfish.jersey.containers:jersey-container-servlet-core:jar</exclude> - <exclude>org.glassfish.jersey.core:jersey-client:jar</exclude> - <exclude>org.glassfish.jersey.core:jersey-common:jar</exclude> - <exclude>org.glassfish.jersey.core:jersey-server:jar</exclude> - <exclude>org.glassfish.jersey.ext:jersey-entity-filtering:jar</exclude> - <exclude>org.glassfish.jersey.ext:jersey-spring3:jar</exclude> - <exclude>org.glassfish.jersey.media:jersey-media-jaxb:jar</exclude> - <exclude>org.glassfish.jersey.media:jersey-media-json-jackson:jar</exclude> - <exclude>org.glassfish.jersey.media:jersey-media-multipart:jar</exclude> - <exclude>org.hdrhistogram:HdrHistogram:jar</exclude> - <exclude>org.javassist:javassist:jar</exclude> - <exclude>org.json4s:json4s-ast_2.11:jar</exclude> - <exclude>org.json4s:json4s-core_2.11:jar</exclude> - <exclude>org.json4s:json4s-jackson_2.11:jar</exclude> - <exclude>org.jsoup:jsoup:jar</exclude> - <exclude>org.jvnet.mimepull:mimepull:jar</exclude> - <exclude>org.jvnet:tiger-types:jar</exclude> - <exclude>org.latencyutils:LatencyUtils:jar</exclude> - <exclude>org.mortbay.jasper:apache-el:jar</exclude> - <exclude>org.mortbay.jetty:jetty:jar</exclude> - <exclude>org.mortbay.jetty:jetty-util:jar</exclude> - <exclude>org.ow2.asm:asm-analysis:jar</exclude> - <exclude>org.ow2.asm:asm-commons:jar</exclude> - <exclude>org.ow2.asm:asm-tree:jar</exclude> - <exclude>org.reflections:reflections:jar</exclude> - <exclude>org.scala-lang.modules:scala-parser-combinators_2.11:jar</exclude> - <exclude>org.scala-lang.modules:scala-xml_2.11:jar</exclude> - <exclude>org.scala-lang:scala-compiler:jar</exclude> - <exclude>org.scala-lang:scala-library:jar</exclude> - <exclude>org.scala-lang:scala-reflect:jar</exclude> - <exclude>org.scala-lang:scalap:jar</exclude> - <exclude>org.slf4j:jul-to-slf4j:jar</exclude> - <exclude>org.slf4j:slf4j-api:jar</exclude> - <exclude>org.springframework.boot:spring-boot:jar</exclude> - <exclude>org.springframework.boot:spring-boot-actuator:jar</exclude> - <exclude>org.springframework.boot:spring-boot-actuator-autoconfigure:jar</exclude> - <exclude>org.springframework.boot:spring-boot-autoconfigure:jar</exclude> - <exclude>org.springframework.boot:spring-boot-starter:jar</exclude> - <exclude>org.springframework.boot:spring-boot-starter-actuator:jar</exclude> - <exclude>org.springframework.boot:spring-boot-starter-aop:jar</exclude> - <exclude>org.springframework.boot:spring-boot-starter-jetty:jar</exclude> - <exclude>org.springframework.boot:spring-boot-starter-json:jar</exclude> - <exclude>org.springframework.boot:spring-boot-starter-log4j2:jar</exclude> - <exclude>org.springframework.boot:spring-boot-starter-web:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-commons:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-config-client:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-context:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-netflix-archaius:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-netflix-core:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-netflix-eureka-client:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-netflix-ribbon:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-starter:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-starter-config:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-starter-eureka:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-starter-netflix-archaius:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-starter-netflix-ribbon:jar</exclude> - <exclude>org.springframework.security:spring-security-crypto:jar</exclude> - <exclude>org.springframework.security:spring-security-rsa:jar</exclude> - <exclude>org.springframework:spring-aop:jar</exclude> - <exclude>org.springframework:spring-beans:jar</exclude> - <exclude>org.springframework:spring-context:jar</exclude> - <exclude>org.springframework:spring-core:jar</exclude> - <exclude>org.springframework:spring-expression:jar</exclude> - <exclude>org.springframework:spring-jcl:jar</exclude> - <exclude>org.springframework:spring-web:jar</exclude> - <exclude>org.springframework:spring-webmvc:jar</exclude> - <exclude>org.tukaani:xz:jar</exclude> - <exclude>org.yaml:snakeyaml:jar</exclude> - <exclude>software.amazon.ion:ion-java:jar</exclude> - <exclude>xerces:xercesImpl:jar</exclude> - <exclude>xmlenc:xmlenc:jar</exclude> - <exclude>xmlpull:xmlpull:jar</exclude> - <exclude>xpp3:xpp3_min:jar</exclude> - </excludes> - </dependencySet> - </dependencySets> - - <fileSets> - - </fileSets> - -</assembly> - diff --git a/linkis-computation-governance/linkis-engineconn/pom.xml b/linkis-computation-governance/linkis-engineconn/pom.xml index 766b7f537..bbf4317ac 100644 --- a/linkis-computation-governance/linkis-engineconn/pom.xml +++ b/linkis-computation-governance/linkis-engineconn/pom.xml @@ -34,7 +34,6 @@ <module>linkis-clustered-engineconn/linkis-once-engineconn</module> <module>linkis-computation-engineconn</module> <module>linkis-engineconn-plugin-core</module> - <module>linkis-engineconn-plugin-server</module> </modules> </project> diff --git a/linkis-computation-governance/linkis-manager/distribution.xml b/linkis-computation-governance/linkis-manager/distribution.xml deleted file mode 100644 index 4b8028abc..000000000 --- a/linkis-computation-governance/linkis-manager/distribution.xml +++ /dev/null @@ -1,297 +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. - --> - -<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.1 https://maven.apache.org/xsd/assembly-2.1.1.xsd";> - <id>linkis-publicservice</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <baseDirectory>linkis-manager</baseDirectory> - - <dependencySets> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <useProjectArtifact>true</useProjectArtifact> - <useTransitiveDependencies>true</useTransitiveDependencies> - <unpack>false</unpack> - <useStrictFiltering>false</useStrictFiltering> - <useTransitiveFiltering>true</useTransitiveFiltering> - <excludes> - <exclude>antlr:antlr:jar</exclude> - <exclude>aopalliance:aopalliance:jar</exclude> - <exclude>asm:asm:jar</exclude> - <exclude>cglib:cglib:jar</exclude> - <exclude>com.amazonaws:aws-java-sdk-autoscaling:jar</exclude> - <exclude>com.amazonaws:aws-java-sdk-core:jar</exclude> - <exclude>com.amazonaws:aws-java-sdk-ec2:jar</exclude> - <exclude>com.amazonaws:aws-java-sdk-route53:jar</exclude> - <exclude>com.amazonaws:aws-java-sdk-sts:jar</exclude> - <exclude>com.amazonaws:jmespath-java:jar</exclude> - <exclude>com.fasterxml.jackson.core:jackson-annotations:jar</exclude> - <exclude>com.fasterxml.jackson.core:jackson-core:jar</exclude> - <exclude>com.fasterxml.jackson.core:jackson-databind:jar</exclude> - <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar</exclude> - <exclude>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar</exclude> - <exclude>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar</exclude> - <exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar</exclude> - <exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar</exclude> - <exclude>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar</exclude> - <exclude>com.fasterxml.jackson.module:jackson-module-parameter-names:jar</exclude> - <exclude>com.fasterxml.jackson.module:jackson-module-paranamer:jar</exclude> - <exclude>com.fasterxml.jackson.module:jackson-module-scala_2.11:jar</exclude> - <exclude>com.github.andrewoma.dexx:dexx-collections:jar</exclude> - <exclude>com.github.vlsi.compactmap:compactmap:jar</exclude> - <exclude>com.google.code.findbugs:annotations:jar</exclude> - <exclude>com.google.code.findbugs:jsr305:jar</exclude> - <exclude>com.google.code.gson:gson:jar</exclude> - <exclude>com.google.guava:guava:jar</exclude> - <exclude>com.google.errorprone:error_prone_annotations:jar</exclude> - <exclude>com.google.guava:failureaccess:jar</exclude> - <exclude>com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava</exclude> - <exclude>com.google.inject:guice:jar</exclude> - <exclude>com.google.protobuf:protobuf-java:jar</exclude> - <exclude>com.netflix.archaius:archaius-core:jar</exclude> - <exclude>com.netflix.eureka:eureka-client:jar</exclude> - <exclude>com.netflix.eureka:eureka-core:jar</exclude> - <exclude>com.netflix.hystrix:hystrix-core:jar</exclude> - <exclude>com.netflix.netflix-commons:netflix-commons-util:jar</exclude> - <exclude>com.netflix.netflix-commons:netflix-eventbus:jar</exclude> - <exclude>com.netflix.netflix-commons:netflix-infix:jar</exclude> - <exclude>com.netflix.netflix-commons:netflix-statistics:jar</exclude> - <exclude>com.netflix.ribbon:ribbon:jar</exclude> - <exclude>com.netflix.ribbon:ribbon-core:jar</exclude> - <exclude>com.netflix.ribbon:ribbon-eureka:jar</exclude> - <exclude>com.netflix.ribbon:ribbon-httpclient:jar</exclude> - <exclude>com.netflix.ribbon:ribbon-loadbalancer:jar</exclude> - <exclude>com.netflix.ribbon:ribbon-transport:jar</exclude> - <exclude>com.netflix.servo:servo-core:jar</exclude> - <exclude>com.ning:async-http-client:jar</exclude> - <exclude>com.sun.jersey.contribs:jersey-apache-client4:jar</exclude> - <exclude>com.sun.jersey:jersey-client:jar</exclude> - <exclude>com.sun.jersey:jersey-core:jar</exclude> - <exclude>com.sun.jersey:jersey-json:jar</exclude> - <exclude>com.sun.jersey:jersey-server:jar</exclude> - <exclude>com.sun.jersey:jersey-servlet:jar</exclude> - <exclude>com.sun.xml.bind:jaxb-impl:jar</exclude> - <exclude>com.thoughtworks.paranamer:paranamer:jar</exclude> - <exclude>com.thoughtworks.xstream:xstream:jar</exclude> - <exclude>org.apache.linkis:linkis-common:jar</exclude> - <exclude>org.apache.linkis:linkis-module:jar</exclude> - <exclude>commons-beanutils:commons-beanutils:jar</exclude> - <exclude>commons-beanutils:commons-beanutils-core:jar</exclude> - <exclude>commons-cli:commons-cli:jar</exclude> - <exclude>commons-codec:commons-codec:jar</exclude> - <exclude>commons-collections:commons-collections:jar</exclude> - <exclude>commons-configuration:commons-configuration:jar</exclude> - <exclude>commons-daemon:commons-daemon:jar</exclude> - <exclude>commons-dbcp:commons-dbcp:jar</exclude> - <exclude>commons-digester:commons-digester:jar</exclude> - <exclude>commons-httpclient:commons-httpclient:jar</exclude> - <exclude>commons-io:commons-io:jar</exclude> - <exclude>commons-jxpath:commons-jxpath:jar</exclude> - <exclude>commons-lang:commons-lang:jar</exclude> - <exclude>commons-logging:commons-logging:jar</exclude> - <exclude>commons-net:commons-net:jar</exclude> - <exclude>commons-pool:commons-pool:jar</exclude> - <exclude>io.micrometer:micrometer-core:jar</exclude> - <exclude>io.netty:netty:jar</exclude> - <exclude>io.netty:netty-all:jar</exclude> - <exclude>io.netty:netty-buffer:jar</exclude> - <exclude>io.netty:netty-codec:jar</exclude> - <exclude>io.netty:netty-codec-http:jar</exclude> - <exclude>io.netty:netty-common:jar</exclude> - <exclude>io.netty:netty-handler:jar</exclude> - <exclude>io.netty:netty-transport:jar</exclude> - <exclude>io.netty:netty-transport-native-epoll:jar</exclude> - <exclude>io.reactivex:rxjava:jar</exclude> - <exclude>io.reactivex:rxnetty:jar</exclude> - <exclude>io.reactivex:rxnetty-contexts:jar</exclude> - <exclude>io.reactivex:rxnetty-servo:jar</exclude> - <exclude>javax.activation:activation:jar</exclude> - <exclude>javax.annotation:javax.annotation-api:jar</exclude> - <exclude>javax.inject:javax.inject:jar</exclude> - <exclude>javax.servlet:javax.servlet-api:jar</exclude> - <exclude>javax.servlet.jsp:jsp-api:jar</exclude> - <exclude>javax.validation:validation-api:jar</exclude> - <exclude>javax.websocket:javax.websocket-api:jar</exclude> - <exclude>javax.ws.rs:javax.ws.rs-api:jar</exclude> - <exclude>javax.xml.bind:jaxb-api:jar</exclude> - <exclude>javax.xml.stream:stax-api:jar</exclude> - <exclude>joda-time:joda-time:jar</exclude> - <exclude>log4j:log4j:jar</exclude> - <exclude>mysql:mysql-connector-java:jar</exclude> - <exclude>net.databinder.dispatch:dispatch-core_2.11:jar</exclude> - <exclude>net.databinder.dispatch:dispatch-json4s-jackson_2.11:jar</exclude> - <exclude>org.antlr:antlr-runtime:jar</exclude> - <exclude>org.antlr:stringtemplate:jar</exclude> - <exclude>org.apache.commons:commons-compress:jar</exclude> - <exclude>org.apache.commons:commons-math:jar</exclude> - <exclude>org.apache.commons:commons-math3:jar</exclude> - <exclude>org.apache.curator:curator-client:jar</exclude> - <exclude>org.apache.curator:curator-framework:jar</exclude> - <exclude>org.apache.curator:curator-recipes:jar</exclude> - <exclude>org.apache.directory.api:api-asn1-api:jar</exclude> - <exclude>org.apache.directory.api:api-util:jar</exclude> - <exclude>org.apache.directory.server:apacheds-i18n:jar</exclude> - <exclude>org.apache.directory.server:apacheds-kerberos-codec:jar</exclude> - <exclude>org.apache.hadoop:hadoop-annotations:jar</exclude> - <exclude>org.apache.hadoop:hadoop-auth:jar</exclude> - <exclude>org.apache.hadoop:hadoop-common:jar</exclude> - <exclude>org.apache.hadoop:hadoop-hdfs:jar</exclude> - <exclude>org.apache.htrace:htrace-core:jar</exclude> - <exclude>org.apache.httpcomponents:httpclient:jar</exclude> - <exclude>org.apache.httpcomponents:httpcore:jar</exclude> - <exclude>org.apache.logging.log4j:log4j-api:jar</exclude> - <exclude>org.apache.logging.log4j:log4j-core:jar</exclude> - <exclude>org.apache.logging.log4j:log4j-jul:jar</exclude> - <exclude>org.apache.logging.log4j:log4j-slf4j-impl:jar</exclude> - <exclude>org.apache.zookeeper:zookeeper:jar</exclude> - <exclude>org.aspectj:aspectjweaver:jar</exclude> - <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude> - <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude> - <exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude> - <exclude>org.codehaus.jackson:jackson-xc:jar</exclude> - <exclude>org.codehaus.jettison:jettison:jar</exclude> - <exclude>org.codehaus.woodstox:stax2-api:jar</exclude> - <exclude>org.codehaus.woodstox:woodstox-core-asl:jar</exclude> - <exclude>org.eclipse.jetty:jetty-annotations:jar</exclude> - <exclude>org.eclipse.jetty:jetty-client:jar</exclude> - <exclude>org.eclipse.jetty:jetty-continuation:jar</exclude> - <exclude>org.eclipse.jetty:jetty-http:jar</exclude> - <exclude>org.eclipse.jetty:jetty-io:jar</exclude> - <exclude>org.eclipse.jetty:jetty-jndi:jar</exclude> - <exclude>org.eclipse.jetty:jetty-plus:jar</exclude> - <exclude>org.eclipse.jetty:jetty-security:jar</exclude> - <exclude>org.eclipse.jetty:jetty-server:jar</exclude> - <exclude>org.eclipse.jetty:jetty-servlet:jar</exclude> - <exclude>org.eclipse.jetty:jetty-servlets:jar</exclude> - <exclude>org.eclipse.jetty:jetty-util:jar</exclude> - <exclude>org.eclipse.jetty:jetty-webapp:jar</exclude> - <exclude>org.eclipse.jetty:jetty-xml:jar</exclude> - <exclude>org.eclipse.jetty.websocket:javax-websocket-client-impl:jar</exclude> - <exclude>org.eclipse.jetty.websocket:javax-websocket-server-impl:jar</exclude> - <exclude>org.eclipse.jetty.websocket:websocket-api:jar</exclude> - <exclude>org.eclipse.jetty.websocket:websocket-client:jar</exclude> - <exclude>org.eclipse.jetty.websocket:websocket-common:jar</exclude> - <exclude>org.eclipse.jetty.websocket:websocket-server:jar</exclude> - <exclude>org.eclipse.jetty.websocket:websocket-servlet:jar</exclude> - <exclude>org.fusesource.leveldbjni:leveldbjni-all:jar</exclude> - <exclude>org.glassfish.hk2:class-model:jar</exclude> - <exclude>org.glassfish.hk2:config-types:jar</exclude> - <exclude>org.glassfish.hk2.external:aopalliance-repackaged:jar</exclude> - <exclude>org.glassfish.hk2.external:asm-all-repackaged:jar</exclude> - <exclude>org.glassfish.hk2.external:bean-validator:jar</exclude> - <exclude>org.glassfish.hk2.external:javax.inject:jar</exclude> - <exclude>org.glassfish.hk2:hk2:jar</exclude> - <exclude>org.glassfish.hk2:hk2-api:jar</exclude> - <exclude>org.glassfish.hk2:hk2-config:jar</exclude> - <exclude>org.glassfish.hk2:hk2-core:jar</exclude> - <exclude>org.glassfish.hk2:hk2-locator:jar</exclude> - <exclude>org.glassfish.hk2:hk2-runlevel:jar</exclude> - <exclude>org.glassfish.hk2:hk2-utils:jar</exclude> - <exclude>org.glassfish.hk2:osgi-resource-locator:jar</exclude> - <exclude>org.glassfish.hk2:spring-bridge:jar</exclude> - <exclude>org.glassfish.jersey.bundles:jaxrs-ri:jar</exclude> - <exclude>org.glassfish.jersey.bundles.repackaged:jersey-guava:jar</exclude> - <exclude>org.glassfish.jersey.containers:jersey-container-servlet:jar</exclude> - <exclude>org.glassfish.jersey.containers:jersey-container-servlet-core:jar</exclude> - <exclude>org.glassfish.jersey.core:jersey-client:jar</exclude> - <exclude>org.glassfish.jersey.core:jersey-common:jar</exclude> - <exclude>org.glassfish.jersey.core:jersey-server:jar</exclude> - <exclude>org.glassfish.jersey.ext:jersey-entity-filtering:jar</exclude> - <exclude>org.glassfish.jersey.ext:jersey-spring3:jar</exclude> - <exclude>org.glassfish.jersey.media:jersey-media-jaxb:jar</exclude> - <exclude>org.glassfish.jersey.media:jersey-media-json-jackson:jar</exclude> - <exclude>org.glassfish.jersey.media:jersey-media-multipart:jar</exclude> - <exclude>org.hdrhistogram:HdrHistogram:jar</exclude> - <exclude>org.javassist:javassist:jar</exclude> - <exclude>org.json4s:json4s-ast_2.11:jar</exclude> - <exclude>org.json4s:json4s-core_2.11:jar</exclude> - <exclude>org.json4s:json4s-jackson_2.11:jar</exclude> - <exclude>org.jsoup:jsoup:jar</exclude> - <exclude>org.jvnet.mimepull:mimepull:jar</exclude> - <exclude>org.jvnet:tiger-types:jar</exclude> - <exclude>org.latencyutils:LatencyUtils:jar</exclude> - <exclude>org.mortbay.jasper:apache-el:jar</exclude> - <exclude>org.mortbay.jetty:jetty:jar</exclude> - <exclude>org.mortbay.jetty:jetty-util:jar</exclude> - <exclude>org.ow2.asm:asm-analysis:jar</exclude> - <exclude>org.ow2.asm:asm-commons:jar</exclude> - <exclude>org.ow2.asm:asm-tree:jar</exclude> - <exclude>org.reflections:reflections:jar</exclude> - <exclude>org.scala-lang.modules:scala-parser-combinators_2.11:jar</exclude> - <exclude>org.scala-lang.modules:scala-xml_2.11:jar</exclude> - <exclude>org.scala-lang:scala-compiler:jar</exclude> - <exclude>org.scala-lang:scala-library:jar</exclude> - <exclude>org.scala-lang:scala-reflect:jar</exclude> - <exclude>org.scala-lang:scalap:jar</exclude> - <exclude>org.slf4j:jul-to-slf4j:jar</exclude> - <exclude>org.slf4j:slf4j-api:jar</exclude> - <exclude>org.springframework.boot:spring-boot:jar</exclude> - <exclude>org.springframework.boot:spring-boot-actuator:jar</exclude> - <exclude>org.springframework.boot:spring-boot-actuator-autoconfigure:jar</exclude> - <exclude>org.springframework.boot:spring-boot-autoconfigure:jar</exclude> - <exclude>org.springframework.boot:spring-boot-starter:jar</exclude> - <exclude>org.springframework.boot:spring-boot-starter-actuator:jar</exclude> - <exclude>org.springframework.boot:spring-boot-starter-aop:jar</exclude> - <exclude>org.springframework.boot:spring-boot-starter-jetty:jar</exclude> - <exclude>org.springframework.boot:spring-boot-starter-json:jar</exclude> - <exclude>org.springframework.boot:spring-boot-starter-log4j2:jar</exclude> - <exclude>org.springframework.boot:spring-boot-starter-web:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-commons:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-config-client:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-context:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-netflix-archaius:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-netflix-core:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-netflix-eureka-client:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-netflix-ribbon:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-starter:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-starter-config:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-starter-eureka:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-starter-netflix-archaius:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:jar</exclude> - <exclude>org.springframework.cloud:spring-cloud-starter-netflix-ribbon:jar</exclude> - <exclude>org.springframework.security:spring-security-crypto:jar</exclude> - <exclude>org.springframework.security:spring-security-rsa:jar</exclude> - <exclude>org.springframework:spring-aop:jar</exclude> - <exclude>org.springframework:spring-beans:jar</exclude> - <exclude>org.springframework:spring-context:jar</exclude> - <exclude>org.springframework:spring-core:jar</exclude> - <exclude>org.springframework:spring-expression:jar</exclude> - <exclude>org.springframework:spring-jcl:jar</exclude> - <exclude>org.springframework:spring-web:jar</exclude> - <exclude>org.springframework:spring-webmvc:jar</exclude> - <exclude>org.tukaani:xz:jar</exclude> - <exclude>org.yaml:snakeyaml:jar</exclude> - <exclude>software.amazon.ion:ion-java:jar</exclude> - <exclude>xerces:xercesImpl:jar</exclude> - <exclude>xmlenc:xmlenc:jar</exclude> - <exclude>xmlpull:xmlpull:jar</exclude> - <exclude>xpp3:xpp3_min:jar</exclude> - <exclude>com.google.j2objc:j2objc-annotations:jar</exclude> - </excludes> - </dependencySet> - </dependencySets> - - <fileSets> - </fileSets> - -</assembly> - diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml b/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml index 7e8963c4d..9a05672ec 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml @@ -41,6 +41,28 @@ <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.linkis</groupId> + <artifactId>linkis-bml-client</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.linkis</groupId> + <artifactId>linkis-common</artifactId> + </exclusion> + + <exclusion> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.linkis</groupId> + <artifactId>linkis-storage</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.apache.linkis</groupId> <artifactId>linkis-manager-persistence</artifactId> diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/assembly/distribution.xml b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/assembly/distribution.xml index 9340d7fc7..f4b17778f 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/assembly/distribution.xml +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/assembly/distribution.xml @@ -36,28 +36,26 @@ <useStrictFiltering>false</useStrictFiltering> <useTransitiveFiltering>true</useTransitiveFiltering> <excludes> - <exclude>com.google.code.findbugs:annotations:jar</exclude> <exclude>commons-beanutils:commons-beanutils:jar</exclude> <exclude>commons-codec:commons-codec:jar</exclude> <exclude>commons-collections:commons-collections:jar</exclude> - <exclude>commons-io:commons-io:jar</exclude> <exclude>commons-logging:commons-logging:jar</exclude> - <exclude>com.google.errorprone:error_prone_annotations:jar</exclude> - <exclude>com.google.guava:failureaccess:jar</exclude> - <exclude>com.google.guava:guava:jar</exclude> - <exclude>com.google.j2objc:j2objc-annotations:jar</exclude> <exclude>org.javassist:javassist:jar</exclude> - <exclude>javax.inject:javax.inject:jar</exclude> - <exclude>javax.xml.bind:jaxb-api:jar</exclude> - <exclude>com.sun.jersey.contribs:jersey-guice:jar</exclude> - <exclude>com.google.code.findbugs:jsr305:jar</exclude> - <exclude>com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava</exclude> - <exclude>com.google.protobuf:protobuf-java:jar</exclude> <exclude>org.reflections:reflections:jar</exclude> <exclude>org.slf4j:slf4j-api:jar</exclude> + <exclude>org.apache.httpcomponents:httpclient:jar</exclude> + <exclude>org.apache.httpcomponents:httpcore:jar</exclude> + <exclude>org.springframework.boot:spring-boot:jar</exclude> + <exclude>org.springframework.boot:spring-boot-autoconfigure:jar</exclude> + <exclude>org.springframework.boot:spring-boot-starter:jar</exclude> + <exclude>org.springframework.cloud:spring-cloud-config-client:jar</exclude> + <exclude>org.springframework:spring-aop:jar</exclude> <exclude>org.springframework:spring-beans:jar</exclude> + <exclude>org.springframework:spring-context:jar</exclude> <exclude>org.springframework:spring-core:jar</exclude> + <exclude>org.springframework:spring-expression:jar</exclude> <exclude>org.springframework:spring-jcl:jar</exclude> + <exclude>org.yaml:snakeyaml:jar</exclude> </excludes> </dependencySet> </dependencySets> diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/cache/EngineConnPluginCache.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/cache/EngineConnPluginCache.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/cache/EngineConnPluginCache.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/cache/EngineConnPluginCache.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/cache/GuavaEngineConnPluginCache.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/cache/GuavaEngineConnPluginCache.java similarity index 91% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/cache/GuavaEngineConnPluginCache.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/cache/GuavaEngineConnPluginCache.java index 19ad8f68b..1a680381a 100644 --- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/cache/GuavaEngineConnPluginCache.java +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/cache/GuavaEngineConnPluginCache.java @@ -18,7 +18,11 @@ package org.apache.linkis.engineplugin.cache; import org.apache.linkis.engineplugin.cache.config.EngineConnPluginCacheConfig; -import org.apache.linkis.engineplugin.cache.refresh.*; +import org.apache.linkis.engineplugin.cache.refresh.DefaultRefreshPluginCacheContainer; +import org.apache.linkis.engineplugin.cache.refresh.PluginCacheRefresher; +import org.apache.linkis.engineplugin.cache.refresh.RefreshPluginCacheContainer; +import org.apache.linkis.engineplugin.cache.refresh.RefreshPluginCacheOperation; +import org.apache.linkis.engineplugin.cache.refresh.RefreshableEngineConnPluginCache; import org.apache.linkis.manager.engineplugin.common.exception.EngineConnPluginNotFoundException; import org.apache.linkis.manager.engineplugin.common.loader.entity.EngineConnPluginInfo; import org.apache.linkis.manager.engineplugin.common.loader.entity.EngineConnPluginInstance; @@ -113,8 +117,8 @@ public class GuavaEngineConnPluginCache implements RefreshableEngineConnPluginCa } @Override - public EngineConnPluginInstance get(EngineConnPluginInfo pluginInfo, PluginGetter caller) - throws Exception { + public EngineConnPluginInstance get( + EngineConnPluginInfo pluginInfo, EngineConnPluginCache.PluginGetter caller) throws Exception { return this.pluginCache.get( pluginInfo.toString(), () -> { diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/cache/config/EngineConnPluginCacheConfig.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/cache/config/EngineConnPluginCacheConfig.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/cache/config/EngineConnPluginCacheConfig.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/cache/config/EngineConnPluginCacheConfig.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/cache/refresh/DefaultRefreshPluginCacheContainer.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/cache/refresh/DefaultRefreshPluginCacheContainer.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/cache/refresh/DefaultRefreshPluginCacheContainer.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/cache/refresh/DefaultRefreshPluginCacheContainer.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/cache/refresh/PluginCacheRefresher.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/cache/refresh/PluginCacheRefresher.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/cache/refresh/PluginCacheRefresher.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/cache/refresh/PluginCacheRefresher.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/cache/refresh/RefreshPluginCacheContainer.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/cache/refresh/RefreshPluginCacheContainer.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/cache/refresh/RefreshPluginCacheContainer.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/cache/refresh/RefreshPluginCacheContainer.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/cache/refresh/RefreshPluginCacheOperation.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/cache/refresh/RefreshPluginCacheOperation.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/cache/refresh/RefreshPluginCacheOperation.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/cache/refresh/RefreshPluginCacheOperation.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/cache/refresh/RefreshableEngineConnPluginCache.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/cache/refresh/RefreshableEngineConnPluginCache.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/cache/refresh/RefreshableEngineConnPluginCache.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/cache/refresh/RefreshableEngineConnPluginCache.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/classloader/EngineConnPluginClassLoader.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/classloader/EngineConnPluginClassLoader.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/classloader/EngineConnPluginClassLoader.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/classloader/EngineConnPluginClassLoader.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/CacheablesEngineConnPluginLoader.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/loaders/CacheablesEngineConnPluginLoader.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/CacheablesEngineConnPluginLoader.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/loaders/CacheablesEngineConnPluginLoader.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/DefaultEngineConnPluginLoader.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/loaders/DefaultEngineConnPluginLoader.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/DefaultEngineConnPluginLoader.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/loaders/DefaultEngineConnPluginLoader.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/EngineConnPluginsLoader.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/loaders/EngineConnPluginsLoader.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/EngineConnPluginsLoader.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/loaders/EngineConnPluginsLoader.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/EngineConnPluginsResourceLoader.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/loaders/EngineConnPluginsResourceLoader.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/EngineConnPluginsResourceLoader.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/loaders/EngineConnPluginsResourceLoader.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/resource/BmlEngineConnPluginResourceLoader.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/loaders/resource/BmlEngineConnPluginResourceLoader.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/resource/BmlEngineConnPluginResourceLoader.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/loaders/resource/BmlEngineConnPluginResourceLoader.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/resource/LocalEngineConnPluginResourceLoader.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/loaders/resource/LocalEngineConnPluginResourceLoader.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/resource/LocalEngineConnPluginResourceLoader.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/loaders/resource/LocalEngineConnPluginResourceLoader.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/resource/PluginResource.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/loaders/resource/PluginResource.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/resource/PluginResource.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/loaders/resource/PluginResource.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/utils/EngineConnPluginUtils.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/utils/EngineConnPluginUtils.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/utils/EngineConnPluginUtils.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/utils/EngineConnPluginUtils.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/utils/ExceptionHelper.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/utils/ExceptionHelper.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/utils/ExceptionHelper.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/utils/ExceptionHelper.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/LinkisEngineConnPluginServer.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/LinkisEngineConnPluginServer.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/LinkisEngineConnPluginServer.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/LinkisEngineConnPluginServer.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/conf/EngineConnPluginSpringConfiguration.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/conf/EngineConnPluginSpringConfiguration.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/conf/EngineConnPluginSpringConfiguration.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/conf/EngineConnPluginSpringConfiguration.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/dao/EngineConnBmlResourceDao.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/dao/EngineConnBmlResourceDao.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/dao/EngineConnBmlResourceDao.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/dao/EngineConnBmlResourceDao.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/dao/impl/EngineConnBmlResourceMapper.xml b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/dao/impl/EngineConnBmlResourceMapper.xml similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/dao/impl/EngineConnBmlResourceMapper.xml rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/dao/impl/EngineConnBmlResourceMapper.xml diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/entity/EngineConnBmlResource.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/entity/EngineConnBmlResource.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/entity/EngineConnBmlResource.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/entity/EngineConnBmlResource.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/restful/EnginePluginRestful.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/restful/EnginePluginRestful.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/restful/EnginePluginRestful.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/restful/EnginePluginRestful.java index ab2b280a7..9386c80f8 100644 --- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/restful/EnginePluginRestful.java +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/restful/EnginePluginRestful.java @@ -20,10 +20,10 @@ package org.apache.linkis.engineplugin.server.restful; import org.apache.linkis.bml.protocol.Version; import org.apache.linkis.common.conf.Configuration; import org.apache.linkis.engineplugin.server.entity.EngineConnBmlResource; -import org.apache.linkis.engineplugin.server.service.EngineConnResourceService; import org.apache.linkis.engineplugin.server.service.EnginePluginAdminService; -import org.apache.linkis.engineplugin.server.service.RefreshEngineConnResourceRequest; import org.apache.linkis.engineplugin.vo.EnginePluginBMLVo; +import org.apache.linkis.engineplugin.server.service.EngineConnResourceService; +import org.apache.linkis.engineplugin.server.service.RefreshEngineConnResourceRequest; import org.apache.linkis.server.Message; import org.apache.linkis.server.utils.ModuleUserUtils; diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/service/EnginePluginAdminService.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/service/EnginePluginAdminService.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/service/EnginePluginAdminService.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/service/EnginePluginAdminService.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/service/impl/EnginePluginAdminServiceImpl.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/service/impl/EnginePluginAdminServiceImpl.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/service/impl/EnginePluginAdminServiceImpl.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/service/impl/EnginePluginAdminServiceImpl.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/vo/EnginePluginBMLVo.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/vo/EnginePluginBMLVo.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/vo/EnginePluginBMLVo.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/vo/EnginePluginBMLVo.java diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/vo/PageViewVo.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/vo/PageViewVo.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/vo/PageViewVo.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/vo/PageViewVo.java diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java index 77d2e9084..9d8ac6af7 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java @@ -55,12 +55,22 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -103,22 +113,18 @@ public class EngineRestfulApi { private static final Logger logger = LoggerFactory.getLogger(EngineRestfulApi.class); - @ApiOperation( - value = "createEngineConn", - notes = "create an engineconn", - response = Message.class) + @ApiOperation(value = "createEngineConn", response = Message.class) @ApiOperationSupport(ignoreParameters = {"jsonNode"}) @RequestMapping(path = "/createEngineConn", method = RequestMethod.POST) - public Message createEngineConn(HttpServletRequest req, @RequestBody JsonNode jsonNode) + public Message createEngineConn( + HttpServletRequest req, @RequestBody EngineCreateRequest engineCreateRequest) throws IOException, InterruptedException { String userName = ModuleUserUtils.getOperationUser(req, "createEngineConn"); - EngineCreateRequest engineCreateRequest = - objectMapper.treeToValue(jsonNode, EngineCreateRequest.class); engineCreateRequest.setUser(userName); - long timeout = engineCreateRequest.getTimeOut(); + long timeout = engineCreateRequest.getTimeout(); if (timeout <= 0) { timeout = AMConfiguration.ENGINE_CONN_START_REST_MAX_WAIT_TIME().getValue().toLong(); - engineCreateRequest.setTimeOut(timeout); + engineCreateRequest.setTimeout(timeout); } logger.info( "User {} try to create a engineConn with maxStartTime {}. EngineCreateRequest is {}.", @@ -219,10 +225,7 @@ public class EngineRestfulApi { notes = "kill one engineconn or more ", response = Message.class) @ApiImplicitParams({ - @ApiImplicitParam( - name = "engineInstance", - dataType = "String", - example = "bdpujes110003:12295"), + @ApiImplicitParam(name = "engineInstance", dataType = "String", example = "bdpujes110:12295"), @ApiImplicitParam( name = "applicationName", dataType = "String", @@ -230,8 +233,7 @@ public class EngineRestfulApi { }) @ApiOperationSupport(ignoreParameters = {"param"}) @RequestMapping(path = "/rm/enginekill", method = RequestMethod.POST) - public Message killEngine(HttpServletRequest req, @RequestBody Map<String, String>[] param) - throws Exception { + public Message killEngine(HttpServletRequest req, @RequestBody Map<String, String>[] param) { String userName = ModuleUserUtils.getOperationUser(req, "enginekill"); Sender sender = Sender.getSender(Sender.getThisServiceInstance()); for (Map<String, String> engineParam : param) { @@ -271,7 +273,7 @@ public class EngineRestfulApi { @ApiImplicitParam(name = "emInstance", dataType = "String", example = "bdpujes110003:9102"), @ApiImplicitParam(name = "engineType", dataType = "String"), @ApiImplicitParam(name = "nodeStatus", dataType = "String"), - @ApiImplicitParam(name = "owner", required = false, dataType = "String", value = "owner"), + @ApiImplicitParam(name = "owner", dataType = "String", value = "owner") }) @ApiOperationSupport(ignoreParameters = {"jsonNode"}) @RequestMapping(path = "/listEMEngines", method = RequestMethod.POST) diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/loader/EngineConnPluginLoaderConf.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/loader/EngineConnPluginLoaderConf.scala similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/loader/EngineConnPluginLoaderConf.scala rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/loader/EngineConnPluginLoaderConf.scala diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/conf/EngineConnPluginConfiguration.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/conf/EngineConnPluginConfiguration.scala similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/conf/EngineConnPluginConfiguration.scala rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/conf/EngineConnPluginConfiguration.scala diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/interceptor/EngineConnLaunchInterceptor.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/interceptor/EngineConnLaunchInterceptor.scala similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/interceptor/EngineConnLaunchInterceptor.scala rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/interceptor/EngineConnLaunchInterceptor.scala diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/loader/EngineConnPluginsLoader.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/loader/EngineConnPluginsLoader.scala similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/loader/EngineConnPluginsLoader.scala rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/loader/EngineConnPluginsLoader.scala diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/AbstractEngineConnBmlResourceGenerator.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/localize/AbstractEngineConnBmlResourceGenerator.scala similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/AbstractEngineConnBmlResourceGenerator.scala rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/localize/AbstractEngineConnBmlResourceGenerator.scala diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/DefaultEngineConnBmlResourceGenerator.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/localize/DefaultEngineConnBmlResourceGenerator.scala similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/DefaultEngineConnBmlResourceGenerator.scala rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/localize/DefaultEngineConnBmlResourceGenerator.scala diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/EngineConnBmlResourceGenerator.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/localize/EngineConnBmlResourceGenerator.scala similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/EngineConnBmlResourceGenerator.scala rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/localize/EngineConnBmlResourceGenerator.scala diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnLaunchService.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnLaunchService.scala similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnLaunchService.scala rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnLaunchService.scala diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceFactoryService.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceFactoryService.scala similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceFactoryService.scala rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceFactoryService.scala diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceService.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceService.scala similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceService.scala rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceService.scala diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/EngineConnLaunchService.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/service/EngineConnLaunchService.scala similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/EngineConnLaunchService.scala rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/service/EngineConnLaunchService.scala diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/EngineConnResourceFactoryService.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/service/EngineConnResourceFactoryService.scala similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/EngineConnResourceFactoryService.scala rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/service/EngineConnResourceFactoryService.scala diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/EngineConnResourceService.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/service/EngineConnResourceService.scala similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/EngineConnResourceService.scala rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/service/EngineConnResourceService.scala diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/conf/AMConfiguration.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/conf/AMConfiguration.scala index c7384e959..1399dd2a0 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/conf/AMConfiguration.scala +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/conf/AMConfiguration.scala @@ -55,9 +55,6 @@ object AMConfiguration { val EM_NEW_WAIT_MILLS = CommonVars("wds.linkis.manager.am.em.new.wait.mills", 1000 * 60L) - val ENGINECONN_SPRING_APPLICATION_NAME = - CommonVars("wds.linkis.engineconn.application.name", "linkis-cg-engineplugin") - val ENGINECONN_DEBUG_ENABLED = CommonVars("wds.linkis.engineconn.debug.mode.enable", false) val MULTI_USER_ENGINE_TYPES = CommonVars( diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/pointer/DefaultEngineConnPluginPointer.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/pointer/DefaultEngineConnPluginPointer.scala deleted file mode 100644 index 88e693ddc..000000000 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/pointer/DefaultEngineConnPluginPointer.scala +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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. - */ - -package org.apache.linkis.manager.am.pointer - -import org.apache.linkis.manager.am.conf.AMConfiguration -import org.apache.linkis.manager.am.exception.AMErrorException -import org.apache.linkis.manager.common.constant.AMConstant -import org.apache.linkis.manager.common.entity.resource.NodeResource -import org.apache.linkis.manager.engineplugin.common.resource.EngineResourceRequest -import org.apache.linkis.rpc.Sender - -import org.springframework.stereotype.Component - -@Component -class DefaultEngineConnPluginPointer extends EngineConnPluginPointer { - - private def getEngineConnPluginSender: Sender = - Sender.getSender(AMConfiguration.ENGINECONN_SPRING_APPLICATION_NAME.getValue) - - override def createEngineResource(engineResourceRequest: EngineResourceRequest): NodeResource = { - getEngineConnPluginSender.ask(engineResourceRequest) match { - case nodeResource: NodeResource => - nodeResource - case ecpTaskException: Exception => - throw new AMErrorException( - AMConstant.ENGINE_ERROR_CODE, - ecpTaskException.getMessage, - ecpTaskException - ) - case _ => - throw new AMErrorException(AMConstant.ENGINE_ERROR_CODE, s"Failed to create engineResource") - } - } - -} diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/pointer/EngineConnPluginPointer.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/pointer/EngineConnPluginPointer.scala deleted file mode 100644 index 2d322a114..000000000 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/pointer/EngineConnPluginPointer.scala +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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. - */ - -package org.apache.linkis.manager.am.pointer - -import org.apache.linkis.manager.common.entity.resource.NodeResource -import org.apache.linkis.manager.engineplugin.common.resource.EngineResourceRequest - -trait EngineConnPluginPointer { - - def createEngineResource(engineResourceRequest: EngineResourceRequest): NodeResource - -} diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineAskEngineService.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineAskEngineService.scala index cd7b22dd6..4dd3e035d 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineAskEngineService.scala +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineAskEngineService.scala @@ -104,15 +104,15 @@ class DefaultEngineAskEngineService engineAskRequest.getLabels.remove("engineInstance") val engineCreateRequest = new EngineCreateRequest engineCreateRequest.setLabels(engineAskRequest.getLabels) - engineCreateRequest.setTimeOut(engineAskRequest.getTimeOut) + engineCreateRequest.setTimeout(engineAskRequest.getTimeOut) engineCreateRequest.setUser(engineAskRequest.getUser) engineCreateRequest.setProperties(engineAskRequest.getProperties) engineCreateRequest.setCreateService(engineAskRequest.getCreateService) val createNode = engineCreateService.createEngine(engineCreateRequest, sender) val timeout = - if (engineCreateRequest.getTimeOut <= 0) { + if (engineCreateRequest.getTimeout <= 0) { AMConfiguration.ENGINE_START_MAX_TIME.getValue.toLong - } else engineCreateRequest.getTimeOut + } else engineCreateRequest.getTimeout // useEngine 需要加上超时 val createEngineNode = getEngineNodeManager.useEngine(createNode, timeout) if (null == createEngineNode) { diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineCreateService.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineCreateService.scala index 3c8b3279a..0804e3025 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineCreateService.scala +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineCreateService.scala @@ -20,13 +20,13 @@ package org.apache.linkis.manager.am.service.engine import org.apache.linkis.common.ServiceInstance import org.apache.linkis.common.exception.LinkisRetryException import org.apache.linkis.common.utils.{ByteTimeUtils, Logging, Utils} +import org.apache.linkis.engineplugin.server.service.EngineConnResourceFactoryService import org.apache.linkis.governance.common.conf.GovernanceCommonConf import org.apache.linkis.governance.common.conf.GovernanceCommonConf.ENGINE_CONN_MANAGER_SPRING_NAME import org.apache.linkis.governance.common.utils.JobUtils import org.apache.linkis.manager.am.conf.{AMConfiguration, EngineConnConfigurationService} import org.apache.linkis.manager.am.exception.AMErrorException import org.apache.linkis.manager.am.label.EngineReuseLabelChooser -import org.apache.linkis.manager.am.pointer.EngineConnPluginPointer import org.apache.linkis.manager.am.selector.{ECAvailableRule, NodeSelector} import org.apache.linkis.manager.common.constant.AMConstant import org.apache.linkis.manager.common.entity.enumeration.NodeStatus @@ -92,7 +92,7 @@ class DefaultEngineCreateService private var engineConnConfigurationService: EngineConnConfigurationService = _ @Autowired - private var engineConnPluginPointer: EngineConnPluginPointer = _ + private var engineConnResourceFactoryService: EngineConnResourceFactoryService = _ @Autowired private var nodeMetricManagerPersistence: NodeMetricManagerPersistence = _ @@ -114,9 +114,9 @@ class DefaultEngineCreateService logger.info(s"Task: $taskId start to create Engine for request: $engineCreateRequest.") val labelBuilderFactory = LabelBuilderFactoryContext.getLabelBuilderFactory val timeout = - if (engineCreateRequest.getTimeOut <= 0) { + if (engineCreateRequest.getTimeout <= 0) { AMConfiguration.ENGINE_START_MAX_TIME.getValue.toLong - } else engineCreateRequest.getTimeOut + } else engineCreateRequest.getTimeout // 1. 检查Label是否合法 var labelList: util.List[Label[_]] = LabelUtils.distinctLabel( @@ -288,8 +288,8 @@ class DefaultEngineCreateService labelList, engineCreateRequest.getProperties ) - val resource = engineConnPluginPointer.createEngineResource(timeoutEngineResourceRequest) - /* emNode.setLabels(nodeLabelService.getNodeLabels(emNode.getServiceInstance)) */ + val resource = + engineConnResourceFactoryService.createEngineResource(timeoutEngineResourceRequest) resourceManager.requestResource( LabelUtils.distinctLabel(labelList, emNode.getLabels), diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/test/java/org/apache/linkis/engineplugin/loader/EngineConnPluginLoaderTest.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/test/java/org/apache/linkis/engineplugin/loader/EngineConnPluginLoaderTest.java similarity index 100% rename from linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/test/java/org/apache/linkis/engineplugin/loader/EngineConnPluginLoaderTest.java rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/test/java/org/apache/linkis/engineplugin/loader/EngineConnPluginLoaderTest.java diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/protocol/engine/EngineCreateRequest.java b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/protocol/engine/EngineCreateRequest.java index e98812f04..7d01c394e 100644 --- a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/protocol/engine/EngineCreateRequest.java +++ b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/protocol/engine/EngineCreateRequest.java @@ -27,7 +27,7 @@ public class EngineCreateRequest implements EngineRequest, RequestMethod { private Map<String, Object> labels; - private long timeOut; + private long timeout; private String user; @@ -53,12 +53,12 @@ public class EngineCreateRequest implements EngineRequest, RequestMethod { this.labels = labels; } - public long getTimeOut() { - return timeOut; + public long getTimeout() { + return timeout; } - public void setTimeOut(long timeOut) { - this.timeOut = timeOut; + public void setTimeout(long timeout) { + this.timeout = timeout; } @Override @@ -104,8 +104,8 @@ public class EngineCreateRequest implements EngineRequest, RequestMethod { return "EngineCreateRequest{" + "labels=" + labels - + ", timeOut=" - + timeOut + + ", timeout=" + + timeout + ", user='" + user + '\'' diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/entity/resource/Resource.scala b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/entity/resource/Resource.scala index 9d550cb41..47b651584 100644 --- a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/entity/resource/Resource.scala +++ b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/entity/resource/Resource.scala @@ -436,17 +436,13 @@ class DriverAndYarnResource( } def isModuleOperate(r: Resource): Boolean = { - if ( - this.yarnResource != null && r.yarnResource != null && - StringUtils.isNotEmpty(this.yarnResource.queueName) && - StringUtils.isNotEmpty(r.yarnResource.queueName) && this.yarnResource.queueName.equals( - r.yarnResource.queueName - ) - ) { + if (this.isModuleOperate || r.isModuleOperate) { + true + } else if (this.yarnResource.queueName.equals(r.yarnResource.queueName)) { logger.debug(s"Not module operate this:$this other:$r") false } else { - false + true } } diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/utils/ResourceUtils.scala b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/utils/ResourceUtils.scala index 2279e50fd..5968a30d6 100644 --- a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/utils/ResourceUtils.scala +++ b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/utils/ResourceUtils.scala @@ -62,7 +62,7 @@ object ResourceUtils { def fromPersistenceResource(persistenceResource: PersistenceResource): CommonNodeResource = { if (persistenceResource == null) return null val nodeResource = new CommonNodeResource - if (persistenceResource.getId != null) nodeResource.setId(persistenceResource.getId) + nodeResource.setId(persistenceResource.getId) if (persistenceResource.getMaxResource != null) { nodeResource.setMaxResource(deserializeResource(persistenceResource.getMaxResource)) } @@ -94,7 +94,7 @@ object ResourceUtils { def fromPersistenceResourceAndUser(persistenceResource: PersistenceResource): UserResource = { if (persistenceResource == null) return null val nodeResource = new UserResource - if (persistenceResource.getId != null) nodeResource.setId(persistenceResource.getId) + nodeResource.setId(persistenceResource.getId) if (persistenceResource.getMaxResource != null) { nodeResource.setMaxResource(deserializeResource(persistenceResource.getMaxResource)) } diff --git a/linkis-computation-governance/linkis-manager/pom.xml b/linkis-computation-governance/linkis-manager/pom.xml index 9189559cf..88ed9d94d 100644 --- a/linkis-computation-governance/linkis-manager/pom.xml +++ b/linkis-computation-governance/linkis-manager/pom.xml @@ -34,69 +34,4 @@ <module>linkis-application-manager</module> </modules> - <dependencies> - <dependency> - <groupId>org.apache.linkis</groupId> - <artifactId>linkis-engineconn-plugin-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.linkis</groupId> - <artifactId>linkis-application-manager</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - - <build> - <finalName>${project.artifactId}-${project.version}</finalName> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - <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> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <inherited>false</inherited> - <configuration> - <skipAssembly>false</skipAssembly> - <finalName>out</finalName> - <appendAssemblyId>false</appendAssemblyId> - <attach>false</attach> - <descriptors> - <descriptor>distribution.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <descriptors> - <descriptor>distribution.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </project> diff --git a/linkis-dist/package/conf/linkis-cg-linkismanager.properties b/linkis-dist/package/conf/linkis-cg-linkismanager.properties index 5a8522b13..dce88b9d4 100644 --- a/linkis-dist/package/conf/linkis-cg-linkismanager.properties +++ b/linkis-dist/package/conf/linkis-cg-linkismanager.properties @@ -25,8 +25,5 @@ wds.linkis.engineConn.dist.load.enable=true #wds.linkis.engineconn.home=/appcom/Install/LinkisInstall/lib/linkis-engineconn-plugins #wds.linkis.engineconn.plugin.loader.store.path=/appcom/Install/LinkisInstall/lib/linkis-engineconn-plugins -wds.linkis.rpc.conf.enable.local.message=true -wds.linkis.rpc.conf.local.app.list=linkis-cg-linkismanager - ##Spring spring.server.port=9101 \ No newline at end of file diff --git a/linkis-dist/package/sbin/linkis-daemon.sh b/linkis-dist/package/sbin/linkis-daemon.sh index 4bb96aace..b8569cdc7 100755 --- a/linkis-dist/package/sbin/linkis-daemon.sh +++ b/linkis-dist/package/sbin/linkis-daemon.sh @@ -156,9 +156,6 @@ case $SERVER_NAME in "cg-engineconnmanager"|"linkis-cg-engineconnmanager"|"engineconnmanager") export SERVER_NAME="cg-engineconnmanager" ;; - "cg-engineplugin"|"linkis-cg-engineplugin"|"engineplugin") - export SERVER_NAME="cg-engineplugin" - ;; "cg-entrance"|"linkis-cg-entrance"|"entrance") export SERVER_NAME="cg-entrance" ;; diff --git a/linkis-dist/src/main/assembly/distribution.xml b/linkis-dist/src/main/assembly/distribution.xml index b45e14b46..d5830eae8 100644 --- a/linkis-dist/src/main/assembly/distribution.xml +++ b/linkis-dist/src/main/assembly/distribution.xml @@ -210,7 +210,7 @@ <!--application-manager--> <fileSet> <directory> - ../linkis-computation-governance/linkis-manager/target/out/lib + ../linkis-computation-governance/linkis-manager/linkis-application-manager/target/out/lib </directory> <outputDirectory> linkis-package/lib/linkis-computation-governance/linkis-cg-linkismanager diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/parser/GatewayParser.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/parser/GatewayParser.scala index 550388112..91debac06 100644 --- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/parser/GatewayParser.scala +++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/parser/GatewayParser.scala @@ -124,11 +124,6 @@ class DefaultGatewayParser(gatewayParsers: Array[GatewayParser]) extends Abstrac // In order to be compatible with metadata module name refactoring,this logic will be removed in subsequent versions } else if (RPCConfiguration.METADATAQUERY_SERVICE_LIST.contains(serviceId)) { RPCConfiguration.METADATAQUERY_SERVICE_APPLICATION_NAME.getValue - } else if ( - RPCConfiguration.LINKIS_MANAGER_SERVICE_MERGED.getValue && RPCConfiguration.LINKIS_MANAGER_SERVICE_LIST - .contains(serviceId) - ) { - RPCConfiguration.LINKIS_MANAGER_APPLICATION_NAME.getValue } else { serviceId } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
