Skip to content

Commit d1a0f97

Browse files
aidentZhangaidentZhang
committed
removed derby-required, unneeded ts.jte params, and apache headers on xml
1 parent 7d0d7e6 commit d1a0f97

7 files changed

Lines changed: 53 additions & 66 deletions

File tree

‎jakarta-ee-tck-runners/transactions-tck/README.md‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -25,49 +25,7 @@ The Transactions TCK includes **195 tests** across two deployment modes:
2525
- **UserTransaction Tests**: Tests for programmatic transaction management via `UserTransaction` API
2626
- **XA Transaction Tests**: Tests for distributed transaction coordination
2727

28-
## Architecture
2928

30-
### Module Structure
31-
32-
```
33-
transactions-tck/
34-
├── pom.xml # Parent POM
35-
├── transactions-tck-setup/ # TCK artifact download and unpacking
36-
│ └── pom.xml
37-
└── transactions-tck-runner/ # Main test execution module
38-
├── pom.xml
39-
├── derby-required # Marker file indicating Derby dependency
40-
├── META-INF/
41-
│ └── application-client.xml # AppClient deployment descriptor
42-
├── jakartaeetck/
43-
│ └── bin/
44-
│ ├── ts.jte # JavaTest environment configuration
45-
│ ├── README.md # TCK binary directory documentation
46-
│ └── certificates/ # SSL certificates for AppClient tests
47-
├── sql/
48-
│ └── derby/
49-
│ ├── derby.ddl.sql # Database schema definition
50-
│ ├── derby.dml.sql # Named SQL statements
51-
│ ├── password.txt # Database password file
52-
│ └── README.md # SQL files documentation
53-
└── src/
54-
├── main/java/ # Arquillian extensions and utilities
55-
│ └── org/jboss/wildfly/tck/transactions/
56-
│ ├── AppClientInitialContextFactory.java
57-
│ ├── Validate.java
58-
│ ├── WildFlyExceptionTransformer.java
59-
│ ├── WildFlyExtension.java
60-
│ └── WildFlyTestArchiveProcessor.java
61-
├── main/resources/
62-
│ └── META-INF/services/
63-
│ └── org.jboss.arquillian.core.spi.LoadableExtension
64-
├── test/java/ # Database setup utilities
65-
│ └── org/jboss/wildfly/tck/transactions/
66-
│ └── DbSetup.java
67-
└── test/resources/ # Test configuration files
68-
├── arquillian.xml # Arquillian container configuration
69-
├── appclient-arquillian.xml # AppClient-specific configuration
70-
└── setup-database.cli # WildFly CLI script for datasource setup
7129
```
7230
7331
## Prerequisites

‎jakarta-ee-tck-runners/transactions-tck/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
~ Copyright The WildFly Authors
4-
~ SPDX-License-Identifier: Apache-2.0
5-
-->
62

73
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
84
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

‎jakarta-ee-tck-runners/transactions-tck/transactions-tck-runner/META-INF/application-client.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
~ Copyright The WildFly Authors
4-
~ SPDX-License-Identifier: Apache-2.0
5-
-->
62

73
<application-client version="10" xmlns="https://jakarta.ee/xml/ns/jakartaee"
84
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

‎jakarta-ee-tck-runners/transactions-tck/transactions-tck-runner/derby-required‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎jakarta-ee-tck-runners/transactions-tck/transactions-tck-runner/jakartaeetck/bin/ts.jte‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# Jakarta Transactions TCK Configuration for WildFly
22
# Minimal configuration - only essential properties for running 195 transaction tests
33

4-
# Work/Report Directories (required by TCK harness)
5-
work.dir=/home/jenkins/agent/workspace/jakartaee-tck_10.0.x/JTWork
6-
report.dir=/home/jenkins/agent/workspace/jakartaee-tck_10.0.x/JTReport
7-
84
# Derby Database Configuration (required for transaction tests)
95
derby.server=localhost
106
derby.port=1527
@@ -40,13 +36,8 @@ JTA_Tab2_Select=select * from JTA_Tab2
4036
JTA_Tab1_Select1=select KEY_ID, COF_NAME, PRICE FROM JTA_Tab1 where KEY_ID = ?
4137
JTA_Tab2_Select1=select KEY_ID, CHOC_NAME, PRICE FROM JTA_Tab2 where KEY_ID = ?
4238

