Skip to content

Commit

Permalink
Change groupId,artifactId, and package in 0.5.0 (apache#809)
Browse files Browse the repository at this point in the history
* change groupId, artifactId and  version of pom.xml
* change package of codes
* change fester to seata
  • Loading branch information
zhangthen authored and lovepoem committed Apr 17, 2019
1 parent 76734a9 commit a39b943
Show file tree
Hide file tree
Showing 471 changed files with 1,902 additions and 1,816 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
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.2</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:
* [email protected] , for dev/user discussion. [subscribe](mailto:[email protected]), [unsubscribe](mailto:[email protected]), [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>0.5.0-SNAPSHOT</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
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
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;

/**
* the store 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.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
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.loader;
package io.seata.common.loader;

import java.io.BufferedReader;
import java.io.IOException;
Expand All @@ -28,8 +28,8 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

import com.alibaba.fescar.common.executor.Initialize;
import com.alibaba.fescar.common.util.CollectionUtils;
import io.seata.common.executor.Initialize;
import io.seata.common.util.CollectionUtils;

import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
Expand All @@ -46,7 +46,7 @@
public class EnhancedServiceLoader {
private static final Logger LOGGER = LoggerFactory.getLogger(EnhancedServiceLoader.class);
private static final String SERVICES_DIRECTORY = "META-INF/services/";
private static final String FESCAR_DIRECTORY = "META-INF/fescar/";
private static final String SEATA_DIRECTORY = "META-INF/seata/";
@SuppressWarnings("rawtypes")
private static Map<Class, List<Class>> providers = new ConcurrentHashMap<Class, List<Class>>();

Expand Down Expand Up @@ -167,7 +167,7 @@ private static <S> S loadFile(Class<S> service, String activateName, ClassLoader
}
}
if (StringUtils.isNotEmpty(activateName)) {
loadFile(service, FESCAR_DIRECTORY + activateName.toLowerCase() + "/", loader, extensions);
loadFile(service, SEATA_DIRECTORY + activateName.toLowerCase() + "/", loader, extensions);

List<Class> activateExtensions = new ArrayList<Class>();
for (int i = 0; i < extensions.size(); i++) {
Expand Down Expand Up @@ -210,7 +210,7 @@ private static <S> List<Class> findAllExtensionClass(Class<S> service, String ac
List<Class> extensions = new ArrayList<Class>();
try {
loadFile(service, SERVICES_DIRECTORY, loader, extensions);
loadFile(service, FESCAR_DIRECTORY, loader, extensions);
loadFile(service, SEATA_DIRECTORY, loader, extensions);
} catch (IOException e) {
throw new EnhancedServiceNotFoundException(e);
}
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.loader;
package io.seata.common.loader;

import org.apache.commons.lang.exception.NestableRuntimeException;

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.loader;
package io.seata.common.loader;

import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
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.thread;
package io.seata.common.thread;

import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
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.thread;
package io.seata.common.thread;

import java.util.concurrent.BlockingQueue;
import java.util.concurrent.RejectedExecutionHandler;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,16 @@
* limitations under the License.
*/

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

import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.sql.Blob;

import javax.sql.rowset.serial.SerialBlob;

import com.alibaba.fescar.common.exception.ShouldNeverHappenException;
import io.seata.common.exception.ShouldNeverHappenException;
import io.seata.common.exception.ShouldNeverHappenException;

/**
* The type Blob utils.
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.util;
package io.seata.common.util;

import java.util.Collection;

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.util;
package io.seata.common.util;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
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.util;
package io.seata.common.util;

import java.net.InetAddress;
import java.net.InetSocketAddress;
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.util;
package io.seata.common.util;

import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
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.util;
package io.seata.common.util;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
Expand Down
Loading

0 comments on commit a39b943

Please sign in to comment.