From 78de0942b4eed055d6a7e0314992ebdad3298be0 Mon Sep 17 00:00:00 2001 From: Arjan Tijms Date: Wed, 12 Jun 2024 12:20:56 +0200 Subject: [PATCH 1/2] GlassFish runner for the Pages TCK Signed-off-by: Arjan Tijms --- glassfish-runner/jsp-tck/pom.xml | 745 ------------------ .../GlassfishApplicationArchiveProcessor.java | 46 -- .../core/tck/GlassfishLoadableExtension.java | 27 - ...boss.arquillian.core.spi.LoadableExtension | 1 - .../jsp_sec_secbasic_web.war.sun-web.xml | 35 - .../jsp_sec_secform_web.war.sun-web.xml | 35 - ..._resource_httplistener_web.war.sun-web.xml | 70 -- ...gext_resource_listener_web.war.sun-web.xml | 70 -- ...xt_resource_taghandler_web.war.sun-web.xml | 70 -- .../jsp-tck/src/test/resources/arquillian.xml | 18 - .../pages-tck/pages-tck-install/pom.xml | 99 +++ .../pages-tck-run}/j2ee.pass | 5 +- .../pages-tck-run}/javajoe.pass | 4 +- .../pages-tck/pages-tck-run/pom.xml | 211 +++++ glassfish-runner/pages-tck/pom.xml | 36 + glassfish-runner/pom.xml | 5 + 16 files changed, 355 insertions(+), 1122 deletions(-) delete mode 100644 glassfish-runner/jsp-tck/pom.xml delete mode 100644 glassfish-runner/jsp-tck/src/main/java/org/glassfish/pages/core/tck/GlassfishApplicationArchiveProcessor.java delete mode 100644 glassfish-runner/jsp-tck/src/main/java/org/glassfish/pages/core/tck/GlassfishLoadableExtension.java delete mode 100644 glassfish-runner/jsp-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension delete mode 100644 glassfish-runner/jsp-tck/src/main/resources/jsp_sec_secbasic_web.war.sun-web.xml delete mode 100644 glassfish-runner/jsp-tck/src/main/resources/jsp_sec_secform_web.war.sun-web.xml delete mode 100644 glassfish-runner/jsp-tck/src/main/resources/jsp_tagext_resource_httplistener_web.war.sun-web.xml delete mode 100644 glassfish-runner/jsp-tck/src/main/resources/jsp_tagext_resource_listener_web.war.sun-web.xml delete mode 100644 glassfish-runner/jsp-tck/src/main/resources/jsp_tagext_resource_taghandler_web.war.sun-web.xml delete mode 100644 glassfish-runner/jsp-tck/src/test/resources/arquillian.xml create mode 100644 glassfish-runner/pages-tck/pages-tck-install/pom.xml rename glassfish-runner/{jsp-tck => pages-tck/pages-tck-run}/j2ee.pass (85%) rename glassfish-runner/{jsp-tck => pages-tck/pages-tck-run}/javajoe.pass (85%) create mode 100644 glassfish-runner/pages-tck/pages-tck-run/pom.xml create mode 100644 glassfish-runner/pages-tck/pom.xml diff --git a/glassfish-runner/jsp-tck/pom.xml b/glassfish-runner/jsp-tck/pom.xml deleted file mode 100644 index c052672053..0000000000 --- a/glassfish-runner/jsp-tck/pom.xml +++ /dev/null @@ -1,745 +0,0 @@ - - - - 4.0.0 - - - org.glassfish - standalone-tck - 11.0.0-SNAPSHOT - ../pom.xml - - jakarta - glassfish.jsp-tck - 11.0.0-SNAPSHOT - jar - - - admin - ${derby.poolName} - ${derby.dataSource} - ${derby.home}/lib/derbyclient.jar${pathsep}${derby.home}/lib/derbyshared.jar${pathsep}${derby.home}/lib/derbytools.jar - ../../lib/dbprocedures.jar${pathsep}${derby.home}/lib/derbynet.jar${pathsep}${derby.home}/lib/derbyshared.jar${pathsep}${derby.home}/lib/derbytools.jar - org.apache.derby.jdbc.ClientDataSource - derbyDB - derby/derby.dml.sql - org.apache.derby.jdbc.ClientDriver - ${project.build.directory}/${glassfish.toplevel.dir}/javadb - cts1 - cts-derby-pool - 1527 - DatabaseName\=\"${derby.dbName}\":user\=${derby.user}:password\=${derby.passwd}:serverName\=${derby.server}:portNumber=${derby.port} - localhost - 5 - ${derby.home}/databases - jdbc:derby://${derby.server}:${derby.port}/${derby.dbName};create=true - cts1 - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - 8.0.0-M2 - glassfish8 - 11.0.0-M1 - 30 - 5 - jdbc/DB1 - 5.9.1 - : - ${derby.properties} - ${derby.poolName} - javax.sql.DataSource - localhost - 4848 - jakarta-pages-tck - 4.0.0 - - - - - org.junit.vintage - junit-vintage-engine - test - - - jakarta.tck - ${tck.artifactId} - ${tck.version} - - - org.glassfish.main.common - simple-glassfish-api - ${glassfish.container.version} - - - org.jboss.arquillian.junit5 - arquillian-junit5-container - 1.7.0.Alpha10 - - - jakarta.platform - jakarta.jakartaee-api - ${jakarta.platform.version} - provided - - - commons-httpclient - commons-httpclient - 3.1 - - - org.glassfish.hk2 - hk2-locator - 3.0.0 - - - org.jboss.arquillian.container - arquillian-container-test-spi - 1.7.0.Alpha10 - - - org.omnifaces.arquillian - arquillian-glassfish-server-managed - 1.2 - test - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - 4.0.0-M2 - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.2.0 - - - download-gf - - unpack - - generate-resources - - - - org.glassfish.main.distributions - ${glassfish-artifact-id} - ${glassfish.container.version} - zip - true - ${project.build.directory} - - - - - - update-jars - - copy - - generate-resources - - - - jakarta.el - jakarta.el-api - true - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules - jakarta.el-api.jar - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - true - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules - jakarta.servlet.jsp-api.jar - - - - - - - - maven-antrun-plugin - 3.0.0 - - - - run - - generate-resources - - - - - - - - - - - - - org.codehaus.mojo - exec-maven-plugin - - - 001-StopDomain - - exec - - process-resources - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - - stop-domain - - - 0 - 1 - - - - - 002-StopDatabase - - exec - - process-resources - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - ${derby.basedir} - - stop-database - - - 0 - 1 - - - - - 003-StartDomain - - exec - - process-resources - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - - start-domain - - - - - 004-StartDatabase - - exec - - process-resources - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - ${derby.basedir} - - start-database - - - - - 005-EnableTraceRequests - - exec - - process-resources - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - - set - server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true - - - - - 006-DeleteUser-j2ee - - exec - - process-resources - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - - --passwordfile - ${project.basedir}/j2ee.pass - delete-file-user - j2ee - - - 0 - 1 - - - - - 007-AddUser-j2ee - - exec - - process-resources - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - - --passwordfile - ${project.basedir}/j2ee.pass - create-file-user - --groups - staff:mgr - j2ee - - - - - 008-DeleteUser-javajoe - - exec - - process-resources - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - - --passwordfile - ${project.basedir}/javajoe.pass - delete-file-user - javajoe - - - 0 - 1 - - - - - 009-AddUser-javajoe - - exec - - process-resources - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - - --passwordfile - ${project.basedir}/javajoe.pass - create-file-user - --groups - guest - javajoe - - - - - 010-list-users - - exec - - process-resources - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - - list-file-users - - - - - - 011-Create Connection Pool - - exec - - process-resources - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - - create-jdbc-connection-pool - --datasourceClassname=org.apache.derby.jdbc.ClientDataSource - --resType=javax.sql.DataSource - --property - DatabaseName=derbyDB:serverName=localhost:PortNumber=1527:User=cts1:Password=cts1 - cts-derby-pool - - - - - 012-Create Connection Pool Resource - - exec - - process-resources - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - - create-jdbc-resource - --poolName=cts-derby-pool - jdbc/DB1 - - - - - 013-Create JMS Resource - - exec - - process-resources - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - - create-jms-resource - --resType=jakarta.jms.QueueConnectionFactory - jms/QueueConnectionFactory - - - - - 014-Create JMS Resource - - exec - - process-resources - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - - create-jms-resource - --resType=jakarta.jms.TopicConnectionFactory - jms/TopicConnectionFactory - - - - - 015-Create JMS Resource - - exec - - process-resources - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - - create-jms-resource - --resType=jakarta.jms.ConnectionFactory - jms/ConnectionFactory - - - - - 016-Create Mail Resource - - exec - - process-resources - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - - create-mail-resource - --mailuser="user01@james.local" - --fromaddress="user01@james.local" - --mailhost=localhost - --debug=true - mail/Session - - - - - 017-Create JMS Resource - - exec - - process-resources - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - - create-jms-resource - --restype=jakarta.jms.Queue - --property=imqDestinationName=myQueue - MY_QUEUE - - - - - 018-Create JMS Resource - - exec - - process-resources - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - - create-jms-resource - --restype=jakarta.jms.Topic - --property=imqDestinationName=myTopic - MY_TOPIC - - - - - 019-Create Custom Resource - - exec - - process-resources - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - - create-custom-resource - --restype=java.net.URL - --factoryclass=javax.naming.spi.ObjectFactory - --property=name=http\://webServerHost/webServerPort - myUrl - - - - - - - - - - - - - - org.codehaus.mojo - exec-maven-plugin - - - 1-StopDomain - - exec - - pre-integration-test - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - - stop-domain - - - 0 - 1 - - - - - 2-StopDatabase - - exec - - pre-integration-test - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin - ${derby.basedir} - - stop-database - - - 0 - 1 - - - - - - - - - maven-failsafe-plugin - 3.0.0-M5 - - - gf-tests - - integration-test - verify - - - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet-api.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.el-api.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet.jsp-api.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet.jsp.jstl-api.jar - - jakarta.tck:${tck.artifactId} - - ${project.build.directory}/${glassfish.toplevel.dir} - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish - localhost - 8080 - ${project.build.directory}/${glassfish.toplevel.dir} - glassfish - ${webServerHome}/domains/domain1/autodeploy - 30 - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.el-api.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet-api.jar:${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet.jsp-api.jar - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet.jsp.jstl.jar:${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet.jsp.jstl-api.jar - true - j2ee - j2ee - javajoe - javajoe - true - true - ee.jakarta.tck.pages.lib.implementation.sun.common.SunRIURL - ${project.build.directory}/jdk11-bundle - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet-api.jar:${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet.jsp-api.jar:${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.el-api.jar:${project.build.directory}/jdk11-bundle/java.base:${project.build.directory}/jdk11-bundle/java.rmi:${project.build.directory}/jdk11-bundle/java.sql:${project.build.directory}/jdk11-bundle/java.naming - - - ${project.build.directory}/${glassfish.toplevel.dir} - - - - - - - - - - - full - - true - - - glassfish - - - - web - - web - - - - diff --git a/glassfish-runner/jsp-tck/src/main/java/org/glassfish/pages/core/tck/GlassfishApplicationArchiveProcessor.java b/glassfish-runner/jsp-tck/src/main/java/org/glassfish/pages/core/tck/GlassfishApplicationArchiveProcessor.java deleted file mode 100644 index 7c7090ebef..0000000000 --- a/glassfish-runner/jsp-tck/src/main/java/org/glassfish/pages/core/tck/GlassfishApplicationArchiveProcessor.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.pages.core.tck; - -import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; -import org.jboss.arquillian.test.spi.TestClass; -import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.spec.WebArchive; - -public class GlassfishApplicationArchiveProcessor implements ApplicationArchiveProcessor { - @Override - public void process(Archive archive, TestClass testClass) { - - if ("jsp_tagext_resource_httplistener_web.war".equals(archive.getName())) { - WebArchive webArchive = (WebArchive) archive; - webArchive.addAsWebInfResource("jsp_tagext_resource_httplistener_web.war.sun-web.xml", "sun-web.xml"); - } else if ("jsp_tagext_resource_listener_web.war".equals(archive.getName())) { - WebArchive webArchive = (WebArchive) archive; - webArchive.addAsWebInfResource("jsp_tagext_resource_listener_web.war.sun-web.xml", "sun-web.xml"); - } else if ("jsp_tagext_resource_taghandler_web.war".equals(archive.getName())) { - WebArchive webArchive = (WebArchive) archive; - webArchive.addAsWebInfResource("jsp_tagext_resource_taghandler_web.war.sun-web.xml", "sun-web.xml"); - } else if ("jsp_sec_secbasic_web.war".equals(archive.getName())) { - WebArchive webArchive = (WebArchive) archive; - webArchive.addAsWebInfResource("jsp_sec_secbasic_web.war.sun-web.xml", "sun-web.xml"); - } else if ("jsp_sec_secform_web.war".equals(archive.getName())) { - WebArchive webArchive = (WebArchive) archive; - webArchive.addAsWebInfResource("jsp_sec_secform_web.war.sun-web.xml", "sun-web.xml"); - } - - } -} diff --git a/glassfish-runner/jsp-tck/src/main/java/org/glassfish/pages/core/tck/GlassfishLoadableExtension.java b/glassfish-runner/jsp-tck/src/main/java/org/glassfish/pages/core/tck/GlassfishLoadableExtension.java deleted file mode 100644 index c3e20c1b0e..0000000000 --- a/glassfish-runner/jsp-tck/src/main/java/org/glassfish/pages/core/tck/GlassfishLoadableExtension.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.pages.core.tck; - -import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; -import org.jboss.arquillian.core.spi.LoadableExtension; - -public class GlassfishLoadableExtension implements LoadableExtension { - @Override - public void register(ExtensionBuilder extensionBuilder) { - extensionBuilder.service(ApplicationArchiveProcessor.class, GlassfishApplicationArchiveProcessor.class); - } -} diff --git a/glassfish-runner/jsp-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/glassfish-runner/jsp-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension deleted file mode 100644 index 13949a58c8..0000000000 --- a/glassfish-runner/jsp-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension +++ /dev/null @@ -1 +0,0 @@ -org.glassfish.pages.core.tck.GlassfishLoadableExtension \ No newline at end of file diff --git a/glassfish-runner/jsp-tck/src/main/resources/jsp_sec_secbasic_web.war.sun-web.xml b/glassfish-runner/jsp-tck/src/main/resources/jsp_sec_secbasic_web.war.sun-web.xml deleted file mode 100644 index c76606fb2b..0000000000 --- a/glassfish-runner/jsp-tck/src/main/resources/jsp_sec_secbasic_web.war.sun-web.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - Administrator - j2ee - - - Manager - javajoe - - - Employee - javajoe - j2ee - - diff --git a/glassfish-runner/jsp-tck/src/main/resources/jsp_sec_secform_web.war.sun-web.xml b/glassfish-runner/jsp-tck/src/main/resources/jsp_sec_secform_web.war.sun-web.xml deleted file mode 100644 index c76606fb2b..0000000000 --- a/glassfish-runner/jsp-tck/src/main/resources/jsp_sec_secform_web.war.sun-web.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - Administrator - j2ee - - - Manager - javajoe - - - Employee - javajoe - j2ee - - diff --git a/glassfish-runner/jsp-tck/src/main/resources/jsp_tagext_resource_httplistener_web.war.sun-web.xml b/glassfish-runner/jsp-tck/src/main/resources/jsp_tagext_resource_httplistener_web.war.sun-web.xml deleted file mode 100644 index 742081ad4d..0000000000 --- a/glassfish-runner/jsp-tck/src/main/resources/jsp_tagext_resource_httplistener_web.war.sun-web.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - DB1 - jdbc/DB1 - - user1 - password1 - - - - qcFactory - jms/QueueConnectionFactory - - j2ee - j2ee - - - - tcFactory - jms/TopicConnectionFactory - - j2ee - j2ee - - - - cFactory - jms/ConnectionFactory - - j2ee - j2ee - - - - mailSession - mail/Session - - - myUrl - http://webServerHost:webServerPort - - - myQueue - MY_QUEUE - - - myTopic - MY_TOPIC - - diff --git a/glassfish-runner/jsp-tck/src/main/resources/jsp_tagext_resource_listener_web.war.sun-web.xml b/glassfish-runner/jsp-tck/src/main/resources/jsp_tagext_resource_listener_web.war.sun-web.xml deleted file mode 100644 index 742081ad4d..0000000000 --- a/glassfish-runner/jsp-tck/src/main/resources/jsp_tagext_resource_listener_web.war.sun-web.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - DB1 - jdbc/DB1 - - user1 - password1 - - - - qcFactory - jms/QueueConnectionFactory - - j2ee - j2ee - - - - tcFactory - jms/TopicConnectionFactory - - j2ee - j2ee - - - - cFactory - jms/ConnectionFactory - - j2ee - j2ee - - - - mailSession - mail/Session - - - myUrl - http://webServerHost:webServerPort - - - myQueue - MY_QUEUE - - - myTopic - MY_TOPIC - - diff --git a/glassfish-runner/jsp-tck/src/main/resources/jsp_tagext_resource_taghandler_web.war.sun-web.xml b/glassfish-runner/jsp-tck/src/main/resources/jsp_tagext_resource_taghandler_web.war.sun-web.xml deleted file mode 100644 index 7b780b523d..0000000000 --- a/glassfish-runner/jsp-tck/src/main/resources/jsp_tagext_resource_taghandler_web.war.sun-web.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - DB1 - jdbc/DB1 - - user1 - password1 - - - - qcFactory - jms/QueueConnectionFactory - - j2ee - j2ee - - - - tcFactory - jms/TopicConnectionFactory - - j2ee - j2ee - - - - cFactory - jms/ConnectionFactory - - j2ee - j2ee - - - - mailSession - mail/Session - - - myUrl - http://webServerHost:webServerPort - - - myQueue - MY_QUEUE - - - myTopic - MY_TOPIC - - diff --git a/glassfish-runner/jsp-tck/src/test/resources/arquillian.xml b/glassfish-runner/jsp-tck/src/test/resources/arquillian.xml deleted file mode 100644 index c7b9520871..0000000000 --- a/glassfish-runner/jsp-tck/src/test/resources/arquillian.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - target/glassfish8 - - - - - diff --git a/glassfish-runner/pages-tck/pages-tck-install/pom.xml b/glassfish-runner/pages-tck/pages-tck-install/pom.xml new file mode 100644 index 0000000000..0889d44250 --- /dev/null +++ b/glassfish-runner/pages-tck/pages-tck-install/pom.xml @@ -0,0 +1,99 @@ + + + + 4.0.0 + + + org.glassfish + pages-tck + 4.0.0-SNAPSHOT + + + pages-tck-install + pom + TCK: Install Jakarta Pages TCK + + + jakarta-pages-tck-${tck.test.pages.version}.zip + https://download.eclipse.org/jakartaee/pages/4.0/${tck.test.pages.file} + 4.0.0 + + + + + + com.googlecode.maven-download-plugin + download-maven-plugin + 1.9.0 + + ${tck.test.pages.url} + true + ${project.build.directory} + + + + download-pages-tck + + wget + + generate-resources + + + + + + maven-install-plugin + + + + install-javatest + + install-file + + process-resources + + ${project.build.directory}/../../../../lib/javatest.jar + javatest + javatest + 5.0 + jar + + + + install-pages-tck-jar + + install-file + + process-resources + + ${project.build.directory}/pages-tck/artifacts/jakarta-pages-tck-4.0.0.jar + jakarta.tck + jakarta-pages-tck + ${tck.test.pages.version} + jar + true + + + + + + + + + diff --git a/glassfish-runner/jsp-tck/j2ee.pass b/glassfish-runner/pages-tck/pages-tck-run/j2ee.pass similarity index 85% rename from glassfish-runner/jsp-tck/j2ee.pass rename to glassfish-runner/pages-tck/pages-tck-run/j2ee.pass index dccc3037eb..29e96f640d 100644 --- a/glassfish-runner/jsp-tck/j2ee.pass +++ b/glassfish-runner/pages-tck/pages-tck-run/j2ee.pass @@ -1,6 +1,5 @@ - # -# Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2024, 2024 Contributors to the Eclipse Foundation. # # This program and the accompanying materials are made available under the # terms of the Eclipse Public License v. 2.0, which is available at @@ -14,4 +13,4 @@ # # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 # -AS_ADMIN_USERPASSWORD=j2ee +AS_ADMIN_USERPASSWORD=j2ee \ No newline at end of file diff --git a/glassfish-runner/jsp-tck/javajoe.pass b/glassfish-runner/pages-tck/pages-tck-run/javajoe.pass similarity index 85% rename from glassfish-runner/jsp-tck/javajoe.pass rename to glassfish-runner/pages-tck/pages-tck-run/javajoe.pass index d69a7520e5..1ecaba672a 100644 --- a/glassfish-runner/jsp-tck/javajoe.pass +++ b/glassfish-runner/pages-tck/pages-tck-run/javajoe.pass @@ -1,5 +1,5 @@ # -# Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2024, 2024 Contributors to the Eclipse Foundation. # # This program and the accompanying materials are made available under the # terms of the Eclipse Public License v. 2.0, which is available at @@ -13,4 +13,4 @@ # # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 # -AS_ADMIN_USERPASSWORD=javajoe +AS_ADMIN_USERPASSWORD=javajoe \ No newline at end of file diff --git a/glassfish-runner/pages-tck/pages-tck-run/pom.xml b/glassfish-runner/pages-tck/pages-tck-run/pom.xml new file mode 100644 index 0000000000..fac279f859 --- /dev/null +++ b/glassfish-runner/pages-tck/pages-tck-run/pom.xml @@ -0,0 +1,211 @@ + + + + + 4.0.0 + + + org.glassfish + pages-tck + 4.0.0-SNAPSHOT + + + pages-tck-run + jar + + pages-tck + Aggregates dependencies and runs the pages TCK on GlassFish + + + ${glassfish.root}/glassfish8 + ${project.build.directory} + 8.0.0-M6 + + UTF-8 + UTF-8 + + + + + + org.jboss.arquillian + arquillian-bom + 1.8.0.Final + pom + import + + + + + + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + 4.0.0 + + + + + jakarta.tck + jakarta-pages-tck + 4.0.0 + test + + + + + org.jboss.arquillian.junit5 + arquillian-junit5-container + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.jupiter + junit-jupiter + test + + + junit + junit + test + + + + + jakarta.tck + sigtest-maven-plugin + 2.2 + test + + + + + org.omnifaces.arquillian + arquillian-glassfish-server-managed + 1.5 + test + + + + + + + maven-compiler-plugin + + 17 + + + + + + maven-dependency-plugin + + + unpack-glassfish-and-certs + + unpack + + generate-test-resources + + ${glassfish.root}/dependency-maven-plugin-markers + + + + + org.glassfish.main.distributions + ${glassfish-artifact-id} + ${glassfish.version} + zip + false + ${glassfish.root} + + + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + jakarta.tck:jakarta-pages-tck + + + + ${glassfish.root}/glassfish8 + + + true + + + set server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true + create-file-user --groups guest --passwordfile ${project.basedir}/javajoe.pass javajoe + create-file-user --groups staff:mgr --passwordfile ${project.basedir}/j2ee.pass j2ee + list-file-users + + ee.jakarta.tck.pages.lib.implementation.sun.common.SunRIURL + + + ${project.build.directory}/jdk-bundle + ${glassfish.root}/glassfish8/glassfish/modules/jakarta.servlet.jsp-api.jar:${glassfish.root}/glassfish8/glassfish/modules/jakarta.servlet-api.jar:${glassfish.root}/glassfish8/glassfish/modules/jakarta.el-api.jar:${project.build.directory}/jdk-bundle/java.base:${project.build.directory}/jdk-bundle/java.rmi:${project.build.directory}/jdk-bundle/java.sql:${project.build.directory}/jdk-bundle/java.naming + + + + + run-tests + + integration-test + verify + + integration-test + + + + + + + + + full + + true + + + glassfish + full + + + + web + + web + web + + + + diff --git a/glassfish-runner/pages-tck/pom.xml b/glassfish-runner/pages-tck/pom.xml new file mode 100644 index 0000000000..2fe3cb3379 --- /dev/null +++ b/glassfish-runner/pages-tck/pom.xml @@ -0,0 +1,36 @@ + + + + + 4.0.0 + + + org.glassfish + standalone-tck + 11.0.0-SNAPSHOT + + + pages-tck + 4.0.0-SNAPSHOT + pom + + + pages-tck-install + pages-tck-run + + diff --git a/glassfish-runner/pom.xml b/glassfish-runner/pom.xml index 07bdb559f9..9ec2bc09d3 100644 --- a/glassfish-runner/pom.xml +++ b/glassfish-runner/pom.xml @@ -1,14 +1,18 @@ @@ -35,6 +39,7 @@ jsonp-tck persistence-tck servlet-tck + pages-tck From 3a792dcd72ceec6ad4c36fb6550a65e2887d34bc Mon Sep 17 00:00:00 2001 From: Arjan Tijms Date: Wed, 12 Jun 2024 20:23:33 +0200 Subject: [PATCH 2/2] Order modules Signed-off-by: Arjan Tijms --- glassfish-runner/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glassfish-runner/pom.xml b/glassfish-runner/pom.xml index 9ec2bc09d3..6970a28cf6 100644 --- a/glassfish-runner/pom.xml +++ b/glassfish-runner/pom.xml @@ -37,9 +37,9 @@ concurrency-tck jsonb-tck jsonp-tck + pages-tck persistence-tck servlet-tck - pages-tck