diff --git a/kitchensink/pom.xml b/kitchensink/pom.xml index 547656a540..82e048db98 100644 --- a/kitchensink/pom.xml +++ b/kitchensink/pom.xml @@ -1,169 +1,176 @@ - - - - 4.0.0 - - org.jboss.eap.quickstarts - quickstart-parent - - 7.4.0.GA - ../pom.xml - - kitchensink - war - Quickstart: kitchensink - A starter Jakarta EE web application project for use in JBoss EAP - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.html - repo - - - + + + 4.0.0 + org.jboss.eap.quickstarts + kitchensink + 1.0.0 + + 3.11.0 + 17 + UTF-8 + UTF-8 + quarkus-bom + io.quarkus.platform + 3.2.0.Final + true + 3.0.0 + + - - - - - - jakarta.enterprise - jakarta.enterprise.cdi-api - provided - - - - - junit - junit - test - - - - - - - org.hibernate - hibernate-jpamodelgen - provided - - - - com.sun.activation - jakarta.activation - provided - - - - - org.hibernate.validator - hibernate-validator - provided - - - - jakarta.validation - jakarta.validation-api - provided - - - - - org.hibernate.validator - hibernate-validator-annotation-processor - provided - - - - - jakarta.persistence - jakarta.persistence-api - provided - - - - - - org.jboss.arquillian.junit - arquillian-junit-container - test - - - - org.jboss.arquillian.protocol - arquillian-protocol-servlet - test - - - - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.3_spec - provided - - - - - org.jboss.spec.javax.ejb - jboss-ejb-api_3.2_spec - provided - - - - - org.jboss.spec.javax.faces - jboss-jsf-api_2.3_spec - provided - - - - - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec - provided - - - - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec - provided - - + + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} + pom + import + - - - - ${project.artifactId} - + + + + io.quarkus + quarkus-arc + + + io.quarkus + quarkus-resteasy-reactive + + + org.apache.myfaces.core.extensions.quarkus + myfaces-quarkus + 4.0.1 + + + io.quarkus + quarkus-jdbc-h2 + + + io.quarkus + quarkus-hibernate-orm + + + io.quarkus + quarkus-hibernate-validator + + + io.quarkus + quarkus-resteasy-reactive-jackson + + + io.quarkiverse.primefaces + quarkus-primefaces + 3.13.1 + + + io.quarkiverse.omnifaces + quarkus-omnifaces + 4.2.0 + + + io.quarkus + quarkus-junit5 + test + + + io.rest-assured + rest-assured + test + + + + + + true + + + false + + redhat + https://maven.repository.redhat.com/ga + + + + + + true + + + false + + redhat + https://maven.repository.redhat.com/ga + + + + + + ${quarkus.platform.group-id} + quarkus-maven-plugin + ${quarkus.platform.version} + true + + + + build + generate-code + generate-code-tests + + + + + + maven-compiler-plugin + ${compiler-plugin.version} + + + -parameters + + + + + maven-surefire-plugin + ${surefire-plugin.version} + + + org.jboss.logmanager.LogManager + ${maven.home} + + + + + maven-failsafe-plugin + ${surefire-plugin.version} + + + + integration-test + verify + + + + ${project.build.directory}/${project.build.finalName}-runner + org.jboss.logmanager.LogManager + ${maven.home} + + + + + + + + + + native + + + native + + + + false + native + + + diff --git a/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/controller/MemberController.java b/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/controller/MemberController.java index 94f1692a07..ae7e14098c 100644 --- a/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/controller/MemberController.java +++ b/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/controller/MemberController.java @@ -16,13 +16,14 @@ */ package org.jboss.as.quickstarts.kitchensink.controller; -import javax.annotation.PostConstruct; -import javax.enterprise.inject.Model; -import javax.enterprise.inject.Produces; -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Model; +import jakarta.enterprise.inject.Produces; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.FacesContext; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jboss.as.quickstarts.kitchensink.model.Member; import org.jboss.as.quickstarts.kitchensink.service.MemberRegistration; @@ -40,10 +41,12 @@ public class MemberController { @Inject private MemberRegistration memberRegistration; - @Produces - @Named private Member newMember; + public Member getNewMember() { + return newMember; + } + @PostConstruct public void initNewMember() { newMember = new Member(); diff --git a/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/data/MemberListProducer.java b/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/data/MemberListProducer.java index 8f1d124c28..c187b3081b 100644 --- a/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/data/MemberListProducer.java +++ b/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/data/MemberListProducer.java @@ -16,18 +16,21 @@ */ package org.jboss.as.quickstarts.kitchensink.data; -import javax.annotation.PostConstruct; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.event.Observes; -import javax.enterprise.event.Reception; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Named; + import java.util.List; import org.jboss.as.quickstarts.kitchensink.model.Member; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.event.Reception; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Named; + @RequestScoped +@Named("memberListProducer") public class MemberListProducer { @Inject @@ -37,8 +40,8 @@ public class MemberListProducer { // @Named provides access the return value via the EL variable name "members" in the UI (e.g. // Facelets or JSP view) - @Produces - @Named + // @Produces + // @Named public List getMembers() { return members; } diff --git a/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/data/MemberRepository.java b/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/data/MemberRepository.java index 4b52388811..6141717699 100644 --- a/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/data/MemberRepository.java +++ b/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/data/MemberRepository.java @@ -16,16 +16,18 @@ */ package org.jboss.as.quickstarts.kitchensink.data; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; + import java.util.List; import org.jboss.as.quickstarts.kitchensink.model.Member; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; + @ApplicationScoped public class MemberRepository { diff --git a/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/model/Member.java b/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/model/Member.java index 3dd2060df0..219bb4404d 100644 --- a/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/model/Member.java +++ b/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/model/Member.java @@ -18,20 +18,20 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; - -import javax.validation.constraints.Email; -import javax.validation.constraints.NotEmpty; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; + +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotEmpty; @SuppressWarnings("serial") @Entity diff --git a/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/rest/JaxRsActivator.java b/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/rest/JaxRsActivator.java deleted file mode 100644 index e4137a359e..0000000000 --- a/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/rest/JaxRsActivator.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2015, Red Hat, Inc. and/or its affiliates, and individual - * contributors by the @authors tag. See the copyright.txt in the - * distribution for a full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.as.quickstarts.kitchensink.rest; - -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; - -/** - * A class extending {@link Application} and annotated with @ApplicationPath is the Jakarta EE "no XML" approach to activating - * JAX-RS. - *

