Browse Source

delete CombinedApplicationServer (#1763)

* move version to parent pom

* move version properties to parent pom for easy management

* remove freemarker dependency

* delete CombinedApplicationServer
Tboy 5 years ago
parent
commit
3cf21dcac0

+ 0 - 49
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/CombinedApplicationServer.java

@@ -1,49 +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.dolphinscheduler.api;
-
-import org.apache.dolphinscheduler.alert.AlertServer;
-import org.apache.dolphinscheduler.server.master.MasterServer;
-import org.apache.dolphinscheduler.server.rpc.LoggerServer;
-import org.apache.dolphinscheduler.server.worker.WorkerServer;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.web.servlet.ServletComponentScan;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Import;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-@SpringBootApplication
-@ConditionalOnProperty(prefix = "server", name = "is-combined-server", havingValue = "true")
-@ServletComponentScan
-@ComponentScan("org.apache.dolphinscheduler")
-@Import({MasterServer.class, WorkerServer.class})
-@EnableSwagger2
-public class CombinedApplicationServer extends SpringBootServletInitializer {
-
-    public static void main(String[] args) throws Exception {
-
-        ApiApplicationServer.main(args);
-
-        LoggerServer server = new LoggerServer();
-        server.start();
-
-        AlertServer alertServer = AlertServer.getInstance();
-        alertServer.start();
-    }
-}