remove build.xml files.

Signed-off-by: Gurunandan Rao <[email protected]>
jakartaee · Dec 13, 2023 · b1869a9 · b1869a9
1 parent f7124fc
commit b1869a9
Show file tree

Hide file tree

Showing 445 changed files with 2,247 additions and 13,812 deletions.
diff --git a/glassfish-runner/jpa-tck/pom.xml b/glassfish-runner/jpa-tck/pom.xml
@@ -278,8 +278,6 @@
                             <goal>verify</goal>
                         </goals>
                         <configuration>
-                            <!--
-                            <test>com.sun.ts.tests.jpa.se.entityManagerFactory.ClientIT#createEntityManagerFactoryNoBeanValidatorTest</test>-->
                             <excludes>
                                 <exclude>**/jpa/ee/**/*.*</exclude>
                             </excludes>
@@ -312,10 +310,6 @@
                             <dependenciesToScan>jakartatck:jpa-tck</dependenciesToScan>
                             <systemPropertyVariables>
                                 <GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
-                                <user>j2ee</user>
-                                <password>j2ee</password>
-                                <authuser>javajoe</authuser>
-                                <authpassword>javajoe</authpassword>
                                 <platform.mode>standalone</platform.mode>
                                 <persistence.unit.name>JPATCK</persistence.unit.name>
                                 <persistence.unit.name.2>JPATCK2</persistence.unit.name.2>
@@ -326,8 +320,6 @@
                                 <jakarta.persistence.jdbc.password>${jakarta.persistence.jdbc.password}</jakarta.persistence.jdbc.password>
                                 <jpa.provider.implementation.specific.properties>eclipselink.logging.level=OFF</jpa.provider.implementation.specific.properties>
                                 <persistence.second.level.caching.supported>true</persistence.second.level.caching.supported>
-                                <webServerHost>localhost</webServerHost>
-                                <webServerPort>8080</webServerPort>
                                 <vehicle>standalone</vehicle>
                                 <user.dir>/tmp</user.dir>
                                 <db.supports.sequence>true</db.supports.sequence>
