diff --git a/test/example_jar_with_metadata_complete_false/pom.xml b/test/example_jar_with_metadata_complete_false/pom.xml deleted file mode 100644 index 8aa4fd3155..0000000000 --- a/test/example_jar_with_metadata_complete_false/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - 4.0.0 - - - org.eclipse.mojarra.test - pom - 4.1.2-SNAPSHOT - - - example_jar_with_metadata_complete_false - jar - - Mojarra ${project.version} - INTEGRATION TESTS - ${project.artifactId} - - - - org.glassfish - jakarta.faces - ${project.version} - provided - - - diff --git a/test/example_jar_with_metadata_complete_false/src/main/java/org/eclipse/mojarra/test/example_jar_with_metadata_complete_false/ExampleFacesComponent.java b/test/example_jar_with_metadata_complete_false/src/main/java/org/eclipse/mojarra/test/example_jar_with_metadata_complete_false/ExampleFacesComponent.java deleted file mode 100644 index 730e32dcd8..0000000000 --- a/test/example_jar_with_metadata_complete_false/src/main/java/org/eclipse/mojarra/test/example_jar_with_metadata_complete_false/ExampleFacesComponent.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 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 - * https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 - * which is available at https://www.apache.org/licenses/LICENSE-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: GPL-2.0 with Classpath-exception-2.0 which - * is available at https://openjdk.java.net/legal/gplv2+ce.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 or Apache-2.0 - */ -package org.eclipse.mojarra.test.example_jar_with_metadata_complete_false; - -import jakarta.faces.component.FacesComponent; -import jakarta.faces.component.html.HtmlOutputText; - -@FacesComponent(createTag = true, namespace="example_jar_with_metadata_complete_false") -public class ExampleFacesComponent extends HtmlOutputText { - -} diff --git a/test/example_jar_with_metadata_complete_false/src/main/resources/META-INF/faces-config.xml b/test/example_jar_with_metadata_complete_false/src/main/resources/META-INF/faces-config.xml deleted file mode 100644 index 0728c095bd..0000000000 --- a/test/example_jar_with_metadata_complete_false/src/main/resources/META-INF/faces-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/test/example_jar_with_metadata_complete_true/pom.xml b/test/example_jar_with_metadata_complete_true/pom.xml deleted file mode 100644 index 4c9f2549e1..0000000000 --- a/test/example_jar_with_metadata_complete_true/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - 4.0.0 - - - org.eclipse.mojarra.test - pom - 4.1.2-SNAPSHOT - - - example_jar_with_metadata_complete_true - jar - - Mojarra ${project.version} - INTEGRATION TESTS - ${project.artifactId} - - - - org.glassfish - jakarta.faces - ${project.version} - provided - - - diff --git a/test/example_jar_with_metadata_complete_true/src/main/java/org/eclipse/mojarra/test/example_jar_with_metadata_complete_true/ExampleFacesComponent.java b/test/example_jar_with_metadata_complete_true/src/main/java/org/eclipse/mojarra/test/example_jar_with_metadata_complete_true/ExampleFacesComponent.java deleted file mode 100644 index c97b56ee9f..0000000000 --- a/test/example_jar_with_metadata_complete_true/src/main/java/org/eclipse/mojarra/test/example_jar_with_metadata_complete_true/ExampleFacesComponent.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 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 - * https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 - * which is available at https://www.apache.org/licenses/LICENSE-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: GPL-2.0 with Classpath-exception-2.0 which - * is available at https://openjdk.java.net/legal/gplv2+ce.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 or Apache-2.0 - */ -package org.eclipse.mojarra.test.example_jar_with_metadata_complete_true; - -import jakarta.faces.component.FacesComponent; -import jakarta.faces.component.html.HtmlOutputText; - -@FacesComponent(createTag = true, namespace="example_jar_with_metadata_complete_true") -public class ExampleFacesComponent extends HtmlOutputText { - -} diff --git a/test/example_jar_with_metadata_complete_true/src/main/resources/META-INF/faces-config.xml b/test/example_jar_with_metadata_complete_true/src/main/resources/META-INF/faces-config.xml deleted file mode 100644 index ea8ec0ee60..0000000000 --- a/test/example_jar_with_metadata_complete_true/src/main/resources/META-INF/faces-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/test/issue5511/pom.xml b/test/issue5511/pom.xml deleted file mode 100644 index 6c14fe0e32..0000000000 --- a/test/issue5511/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - 4.0.0 - - - org.eclipse.mojarra.test - pom - 4.1.2-SNAPSHOT - - - issue5511 - war - - Mojarra ${project.version} - INTEGRATION TESTS - ${project.artifactId} - - - - org.eclipse.mojarra.test - example_jar_with_metadata_complete_false - ${project.version} - - - org.eclipse.mojarra.test - example_jar_with_metadata_complete_true - ${project.version} - - - - org.eclipse.mojarra.test - base - ${project.version} - test - - - diff --git a/test/issue5511/src/main/webapp/WEB-INF/beans.xml b/test/issue5511/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/issue5511/src/main/webapp/WEB-INF/web.xml b/test/issue5511/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 64e14f6f40..0000000000 --- a/test/issue5511/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - facesServlet - jakarta.faces.webapp.FacesServlet - 1 - - - facesServlet - *.xhtml - - diff --git a/test/issue5511/src/main/webapp/issue5511-using-jar-with-metadata-complete-false.xhtml b/test/issue5511/src/main/webapp/issue5511-using-jar-with-metadata-complete-false.xhtml deleted file mode 100644 index 1ac34508f5..0000000000 --- a/test/issue5511/src/main/webapp/issue5511-using-jar-with-metadata-complete-false.xhtml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - issue5511 - trying to use annotated @FacesComponent from JAR with metadata-complete=false - - - - - diff --git a/test/issue5511/src/main/webapp/issue5511-using-jar-with-metadata-complete-true.xhtml b/test/issue5511/src/main/webapp/issue5511-using-jar-with-metadata-complete-true.xhtml deleted file mode 100644 index eee8362ed0..0000000000 --- a/test/issue5511/src/main/webapp/issue5511-using-jar-with-metadata-complete-true.xhtml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - issue5511 - trying to use annotated @FacesComponent from JAR with metadata-complete=true - - - - - diff --git a/test/issue5511/src/test/java/org/eclipse/mojarra/test/issue5511/Issue5511IT.java b/test/issue5511/src/test/java/org/eclipse/mojarra/test/issue5511/Issue5511IT.java deleted file mode 100644 index debc5f4884..0000000000 --- a/test/issue5511/src/test/java/org/eclipse/mojarra/test/issue5511/Issue5511IT.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 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 - * https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 - * which is available at https://www.apache.org/licenses/LICENSE-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: GPL-2.0 with Classpath-exception-2.0 which - * is available at https://openjdk.java.net/legal/gplv2+ce.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 or Apache-2.0 - */ -package org.eclipse.mojarra.test.issue5511; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.eclipse.mojarra.test.base.BaseIT; -import org.junit.jupiter.api.Test; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; - -/** - * https://github.com/eclipse-ee4j/mojarra/issues/5511 - */ -class Issue5511IT extends BaseIT { - - @FindBy(id = "exampleFacesComponent") - private WebElement exampleFacesComponent; - - @Test - void testJarWithMetadataCompleteFalse() { - open("issue5511-using-jar-with-metadata-complete-false.xhtml"); - assertEquals("span", exampleFacesComponent.getTagName().toLowerCase(), "The @FacesComponent annotation SHOULD be processed because of metadata-complete=false on its JAR"); - assertEquals("Hello World", exampleFacesComponent.getText(), "Because it renders a span via HtmlOutputText, it should output its value as well."); - } - - @Test - void testJarWithMetadataCompleteTrue() { - open("issue5511-using-jar-with-metadata-complete-true.xhtml"); - assertEquals("ex:examplefacescomponent", exampleFacesComponent.getTagName().toLowerCase(), "The @FacesComponent annotation SHOULD NOT be processed because of metadata-complete=true on its JAR"); - assertEquals("", exampleFacesComponent.getText(), "Because it does not render to a valid HTML element, it should not output anything either."); - } -}