Skip to content

Commit 7d0d7e6

Browse files
aidentZhangaidentZhang
committed
cleaned up headers, moved derby tables into tck
1 parent 5582df1 commit 7d0d7e6

11 files changed

Lines changed: 26 additions & 189 deletions

File tree

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
1-
#
2-
# Copyright The WildFly Authors
3-
# SPDX-License-Identifier: Apache-2.0
4-
#
5-
61
This file triggers the setup-derby-module profile in the parent POM.
72
The profile copies the Derby JDBC driver module configuration to the WildFly installation.

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
#
2-
# Copyright The WildFly Authors
3-
# SPDX-License-Identifier: Apache-2.0
4-
#
5-
61
# Jakarta Transactions TCK Configuration for WildFly
72
# Minimal configuration - only essential properties for running 195 transaction tests
83

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

Lines changed: 26 additions & 30 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">
@@ -187,49 +183,49 @@
187183
</executions>
188184
</plugin>
189185

190-
<!-- Copy SQL files and ts.jte -->
186+
<!-- Unpack SQL files from TCK artifact -->
191187
<plugin>
192188
<groupId>org.apache.maven.plugins</groupId>
193-
<artifactId>maven-resources-plugin</artifactId>
189+
<artifactId>maven-dependency-plugin</artifactId>
194190
<executions>
195191
<execution>
196-
<id>copy-sql-files</id>
192+
<id>unpack-sql-files</id>
197193
<phase>generate-test-resources</phase>
198194
<goals>
199-
<goal>copy-resources</goal>
195+
<goal>unpack-dependencies</goal>
200196
</goals>
201197
<configuration>
202-
<outputDirectory>${project.build.directory}/test-classes/sql/derby</outputDirectory>
203-
<resources>
204-
<resource>
205-
<directory>sql/derby</directory>
206-
<includes>
207-
<include>*.sql</include>
208-
<include>*.txt</include>
209-
</includes>
210-
</resource>
211-
</resources>
198+
<includeGroupIds>jakarta.tck</includeGroupIds>
199+
<includeArtifactIds>transactions-tck</includeArtifactIds>
200+
<outputDirectory>${project.build.directory}/test-classes/sql</outputDirectory>
201+
<includes>derby/**/*.sql,derby/**/*.txt</includes>
202+
<overWriteReleases>true</overWriteReleases>
203+
<overWriteSnapshots>true</overWriteSnapshots>
212204
</configuration>
213205
</execution>
214206
<execution>
215-
<id>copy-sql-files-for-appclient</id>
207+
<id>unpack-sql-files-for-appclient</id>
216208
<phase>generate-test-resources</phase>
217209
<goals>
218-
<goal>copy-resources</goal>
210+
<goal>unpack-dependencies</goal>
219211
</goals>
220212
<configuration>
221-
<outputDirectory>${project.build.directory}/sql/derby</outputDirectory>
222-
<resources>
223-
<resource>
224-
<directory>sql/derby</directory>
225-
<includes>
226-
<include>*.sql</include>
227-
<include>*.txt</include>
228-
</includes>
229-
</resource>
230-
</resources>
213+
<includeGroupIds>jakarta.tck</includeGroupIds>
214+
<includeArtifactIds>transactions-tck</includeArtifactIds>
215+
<outputDirectory>${project.build.directory}/sql</outputDirectory>
216+
<includes>derby/**/*.sql,derby/**/*.txt</includes>
217+
<overWriteReleases>true</overWriteReleases>
218+
<overWriteSnapshots>true</overWriteSnapshots>
231219
</configuration>
232220
</execution>
221+
</executions>
222+
</plugin>
223+
224+
<!-- Copy ts.jte and other resources -->
225+
<plugin>
226+
<groupId>org.apache.maven.plugins</groupId>
227+
<artifactId>maven-resources-plugin</artifactId>
228+
<executions>
233229
<execution>
234230
<id>copy-ts-jte</id>
235231
<phase>generate-test-resources</phase>

‎jakarta-ee-tck-runners/transactions-tck/transactions-tck-runner/sql/derby/README.md‎

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

‎jakarta-ee-tck-runners/transactions-tck/transactions-tck-runner/sql/derby/derby.ddl.sql‎

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

‎jakarta-ee-tck-runners/transactions-tck/transactions-tck-runner/sql/derby/derby.dml.sql‎

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

‎jakarta-ee-tck-runners/transactions-tck/transactions-tck-runner/sql/derby/password.txt‎

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

‎jakarta-ee-tck-runners/transactions-tck/transactions-tck-runner/src/test/resources/appclient-arquillian.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
<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jboss.org/schema/arquillian"
84
xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">

‎jakarta-ee-tck-runners/transactions-tck/transactions-tck-runner/src/test/resources/arquillian.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
<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jboss.org/schema/arquillian"
84
xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">

‎jakarta-ee-tck-runners/transactions-tck/transactions-tck-runner/src/test/resources/setup-database.cli‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
#
2-
# Copyright The WildFly Authors
3-
# SPDX-License-Identifier: Apache-2.0
4-
#
5-
61
# Setup database for Jakarta Transactions TCK
72
# This script configures the Derby datasource for the TCK tests
83

0 commit comments

Comments
 (0)