Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion deployment/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-websockets-client-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-security-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jsonp-deployment</artifactId>
Expand All @@ -56,7 +60,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-http-dev-ui-spi</artifactId>
<artifactId>quarkus-devui-deployment-spi</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
import org.omnifaces.config.WebXml;
import org.omnifaces.resourcehandler.CombinedResourceHandler;
import org.omnifaces.resourcehandler.WebAppManifest;
import org.omnifaces.security.AnonymousTagHandler;
import org.omnifaces.security.AuthenticatedTagHandler;
import org.omnifaces.security.AuthorizeTagHandler;

import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem;
Expand Down Expand Up @@ -185,9 +188,25 @@ void registerForReflection(BuildProducer<ReflectiveClassBuildItem> reflectiveCla
ReflectiveClassBuildItem.builder(classNames.toArray(new String[0])).methods(true).serialization(true).build());
}

@BuildStep
void registerSecurityTaglibForReflection(BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
final List<String> classes = new ArrayList<>();

classes.add(AnonymousTagHandler.class.getName());
classes.add(AuthenticatedTagHandler.class.getName());
classes.add(AuthorizeTagHandler.class.getName());

reflectiveClass.produce(ReflectiveClassBuildItem.builder(classes.toArray(new String[0]))
.constructors()
.methods()
.fields()
.serialization()
.build());
}

@Record(ExecutionTime.STATIC_INIT)
@BuildStep
void registerWebManifests(OmniFacesRecorder recorder, BuildProducer<UnremovableBeanBuildItem> unremovableBeans) {
void registerUnremovableBeans(OmniFacesRecorder recorder, BuildProducer<UnremovableBeanBuildItem> unremovableBeans) {
// make WebManifest beans un-removable, users still have to make them beans
// https://github.com/quarkiverse/quarkus-omnifaces/issues/72
unremovableBeans.produce(UnremovableBeanBuildItem.beanTypes(WebAppManifest.class));
Expand All @@ -204,6 +223,7 @@ void substrateResourceBuildItems(BuildProducer<NativeImageResourceBuildItem> nat
"META-INF/omnifaces.taglib.xml",
"META-INF/omnifaces-functions.taglib.xml",
"META-INF/omnifaces-ui.taglib.xml",
"META-INF/omnifaces-security.taglib.xml",
"META-INF/web-fragment.xml",
"META-INF/faces-config.xml",
"META-INF/web.xml",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package io.quarkiverse.omnifaces.deployment.devui;

import org.omnifaces.config.WebXml;

import io.quarkus.deployment.IsDevelopment;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
Expand All @@ -17,18 +15,12 @@
*/
public class OmnifacesDevUIProcessor {

private static final String EXTENSION_NAME = "OmniFaces";

@BuildStep(onlyIf = IsDevelopment.class)
void createCard(BuildProducer<CardPageBuildItem> cardPageBuildItemBuildProducer) {
final CardPageBuildItem card = new CardPageBuildItem();

final PageBuilder<ExternalPageBuilder> versionPage = Page.externalPageBuilder("Version")
.icon("font-awesome-solid:book")
.url("https://omnifaces.org/")
.doNotEmbed()
.staticLabel(WebXml.class.getPackage().getImplementationVersion());
card.addPage(versionPage);
card.addLibraryVersion("org.omnifaces", "omnifaces", "OmniFaces",
"https://omnifaces.org/");

final PageBuilder<ExternalPageBuilder> localePage = Page.externalPageBuilder("Locale")
.icon("font-awesome-solid:location-dot")
Expand All @@ -44,8 +36,6 @@ void createCard(BuildProducer<CardPageBuildItem> cardPageBuildItemBuildProducer)
.dynamicLabelJsonRPCMethodName("getSessionTimeout");
card.addPage(sessionPage);

card.setCustomCard("qwc-omnifaces-card.js");

cardPageBuildItemBuildProducer.produce(card);
}

Expand Down
92 changes: 0 additions & 92 deletions deployment/src/main/resources/dev-ui/qwc-omnifaces-card.js

This file was deleted.

5 changes: 3 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@
</scm>
<properties>
<maven.compiler.release>17</maven.compiler.release>
<quarkus.version>3.27.0</quarkus.version>
<jakarta-security.version>4.0.0</jakarta-security.version>
<quarkus.version>3.27.1</quarkus.version>
<myfaces.version>4.1.2</myfaces.version>
<omnifaces.version>5.0-M6</omnifaces.version>
<omnifaces.version>5.0</omnifaces.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
9 changes: 9 additions & 0 deletions runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jaxp</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-security</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-info-runtime-spi</artifactId>
Expand All @@ -37,6 +41,11 @@
<groupId>org.omnifaces</groupId>
<artifactId>omnifaces</artifactId>
</dependency>
<dependency>
<groupId>jakarta.security.enterprise</groupId>
<artifactId>jakarta.security.enterprise-api</artifactId>
<version>${jakarta-security.version}</version>
</dependency>
<dependency>
<groupId>org.graalvm.sdk</groupId>
<artifactId>graal-sdk</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.Map;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.omnifaces.util.Faces;

import io.quarkus.info.runtime.spi.InfoContributor;
Expand All @@ -18,7 +19,7 @@ public String name() {

@Override
public Map<String, Object> data() {
String facesImpl = StringUtils.removeIgnoreCase(StringUtils.removeIgnoreCase(Faces.getImplInfo(), "Core"), "Impl");
String facesImpl = Strings.CI.remove(Strings.CI.remove(Faces.getImplInfo(), "Core"), "Impl");
String server = "Undertow " + Undertow.class.getPackage().getImplementationVersion();
String omniFaces = "OmniFaces: " + StringUtils.defaultIfEmpty(
org.omnifaces.util.Faces.class.getPackage().getImplementationVersion(), "???");
Expand Down
Loading