43-
# Transaction Synchronization Registry (required by transaction tests)
44-
tsrJndiName=java:comp/TransactionSynchronizationRegistry
45-
4639
# Web Server Configuration (required by servlet/JSP tests)
4740
webServerHost=localhost
4841
webServerPort=8080
49-
webServerHost.2=localhost
50-
webServerPort.2=8002
5142

5243
# Made with Bob

‎jakarta-ee-tck-runners/transactions-tck/transactions-tck-runner/pom.xml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,45 @@
251251
<plugin>
252252
<artifactId>maven-dependency-plugin</artifactId>
253253
<executions>
254+
<execution>
255+
<id>copy-derby-jars</id>
256+
<phase>generate-test-resources</phase>
257+
<goals>
258+
<goal>copy</goal>
259+
</goals>
260+
<configuration>
261+
<artifactItems>
262+
<artifactItem>
263+
<groupId>org.apache.derby</groupId>
264+
<artifactId>derby</artifactId>
265+
<version>10.16.1.1</version>
266+
<outputDirectory>${jboss.home}/modules/org/apache/derby/main</outputDirectory>
267+
<destFileName>derby.jar</destFileName>
268+
</artifactItem>
269+
<artifactItem>
270+
<groupId>org.apache.derby</groupId>
271+
<artifactId>derbyclient</artifactId>
272+
<version>10.16.1.1</version>
273+
<outputDirectory>${jboss.home}/modules/org/apache/derby/main</outputDirectory>
274+
<destFileName>derbyclient.jar</destFileName>
275+
</artifactItem>
276+
<artifactItem>
277+
<groupId>org.apache.derby</groupId>
278+
<artifactId>derbyshared</artifactId>
279+
<version>10.16.1.1</version>
280+
<outputDirectory>${jboss.home}/modules/org/apache/derby/main</outputDirectory>
281+
<destFileName>derbyshared.jar</destFileName>
282+
</artifactItem>
283+
<artifactItem>
284+
<groupId>org.apache.derby</groupId>
285+
<artifactId>derbytools</artifactId>
286+
<version>10.16.1.1</version>
287+
<outputDirectory>${jboss.home}/modules/org/apache/derby/main</outputDirectory>
288+
<destFileName>derbytools.jar</destFileName>
289+
</artifactItem>
290+
</artifactItems>
291+
</configuration>
292+
</execution>
254293
<execution>
255294
<id>copy-transactions-tck</id>
256295
<phase>process-resources</phase>
@@ -294,6 +333,20 @@
294333
<groupId>org.apache.maven.plugins</groupId>
295334
<artifactId>maven-antrun-plugin</artifactId>
296335
<executions>
336+
<execution>
337+
<id>copy-derby-module-xml</id>
338+
<phase>generate-test-resources</phase>
339+
<goals>
340+
<goal>run</goal>
341+
</goals>
342+
<configuration>
343+
<target>
344+
<copy file="${basedir}/../../modules/derby-module.xml"
345+
tofile="${jboss.home}/modules/org/apache/derby/main/module.xml"
346+
failonerror="true"/>
347+
</target>
348+
</configuration>
349+
</execution>
297350
<execution>
298351
<id>copy-ts-jte-to-target</id>
299352
<phase>process-test-classes</phase>

‎jakarta-ee-tck-runners/transactions-tck/transactions-tck-runner/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
1-
#
2-
# Copyright The WildFly Authors
3-
# SPDX-License-Identifier: Apache-2.0
4-
#
5-
61
org.jboss.wildfly.tck.transactions.WildFlyExtension

0 commit comments

Comments
 (0)