From 27597de7efef2283d522688717820a3d2a3084d9 Mon Sep 17 00:00:00 2001 From: "gurunandan.rao@oracle.com" Date: Tue, 4 Jan 2022 14:46:48 +0530 Subject: [PATCH] make folders generic without glassfish version. Signed-off-by: gurunandan.rao@oracle.com --- glassfish-common/pom.xml | 6 ++--- ...boss.arquillian.core.spi.LoadableExtension | 1 - .../pom.xml | 25 +++++++++++++------ ...lassFishManagedContainerConfiguration.java | 2 +- .../GlassFishManagedContainerExtension.java | 2 +- .../GlassFishManagedDeployableContainer.java | 2 +- .../managed}/GlassFishServerControl.java | 2 +- ...boss.arquillian.core.spi.LoadableExtension | 1 + .../glassfish/managed}/CDIJarTestCase.java | 2 +- .../GlassFishDeployWithoutAppXmlTest.java | 2 +- .../GlassFishManagedDeployEarTest.java | 2 +- .../GlassFishManagedDeployWarTest.java | 2 +- ...lassFishManagedDeploymentTestTemplate.java | 2 +- .../container/glassfish/managed}/Greeter.java | 2 +- .../glassfish/managed}/GreeterServlet.java | 2 +- .../managed}/GreeterServletWithDerby.java | 2 +- .../glassfish/managed}/SimpleBean.java | 2 +- .../glassfish/managed}/StartGFTest.java | 2 +- .../src/test/resources/application.xml | 0 .../src/test/resources/arquillian.xml | 0 .../README.txt | 0 .../pom.xml | 10 ++++---- .../glassfish/remote}/GlassFishExtension.java | 2 +- .../GlassFishRestDeployableContainer.java | 2 +- ...boss.arquillian.core.spi.LoadableExtension | 0 .../glassfish/remote}/CDIJarTestCase.java | 0 .../GlassFishDeployWithoutAppXmlTest.java | 0 .../remote}/GlassFishRestDeployEarTest.java | 0 .../remote}/GlassFishRestDeployWarTest.java | 0 .../container/glassfish/remote}/Greeter.java | 0 .../glassfish/remote}/GreeterServlet.java | 0 .../glassfish/remote}/SimpleBean.java | 0 .../src/test/resources/application.xml | 0 .../src/test/resources/arquillian.xml | 0 pom.xml | 23 ++++++++--------- 35 files changed, 54 insertions(+), 44 deletions(-) delete mode 100644 glassfish-managed-6/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension rename {glassfish-managed-6 => glassfish-managed}/pom.xml (84%) rename {glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6 => glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed}/GlassFishManagedContainerConfiguration.java (98%) rename {glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6 => glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed}/GlassFishManagedContainerExtension.java (95%) rename {glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6 => glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed}/GlassFishManagedDeployableContainer.java (98%) rename {glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6 => glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed}/GlassFishServerControl.java (99%) create mode 100644 glassfish-managed/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension rename {glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6 => glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed}/CDIJarTestCase.java (96%) rename {glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6 => glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed}/GlassFishDeployWithoutAppXmlTest.java (97%) rename {glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6 => glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed}/GlassFishManagedDeployEarTest.java (97%) rename {glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6 => glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed}/GlassFishManagedDeployWarTest.java (96%) rename {glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6 => glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed}/GlassFishManagedDeploymentTestTemplate.java (95%) rename {glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6 => glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed}/Greeter.java (95%) rename {glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6 => glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed}/GreeterServlet.java (96%) rename {glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6 => glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed}/GreeterServletWithDerby.java (98%) rename {glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6 => glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed}/SimpleBean.java (93%) rename {glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6 => glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed}/StartGFTest.java (97%) rename {glassfish-managed-6 => glassfish-managed}/src/test/resources/application.xml (100%) rename {glassfish-managed-6 => glassfish-managed}/src/test/resources/arquillian.xml (100%) rename {glassfish-remote-6 => glassfish-remote}/README.txt (100%) rename {glassfish-remote-6 => glassfish-remote}/pom.xml (91%) rename {glassfish-remote-6/src/main/java/org/jboss/arquillian/container/glassfish/remote_6 => glassfish-remote/src/main/java/org/jboss/arquillian/container/glassfish/remote}/GlassFishExtension.java (95%) rename {glassfish-remote-6/src/main/java/org/jboss/arquillian/container/glassfish/remote_6 => glassfish-remote/src/main/java/org/jboss/arquillian/container/glassfish/remote}/GlassFishRestDeployableContainer.java (98%) rename {glassfish-remote-6 => glassfish-remote}/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension (100%) rename {glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6 => glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote}/CDIJarTestCase.java (100%) rename {glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6 => glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote}/GlassFishDeployWithoutAppXmlTest.java (100%) rename {glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6 => glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote}/GlassFishRestDeployEarTest.java (100%) rename {glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6 => glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote}/GlassFishRestDeployWarTest.java (100%) rename {glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6 => glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote}/Greeter.java (100%) rename {glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6 => glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote}/GreeterServlet.java (100%) rename {glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6 => glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote}/SimpleBean.java (100%) rename {glassfish-remote-6 => glassfish-remote}/src/test/resources/application.xml (100%) rename {glassfish-remote-6 => glassfish-remote}/src/test/resources/arquillian.xml (100%) diff --git a/glassfish-common/pom.xml b/glassfish-common/pom.xml index c51452e..ad9c3f6 100644 --- a/glassfish-common/pom.xml +++ b/glassfish-common/pom.xml @@ -1,13 +1,13 @@ 4.0.0 - arquillian-parent-glassfish6 + arquillian-parent-glassfish7 org.jboss.arquillian.container 1.0.0.Final-SNAPSHOT .. - arquillian-glassfish6-common - Arquillian Container GlassFish 6+ Common Services + arquillian-glassfish7-common + Arquillian Container GlassFish 7+ Common Services diff --git a/glassfish-managed-6/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/glassfish-managed-6/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension deleted file mode 100644 index 9e5a950..0000000 --- a/glassfish-managed-6/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension +++ /dev/null @@ -1 +0,0 @@ -org.jboss.arquillian.container.glassfish.managed_6.GlassFishManagedContainerExtension diff --git a/glassfish-managed-6/pom.xml b/glassfish-managed/pom.xml similarity index 84% rename from glassfish-managed-6/pom.xml rename to glassfish-managed/pom.xml index dcccc3f..d675388 100644 --- a/glassfish-managed-6/pom.xml +++ b/glassfish-managed/pom.xml @@ -4,14 +4,19 @@ org.jboss.arquillian.container - arquillian-parent-glassfish6 + arquillian-parent-glassfish7 1.0.0.Final-SNAPSHOT ../pom.xml - arquillian-glassfish-managed-6 - Arquillian Container GlassFish Managed 6 - GlassFish 6 Managed Container integration for the Arquillian Project + arquillian-glassfish-managed + Arquillian Container GlassFish Managed 7 + GlassFish 7 Managed Container integration for the Arquillian Project + + + + 1.7.0.Alpha10 + @@ -26,42 +31,49 @@ org.jboss.arquillian.container - arquillian-glassfish6-common + arquillian-glassfish7-common ${project.version} org.jboss.arquillian.container arquillian-container-spi + ${version.arquillian_core} org.jboss.arquillian.container arquillian-container-test-spi + ${version.arquillian_core} org.jboss.arquillian.protocol arquillian-protocol-servlet-jakarta + ${version.arquillian_core} org.jboss.arquillian.testenricher arquillian-testenricher-cdi-jakarta + ${version.arquillian_core} org.jboss.arquillian.testenricher arquillian-testenricher-ejb-jakarta + ${version.arquillian_core} org.jboss.arquillian.testenricher arquillian-testenricher-resource-jakarta + ${version.arquillian_core} org.jboss.arquillian.testenricher arquillian-testenricher-initialcontext + ${version.arquillian_core} @@ -148,8 +160,7 @@ org.glassfish.main.distributions glassfish - ${version.glassfish6} - glassfish6 + glassfish7 false diff --git a/glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedContainerConfiguration.java b/glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed/GlassFishManagedContainerConfiguration.java similarity index 98% rename from glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedContainerConfiguration.java rename to glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed/GlassFishManagedContainerConfiguration.java index 560cff2..a28aa55 100644 --- a/glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedContainerConfiguration.java +++ b/glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed/GlassFishManagedContainerConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.arquillian.container.glassfish.managed_6; +package org.jboss.arquillian.container.glassfish.managed; import org.jboss.arquillian.container.glassfish.CommonGlassFishConfiguration; import org.jboss.arquillian.container.glassfish.clientutils.GlassFishClient; diff --git a/glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedContainerExtension.java b/glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed/GlassFishManagedContainerExtension.java similarity index 95% rename from glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedContainerExtension.java rename to glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed/GlassFishManagedContainerExtension.java index e2d7680..6d2cbd0 100644 --- a/glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedContainerExtension.java +++ b/glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed/GlassFishManagedContainerExtension.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.arquillian.container.glassfish.managed_6; +package org.jboss.arquillian.container.glassfish.managed; import org.jboss.arquillian.container.spi.client.container.DeployableContainer; import org.jboss.arquillian.core.spi.LoadableExtension; diff --git a/glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployableContainer.java b/glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed/GlassFishManagedDeployableContainer.java similarity index 98% rename from glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployableContainer.java rename to glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed/GlassFishManagedDeployableContainer.java index 2d70aa9..8bcec07 100644 --- a/glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployableContainer.java +++ b/glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed/GlassFishManagedDeployableContainer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.arquillian.container.glassfish.managed_6; +package org.jboss.arquillian.container.glassfish.managed; import org.jboss.arquillian.container.glassfish.CommonGlassFishManager; import org.jboss.arquillian.container.spi.client.container.DeployableContainer; diff --git a/glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishServerControl.java b/glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed/GlassFishServerControl.java similarity index 99% rename from glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishServerControl.java rename to glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed/GlassFishServerControl.java index 250323f..6752d50 100644 --- a/glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishServerControl.java +++ b/glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed/GlassFishServerControl.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.arquillian.container.glassfish.managed_6; +package org.jboss.arquillian.container.glassfish.managed; import org.jboss.arquillian.container.spi.client.container.LifecycleException; diff --git a/glassfish-managed/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/glassfish-managed/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension new file mode 100644 index 0000000..ad0914d --- /dev/null +++ b/glassfish-managed/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension @@ -0,0 +1 @@ +org.jboss.arquillian.container.glassfish.managed.GlassFishManagedContainerExtension diff --git a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/CDIJarTestCase.java b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/CDIJarTestCase.java similarity index 96% rename from glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/CDIJarTestCase.java rename to glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/CDIJarTestCase.java index ebf1f2b..228b13c 100644 --- a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/CDIJarTestCase.java +++ b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/CDIJarTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.arquillian.container.glassfish.managed_6; +package org.jboss.arquillian.container.glassfish.managed; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; diff --git a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishDeployWithoutAppXmlTest.java b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/GlassFishDeployWithoutAppXmlTest.java similarity index 97% rename from glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishDeployWithoutAppXmlTest.java rename to glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/GlassFishDeployWithoutAppXmlTest.java index ae34575..2e955ef 100644 --- a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishDeployWithoutAppXmlTest.java +++ b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/GlassFishDeployWithoutAppXmlTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.arquillian.container.glassfish.managed_6; +package org.jboss.arquillian.container.glassfish.managed; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; diff --git a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployEarTest.java b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/GlassFishManagedDeployEarTest.java similarity index 97% rename from glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployEarTest.java rename to glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/GlassFishManagedDeployEarTest.java index 896f3ce..a2602c1 100644 --- a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployEarTest.java +++ b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/GlassFishManagedDeployEarTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.arquillian.container.glassfish.managed_6; +package org.jboss.arquillian.container.glassfish.managed; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; diff --git a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployWarTest.java b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/GlassFishManagedDeployWarTest.java similarity index 96% rename from glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployWarTest.java rename to glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/GlassFishManagedDeployWarTest.java index 783792f..59eda3f 100644 --- a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployWarTest.java +++ b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/GlassFishManagedDeployWarTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.arquillian.container.glassfish.managed_6; +package org.jboss.arquillian.container.glassfish.managed; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; diff --git a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeploymentTestTemplate.java b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/GlassFishManagedDeploymentTestTemplate.java similarity index 95% rename from glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeploymentTestTemplate.java rename to glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/GlassFishManagedDeploymentTestTemplate.java index c2bbfe0..b974704 100644 --- a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeploymentTestTemplate.java +++ b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/GlassFishManagedDeploymentTestTemplate.java @@ -1,4 +1,4 @@ -package org.jboss.arquillian.container.glassfish.managed_6; +package org.jboss.arquillian.container.glassfish.managed; import org.jboss.arquillian.test.api.ArquillianResource; import org.junit.Test; diff --git a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/Greeter.java b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/Greeter.java similarity index 95% rename from glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/Greeter.java rename to glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/Greeter.java index 696b27d..0087358 100644 --- a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/Greeter.java +++ b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/Greeter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.arquillian.container.glassfish.managed_6; +package org.jboss.arquillian.container.glassfish.managed; import jakarta.ejb.Stateless; import java.io.Serializable; diff --git a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GreeterServlet.java b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/GreeterServlet.java similarity index 96% rename from glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GreeterServlet.java rename to glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/GreeterServlet.java index e577e85..8183261 100644 --- a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GreeterServlet.java +++ b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/GreeterServlet.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.arquillian.container.glassfish.managed_6; +package org.jboss.arquillian.container.glassfish.managed; import jakarta.ejb.EJB; import jakarta.servlet.ServletException; diff --git a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GreeterServletWithDerby.java b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/GreeterServletWithDerby.java similarity index 98% rename from glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GreeterServletWithDerby.java rename to glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/GreeterServletWithDerby.java index 539d0ac..a263857 100644 --- a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GreeterServletWithDerby.java +++ b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/GreeterServletWithDerby.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.arquillian.container.glassfish.managed_6; +package org.jboss.arquillian.container.glassfish.managed; import jakarta.annotation.Resource; import jakarta.ejb.EJB; diff --git a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/SimpleBean.java b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/SimpleBean.java similarity index 93% rename from glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/SimpleBean.java rename to glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/SimpleBean.java index 857418d..8f85dd5 100644 --- a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/SimpleBean.java +++ b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/SimpleBean.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.arquillian.container.glassfish.managed_6; +package org.jboss.arquillian.container.glassfish.managed; public class SimpleBean { } diff --git a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/StartGFTest.java b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/StartGFTest.java similarity index 97% rename from glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/StartGFTest.java rename to glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/StartGFTest.java index b821b17..2a0008b 100644 --- a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/StartGFTest.java +++ b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed/StartGFTest.java @@ -1,4 +1,4 @@ -package org.jboss.arquillian.container.glassfish.managed_6; +package org.jboss.arquillian.container.glassfish.managed; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/glassfish-managed-6/src/test/resources/application.xml b/glassfish-managed/src/test/resources/application.xml similarity index 100% rename from glassfish-managed-6/src/test/resources/application.xml rename to glassfish-managed/src/test/resources/application.xml diff --git a/glassfish-managed-6/src/test/resources/arquillian.xml b/glassfish-managed/src/test/resources/arquillian.xml similarity index 100% rename from glassfish-managed-6/src/test/resources/arquillian.xml rename to glassfish-managed/src/test/resources/arquillian.xml diff --git a/glassfish-remote-6/README.txt b/glassfish-remote/README.txt similarity index 100% rename from glassfish-remote-6/README.txt rename to glassfish-remote/README.txt diff --git a/glassfish-remote-6/pom.xml b/glassfish-remote/pom.xml similarity index 91% rename from glassfish-remote-6/pom.xml rename to glassfish-remote/pom.xml index f383439..d05c253 100644 --- a/glassfish-remote-6/pom.xml +++ b/glassfish-remote/pom.xml @@ -3,16 +3,16 @@ org.jboss.arquillian.container - arquillian-parent-glassfish6 + arquillian-parent-glassfish7 1.0.0.Final-SNAPSHOT ../pom.xml 4.0.0 - arquillian-glassfish-remote-6 - Arquillian Container GlassFish Remote 6.x - GlassFish 6.x Remote Container integration for the Arquillian Project + arquillian-glassfish-remote + Arquillian Container GlassFish Remote 7.x + GlassFish 7.x Remote Container integration for the Arquillian Project @@ -26,7 +26,7 @@ org.jboss.arquillian.container - arquillian-glassfish6-common + arquillian-glassfish7-common ${project.version} diff --git a/glassfish-remote-6/src/main/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishExtension.java b/glassfish-remote/src/main/java/org/jboss/arquillian/container/glassfish/remote/GlassFishExtension.java similarity index 95% rename from glassfish-remote-6/src/main/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishExtension.java rename to glassfish-remote/src/main/java/org/jboss/arquillian/container/glassfish/remote/GlassFishExtension.java index 1bf6c80..fc0af4a 100644 --- a/glassfish-remote-6/src/main/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishExtension.java +++ b/glassfish-remote/src/main/java/org/jboss/arquillian/container/glassfish/remote/GlassFishExtension.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.arquillian.container.glassfish.remote_6; +package org.jboss.arquillian.container.glassfish.remote; import org.jboss.arquillian.container.spi.client.container.DeployableContainer; import org.jboss.arquillian.core.spi.LoadableExtension; diff --git a/glassfish-remote-6/src/main/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishRestDeployableContainer.java b/glassfish-remote/src/main/java/org/jboss/arquillian/container/glassfish/remote/GlassFishRestDeployableContainer.java similarity index 98% rename from glassfish-remote-6/src/main/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishRestDeployableContainer.java rename to glassfish-remote/src/main/java/org/jboss/arquillian/container/glassfish/remote/GlassFishRestDeployableContainer.java index e0bfbb7..a29a535 100644 --- a/glassfish-remote-6/src/main/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishRestDeployableContainer.java +++ b/glassfish-remote/src/main/java/org/jboss/arquillian/container/glassfish/remote/GlassFishRestDeployableContainer.java @@ -17,7 +17,7 @@ /** * @author Jason Porter */ -package org.jboss.arquillian.container.glassfish.remote_6; +package org.jboss.arquillian.container.glassfish.remote; import org.jboss.arquillian.container.glassfish.CommonGlassFishConfiguration; import org.jboss.arquillian.container.glassfish.CommonGlassFishManager; diff --git a/glassfish-remote-6/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/glassfish-remote/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension similarity index 100% rename from glassfish-remote-6/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension rename to glassfish-remote/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension diff --git a/glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/CDIJarTestCase.java b/glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote/CDIJarTestCase.java similarity index 100% rename from glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/CDIJarTestCase.java rename to glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote/CDIJarTestCase.java diff --git a/glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishDeployWithoutAppXmlTest.java b/glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote/GlassFishDeployWithoutAppXmlTest.java similarity index 100% rename from glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishDeployWithoutAppXmlTest.java rename to glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote/GlassFishDeployWithoutAppXmlTest.java diff --git a/glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishRestDeployEarTest.java b/glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote/GlassFishRestDeployEarTest.java similarity index 100% rename from glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishRestDeployEarTest.java rename to glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote/GlassFishRestDeployEarTest.java diff --git a/glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishRestDeployWarTest.java b/glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote/GlassFishRestDeployWarTest.java similarity index 100% rename from glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishRestDeployWarTest.java rename to glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote/GlassFishRestDeployWarTest.java diff --git a/glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/Greeter.java b/glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote/Greeter.java similarity index 100% rename from glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/Greeter.java rename to glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote/Greeter.java diff --git a/glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GreeterServlet.java b/glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote/GreeterServlet.java similarity index 100% rename from glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GreeterServlet.java rename to glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote/GreeterServlet.java diff --git a/glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/SimpleBean.java b/glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote/SimpleBean.java similarity index 100% rename from glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/SimpleBean.java rename to glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote/SimpleBean.java diff --git a/glassfish-remote-6/src/test/resources/application.xml b/glassfish-remote/src/test/resources/application.xml similarity index 100% rename from glassfish-remote-6/src/test/resources/application.xml rename to glassfish-remote/src/test/resources/application.xml diff --git a/glassfish-remote-6/src/test/resources/arquillian.xml b/glassfish-remote/src/test/resources/arquillian.xml similarity index 100% rename from glassfish-remote-6/src/test/resources/arquillian.xml rename to glassfish-remote/src/test/resources/arquillian.xml diff --git a/pom.xml b/pom.xml index b7e1e57..b9b9ecb 100644 --- a/pom.xml +++ b/pom.xml @@ -14,11 +14,11 @@ org.jboss.arquillian.container - arquillian-parent-glassfish6 + arquillian-parent-glassfish7 1.0.0.Final-SNAPSHOT pom - Arquillian Container Parent GlassFish 6+ - GlassFish 6.x and Later Container integrations for the Arquillian Project + Arquillian Container Parent GlassFish 7+ + GlassFish 7.x and Later Container integrations for the Arquillian Project scm:git:git://git@github.com:arquillian/arquillian-container-glassfish6.git @@ -29,15 +29,15 @@ - 1.7.0.Alpha2 - 6.2.3 + 1.7.0.Alpha10 + 7.0.0-M4 - 3.1.0-M1 + 3.1.0-M5 4.0.0 - 4.0.0 - 2.0.0 + 5.0.0 + 2.1.0 4.0.0 - 2.0.0 + 2.1.0 6.0.0 4.0.0 @@ -71,7 +71,6 @@ ${jakarta.ejb.version} test - org.glassfish.jersey @@ -129,8 +128,8 @@ glassfish-common - glassfish-managed-6 - glassfish-remote-6 + glassfish-managed + glassfish-remote