Skip to content

Commit

Permalink
Release 0.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangthen authored Apr 19, 2019
2 parents 9531156 + c2efff8 commit 95deba8
Show file tree
Hide file tree
Showing 491 changed files with 5,396 additions and 3,109 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/BUG_REPORT.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
name: Bug Report
about: If you would like to report a issue to Fescar, please use this template.
about: If you would like to report a issue to Seata, please use this template.


---

- [ ] I have searched the [issues](https://github.com/alibaba/fescar/issues) of this repository and believe that this is not a duplicate.
- [ ] I have searched the [issues](https://github.com/seata/seata/issues) of this repository and believe that this is not a duplicate.

### Ⅰ. Issue Description

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Feature Request
about: Suggest an idea for Fescar
about: Suggest an idea for Seata

---

Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ target/
*.tar
*.tar.gz
*.class
.flattened-pom.xml

# eclipse ignore
.settings/
Expand All @@ -29,9 +30,10 @@ target/
/distribution/lib
server/*root.*
server/.root.*
*.data

# system ignore
.DS_Store
Thumbs.db
*.orig
*.class
*.class
Binary file added .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
1 change: 1 addition & 0 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ language: java
sudo: false # faster builds

jdk:
- openjdk11
- openjdk8

cache:
Expand All @@ -12,7 +11,7 @@ cache:
install: true

script:
- mvn clean package verify
- travis_wait 30 ./mvnw clean install -DskipTests=false

after_success:
- bash <(curl -s https://codecov.io/bash)
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#### FEATURES:

* support standalone fescar-server.
* support standalone seata-server.
* support mysql automatic transaction.
* support @GlobalTransactional spring annotation.
* support dubbo on filter.
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Fescar
# Seata

## Fescar Code Style
Fescar code style Comply with Alibaba Java Coding Guidelines.
## Seata Code Style
Seata code style Comply with Alibaba Java Coding Guidelines.

Fescar 的编码规范遵从于《阿里巴巴JAVA开发规约》。
Seata 的编码规范遵从于《阿里巴巴JAVA开发规约》。


### Guidelines
Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,26 +80,26 @@ For more details about principle and design, please go to [Seata wiki page](http

## Maven dependency
```xml
<fescar.version>0.4.1</fescar.version>
<seata.version>0.5.0</seata.version>

<dependency>
<groupId>com.alibaba.fescar</groupId>
<artifactId>fescar-spring</artifactId>
<version>${fescar.version}</version>
<groupId>io.seata</groupId>
<artifactId>seata-spring</artifactId>
<version>${seata.version}</version>
</dependency>

<!--dependency for Apache Dubbo-->
<dependency>
<groupId>com.alibaba.fescar</groupId>
<artifactId>fescar-dubbo</artifactId>
<version>${fescar.version}</version>
<groupId>io.seata</groupId>
<artifactId>seata-dubbo</artifactId>
<version>${seata.version}</version>
</dependency>

<!--dependency for Alibaba Dubbo-->
<dependency>
<groupId>com.alibaba.fescar</groupId>
<artifactId>fescar-dubbo-alibaba</artifactId>
<version>${fescar.version}</version>
<groupId>io.seata</groupId>
<artifactId>seata-dubbo-alibaba</artifactId>
<version>${seata.version}</version>
</dependency>

```
Expand All @@ -123,7 +123,7 @@ Contributors are welcomed to join the FEATS project. Please check [CONTRIBUTING]

## Contact

* [Twitter](): TBD. Follow along for latest Fescar news on Twitter.
* [Twitter](https://twitter.com/seataio): Follow along for latest Seata news on Twitter.

* Mailing list:
* dev-fescar@googlegroups.com , for dev/user discussion. [subscribe](mailto:dev-fescar+subscribe@googlegroups.com), [unsubscribe](mailto:dev-fescar+unsubscribe@googlegroups.com), [archive](https://groups.google.com/forum/#!forum/dev-fescar)
Expand All @@ -135,7 +135,7 @@ Contributors are welcomed to join the FEATS project. Please check [CONTRIBUTING]

## Seata ecosystem

* [Seata Ecosystem Entry](https://github.com/fescar-group) - A GitHub group `seata-group` to gather all Seata relevant projects not appropriate in [seata](https://github.com/seata) group yet
* [Seata Ecosystem Entry](https://github.com/seata) - A GitHub group `seata` to gather all Seata relevant projects
* [Seata Samples](https://github.com/fescar-group/fescar-samples) - Samples for Seata
* [Seata Docker](https://github.com/fescar-group/fescar-docker) - Seata integration with docker
* [Seata K8s](https://github.com/fescar-group/fescar-k8s) - Seata integration with k8s
Expand Down
10 changes: 5 additions & 5 deletions common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>fescar-all</artifactId>
<groupId>com.alibaba.fescar</groupId>
<version>0.4.2</version>
<groupId>io.seata</groupId>
<artifactId>seata-parent</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>fescar-common</artifactId>
<artifactId>seata-common</artifactId>
<packaging>jar</packaging>
<name>fescar-common ${project.version}</name>
<name>seata-common ${project.version}</name>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.alibaba.fescar.common;
package io.seata.common;

/**
* The type Constants.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.alibaba.fescar.common;
package io.seata.common;

/**
* The type Xid.
Expand Down Expand Up @@ -71,21 +71,6 @@ public static long getTransactionId(String xid) {
return Long.parseLong(xid.substring(idx + 1));
}

/**
* Gets server address.
*
* @param xid the xid
* @return the server address
*/
public static String getServerAddress(String xid) {
if (xid == null) {
return null;
}

int idx = xid.lastIndexOf(":");
return xid.substring(0, idx);
}

/**
* Gets port.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.fescar.common.exception;
package io.seata.common.exception;

/**
* eureka registry exception
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.alibaba.fescar.common.exception;
package io.seata.common.exception;

/**
* The enum Framework error code.
Expand All @@ -28,34 +28,34 @@ public enum FrameworkErrorCode {
*/
ThreadPoolFull("0004", "netty线程池满", "请在配置文件中调整线程数, corePoolSize 的值调大一些"),
/**
* The Init fescar client error.
* The Init services client error.
*/
InitFescarClientError("0008", "fescarAppName or fescarServerGroup is null", ""),
InitSeataClientError("0008", "seataAppName or seataServerGroup is null", ""),
/**
* The Null rule error.
*/
NullRuleError("0010", "fescar rules is null", ""),
NullRuleError("0010", "services rules is null", ""),

/**
* 0101 ~ 0199 网络有关的错误,连接不上,断开,dispatch等
*/
NetConnect("0101", "无法连接服务器", "请检查fescar server是否启动,到fescar server的网络连接是否正常"),
NetConnect("0101", "无法连接服务器", "请检查seata server是否启动,到seata server的网络连接是否正常"),
/**
* The Net reg appname.
*/
NetRegAppname("0102", "register client app name failed", "请检查fescar server是否启动,到fescar server的网络连接是否正常"),
NetRegAppname("0102", "register client app name failed", "请检查seata server是否启动,到seata server的网络连接是否正常"),
/**
* The Net disconnect.
*/
NetDisconnect("0103", "fescarConnection closed", "网络断开,请检查到对端(client 或fescar server)的网络连接"),
NetDisconnect("0103", "seataConnection closed", "网络断开,请检查到对端(client 或seata server)的网络连接"),
/**
* The Net dispatch.
*/
NetDispatch("0104", "dispatch 错误", "网络处理错误,请检查到对端(client 或fescar server)的网络连接 "),
NetDispatch("0104", "dispatch 错误", "网络处理错误,请检查到对端(client 或seata server)的网络连接 "),
/**
* The Net on message.
*/
NetOnMessage("0105", "on message 错误", "网络处理错误,请检查到对端(client 或fescar server)的网络连接 "),
NetOnMessage("0105", "on message 错误", "网络处理错误,请检查到对端(client 或seata server)的网络连接 "),
/**
* Get channel error framework error code.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.alibaba.fescar.common.exception;
package io.seata.common.exception;

import java.sql.SQLException;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.alibaba.fescar.common.exception;
package io.seata.common.exception;

/**
* The type Not support yet exception.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.alibaba.fescar.common.exception;
package io.seata.common.exception;

/**
* The type Should never happen exception.
Expand Down
89 changes: 89 additions & 0 deletions common/src/main/java/io/seata/common/exception/StoreException.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
/*
* Copyright 1999-2018 Alibaba Group Holding Ltd.
*
* Licensed 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 io.seata.common.exception;

/**
* the store exception
*
* @author zhangsen
* @data 2019 /4/2
*/
public class StoreException extends FrameworkException {

/**
* Instantiates a new Store exception.
*/
public StoreException() {
}

/**
* Instantiates a new Store exception.
*
* @param err the err
*/
public StoreException(FrameworkErrorCode err) {
super(err);
}

/**
* Instantiates a new Store exception.
*
* @param msg the msg
*/
public StoreException(String msg) {
super(msg);
}

/**
* Instantiates a new Store exception.
*
* @param msg the msg
* @param errCode the err code
*/
public StoreException(String msg, FrameworkErrorCode errCode) {
super(msg, errCode);
}

/**
* Instantiates a new Store exception.
*
* @param cause the cause
* @param msg the msg
* @param errCode the err code
*/
public StoreException(Throwable cause, String msg, FrameworkErrorCode errCode) {
super(cause, msg, errCode);
}

/**
* Instantiates a new Store exception.
*
* @param th the th
*/
public StoreException(Throwable th) {
super(th);
}

/**
* Instantiates a new Store exception.
*
* @param th the th
* @param msg the msg
*/
public StoreException(Throwable th, String msg) {
super(th, msg);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.alibaba.fescar.common.executor;
package io.seata.common.executor;

/**
* The interface Callback.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.alibaba.fescar.common.executor;
package io.seata.common.executor;

/**
* The interface Initialize.
Expand Down
Loading

0 comments on commit 95deba8

Please sign in to comment.