@@ -343,6 +335,29 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>exec-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <executions>
+                    <execution>
+                        <id>stop-database-final</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>${exec.asadmin}</executable>
+                            <arguments>
+                                <argument>stop-database</argument>
+                            </arguments>
+                            <successCodes>
+                                <successCode>0</successCode>
+                                <successCode>1</successCode>
+                            </successCodes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/build.xml
diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/common/build.xml
diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/pluggability/altprovider/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/common/pluggability/altprovider/build.xml
diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/pluggability/util/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/common/pluggability/util/build.xml
diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/Util.java b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/Util.java
@@ -99,21 +99,16 @@ public String toString(Collection c) {
 	@AfterEach
 	public void cleanup() throws Exception {
 		try {
-		logger.log(Logger.Level.TRACE, "Cleanup data");
-		removeTestData();
-		logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup");
-		super.cleanup();
+			logger.log(Logger.Level.TRACE, "Cleanup data");
+			removeTestData();
+			logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup");
+			super.cleanup();
 		} finally {
-		removeTestJarFromCP();
+			removeTestJarFromCP();
 		}
 
 	}
 
-	public void cleanupNoData() throws Exception {
-		logger.log(Logger.Level.TRACE, "in cleanupNoData");
-		super.cleanup();
-	}
-
 	public void createTrimData() throws Exception {
 		logger.log(Logger.Level.TRACE, "createTrimData");
 		getEntityTransaction().begin();

diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilAliasData.java b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilAliasData.java
@@ -0,0 +1,26 @@
+package com.sun.ts.tests.jpa.common.schema30;
+
+import java.lang.System.Logger;
+
+import org.junit.jupiter.api.BeforeEach;
+
+public abstract class UtilAliasData extends Util {
+
+	private static final Logger logger = (Logger) System.getLogger(UtilAliasData.class.getName());
+
+	@BeforeEach
+	public void setupAliasData() throws Exception {
+		logger.log(Logger.Level.TRACE, "setupAliasData");
+		try {
+			super.setup();
+			createDeployment();
+			removeTestData();
+			createCustomerData();
+			createAliasData();
+		} catch (Exception e) {
+			logger.log(Logger.Level.ERROR, "Exception: ", e);
+			throw new Exception("setupAliasData failed:", e);
+		}
+	}
+
+}
diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilAliasOnlyData.java b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilAliasOnlyData.java
@@ -0,0 +1,25 @@
+package com.sun.ts.tests.jpa.common.schema30;
+
+import java.lang.System.Logger;
+
+import org.junit.jupiter.api.BeforeEach;
+
+public abstract class UtilAliasOnlyData extends Util {
+
+	private static final Logger logger = (Logger) System.getLogger(UtilAliasOnlyData.class.getName());
+
+	@BeforeEach
+	public void setupAliasOnlyData() throws Exception {
+		logger.log(Logger.Level.TRACE, "setupAliasOnlyData");
+		try {
+			super.setup();
+			createDeployment();
+			removeTestData();
+			createAliasOnlyData();
+		} catch (Exception e) {
+			logger.log(Logger.Level.ERROR, "Exception: ", e);
+			throw new Exception("setupCustomerData failed:", e);
+		}
+	}
+
+}
diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilCustAliasProductData.java b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilCustAliasProductData.java
@@ -0,0 +1,27 @@
+package com.sun.ts.tests.jpa.common.schema30;
+
+import java.lang.System.Logger;
+
+import org.junit.jupiter.api.BeforeEach;
+
+public abstract class UtilCustAliasProductData extends Util {
+
+	private static final Logger logger = (Logger) System.getLogger(UtilCustAliasProductData.class.getName());
+
+	@BeforeEach
+	public void setupCustAliasProductData() throws Exception {
+		logger.log(Logger.Level.TRACE, "setupCustAliasProductData");
+		try {
+			super.setup();
+			createDeployment();
+			removeTestData();
+			createCustomerData();
+			createProductData();
+			createAliasData();
+		} catch (Exception e) {
+			logger.log(Logger.Level.ERROR, "Exception: ", e);
+			throw new Exception("setupCustAliasProductData failed:", e);
+		}
+	}
+
+}
diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilCustomerData.java b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilCustomerData.java
@@ -0,0 +1,25 @@
+package com.sun.ts.tests.jpa.common.schema30;
+
+import java.lang.System.Logger;
+
+import org.junit.jupiter.api.BeforeEach;
+
+public abstract class UtilCustomerData extends Util {
+
+	private static final Logger logger = (Logger) System.getLogger(UtilCustomerData.class.getName());
+
+	@BeforeEach
+	public void setupCustomerData() throws Exception {
+		logger.log(Logger.Level.TRACE, "setupCustomerData");
+		try {
+			super.setup();
+			createDeployment();
+			removeTestData();
+			createCustomerData();
+		} catch (Exception e) {
+			logger.log(Logger.Level.ERROR, "Exception: ", e);
+			throw new Exception("setupCustomerData failed:", e);
+		}
+	}
+
+}
diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilDepartmentEmployeeData.java b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilDepartmentEmployeeData.java
@@ -0,0 +1,25 @@
+package com.sun.ts.tests.jpa.common.schema30;
+
+import java.lang.System.Logger;
+
+import org.junit.jupiter.api.BeforeEach;
+
+public abstract class UtilDepartmentEmployeeData extends Util {
+
+	private static final Logger logger = (Logger) System.getLogger(UtilDepartmentEmployeeData.class.getName());
+
+	@BeforeEach
+	public void setupDepartmentEmployeeData() throws Exception {
+		logger.log(Logger.Level.TRACE, "setupDepartmentEmployeeData");
+		try {
+			super.setup();
+			createDeployment();
+			removeTestData();
+			createDepartmentEmployeeData();
+		} catch (Exception e) {
+			logger.log(Logger.Level.ERROR, "Exception: ", e);
+			throw new Exception("setupDepartmentEmployeeData failed:", e);
+		}
+	}
+
+}
diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilOrderData.java b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilOrderData.java
@@ -0,0 +1,27 @@
+package com.sun.ts.tests.jpa.common.schema30;
+
+import java.lang.System.Logger;
+
+import org.junit.jupiter.api.BeforeEach;
+
+public abstract class UtilOrderData extends Util {
+
+	private static final Logger logger = (Logger) System.getLogger(UtilOrderData.class.getName());
+
+	@BeforeEach
+	public void setupOrderData() throws Exception {
+		logger.log(Logger.Level.TRACE, "setupOrderData");
+		try {
+			super.setup();
+			createDeployment();
+			removeTestData();
+			createCustomerData();
+			createProductData();
+			createOrderData();
+		} catch (Exception e) {
+			logger.log(Logger.Level.ERROR, "Exception: ", e);
+			throw new Exception("setupCustomerData failed:", e);
+		}
+	}
+
+}