Skip to content

Commit 2f43a83

Browse files
wushengyeyouyawushengyeyouya
authored
Merge pull request #447 from JackChen0810/dev-1.0.1
Version 1.0.1 of DSS is adapted to Apache of linkis #444;All interfaces of DSS can be changed into spring MVC #445
2 parents dcac965 + 7c0dde5 commit 2f43a83

File tree

394 files changed

+2589
-3022
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

394 files changed

+2589
-3022
lines changed

‎assembly/config/config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,6 @@ EMAIL_PASSWORD=xxxxx
7676
EMAIL_PROTOCOL=smtp
7777
############## ############## dss_appconn_instance configuration end ############## ##############
7878

79-
DSS_VERSION=1.0.0
79+
DSS_VERSION=1.0.1
8080

8181
DSS_FILE_NAME="dss-$DSS_VERSION"

‎assembly/dss-package/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
<parent>
2222
<artifactId>dss</artifactId>
2323
<groupId>com.webank.wedatasphere.dss</groupId>
24-
<version>1.0.0</version>
24+
<version>1.0.1</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727
<artifactId>dss-package</artifactId>
2828
<dependencies>
2929
<dependency>
30-
<groupId>com.webank.wedatasphere.linkis</groupId>
30+
<groupId>org.apache.linkis</groupId>
3131
<artifactId>linkis-rpc</artifactId>
3232
<version>${linkis.version}</version>
3333
<exclusions>
@@ -88,7 +88,7 @@
8888
</dependency>
8989

9090
<dependency>
91-
<groupId>com.webank.wedatasphere.linkis</groupId>
91+
<groupId>org.apache.linkis</groupId>
9292
<artifactId>linkis-hadoop-common</artifactId>
9393
<version>${linkis.version}</version>
9494
</dependency>
@@ -111,12 +111,12 @@
111111
</dependency>
112112

113113
<dependency>
114-
<groupId>com.webank.wedatasphere.linkis</groupId>
114+
<groupId>org.apache.linkis</groupId>
115115
<artifactId>linkis-mybatis</artifactId>
116116
<version>${linkis.version}</version>
117117
</dependency>
118118
<dependency>
119-
<groupId>com.webank.wedatasphere.linkis</groupId>
119+
<groupId>org.apache.linkis</groupId>
120120
<artifactId>linkis-storage</artifactId>
121121
<version>${linkis.version}</version>
122122
</dependency>

‎assembly/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>dss</artifactId>
2323
<groupId>com.webank.wedatasphere.dss</groupId>
24-
<version>1.0.0</version>
24+
<version>1.0.1</version>
2525
</parent>
2626
<packaging>pom</packaging>
2727
<modelVersion>4.0.0</modelVersion>

‎conf/dss-flow-execution-server.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ spring.server.port=9205
2020
spring.spring.application.name=dss-flow-entrance
2121