- *

- * Resources are served relative to the servlet path specified in the {@link ApplicationPath} annotation. - *

- */ -@ApplicationPath("/rest") -public class JaxRsActivator extends Application { - /* class body intentionally left blank */ -} diff --git a/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/rest/MemberResourceRESTService.java b/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/rest/MemberResourceRESTService.java index 30af6a5de3..bc6cb0b67b 100644 --- a/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/rest/MemberResourceRESTService.java +++ b/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/rest/MemberResourceRESTService.java @@ -23,22 +23,22 @@ import java.util.Set; import java.util.logging.Logger; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.persistence.NoResultException; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.ValidationException; -import javax.validation.Validator; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.persistence.NoResultException; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.ValidationException; +import jakarta.validation.Validator; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.as.quickstarts.kitchensink.data.MemberRepository; import org.jboss.as.quickstarts.kitchensink.model.Member; @@ -49,7 +49,7 @@ *

* This class produces a RESTful service to read/write the contents of the members table. */ -@Path("/members") +@Path("/rest/members") @RequestScoped public class MemberResourceRESTService { diff --git a/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/service/MemberRegistration.java b/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/service/MemberRegistration.java index 5ad3ed4fea..7ce86a9a15 100644 --- a/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/service/MemberRegistration.java +++ b/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/service/MemberRegistration.java @@ -18,14 +18,16 @@ import org.jboss.as.quickstarts.kitchensink.model.Member; -import javax.ejb.Stateless; -import javax.enterprise.event.Event; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Event; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; + import java.util.logging.Logger; // The @Stateless annotation eliminates the need for manual transaction demarcation -@Stateless +@ApplicationScoped public class MemberRegistration { @Inject @@ -37,6 +39,7 @@ public class MemberRegistration { @Inject private Event memberEventSrc; + @Transactional public void register(Member member) throws Exception { log.info("Registering " + member.getName()); em.persist(member); diff --git a/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/util/Resources.java b/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/util/Resources.java index d080d39e4c..afa6b51f8b 100644 --- a/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/util/Resources.java +++ b/kitchensink/src/main/java/org/jboss/as/quickstarts/kitchensink/util/Resources.java @@ -18,12 +18,12 @@ import java.util.logging.Logger; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.faces.context.FacesContext; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.faces.context.FacesContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; /** * This class uses CDI to alias Jakarta EE resources, such as the persistence context, to CDI beans @@ -38,19 +38,10 @@ * */ public class Resources { - @Produces - @PersistenceContext - private EntityManager em; @Produces public Logger produceLog(InjectionPoint injectionPoint) { return Logger.getLogger(injectionPoint.getMember().getDeclaringClass().getName()); } - @Produces - @RequestScoped - public FacesContext produceFacesContext() { - return FacesContext.getCurrentInstance(); - } - } diff --git a/kitchensink/src/main/resources/META-INF/persistence.xml b/kitchensink/src/main/resources/META-INF/persistence.xml deleted file mode 100644 index d86ff7b875..0000000000 --- a/kitchensink/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - java:jboss/datasources/KitchensinkQuickstartDS - - - - - - - diff --git a/kitchensink/src/main/webapp/WEB-INF/templates/default.xhtml b/kitchensink/src/main/resources/META-INF/resources/WEB-INF/templates/default.xhtml similarity index 100% rename from kitchensink/src/main/webapp/WEB-INF/templates/default.xhtml rename to kitchensink/src/main/resources/META-INF/resources/WEB-INF/templates/default.xhtml diff --git a/kitchensink/src/main/webapp/WEB-INF/faces-config.xml b/kitchensink/src/main/resources/META-INF/resources/faces-config.xml similarity index 100% rename from kitchensink/src/main/webapp/WEB-INF/faces-config.xml rename to kitchensink/src/main/resources/META-INF/resources/faces-config.xml diff --git a/kitchensink/src/main/webapp/index.html b/kitchensink/src/main/resources/META-INF/resources/index.html similarity index 94% rename from kitchensink/src/main/webapp/index.html rename to kitchensink/src/main/resources/META-INF/resources/index.html index 5d4d3cbb4d..04f648c43a 100644 --- a/kitchensink/src/main/webapp/index.html +++ b/kitchensink/src/main/resources/META-INF/resources/index.html @@ -18,6 +18,6 @@ - + diff --git a/kitchensink/src/main/webapp/index.xhtml b/kitchensink/src/main/resources/META-INF/resources/index.xhtml similarity index 88% rename from kitchensink/src/main/webapp/index.xhtml rename to kitchensink/src/main/resources/META-INF/resources/index.xhtml index fd25bef908..ad8dd0ddae 100644 --- a/kitchensink/src/main/webapp/index.xhtml +++ b/kitchensink/src/main/resources/META-INF/resources/index.xhtml @@ -34,16 +34,16 @@ model class.

- + - + + value="#{memberController.newMember.phoneNumber}" /> @@ -59,11 +59,11 @@

Members

- + No registered members. - Id diff --git a/kitchensink/src/main/webapp/resources/css/screen.css b/kitchensink/src/main/resources/META-INF/resources/resources/css/screen.css similarity index 100% rename from kitchensink/src/main/webapp/resources/css/screen.css rename to kitchensink/src/main/resources/META-INF/resources/resources/css/screen.css diff --git a/kitchensink/src/main/webapp/resources/gfx/asidebkg.png b/kitchensink/src/main/resources/META-INF/resources/resources/gfx/asidebkg.png similarity index 100% rename from kitchensink/src/main/webapp/resources/gfx/asidebkg.png rename to kitchensink/src/main/resources/META-INF/resources/resources/gfx/asidebkg.png diff --git a/kitchensink/src/main/webapp/resources/gfx/banner.png b/kitchensink/src/main/resources/META-INF/resources/resources/gfx/banner.png similarity index 100% rename from kitchensink/src/main/webapp/resources/gfx/banner.png rename to kitchensink/src/main/resources/META-INF/resources/resources/gfx/banner.png diff --git a/kitchensink/src/main/webapp/resources/gfx/bkg-blkheader.png b/kitchensink/src/main/resources/META-INF/resources/resources/gfx/bkg-blkheader.png similarity index 100% rename from kitchensink/src/main/webapp/resources/gfx/bkg-blkheader.png rename to kitchensink/src/main/resources/META-INF/resources/resources/gfx/bkg-blkheader.png diff --git a/kitchensink/src/main/webapp/resources/gfx/headerbkg.png b/kitchensink/src/main/resources/META-INF/resources/resources/gfx/headerbkg.png similarity index 100% rename from kitchensink/src/main/webapp/resources/gfx/headerbkg.png rename to kitchensink/src/main/resources/META-INF/resources/resources/gfx/headerbkg.png diff --git a/kitchensink/src/main/webapp/resources/gfx/rhjb_eap_logo.png b/kitchensink/src/main/resources/META-INF/resources/resources/gfx/rhjb_eap_logo.png similarity index 100% rename from kitchensink/src/main/webapp/resources/gfx/rhjb_eap_logo.png rename to kitchensink/src/main/resources/META-INF/resources/resources/gfx/rhjb_eap_logo.png diff --git a/kitchensink/src/main/webapp/resources/gfx/wildfly_400x130.jpg b/kitchensink/src/main/resources/META-INF/resources/resources/gfx/wildfly_400x130.jpg similarity index 100% rename from kitchensink/src/main/webapp/resources/gfx/wildfly_400x130.jpg rename to kitchensink/src/main/resources/META-INF/resources/resources/gfx/wildfly_400x130.jpg diff --git a/kitchensink/src/main/resources/META-INF/resources/test.xhtml b/kitchensink/src/main/resources/META-INF/resources/test.xhtml new file mode 100644 index 0000000000..f7231b164a --- /dev/null +++ b/kitchensink/src/main/resources/META-INF/resources/test.xhtml @@ -0,0 +1,76 @@ + + + +

Welcome to JBoss!

+ + +

Member Registration

+

Enforces annotation-based constraints defined on the + model class.

+ + + + + + + + + + + + + + +

+ + + + +

+ + +

Members

+ + No registered members. + + + + Id + #{_member.id} + + + Name + #{_member.name} + + + Email + #{_member.email} + + + Phone # + #{_member.phoneNumber} + + + REST URL + /rest/members/#{_member.id} + + + REST URL for all members: /rest/members + + + + + \ No newline at end of file diff --git a/kitchensink/src/main/resources/META-INF/web.xml b/kitchensink/src/main/resources/META-INF/web.xml new file mode 100644 index 0000000000..ae80908503 --- /dev/null +++ b/kitchensink/src/main/resources/META-INF/web.xml @@ -0,0 +1,37 @@ + + + + + + jakarta.faces.ENABLE_WEBSOCKET_ENDPOINT + true + + + jakarta.faces.INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL + true + + + jakarta.faces.AUTOMATIC_EXTENSIONLESS_MAPPING + true + + + \ No newline at end of file diff --git a/kitchensink/src/main/resources/application.properties b/kitchensink/src/main/resources/application.properties new file mode 100644 index 0000000000..f6446724ae --- /dev/null +++ b/kitchensink/src/main/resources/application.properties @@ -0,0 +1,2 @@ +quarkus.hibernate-orm.log.sql=true +quarkus.hibernate-orm.database.generation=drop-and-create \ No newline at end of file diff --git a/kitchensink/src/main/resources/import.sql b/kitchensink/src/main/resources/import.sql index d40fb73dc5..6ba8c59aa2 100644 --- a/kitchensink/src/main/resources/import.sql +++ b/kitchensink/src/main/resources/import.sql @@ -16,4 +16,4 @@ -- -- You can use this file to load seed data into the database using SQL statements -insert into Member (id, name, email, phone_number) values (0, 'John Smith', 'john.smith@mailinator.com', '2125551212') \ No newline at end of file +insert into Member (id, name, email, phone_number) values (0, 'John Smith', 'john.smith@mailinator.com', '2125551212'); \ No newline at end of file diff --git a/kitchensink/src/main/webapp/WEB-INF/beans.xml b/kitchensink/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index d3ddf148e7..0000000000 --- a/kitchensink/src/main/webapp/WEB-INF/beans.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/kitchensink/src/main/webapp/WEB-INF/kitchensink-quickstart-ds.xml b/kitchensink/src/main/webapp/WEB-INF/kitchensink-quickstart-ds.xml deleted file mode 100644 index 0bb49c7aa5..0000000000 --- a/kitchensink/src/main/webapp/WEB-INF/kitchensink-quickstart-ds.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - jdbc:h2:mem:kitchensink-quickstart;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1 - h2 - - sa - sa - - - - diff --git a/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/MemberRegistrationIT.java b/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/MemberRegistrationIT.java index 1b99358ac0..669014ddc0 100644 --- a/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/MemberRegistrationIT.java +++ b/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/MemberRegistrationIT.java @@ -16,35 +16,22 @@ */ package org.jboss.as.quickstarts.kitchensink.test; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.logging.Logger; import javax.inject.Inject; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; + + import org.jboss.as.quickstarts.kitchensink.model.Member; import org.jboss.as.quickstarts.kitchensink.service.MemberRegistration; -import org.jboss.as.quickstarts.kitchensink.util.Resources; -import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; -@RunWith(Arquillian.class) +import io.quarkus.test.junit.QuarkusTest; + +@QuarkusTest public class MemberRegistrationIT { - @Deployment - public static Archive createTestArchive() { - return ShrinkWrap.create(WebArchive.class, "test.war") - .addClasses(Member.class, MemberRegistration.class, Resources.class) - .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") - // Deploy our test datasource - .addAsWebInfResource("test-ds.xml"); - } @Inject MemberRegistration memberRegistration; diff --git a/kitchensink/src/test/resources/META-INF/test-persistence.xml b/kitchensink/src/test/resources/META-INF/test-persistence.xml deleted file mode 100644 index 8bc8338c23..0000000000 --- a/kitchensink/src/test/resources/META-INF/test-persistence.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - java:jboss/datasources/KitchensinkQuickstartTestDS - - - - - - - diff --git a/kitchensink/src/test/resources/arquillian.xml b/kitchensink/src/test/resources/arquillian.xml deleted file mode 100644 index fdeb809fee..0000000000 --- a/kitchensink/src/test/resources/arquillian.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/kitchensink/src/test/resources/test-ds.xml b/kitchensink/src/test/resources/test-ds.xml deleted file mode 100644 index 0d1fbb5f87..0000000000 --- a/kitchensink/src/test/resources/test-ds.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - jdbc:h2:mem:kitchensink-quickstart-test;DB_CLOSE_DELAY=-1 - h2 - - sa - sa - - - -