From 72b6570580f4e18ac13f7e46be18030eec181c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Tue, 12 Apr 2022 21:52:39 +0200 Subject: [PATCH] Issue #23507 nucleus-tests moved to appserver admin tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # appserver/tests/admin/tests/pom.xml # nucleus/tests/pom.xml Signed-off-by: David Matějček --- .../tests/admin/admin-extension}/osgi.bundle | 0 .../tests/admin/admin-extension}/pom.xml | 32 ++------- .../progress/ProgressComplexCommand.java | 0 .../tests/progress/ProgressCustomCommand.java | 0 .../progress/ProgressDoubleTotalsCommand.java | 0 .../progress/ProgressExecOtherCommand.java | 0 .../progress/ProgressFailInHalfCommand.java | 0 .../progress/ProgressFullAnnotCommand.java | 0 .../progress/ProgressPayloadCommand.java | 0 .../tests/progress/ProgressSimpleCommand.java | 0 .../progress/ProgressStepBackCommand.java | 0 .../ProgressWithSupplementCommand.java | 0 .../tests/progress/SupplementAfter.java | 0 .../tests/progress/SupplementBefore.java | 0 appserver/tests/admin/pom.xml | 38 +++++++++++ .../tests/admin/tests}/pom.xml | 12 ++-- .../glassfish/nucleus/admin/ClusterTest.java | 0 .../nucleus/admin/MiscCommandsTest.java | 0 .../nucleus/admin/OSGiCommandsTest.java | 0 .../org/glassfish/nucleus/admin/RestTest.java | 0 .../admin/progress/DetachAttachTest.java | 0 .../admin/progress/JobManagerTest.java | 0 .../admin/progress/ProgressMessage.java | 0 .../progress/ProgressStatusBasicTest.java | 0 .../progress/ProgressStatusComplexTest.java | 0 .../progress/ProgressStatusFailTest.java | 0 .../progress/ProgressStatusSpecialTest.java | 0 .../nucleus/admin/rest/ApplicationTest.java | 0 .../nucleus/admin/rest/AuthRealmTest.java | 0 .../nucleus/admin/rest/ClusterTest.java | 0 .../nucleus/admin/rest/ConfigTest.java | 0 .../nucleus/admin/rest/DomainTest.java | 0 .../nucleus/admin/rest/ElementStarTest.java | 0 .../admin/rest/ExternalResourceTest.java | 0 .../nucleus/admin/rest/JdbcTest.java | 0 .../glassfish/nucleus/admin/rest/JmsTest.java | 0 .../nucleus/admin/rest/JobsResourceTest.java | 0 .../nucleus/admin/rest/JvmOptionsTest.java | 0 .../nucleus/admin/rest/MetadataTest.java | 0 .../nucleus/admin/rest/MonitoringTest.java | 0 .../admin/rest/NetworkListenerTest.java | 0 .../NoCLICommandResourceCreationTest.java | 0 .../nucleus/admin/rest/PartialUpdateTest.java | 0 .../nucleus/admin/rest/PropertiesBagTest.java | 0 .../nucleus/admin/rest/ProvidersTest.java | 0 .../nucleus/admin/rest/ResourceRefTest.java | 0 .../nucleus/admin/rest/RestTestBase.java | 0 .../admin/rest/SystemPropertiesTest.java | 0 .../admin/rest/TokenAuthenticationTest.java | 0 .../nucleus/admin/rest/ZeroConfigTest.java | 0 .../test/tool/DomainLifecycleExtension.java | 0 .../nucleus/test/tool/NucleusTestUtils.java | 0 .../test/tool/StopDomainExtension.java | 0 .../tests}/src/test/resources/password.txt | 0 .../src/test/resources/password_update.txt | 0 appserver/tests/pom.xml | 3 +- nucleus/pom.xml | 1 - .../admin/src/main/java/.gitkeep_empty_dir | 0 .../src/main/resources/.gitkeep_empty_dir | 0 nucleus/tests/pom.xml | 68 ------------------- 60 files changed, 49 insertions(+), 105 deletions(-) rename {nucleus/tests/admin-adon => appserver/tests/admin/admin-extension}/osgi.bundle (100%) rename {nucleus/tests/admin-adon => appserver/tests/admin/admin-extension}/pom.xml (71%) rename {nucleus/tests/admin-adon => appserver/tests/admin/admin-extension}/src/main/java/com/sun/enterprise/tests/progress/ProgressComplexCommand.java (100%) rename {nucleus/tests/admin-adon => appserver/tests/admin/admin-extension}/src/main/java/com/sun/enterprise/tests/progress/ProgressCustomCommand.java (100%) rename {nucleus/tests/admin-adon => appserver/tests/admin/admin-extension}/src/main/java/com/sun/enterprise/tests/progress/ProgressDoubleTotalsCommand.java (100%) rename {nucleus/tests/admin-adon => appserver/tests/admin/admin-extension}/src/main/java/com/sun/enterprise/tests/progress/ProgressExecOtherCommand.java (100%) rename {nucleus/tests/admin-adon => appserver/tests/admin/admin-extension}/src/main/java/com/sun/enterprise/tests/progress/ProgressFailInHalfCommand.java (100%) rename {nucleus/tests/admin-adon => appserver/tests/admin/admin-extension}/src/main/java/com/sun/enterprise/tests/progress/ProgressFullAnnotCommand.java (100%) rename {nucleus/tests/admin-adon => appserver/tests/admin/admin-extension}/src/main/java/com/sun/enterprise/tests/progress/ProgressPayloadCommand.java (100%) rename {nucleus/tests/admin-adon => appserver/tests/admin/admin-extension}/src/main/java/com/sun/enterprise/tests/progress/ProgressSimpleCommand.java (100%) rename {nucleus/tests/admin-adon => appserver/tests/admin/admin-extension}/src/main/java/com/sun/enterprise/tests/progress/ProgressStepBackCommand.java (100%) rename {nucleus/tests/admin-adon => appserver/tests/admin/admin-extension}/src/main/java/com/sun/enterprise/tests/progress/ProgressWithSupplementCommand.java (100%) rename {nucleus/tests/admin-adon => appserver/tests/admin/admin-extension}/src/main/java/com/sun/enterprise/tests/progress/SupplementAfter.java (100%) rename {nucleus/tests/admin-adon => appserver/tests/admin/admin-extension}/src/main/java/com/sun/enterprise/tests/progress/SupplementBefore.java (100%) create mode 100755 appserver/tests/admin/pom.xml rename {nucleus/tests/admin => appserver/tests/admin/tests}/pom.xml (91%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/ClusterTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/MiscCommandsTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/OSGiCommandsTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/RestTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/progress/DetachAttachTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/progress/JobManagerTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/progress/ProgressMessage.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusBasicTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusComplexTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusFailTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusSpecialTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/ApplicationTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/AuthRealmTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/ClusterTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/ConfigTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/DomainTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/ElementStarTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/ExternalResourceTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/JdbcTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/JmsTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/JobsResourceTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/JvmOptionsTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/MetadataTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/MonitoringTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/NetworkListenerTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/NoCLICommandResourceCreationTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/PartialUpdateTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/PropertiesBagTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/ProvidersTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/ResourceRefTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/RestTestBase.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/SystemPropertiesTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/TokenAuthenticationTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/admin/rest/ZeroConfigTest.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/test/tool/DomainLifecycleExtension.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/test/tool/NucleusTestUtils.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/java/org/glassfish/nucleus/test/tool/StopDomainExtension.java (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/resources/password.txt (100%) rename {nucleus/tests/admin => appserver/tests/admin/tests}/src/test/resources/password_update.txt (100%) delete mode 100644 nucleus/tests/admin/src/main/java/.gitkeep_empty_dir delete mode 100644 nucleus/tests/admin/src/main/resources/.gitkeep_empty_dir delete mode 100755 nucleus/tests/pom.xml diff --git a/nucleus/tests/admin-adon/osgi.bundle b/appserver/tests/admin/admin-extension/osgi.bundle similarity index 100% rename from nucleus/tests/admin-adon/osgi.bundle rename to appserver/tests/admin/admin-extension/osgi.bundle diff --git a/nucleus/tests/admin-adon/pom.xml b/appserver/tests/admin/admin-extension/pom.xml similarity index 71% rename from nucleus/tests/admin-adon/pom.xml rename to appserver/tests/admin/admin-extension/pom.xml index 9dcd67e83ce..4066d53b64b 100644 --- a/nucleus/tests/admin-adon/pom.xml +++ b/appserver/tests/admin/admin-extension/pom.xml @@ -21,36 +21,12 @@ 4.0.0 org.glassfish.main.tests - nucleus-tests - 6.2.6-SNAPSHOT + admin-tests-parent + 7.0.0-SNAPSHOT - test-progress-status-commands - Progress status - Test Commands + test-progress-admin-extension + GlassFish Admin Tests - Progress Admin Extension glassfish-jar - - - - - - - - src/main/java - - **/*.properties - - - - src/main/resources - - **/*.1 - **/*.xml - **/*.properties - - - - - - org.glassfish.main.common diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressComplexCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressComplexCommand.java similarity index 100% rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressComplexCommand.java rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressComplexCommand.java diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressCustomCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressCustomCommand.java similarity index 100% rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressCustomCommand.java rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressCustomCommand.java diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressDoubleTotalsCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressDoubleTotalsCommand.java similarity index 100% rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressDoubleTotalsCommand.java rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressDoubleTotalsCommand.java diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressExecOtherCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressExecOtherCommand.java similarity index 100% rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressExecOtherCommand.java rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressExecOtherCommand.java diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressFailInHalfCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressFailInHalfCommand.java similarity index 100% rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressFailInHalfCommand.java rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressFailInHalfCommand.java diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressFullAnnotCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressFullAnnotCommand.java similarity index 100% rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressFullAnnotCommand.java rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressFullAnnotCommand.java diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressPayloadCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressPayloadCommand.java similarity index 100% rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressPayloadCommand.java rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressPayloadCommand.java diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressSimpleCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressSimpleCommand.java similarity index 100% rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressSimpleCommand.java rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressSimpleCommand.java diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressStepBackCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressStepBackCommand.java similarity index 100% rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressStepBackCommand.java rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressStepBackCommand.java diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressWithSupplementCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressWithSupplementCommand.java similarity index 100% rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressWithSupplementCommand.java rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressWithSupplementCommand.java diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/SupplementAfter.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/SupplementAfter.java similarity index 100% rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/SupplementAfter.java rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/SupplementAfter.java diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/SupplementBefore.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/SupplementBefore.java similarity index 100% rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/SupplementBefore.java rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/SupplementBefore.java diff --git a/appserver/tests/admin/pom.xml b/appserver/tests/admin/pom.xml new file mode 100755 index 00000000000..caa3d877e3e --- /dev/null +++ b/appserver/tests/admin/pom.xml @@ -0,0 +1,38 @@ + + + + + 4.0.0 + + + org.glassfish.main.tests + tests + 7.0.0-SNAPSHOT + + + admin-tests-parent + pom + + GlassFish Admin Tests - Parent + + + admin-extension + tests + + diff --git a/nucleus/tests/admin/pom.xml b/appserver/tests/admin/tests/pom.xml similarity index 91% rename from nucleus/tests/admin/pom.xml rename to appserver/tests/admin/tests/pom.xml index d927abfd579..0a6794a0d86 100644 --- a/nucleus/tests/admin/pom.xml +++ b/appserver/tests/admin/tests/pom.xml @@ -22,15 +22,13 @@ org.glassfish.main.tests - nucleus-tests + admin-tests-parent 7.0.0-SNAPSHOT - org.glassfish.tests - nucleus-admin + admin-tests - Nucleus Tests - Admin - This pom describes how to run admin developer tests on the Nucleus Bundle + GlassFish Admin Tests @@ -77,7 +75,7 @@ org.glassfish.main.tests - test-progress-status-commands + test-progress-admin-extension ${project.version} test @@ -122,7 +120,7 @@ copy-dependencies - test-progress-status-commands + test-progress-admin-extension true ${project.build.directory}/glassfish6/glassfish/modules diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/ClusterTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/ClusterTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/ClusterTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/ClusterTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/MiscCommandsTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/MiscCommandsTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/MiscCommandsTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/MiscCommandsTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/OSGiCommandsTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/OSGiCommandsTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/OSGiCommandsTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/OSGiCommandsTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/RestTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/RestTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/RestTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/RestTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/DetachAttachTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/DetachAttachTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/DetachAttachTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/DetachAttachTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/JobManagerTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/JobManagerTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/JobManagerTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/JobManagerTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/ProgressMessage.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressMessage.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/ProgressMessage.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressMessage.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusBasicTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusBasicTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusBasicTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusBasicTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusComplexTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusComplexTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusComplexTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusComplexTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusFailTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusFailTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusFailTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusFailTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusSpecialTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusSpecialTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusSpecialTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusSpecialTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ApplicationTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ApplicationTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ApplicationTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ApplicationTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/AuthRealmTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/AuthRealmTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/AuthRealmTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/AuthRealmTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ClusterTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ClusterTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ClusterTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ClusterTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ConfigTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ConfigTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ConfigTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ConfigTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/DomainTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/DomainTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/DomainTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/DomainTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ElementStarTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ElementStarTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ElementStarTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ElementStarTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ExternalResourceTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ExternalResourceTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ExternalResourceTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ExternalResourceTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/JdbcTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JdbcTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/JdbcTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JdbcTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/JmsTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JmsTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/JmsTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JmsTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/JobsResourceTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JobsResourceTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/JobsResourceTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JobsResourceTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/JvmOptionsTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JvmOptionsTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/JvmOptionsTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JvmOptionsTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/MetadataTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/MetadataTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/MetadataTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/MetadataTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/MonitoringTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/MonitoringTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/MonitoringTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/MonitoringTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/NetworkListenerTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/NetworkListenerTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/NetworkListenerTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/NetworkListenerTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/NoCLICommandResourceCreationTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/NoCLICommandResourceCreationTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/NoCLICommandResourceCreationTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/NoCLICommandResourceCreationTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/PartialUpdateTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/PartialUpdateTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/PartialUpdateTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/PartialUpdateTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/PropertiesBagTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/PropertiesBagTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/PropertiesBagTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/PropertiesBagTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ProvidersTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ProvidersTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ProvidersTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ProvidersTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ResourceRefTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ResourceRefTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ResourceRefTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ResourceRefTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/RestTestBase.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/RestTestBase.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/RestTestBase.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/RestTestBase.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/SystemPropertiesTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/SystemPropertiesTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/SystemPropertiesTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/SystemPropertiesTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/TokenAuthenticationTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/TokenAuthenticationTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/TokenAuthenticationTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/TokenAuthenticationTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ZeroConfigTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ZeroConfigTest.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ZeroConfigTest.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ZeroConfigTest.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/test/tool/DomainLifecycleExtension.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/DomainLifecycleExtension.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/test/tool/DomainLifecycleExtension.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/DomainLifecycleExtension.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/test/tool/NucleusTestUtils.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/NucleusTestUtils.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/test/tool/NucleusTestUtils.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/NucleusTestUtils.java diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/test/tool/StopDomainExtension.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/StopDomainExtension.java similarity index 100% rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/test/tool/StopDomainExtension.java rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/StopDomainExtension.java diff --git a/nucleus/tests/admin/src/test/resources/password.txt b/appserver/tests/admin/tests/src/test/resources/password.txt similarity index 100% rename from nucleus/tests/admin/src/test/resources/password.txt rename to appserver/tests/admin/tests/src/test/resources/password.txt diff --git a/nucleus/tests/admin/src/test/resources/password_update.txt b/appserver/tests/admin/tests/src/test/resources/password_update.txt similarity index 100% rename from nucleus/tests/admin/src/test/resources/password_update.txt rename to appserver/tests/admin/tests/src/test/resources/password_update.txt diff --git a/appserver/tests/pom.xml b/appserver/tests/pom.xml index 79f376b0439..0a2ef6fa555 100755 --- a/appserver/tests/pom.xml +++ b/appserver/tests/pom.xml @@ -119,6 +119,7 @@ tck + admin appserv-tests @@ -129,7 +130,7 @@ fastest - + appserv-tests diff --git a/nucleus/pom.xml b/nucleus/pom.xml index ae65b3cd9a5..7044f3c1c93 100644 --- a/nucleus/pom.xml +++ b/nucleus/pom.xml @@ -74,7 +74,6 @@ diagnostics resources featuresets - tests diff --git a/nucleus/tests/admin/src/main/java/.gitkeep_empty_dir b/nucleus/tests/admin/src/main/java/.gitkeep_empty_dir deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/nucleus/tests/admin/src/main/resources/.gitkeep_empty_dir b/nucleus/tests/admin/src/main/resources/.gitkeep_empty_dir deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/nucleus/tests/pom.xml b/nucleus/tests/pom.xml deleted file mode 100755 index 491e1a5abec..00000000000 --- a/nucleus/tests/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - 4.0.0 - - - org.glassfish.main - glassfish-nucleus-parent - 7.0.0-SNAPSHOT - - - org.glassfish.main.tests - nucleus-tests - pom - - Nucleus Tests - - - admin - admin-adon - - - - - - - org.codehaus.mojo - findbugs-maven-plugin - - true - - - - - - - - maven-javadoc-plugin - - true - - - - maven-deploy-plugin - - true - - - - -