2222
##mybatis
23-
wds.linkis.server.mybatis.mapperLocations=classpath*:com/webank/wedatasphere/dss/flow/execution/entrance/dao/impl/*.xml,classpath*:com/webank/wedatasphere/linkis/jobhistory/dao/impl/*.xml
23+
wds.linkis.server.mybatis.mapperLocations=classpath*:com/webank/wedatasphere/dss/flow/execution/entrance/dao/impl/*.xml,classpath*:org/apache/linkis/jobhistory/dao/impl/*.xml
2424

2525
wds.linkis.server.mybatis.typeAliasesPackage=
2626

27-
wds.linkis.server.mybatis.BasePackage=com.webank.wedatasphere.dss.flow.execution.entrance.dao,com.webank.wedatasphere.linkis.jobhistory.dao
27+
wds.linkis.server.mybatis.BasePackage=com.webank.wedatasphere.dss.flow.execution.entrance.dao,org.apache.linkis.jobhistory.dao
2828

2929

30-
wds.linkis.server.restful.scan.packages=com.webank.wedatasphere.linkis.entrance.restful,com.webank.wedatasphere.dss.flow.execution.entrance.restful
30+
wds.linkis.server.restful.scan.packages=org.apache.linkis.entrance.restful,com.webank.wedatasphere.dss.flow.execution.entrance.restful
3131

32-
#wds.linkis.server.component.exclude.classes=com.webank.wedatasphere.linkis.DataWorkCloudApplication
32+
#wds.linkis.server.component.exclude.classes=org.apache.linkis.DataWorkCloudApplication
3333

3434
wds.linkis.engine.application.name=flowExecutionEngine
3535
wds.linkis.enginemanager.application.name=flowExecution
@@ -45,9 +45,9 @@ wds.linkis.server.socket.mode=true
4545
wds.linkis.client.flow.adminuser=ws
4646
wds.linkis.client.flow.author.user.token=WS-AUTH
4747

48-
wds.linkis.server.component.exclude.classes=com.webank.wedatasphere.linkis.entranceclient.conf.ClientForEntranceSpringConfiguration,com.webank.wedatasphere.linkis.entranceclient.conf.ClientSpringConfiguration
48+
wds.linkis.server.component.exclude.classes=org.apache.linkis.entranceclient.conf.ClientForEntranceSpringConfiguration,org.apache.linkis.entranceclient.conf.ClientSpringConfiguration
4949

50-
wds.linkis.server.component.exclude.packages=com.webank.wedatasphere.linkis.entrance.restful.
50+
wds.linkis.server.component.exclude.packages=org.apache.linkis.entrance.restful.
5151
spring.spring.main.allow-bean-definition-overriding=true
5252

5353
wds.linkis.entrance.config.log.path=file:///appcom/tmp/dss/

‎conf/dss.properties

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,10 @@ wds.linkis.server.mybatis.datasource.username=
2727
wds.dss.esb.appid=
2828
wds.dss.esb.token=
2929

30-
wds.dss.appconn.scheduler.job.label=dev
30+
wds.dss.appconn.scheduler.job.label=dev
31+
32+
33+
wds.linkis.reflect.scan.package=org.apache.linkis,com.webank.wedatasphere.dss
34+
spring.spring.mvc.servlet.path=/api/rest_j/v1
35+
spring.spring.servlet.multipart.max-file-size=200MB
36+
spring.spring.servlet.multipart.max-request-size=200MB

‎dss-appconn/appconns/dss-datachecker-appconn/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>dss</artifactId>
2323
<groupId>com.webank.wedatasphere.dss</groupId>
24-
<version>1.0.0</version>
24+
<version>1.0.1</version>
2525
<relativePath>../../../pom.xml</relativePath>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
@@ -38,7 +38,7 @@
3838
<exclusions>
3939
<exclusion>
4040
<artifactId>linkis-common</artifactId>
41-
<groupId>com.webank.wedatasphere.linkis</groupId>
41+
<groupId>org.apache.linkis</groupId>
4242
</exclusion>
4343
<exclusion>
4444
<artifactId>json4s-jackson_2.11</artifactId>

‎dss-appconn/appconns/dss-datachecker-appconn/src/main/scala/com/webank/wedatapshere/dss/appconn/datachecker/DataCheckerRefExecutionOperation.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import com.webank.wedatasphere.dss.standard.app.development.listener.common.{Asy
2323
import com.webank.wedatasphere.dss.standard.app.development.listener.core.{Killable, LongTermRefExecutionOperation, Procedure}
2424
import com.webank.wedatasphere.dss.standard.app.development.ref.ExecutionRequestRef
2525
import com.webank.wedatasphere.dss.standard.app.development.service.DevelopmentService
26-
import com.webank.wedatasphere.linkis.common.log.LogUtils
27-
import com.webank.wedatasphere.linkis.common.utils.{Utils, VariableUtils}
26+
import org.apache.linkis.common.log.LogUtils
27+
import org.apache.linkis.common.utils.{Utils, VariableUtils}
2828
import org.slf4j.LoggerFactory;
2929

3030
class DataCheckerRefExecutionOperation extends LongTermRefExecutionOperation with Killable with Procedure{

‎dss-appconn/appconns/dss-eventchecker-appconn/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>dss</artifactId>
2323
<groupId>com.webank.wedatasphere.dss</groupId>
24-
<version>1.0.0</version>
24+
<version>1.0.1</version>
2525
<relativePath>../../../pom.xml</relativePath>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
@@ -67,13 +67,13 @@
6767
</dependency>
6868

6969
<dependency>
70-
<groupId>com.webank.wedatasphere.linkis</groupId>
70+
<groupId>org.apache.linkis</groupId>
7171
<artifactId>linkis-cs-client</artifactId>
7272
<version>${linkis.version}</version>
7373
<exclusions>
7474
<exclusion>
7575
<artifactId>linkis-common</artifactId>
76-
<groupId>com.webank.wedatasphere.linkis</groupId>
76+
<groupId>org.apache.linkis</groupId>
7777
</exclusion>
7878
<exclusion>
7979
<artifactId>json4s-jackson_2.11</artifactId>
@@ -83,7 +83,7 @@
8383
</dependency>
8484

8585
<dependency>
86-
<groupId>com.webank.wedatasphere.linkis</groupId>
86+
<groupId>org.apache.linkis</groupId>
8787
<artifactId>linkis-storage</artifactId>
8888
<version>${linkis.version}</version>
8989
<scope>provided</scope>

‎dss-appconn/appconns/dss-eventchecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/eventchecker/EventCheckerAppConn.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package com.webank.wedatasphere.dss.appconn.eventchecker;
1818

19+
import com.webank.wedatasphere.dss.appconn.eventchecker.standard.EventCheckerDevelopmentStandard;
1920
import com.webank.wedatasphere.dss.appconn.core.ext.OnlyDevelopmentAppConn;
2021
import com.webank.wedatasphere.dss.appconn.core.impl.AbstractAppConn;
21-
import com.webank.wedatasphere.dss.appconn.eventchecker.standard.EventCheckerDevelopmentStandard;
2222
import com.webank.wedatasphere.dss.standard.app.development.standard.DevelopmentIntegrationStandard;
2323

2424
public class EventCheckerAppConn extends AbstractAppConn implements OnlyDevelopmentAppConn {

‎dss-appconn/appconns/dss-eventchecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/eventchecker/cs/CSEventReceiverHelper.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
package com.webank.wedatasphere.dss.appconn.eventchecker.cs;
1818

1919
import com.google.gson.Gson;
20-
import com.webank.wedatasphere.linkis.cs.client.service.CSVariableService;
21-
import com.webank.wedatasphere.linkis.cs.client.utils.ContextServiceUtils;
22-
import com.webank.wedatasphere.linkis.cs.client.utils.SerializeHelper;
23-
import com.webank.wedatasphere.linkis.cs.common.entity.enumeration.ContextScope;
24-
import com.webank.wedatasphere.linkis.cs.common.entity.enumeration.ContextType;
25-
import com.webank.wedatasphere.linkis.cs.common.entity.object.LinkisVariable;
26-
import com.webank.wedatasphere.linkis.cs.common.entity.source.CommonContextKey;
27-
import com.webank.wedatasphere.linkis.cs.common.entity.source.ContextKey;
28-
import com.webank.wedatasphere.linkis.cs.common.utils.CSCommonUtils;
20+
import org.apache.linkis.cs.client.service.CSVariableService;
21+
import org.apache.linkis.cs.client.utils.ContextServiceUtils;
22+
import org.apache.linkis.cs.client.utils.SerializeHelper;
23+
import org.apache.linkis.cs.common.entity.enumeration.ContextScope;
24+
import org.apache.linkis.cs.common.entity.enumeration.ContextType;
25+
import org.apache.linkis.cs.common.entity.object.LinkisVariable;
26+
import org.apache.linkis.cs.common.entity.source.CommonContextKey;
27+
import org.apache.linkis.cs.common.entity.source.ContextKey;
28+
import org.apache.linkis.cs.common.utils.CSCommonUtils;
2929
import org.slf4j.Logger;
3030
import org.slf4j.LoggerFactory;
3131

0 commit comments

Comments
 (0)