Persistence tck bundle, package rename, documentation, signature test…

…s. (#1232) * persistence tck documentation, signature test, documentation. Signed-off-by: Gurunandan Rao <[email protected]> * rename packages for persistence tck. Signed-off-by: Gurunandan Rao <[email protected]> * add dist folder, ignored by git. Signed-off-by: Gurunandan Rao <[email protected]> --------- Signed-off-by: Gurunandan Rao <[email protected]>
jakartaee · Mar 3, 2024 · 50d5558 · 50d5558
1 parent d151787
commit 50d5558
Show file tree

Hide file tree

Showing 1,968 changed files with 243,893 additions and 202,202 deletions.
diff --git a/glassfish-runner/jpa-tck/pom.xml b/glassfish-runner/jpa-tck/pom.xml
@@ -28,12 +28,8 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <properties>
-        <tck.artifactId>jakarta.tck.jpa-tck</tck.artifactId>
+        <tck.artifactId>jakarta.tck.persistence-tck-tests</tck.artifactId>
         <tck.version>3.1.0</tck.version>
-        <admin.user>admin</admin.user>
-        <admin.pass>admin</admin.pass>
-        <admin.pass.file>/tmp/ripassword</admin.pass.file>
-        <admin.pass.file.encoded>${admin.pass.file}.encoded</admin.pass.file.encoded>
         <jakarta.persistence.provider>org.eclipse.persistence.jpa.PersistenceProvider</jakarta.persistence.provider>
         <jakarta.persistence.jdbc.driver>org.apache.derby.jdbc.ClientDriver</jakarta.persistence.jdbc.driver>
         <jakarta.persistence.jdbc.url>jdbc:derby://localhost:1527/derbyDB;create=true</jakarta.persistence.jdbc.url>
@@ -81,7 +77,7 @@
         </dependency>
         <dependency>
             <groupId>jakarta.tck</groupId>
-            <artifactId>jpa-tck</artifactId>
+            <artifactId>persistence-tck-tests</artifactId>
             <version>10.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
@@ -280,6 +276,7 @@
                         <configuration>
                             <includes>
                                 <include>**/*Client*.*</include>
+                                <include>**/*JPASigTest*.*</include>
                             </includes>
                             <excludes>
                                 <exclude>**/jpa/ee/**/*.*</exclude>
@@ -310,7 +307,7 @@
                                 <additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/expressly.jar</additionalClasspathElement>
                                 <additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/classmate.jar</additionalClasspathElement>
                             </additionalClasspathElements>
-                            <dependenciesToScan>jakarta.tck:jpa-tck</dependenciesToScan>
+                            <dependenciesToScan>jakarta.tck:persistence-tck-tests</dependenciesToScan>
                             <systemPropertyVariables>
                                 <GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
                                 <platform.mode>standalone</platform.mode>
@@ -330,6 +327,8 @@
                                 <Select_Jpa_Purchase_Order>SELECT ID, TOTAL FROM PURCHASE_ORDER WHERE ID=?</Select_Jpa_Purchase_Order>
                                 <log.file.location>/tmp</log.file.location>
                                 <jdbc.db>${jdbc.db}</jdbc.db>
+                                <sigTestClasspath>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.persistence-api.jar:${project.build.directory}/jdk11-bundle/java.base:${project.build.directory}/jdk11-bundle/java.rmi:${project.build.directory}/jdk11-bundle/java.sql:${project.build.directory}/jdk11-bundle/java.naming</sigTestClasspath>
+                                <jimage.dir>${project.build.directory}/jdk11-bundle</jimage.dir>
                             </systemPropertyVariables>
                         </configuration>
                     </execution>

diff --git a/jpa/bin/pom.xml b/jpa/bin/pom.xml
diff --git a/jpa/common/pom.xml b/jpa/common/pom.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2021, 2024  Contributors to the Eclipse Foundation
+    All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>jakarta.tck</groupId>
+        <artifactId>persistence-tck</artifactId>
+        <version>3.2.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>persistence-tck-common</artifactId>
+    <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <doclint>none</doclint>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
+                <configuration>
+                    <resources>
+                        <resource>
+                            <directory>src/main/java</directory>
+                            <includes>
+                                <include>**/*.xml</include>
+                                <include>**/*.map</include>
+                                <include>**/*.txt</include>
+                                <include>**/*.sig*</include>
+                            </includes>
+                        </resource>
+                    </resources>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/...s/jpa/common/DriverManagerConnection.java → ...tence/common/DriverManagerConnection.java b/...s/jpa/common/DriverManagerConnection.java → ...tence/common/DriverManagerConnection.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.ts.tests.jpa.common;
+package ee.jakarta.tck.persistence.common;
 
 import java.lang.System.Logger;
 import java.sql.Connection;

diff --git a/...sun/ts/tests/jpa/common/PMClientBase.java → .../tck/persistence/common/PMClientBase.java b/...sun/ts/tests/jpa/common/PMClientBase.java → .../tck/persistence/common/PMClientBase.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.ts.tests.jpa.common;
+package ee.jakarta.tck.persistence.common;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -85,7 +85,7 @@ abstract public class PMClientBase implements UseEntityManager, UseEntityManager
 
 	transient private boolean inContainer;
 
-	private boolean testArtifactDeployed = false;
+	transient private boolean testArtifactDeployed = false;
 
 	// The following are properties specific to standalone TCK,
 	// not used when running tests in JakartaEE environment
@@ -1087,8 +1087,8 @@ public String convertToURI(String path) {
 		return sURI;
 	}
 
-	public static final String STANDALONE_PERSISTENCE_XML = "com/sun/ts/tests/jpa/common/template/standalone/persistence.xml";
-	public static final String EE_PERSISTENCE_XML = "com/sun/ts/tests/jpa/common/template/persistence.xml";
+	public static final String STANDALONE_PERSISTENCE_XML = "ee/jakarta/tck/persistence/common/template/standalone/persistence.xml";
+	public static final String EE_PERSISTENCE_XML = "ee/jakarta/tck/persistence/common/template/persistence.xml";
 
 	public static final String PERSISTENCE_ELEMENT_TAG = "persistence-unit";
 	public static final String CLASS_ELEMENT_TAG = "class";

diff --git a/...s/tests/jpa/common/persistence-import.xml → ...persistence/common/persistence-import.xml b/...s/tests/jpa/common/persistence-import.xml → ...persistence/common/persistence-import.xml
diff --git a/...mon/pluggability/altprovider/METAINF/services/jakarta.persistence.spi.PersistenceProvider b/...mon/pluggability/altprovider/METAINF/services/jakarta.persistence.spi.PersistenceProvider
@@ -0,0 +1 @@
+ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceProvider
diff --git a/...altprovider/implementation/CacheImpl.java → ...altprovider/implementation/CacheImpl.java b/...altprovider/implementation/CacheImpl.java → ...altprovider/implementation/CacheImpl.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.ts.tests.jpa.common.pluggability.altprovider.implementation;
+package ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation;
 
 import jakarta.persistence.Cache;
 

diff --git a/.../implementation/ClassTransformerImpl.java → .../implementation/ClassTransformerImpl.java b/.../implementation/ClassTransformerImpl.java → .../implementation/ClassTransformerImpl.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.ts.tests.jpa.common.pluggability.altprovider.implementation;
+package ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation;
 
 import java.security.ProtectionDomain;
 

diff --git a/...lementation/EntityManagerFactoryImpl.java → ...lementation/EntityManagerFactoryImpl.java b/...lementation/EntityManagerFactoryImpl.java → ...lementation/EntityManagerFactoryImpl.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.ts.tests.jpa.common.pluggability.altprovider.implementation;
+package ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation;
 
 import java.util.Map;
 

diff --git a/...der/implementation/EntityManagerImpl.java → ...der/implementation/EntityManagerImpl.java b/...der/implementation/EntityManagerImpl.java → ...der/implementation/EntityManagerImpl.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.ts.tests.jpa.common.pluggability.altprovider.implementation;
+package ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation;
 
 import java.util.List;
 import java.util.Map;

diff --git a/...implementation/EntityTransactionImpl.java → ...implementation/EntityTransactionImpl.java b/...implementation/EntityTransactionImpl.java → ...implementation/EntityTransactionImpl.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.ts.tests.jpa.common.pluggability.altprovider.implementation;
+package ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation;
 
 public class EntityTransactionImpl implements jakarta.persistence.EntityTransaction {
 	protected boolean isActive;

diff --git a/...r/implementation/PersistenceProvider.java → ...r/implementation/PersistenceProvider.java b/...r/implementation/PersistenceProvider.java → ...r/implementation/PersistenceProvider.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.ts.tests.jpa.common.pluggability.altprovider.implementation;
+package ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation;
 
 import java.net.URL;
 import java.util.ArrayList;
@@ -118,7 +118,7 @@ public EntityManagerFactory createEntityManagerFactory(String puName, Map proper
 					return null;
 				}
 				if (!pp.equals(
-						"com.sun.ts.tests.jpa.common.pluggability.altprovider.implementation.PersistenceProvider")) {
+						"ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceProvider")) {
 					System.out.println(
 							"returning null from ALTERNATE_PROVIDER: PersistenceProvider.createEntityManagerFactory(String, Map) different provider specified");
 					return null;

diff --git a/...plementation/PersistenceUnitInfoImpl.java → ...plementation/PersistenceUnitInfoImpl.java b/...plementation/PersistenceUnitInfoImpl.java → ...plementation/PersistenceUnitInfoImpl.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.ts.tests.jpa.common.pluggability.altprovider.implementation;
+package ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation;
 
 import java.net.URL;
 import java.util.Iterator;

diff --git a/...altprovider/implementation/QueryImpl.java → ...altprovider/implementation/QueryImpl.java b/...altprovider/implementation/QueryImpl.java → ...altprovider/implementation/QueryImpl.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.ts.tests.jpa.common.pluggability.altprovider.implementation;
+package ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation;
 
 import java.util.Calendar;
 import java.util.Date;

diff --git a/...tprovider/implementation/TSLogRecord.java → ...tprovider/implementation/TSLogRecord.java b/...tprovider/implementation/TSLogRecord.java → ...tprovider/implementation/TSLogRecord.java
@@ -19,7 +19,7 @@
  * @author Raja Perumal
  */
 
-package com.sun.ts.tests.jpa.common.pluggability.altprovider.implementation;
+package ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;

diff --git a/.../altprovider/implementation/TSLogger.java → .../altprovider/implementation/TSLogger.java b/.../altprovider/implementation/TSLogger.java → .../altprovider/implementation/TSLogger.java
@@ -19,7 +19,7 @@
  * @author Raja Perumal
  */
 
-package com.sun.ts.tests.jpa.common.pluggability.altprovider.implementation;
+package ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation;
 
 import java.io.File;
 import java.text.DateFormat;

diff --git a/...ovider/implementation/TSXMLFormatter.java → ...ovider/implementation/TSXMLFormatter.java b/...ovider/implementation/TSXMLFormatter.java → ...ovider/implementation/TSXMLFormatter.java
@@ -19,7 +19,7 @@
  * @author Raja Perumal
  */
 
-package com.sun.ts.tests.jpa.common.pluggability.altprovider.implementation;
+package ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation;
 
 import java.util.ResourceBundle;
 import java.util.logging.Handler;

diff --git a/...n/pluggability/util/LogFileProcessor.java → ...n/pluggability/util/LogFileProcessor.java b/...n/pluggability/util/LogFileProcessor.java → ...n/pluggability/util/LogFileProcessor.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.ts.tests.jpa.common.pluggability.util;
+package ee.jakarta.tck.persistence.common.pluggability.util;
 
 import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;

diff --git a/...mon/pluggability/util/LogRecordEntry.java → ...mon/pluggability/util/LogRecordEntry.java b/...mon/pluggability/util/LogRecordEntry.java → ...mon/pluggability/util/LogRecordEntry.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.ts.tests.jpa.common.pluggability.util;
+package ee.jakarta.tck.persistence.common.pluggability.util;
 
 import java.io.Serializable;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceProvider