Commit b82c4593 authored by Bruce Link's avatar Bruce Link
Browse files

first EE 10 version

parent 993c0a2d
ARG runtime_image=quay.io/wildfly/wildfly-runtime-jdk11:latest
ARG runtime_image=quay.io/wildfly/wildfly-runtime-jdk17:latest
FROM ${runtime_image}
COPY --chown=jboss:root target/server $JBOSS_HOME
RUN chmod -R ug+rwX $JBOSS_HOME
build:
uri: https://gitlab.infoteach.ca/bdlink/ch4-tags.git
mode: s2i
ref: master
ref: ee10
s2i:
version: latest
builderImage: quay.io/wildfly/wildfly-s2i-jdk11
runtimeImage: quay.io/wildfly/wildfly-runtime-jdk11
builderImage: quay.io/wildfly/wildfly-s2i-jdk17
runtimeImage: quay.io/wildfly/wildfly-runtime-jdk17
deploy:
replicas: 1
\ No newline at end of file
......@@ -7,11 +7,11 @@
<packaging>war</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<version.maven.war.plugin>3.3.2</version.maven.war.plugin>
<version.wildfly>26.1.2.Final</version.wildfly>
<version.wildfly.cloud.galleon.pack>1.1.2.Final</version.wildfly.cloud.galleon.pack>
<version.wildfly>27.0.0.Alpha5</version.wildfly>
<version.wildfly.cloud.galleon.pack>1.0.0.Final</version.wildfly.cloud.galleon.pack>
<version.wildfly.plugin>3.0.2.Final</version.wildfly.plugin>
</properties>
......@@ -19,13 +19,15 @@
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<version>8.0.0</version>
<version>10.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId>
<version>11.0.0</version>
<classifier>jakarta</classifier>
</dependency>
</dependencies>
......@@ -46,9 +48,6 @@
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.wildfly}</location>
</feature-pack>
<feature-pack>
<location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.wildfly.cloud.galleon.pack}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>jsf</layer>
......@@ -56,7 +55,7 @@
<galleon-options>
<jboss-fork-embedded>true</jboss-fork-embedded>
</galleon-options>
</configuration>
</configuration>
<executions>
<execution>
<goals>
......@@ -89,10 +88,11 @@
</build>
<profiles>
<profile>
<!-- When built in OpenShift console, add ENV under Build Config: -->
<!-- MAVEN_ARGS=-Popenshift-v1 -->
<!-- Use this profile for any OpenShift s2i v1 specific customization your app will need. -->
<id>openshift-v1</id>
<!-- When built in OpenShift the 'openshift' profile will be used when invoking mvn. -->
<!-- Use this profile for any OpenShift specific customization your app will need. -->
<!-- By default that is to put the resulting archive into the 'deployments' folder. -->
<!-- http://maven.apache.org/guides/mini/guide-building-for-different-environments.html -->
<id>old</id>
<build>
<plugins>
<plugin>
......@@ -110,8 +110,8 @@
</profile>
<profile>
<!-- When built with helm this profile should be used when invoking mvn. -->
<!-- Use this profile for any OpenShift s2i v2 specific customization your app will need. -->
<!-- When built with helm the 'helm' profile should be used when invoking mvn. -->
<!-- Use this profile for any OpenShift specific customization your app will need. -->
<!-- By default that is to put the resulting archive into the 'deployments' folder. -->
<!-- http://maven.apache.org/guides/mini/guide-building-for-different-environments.html -->
<id>openshift</id>
......@@ -125,12 +125,10 @@
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.wildfly}</location>
<feature-pack>
<location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.wildfly.cloud.galleon.pack}</location>
</feature-pack>
</feature-pack>
</feature-packs>
<layers>
<layer>cloud-server</layer>
<layer>jsf</layer>
</layers>
<galleon-options>
......
......@@ -3,9 +3,9 @@ package com.corejsf;
import java.io.Serializable;
import java.util.Locale;
import javax.inject.Named;
import javax.enterprise.context.SessionScoped;
import javax.faces.context.FacesContext;
import jakarta.inject.Named;
import jakarta.enterprise.context.SessionScoped;
import jakarta.faces.context.FacesContext;
@Named
@SessionScoped
......
......@@ -2,8 +2,8 @@ package com.corejsf;
import java.io.Serializable;
import javax.inject.Named;
import javax.enterprise.context.RequestScoped;
import jakarta.inject.Named;
import jakarta.enterprise.context.RequestScoped;
@Named("messageUser")
@RequestScoped
......
......@@ -12,9 +12,9 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import javax.inject.Named;
import javax.enterprise.context.SessionScoped;
import javax.faces.model.SelectItem;
import jakarta.inject.Named;
import jakarta.enterprise.context.SessionScoped;
import jakarta.faces.model.SelectItem;
@Named("form")
@SessionScoped
......
......@@ -2,8 +2,8 @@ package com.corejsf;
import java.io.Serializable;
import javax.inject.Named;
import javax.enterprise.context.RequestScoped;
import jakarta.inject.Named;
import jakarta.enterprise.context.RequestScoped;
@Named("user")
@RequestScoped
......
<?xml version="1.0"?>
<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
version="2.0"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
version="4.0"
bean-discovery-mode="annotated"/>
<?xml version="1.0" encoding="UTF-8"?>
<faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_3.xsd"
version="2.3">
<faces-config xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_4_0.xsd"
version="4.0">
<application>
<resource-bundle>
<base-name>messages</base-name>
......
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
version="4.0">
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
version="6.0">
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
<servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://xmlns.jcp.org/jsf/html">
xmlns:h="jakarta.faces.html">
<h:head>
<title>#{msgs.flagWindowTitle}</title>
</h:head>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:h="jakarta.faces.html"
xmlns:f="jakarta.faces.core"
xmlns:ui="jakarta.faces.facelets"
xmlns:p="http://primefaces.org/ui">
<h:head>
<title>Core JavaServer Faces: Chapter-04</title>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://xmlns.jcp.org/jsf/html">
xmlns:h="jakarta.faces.html">
<h:head>
<title>#{msgs.windowTitle}</title>
<h:outputStylesheet library="css" name="styles.css"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html">
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html">
<h:head>
<title>#{msgs.msWindowTitle}</title>
<h:outputStylesheet library="css" name="styles.css"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://xmlns.jcp.org/jsf/html">
xmlns:h="jakarta.faces.html">
<h:head>
<title>#{msgs.personWindowTitle}</title>
</h:head>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html">
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html">
<h:head>
<h:outputStylesheet library="css" name="styles.css"/>
<title>#{msgs.selectWindowTitle}</title>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html">
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html">
<h:head>
<title>#{msgs.indexWindowTitle}</title>
</h:head>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://xmlns.jcp.org/jsf/html">
xmlns:h="jakarta.faces.html">
<h:head>
<title>#{msgs.thankYouWindowTitle}</title>
</h:head>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment