Skip to content

Commit

Permalink
Remove the obsolete XA distributed transaction manager implementation…
Browse files Browse the repository at this point in the history
… of Bitronix
  • Loading branch information
linghengqian committed Aug 4, 2023
1 parent b0b6c81 commit 43339f4
Show file tree
Hide file tree
Showing 41 changed files with 6 additions and 1,275 deletions.
5 changes: 0 additions & 5 deletions distribution/jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,6 @@
<artifactId>shardingsphere-transaction-xa-narayana</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-transaction-xa-bitronix</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-transaction-base-seata-at</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,5 @@ ShardingSphere 默认情况下仅包含核心 SPI 的实现,在 Git Source 存
- `org.apache.shardingsphere:shardingsphere-cluster-mode-repository-consul`,基于 Consul 的持久化实现
- XA 分布式事务管理器
- `org.apache.shardingsphere:shardingsphere-transaction-xa-narayana`,基于 Narayana 的 XA 分布式事务管理器
- `org.apache.shardingsphere:shardingsphere-transaction-xa-bitronix`,基于 Bitronix 的 XA 分布式事务管理器
- SQL 翻译
- `org.apache.shardingsphere:shardingsphere-sql-translator-jooq-provider`,使用 JooQ 的 SQL 翻译器
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,5 @@ All optional plugins are listed below in the form of `groupId:artifactId`.
- `org.apache.shardingsphere:shardingsphere-cluster-mode-repository-consul`, Consul based persistence
- XA transaction manager provider definition
- `org.apache.shardingsphere:shardingsphere-transaction-xa-narayana`, XA distributed transaction manager based on Narayana
- `org.apache.shardingsphere:shardingsphere-transaction-xa-bitronix`, XA distributed transaction manager based on Bitronix
- SQL translator
- `org.apache.shardingsphere:shardingsphere-sql-translator-jooq-provider`, JooQ SQL translator

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ value ::=

- `defaultTransactionType` 支持 `LOCAL``XA``BASE`

- `transactionManager` 支持 `Atomikos``Narayana``Bitronix`
- `transactionManager` 支持 `Atomikos``Narayana`

### 示例

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ value ::=

- `defaultTransactionType` support `LOCAL`, `XA`, `BASE`

- `transactionManager` support `Atomikos`, `Narayana` and `Bitronix`
- `transactionManager` support `Atomikos` and `Narayana`

### Example

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,5 @@ ShardingSphere 默认情况下仅包含核心 SPI 的实现,在 Git Source 存
- `org.apache.shardingsphere:shardingsphere-cluster-mode-repository-consul`,基于 Consul 的持久化实现
- XA 分布式事务管理器
- `org.apache.shardingsphere:shardingsphere-transaction-xa-narayana`,基于 Narayana 的 XA 分布式事务管理器
- `org.apache.shardingsphere:shardingsphere-transaction-xa-bitronix`,基于 Bitronix 的 XA 分布式事务管理器
- SQL 翻译
- `org.apache.shardingsphere:shardingsphere-sql-translator-jooq-provider`,使用 JooQ 的 SQL 翻译器
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,5 @@ All optional plugins are listed below in the form of `groupId:artifactId`.
- `org.apache.shardingsphere:shardingsphere-cluster-mode-repository-consul`, Consul based persistence
- XA transaction manager provider definition
- `org.apache.shardingsphere:shardingsphere-transaction-xa-narayana`, XA distributed transaction manager based on Narayana
- `org.apache.shardingsphere:shardingsphere-transaction-xa-bitronix`, XA distributed transaction manager based on Bitronix
- SQL translator
- `org.apache.shardingsphere:shardingsphere-sql-translator-jooq-provider`, JooQ SQL translator

This file was deleted.

This file was deleted.

11 changes: 0 additions & 11 deletions examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
<narayana.version>5.9.1.Final</narayana.version>
<jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
<jboss-logging.version>3.2.1.Final</jboss-logging.version>
<btm.version>2.1.3</btm.version>

<seata.version>1.6.1</seata.version>

Expand Down Expand Up @@ -100,11 +99,6 @@
<artifactId>shardingsphere-transaction-xa-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-transaction-xa-bitronix</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-transaction-xa-narayana</artifactId>
Expand Down Expand Up @@ -279,11 +273,6 @@
<artifactId>jboss-logging</artifactId>
<version>${jboss-logging.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.btm</groupId>
<artifactId>btm</artifactId>
<version>${btm.version}</version>
</dependency>
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-all</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public enum YamlExampleConfigurationSupportedValue {

MODES("modes", new HashSet<>(Arrays.asList("memory", "proxy", "cluster-zookeeper", "cluster-etcd", "standalone"))),

TRANSACTIONS("transactions", new HashSet<>(Arrays.asList("local", "xa-atomikos", "xa-narayana", "xa-bitronix", "base-seata"))),
TRANSACTIONS("transactions", new HashSet<>(Arrays.asList("local", "xa-atomikos", "xa-narayana", "base-seata"))),

FEATURES("features", new HashSet<>(Arrays.asList("shadow", "sharding", "readwrite-splitting", "encrypt", "db-discovery", "mask"))),

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@
org.apache.shardingsphere.example.generator.scenario.transaction.type.LocalExampleScenario
org.apache.shardingsphere.example.generator.scenario.transaction.type.SeataExampleScenario
org.apache.shardingsphere.example.generator.scenario.transaction.type.XAAtomikosExampleScenario
org.apache.shardingsphere.example.generator.scenario.transaction.type.XABitronixExampleScenario
org.apache.shardingsphere.example.generator.scenario.transaction.type.XANarayanaExampleScenario
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ transactions:
- local
- xa-atomikos
- xa-narayana
- xa-bitronix
- base-seata

# supported: sharding,readwrite-splitting,encrypt,shadow,mask
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,6 @@ public final class Configuration {
return new TransactionRuleConfiguration("XA", "Atomikos", new Properties());
<#elseif transaction=="xa-narayana">
return new TransactionRuleConfiguration("XA", "Narayana", new Properties());
<#elseif transaction=="xa-bitronix">
return new TransactionRuleConfiguration("XA", "Bitronix", new Properties());
<#elseif transaction=="base-seata">
return new TransactionRuleConfiguration("BASE", "Seata", new Properties());
</#if>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,6 @@
<artifactId>jboss-logging</artifactId>
<version>3.2.1.Final</version>
</dependency>
<#elseif transaction=="xa-bitronix">
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-transaction-xa-bitronix</artifactId>
<version>${r'${project.version}'}</version>
</dependency>
<dependency>
<groupId>org.codehaus.btm</groupId>
<artifactId>btm</artifactId>
<version>2.1.3</version>
</dependency>
<#elseif transaction=="base-seata">
<dependency>
<groupId>org.apache.shardingsphere</groupId>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@ NARAYANA
: N A R A Y A N A
;

BITRONIX
: B I T R O N I X
;

TRUE
: T R U E
;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ providerName
;

buildInProviderTypeName
: ATOMIKOS | NARAYANA | BITRONIX
: ATOMIKOS | NARAYANA
;
Loading

0 comments on commit 43339f4

Please sign in to comment.