diff --git a/jersey-tck/README.md b/tests/jersey-tck/README.md similarity index 100% rename from jersey-tck/README.md rename to tests/jersey-tck/README.md diff --git a/jersey-tck/j2ee.pass b/tests/jersey-tck/j2ee.pass similarity index 100% rename from jersey-tck/j2ee.pass rename to tests/jersey-tck/j2ee.pass diff --git a/jersey-tck/javajoe.pass b/tests/jersey-tck/javajoe.pass similarity index 100% rename from jersey-tck/javajoe.pass rename to tests/jersey-tck/javajoe.pass diff --git a/jersey-tck/pom.xml b/tests/jersey-tck/pom.xml similarity index 89% rename from jersey-tck/pom.xml rename to tests/jersey-tck/pom.xml index e0fc24e1b6..3a4f9468a1 100644 --- a/jersey-tck/pom.xml +++ b/tests/jersey-tck/pom.xml @@ -31,7 +31,7 @@ 11 11 - 3.1.0-M3 + 3.1.0-M3 6.2.5 ${project.build.directory}/glassfish6 10.0.0-RC1 @@ -308,7 +308,8 @@ exec - ${project.build.directory}/glassfish6/glassfish/bin/asadmin + ${asadmin.home} + ${asadmin} stop-domain @@ -321,7 +322,8 @@ exec - ${project.build.directory}/glassfish6/glassfish/bin/asadmin + ${asadmin.home} + ${asadmin} start-domain @@ -334,7 +336,8 @@ exec - ${project.build.directory}/glassfish6/glassfish/bin/asadmin + ${asadmin.home} + ${asadmin} set server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true @@ -348,7 +351,8 @@ exec - ${project.build.directory}/glassfish6/glassfish/bin/asadmin + ${asadmin.home} + ${asadmin} --passwordfile ${project.basedir}/j2ee.pass @@ -368,7 +372,8 @@ exec - ${project.build.directory}/glassfish6/glassfish/bin/asadmin + ${asadmin.home} + ${asadmin} --passwordfile ${project.basedir}/j2ee.pass @@ -386,7 +391,8 @@ exec - ${project.build.directory}/glassfish6/glassfish/bin/asadmin + ${asadmin.home} + ${asadmin} --passwordfile ${project.basedir}/javajoe.pass @@ -406,7 +412,8 @@ exec - ${project.build.directory}/glassfish6/glassfish/bin/asadmin + ${asadmin.home} + ${asadmin} --passwordfile ${project.basedir}/javajoe.pass @@ -424,7 +431,8 @@ exec - ${project.build.directory}/glassfish6/glassfish/bin/asadmin + ${asadmin.home} + ${asadmin} list-file-users @@ -437,7 +445,8 @@ exec - ${project.build.directory}/glassfish6/glassfish/bin/asadmin + ${asadmin.home} + ${asadmin} stop-domain @@ -460,6 +469,7 @@ **/SeBootstrapIT.java + false jakarta.ws.rs:${tck.artifactId} ${glassfish.home} @@ -488,6 +498,7 @@ verify + false **/SeBootstrapIT.java @@ -498,4 +509,36 @@ + + + onLinux + + + unix + + + + ${basedir} + ${project.build.directory}/glassfish6/glassfish/bin/asadmin + + + + onWindows + + + Windows + + + + ${glassfish.home}/glassfish/bin + asadmin + + + + jersey-tck + + 3.1.0-SNAPSHOT + + + diff --git a/jersey-tck/src/main/java/org/glassfish/jersey/core/tck/JerseyApplicationArchiveProcessor.java b/tests/jersey-tck/src/main/java/org/glassfish/jersey/core/tck/JerseyApplicationArchiveProcessor.java similarity index 100% rename from jersey-tck/src/main/java/org/glassfish/jersey/core/tck/JerseyApplicationArchiveProcessor.java rename to tests/jersey-tck/src/main/java/org/glassfish/jersey/core/tck/JerseyApplicationArchiveProcessor.java diff --git a/jersey-tck/src/main/java/org/glassfish/jersey/core/tck/JerseyLoadableExtension.java b/tests/jersey-tck/src/main/java/org/glassfish/jersey/core/tck/JerseyLoadableExtension.java similarity index 100% rename from jersey-tck/src/main/java/org/glassfish/jersey/core/tck/JerseyLoadableExtension.java rename to tests/jersey-tck/src/main/java/org/glassfish/jersey/core/tck/JerseyLoadableExtension.java diff --git a/jersey-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/tests/jersey-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension similarity index 100% rename from jersey-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension rename to tests/jersey-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension diff --git a/jersey-tck/src/main/resources/jaxrs_ee_core_securitycontext_basic_web.war.sun-web.xml b/tests/jersey-tck/src/main/resources/jaxrs_ee_core_securitycontext_basic_web.war.sun-web.xml similarity index 100% rename from jersey-tck/src/main/resources/jaxrs_ee_core_securitycontext_basic_web.war.sun-web.xml rename to tests/jersey-tck/src/main/resources/jaxrs_ee_core_securitycontext_basic_web.war.sun-web.xml diff --git a/jersey-tck/src/main/resources/jaxrs_ee_rs_container_requestcontext_security_web.war.sun-web.xml b/tests/jersey-tck/src/main/resources/jaxrs_ee_rs_container_requestcontext_security_web.war.sun-web.xml similarity index 100% rename from jersey-tck/src/main/resources/jaxrs_ee_rs_container_requestcontext_security_web.war.sun-web.xml rename to tests/jersey-tck/src/main/resources/jaxrs_ee_rs_container_requestcontext_security_web.war.sun-web.xml diff --git a/tests/pom.xml b/tests/pom.xml index 0d1a49957c..700f42e00b 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -105,5 +105,13 @@ + + jersey-tck + + jersey-tck + + + +