From 11f4bdf030f0c761f5f353793b64716fb2771fa2 Mon Sep 17 00:00:00 2001
From: Oliver Lietz <info@oliverlietz.de>
Date: Tue, 17 Oct 2023 18:35:43 +0200
Subject: [PATCH] #1092 Modernize GlassFish test container

* adjust javadoc
* clean up configurations
---
 .../EmbeddedGlassFishTestContainer.java       |  2 +-
 .../src/test/resources/exam.properties        |  1 -
 .../src/it/regression-javaee-moviefun/pom.xml | 27 -------------------
 .../src/test/resources/exam.properties        |  1 -
 .../src/test/resources/exam.properties        |  1 -
 .../src/test/resources/exam.properties        |  1 -
 .../src/test/resources/exam.properties        |  1 -
 7 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/containers/pax-exam-container-glassfish-embedded/src/main/java/org/ops4j/pax/exam/glassfish/embedded/EmbeddedGlassFishTestContainer.java b/containers/pax-exam-container-glassfish-embedded/src/main/java/org/ops4j/pax/exam/glassfish/embedded/EmbeddedGlassFishTestContainer.java
index 1c7e17c84..ccf6328cd 100644
--- a/containers/pax-exam-container-glassfish-embedded/src/main/java/org/ops4j/pax/exam/glassfish/embedded/EmbeddedGlassFishTestContainer.java
+++ b/containers/pax-exam-container-glassfish-embedded/src/main/java/org/ops4j/pax/exam/glassfish/embedded/EmbeddedGlassFishTestContainer.java
@@ -57,7 +57,7 @@
 import org.xml.sax.SAXException;
 
 /**
- * A {@link TestContainer} for the GlassFish 3.1 Java EE 6 application server.
+ * A {@link TestContainer} for the GlassFish application server.
  * <p>
  * This container uses Embedded GlassFish and only Java EE mode, but not OSGi mode. You deploy WAR
  * modules via Pax Exam options (but no OSGi bundles).
diff --git a/itest/javaee/src/it/regression-javaee-data/src/test/resources/exam.properties b/itest/javaee/src/it/regression-javaee-data/src/test/resources/exam.properties
index bca2398dd..2f25d5f6b 100644
--- a/itest/javaee/src/it/regression-javaee-data/src/test/resources/exam.properties
+++ b/itest/javaee/src/it/regression-javaee-data/src/test/resources/exam.properties
@@ -1,3 +1,2 @@
 pax.exam.system = javaee
-pax.exam.glassfish.home = /tmp/glassfish-3.1.2.2
 pax.exam.glassfish.config.overwrite = true
diff --git a/itest/javaee/src/it/regression-javaee-moviefun/pom.xml b/itest/javaee/src/it/regression-javaee-moviefun/pom.xml
index d05bd159d..a448a4d39 100644
--- a/itest/javaee/src/it/regression-javaee-moviefun/pom.xml
+++ b/itest/javaee/src/it/regression-javaee-moviefun/pom.xml
@@ -120,31 +120,6 @@
 
         <plugins>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>generate-test-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.glassfish.main.distributions</groupId>
-                                    <artifactId>glassfish</artifactId>
-                                    <version>${dependency.glassfish.version}</version>
-                                    <type>zip</type>
-                                    <outputDirectory>${project.build.directory}</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -157,8 +132,6 @@
                             </excludes>
                         </configuration>
                     </execution>
-                    <!--execution> <id>perclass</id> <configuration> <forkMode>always</forkMode> <includes> 
-                        <include>**/perclass/**</include> </includes> </configuration> </execution -->
                 </executions>
                 <configuration>
                     <parallel>none</parallel>
diff --git a/itest/javaee/src/it/regression-javaee-moviefun/src/test/resources/exam.properties b/itest/javaee/src/it/regression-javaee-moviefun/src/test/resources/exam.properties
index e545830af..2f25d5f6b 100644
--- a/itest/javaee/src/it/regression-javaee-moviefun/src/test/resources/exam.properties
+++ b/itest/javaee/src/it/regression-javaee-moviefun/src/test/resources/exam.properties
@@ -1,3 +1,2 @@
 pax.exam.system = javaee
-pax.exam.glassfish.home = target/glassfish3
 pax.exam.glassfish.config.overwrite = true
diff --git a/itest/javaee/src/it/regression-javaee-testng/src/test/resources/exam.properties b/itest/javaee/src/it/regression-javaee-testng/src/test/resources/exam.properties
index bca2398dd..2f25d5f6b 100644
--- a/itest/javaee/src/it/regression-javaee-testng/src/test/resources/exam.properties
+++ b/itest/javaee/src/it/regression-javaee-testng/src/test/resources/exam.properties
@@ -1,3 +1,2 @@
 pax.exam.system = javaee
-pax.exam.glassfish.home = /tmp/glassfish-3.1.2.2
 pax.exam.glassfish.config.overwrite = true
diff --git a/itest/javaee/src/it/regression-javaee-userprobe/src/test/resources/exam.properties b/itest/javaee/src/it/regression-javaee-userprobe/src/test/resources/exam.properties
index bca2398dd..2f25d5f6b 100644
--- a/itest/javaee/src/it/regression-javaee-userprobe/src/test/resources/exam.properties
+++ b/itest/javaee/src/it/regression-javaee-userprobe/src/test/resources/exam.properties
@@ -1,3 +1,2 @@
 pax.exam.system = javaee
-pax.exam.glassfish.home = /tmp/glassfish-3.1.2.2
 pax.exam.glassfish.config.overwrite = true
diff --git a/itest/javaee/src/it/regression-javaee/src/test/resources/exam.properties b/itest/javaee/src/it/regression-javaee/src/test/resources/exam.properties
index 35d02a841..2f25d5f6b 100644
--- a/itest/javaee/src/it/regression-javaee/src/test/resources/exam.properties
+++ b/itest/javaee/src/it/regression-javaee/src/test/resources/exam.properties
@@ -1,3 +1,2 @@
 pax.exam.system = javaee
-pax.exam.glassfish.home = /tmp/glassfish
 pax.exam.glassfish.config.overwrite = true