1，quartz.properties add conf category 2，dolphinscheduler-daemon.sh mo…

…dify (apache#1960) * 1，remove dolphinscheduler-rpc module 2，add dolphinscheduler-remote module 3，add dolphinscheduler-service module 4，refactor LoggerServer module (apache#1925) * 1，remove dolphinscheduler-rpc module 2，add dolphinscheduler-remote module 3，add dolphinscheduler-service module 4，refactor LoggerServer module * ProcessUtils modify * Refactor architecture (apache#1926) * move version to parent pom * move version properties to parent pom for easy management * remove freemarker dependency * delete CombinedApplicationServer * apache#1871 correct spelling * apache#1873 some updates for TaskQueueZkImpl * apache#1875 remove unused properties in pom * apache#1878 1. remove tomcat dependency 2. remove combined_logback.xml in api module 3. format pom.xml for not aligning * apache#1885 fix api server startup failure 1. add jsp-2.1 dependency 2. remove jasper-runtime dependency * add stringutils ut (apache#1921) * add stringutils ut * Newfeature for apache#1675. (apache#1908) Continue to finish the rest works, add the cache feature for dependence,mr,python,sub_process,procedure and shell. * Add modify user name for process definition (apache#1919) * class overrides equals() and should therefore also override hashCode() * apache#1862 add modify user in process difinition list * apache#1862 add pg-1.2.2 ddl.sql * modify ScriptRunnerTest * add updateProessDifinition UT * modify updateProcessDifinition UT * modify updateProcessDifinition UT * modify mysql 1.2.2 ddl.sql&dml.sql * add scope test to mysql in pom * modify pg-1.2.2 ddl.sql * refactor module * updates Co-authored-by: khadgarmage <[email protected]> Co-authored-by: zhukai <[email protected]> Co-authored-by: Yelli <[email protected]> * dolphinscheduler-common remove spring (apache#1931) * dolphinscheduler-common remove spring * dolphinscheduler-common remove spring * dolphinscheduler-common remove spring * dolphinscheduler-common remove spring * dolphinscheduler-common remove spring * SpringApplicationContext class title add license (apache#1932) * dolphinscheduler-common remove spring * dolphinscheduler-common remove spring * dolphinscheduler-common remove spring * dolphinscheduler-common remove spring * dolphinscheduler-common remove spring * dolphinscheduler-common remove spring * add license (apache#1934) * dolphinscheduler-common remove spring * dolphinscheduler-common remove spring * dolphinscheduler-common remove spring * dolphinscheduler-common remove spring * dolphinscheduler-common remove spring * dolphinscheduler-common remove spring * Refactor architecture (apache#1936) * move datasource classes to dao module * fix send4LetterWord bug * LoggerServiceTest remove ProcessDao (apache#1944) * dolphinscheduler-common remove spring * dolphinscheduler-common remove spring * dolphinscheduler-common remove spring * dolphinscheduler-common remove spring * dolphinscheduler-common remove spring * dolphinscheduler-common remove spring * LoggerServiceTest remove ProcessDao * exclude jasper-compiler in case of runtime conflict (apache#1938) * move datasource classes to dao module * fix send4LetterWord bug * exclude jasper-compiler in case of runtime conflict * DataAnaylysisServiceTest and ProcessDefinitionService modify * remote module add comment * OSUtilsTest modify * add finally block to close channel (apache#1951) * move datasource classes to dao module * fix send4LetterWord bug * exclude jasper-compiler in case of runtime conflict * add finally block to close channel * 1，quartz.properties add conf category 2，dolphinscheduler-daemon.sh modify * dolphinscheduler-binary.xml modify Co-authored-by: Tboy <[email protected]> Co-authored-by: khadgarmage <[email protected]> Co-authored-by: zhukai <[email protected]> Co-authored-by: Yelli <[email protected]>
wjw0716 · Feb 15, 2020 · c6f2524 · c6f2524
1 parent 99ac739
commit c6f2524
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-binary.xml b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-binary.xml
@@ -112,6 +112,21 @@
 		</fileSet>
 		<!--server end-->
 
+
+		<!--service end-->
+		<fileSet>
+			<directory>${basedir}/../dolphinscheduler-service/src/main/resources</directory>
+			<includes>
+				<include>**/*.properties</include>
+				<include>**/*.xml</include>
+				<include>**/*.json</include>
+				<include>**/*.yml</include>
+			</includes>
+			<outputDirectory>conf</outputDirectory>
+		</fileSet>
+		<!--service end-->
+
+
 		<fileSet>
 			<directory>${basedir}/../dolphinscheduler-server/target/dolphinscheduler-server-${project.version}</directory>
 			<includes>

diff --git a/script/dolphinscheduler-daemon.sh b/script/dolphinscheduler-daemon.sh
@@ -69,7 +69,7 @@ elif [ "$command" = "alert-server" ]; then
   LOG_FILE="-Dserver=alert-server"
   CLASS=org.apache.dolphinscheduler.alert.AlertServer
 elif [ "$command" = "logger-server" ]; then
-  CLASS=org.apache.dolphinscheduler.server.rpc.LoggerServer
+  CLASS=org.apache.dolphinscheduler.server.log.LoggerServer
 elif [ "$command" = "combined-server" ]; then
   LOG_FILE="-Dlogging.config=classpath:combined_logback.xml -Dspring.profiles.active=api -Dserver.is-combined-server=true"
   CLASS=org.apache.dolphinscheduler.api.CombinedApplicationServer