diff --git a/boms/common-ee/pom.xml b/boms/common-ee/pom.xml index e3db1a90ee5c..cc3d4da77ff3 100644 --- a/boms/common-ee/pom.xml +++ b/boms/common-ee/pom.xml @@ -1825,6 +1825,20 @@ + + + jakarta.faces + jakarta.faces-api + ${version.jakarta.faces.jakarta-faces-api} + + + * + * + + + + jakarta.inject jakarta.inject-api @@ -3194,20 +3208,6 @@ - - - jakarta.faces - jakarta.faces-api - ${version.jakarta.faces.jakarta-faces-api} - - - * - * - - - - org.glassfish.expressly expressly diff --git a/boms/preview-ee/pom.xml b/boms/preview-ee/pom.xml index 3c9bbfddeae0..0fc5c04560e5 100644 --- a/boms/preview-ee/pom.xml +++ b/boms/preview-ee/pom.xml @@ -30,6 +30,30 @@ WildFly Preview: Dependency Management (Base Dependencies) + + 3.0.0-M1 + + 3.0.0-M2 + 6.0.0-RC1 + 3.1.0-M1 + 4.1.0.RC1 + 4.1.0-M1 + 2.2.0-RC1 + 3.2.0-M2 + 4.0.0-M2 + 6.1.0-M2 + + 3.1.0-M2 + 2.2.0-M1 + 4.1.0-M1 + 6.0.0.Beta1 + 6.0.Beta4 + + @@ -46,6 +70,200 @@ + + jakarta.annotation + jakarta.annotation-api + ${version.jakarta.annotation.jakarta-annotation-api} + + + * + * + + + + + + jakarta.authorization + jakarta.authorization-api + ${version.jakarta.authorization.jakarta-authorization-api} + + + * + * + + + + + jakarta.el + jakarta.el-api + ${version.jakarta.el} + + + * + * + + + + + jakarta.enterprise + jakarta.enterprise.cdi-api + ${version.jakarta.enterprise} + + + * + * + + + + + jakarta.enterprise + jakarta.enterprise.cdi-el-api + ${version.jakarta.enterprise} + + + * + * + + + + + jakarta.enterprise.concurrent + jakarta.enterprise.concurrent-api + ${version.jakarta.enterprise.concurrent.jakarta-enterprise.concurrent-api} + + + * + * + + + + + jakarta.enterprise + jakarta.enterprise.lang-model + ${version.jakarta.enterprise} + + + * + * + + + + + + jakarta.faces + jakarta.faces-api + ${version.jakarta.faces.jakarta-faces-api} + + + * + * + + + + + jakarta.interceptor + jakarta.interceptor-api + ${version.jakarta.interceptor.jakarta-interceptors-api} + + + * + * + + + + + jakarta.persistence + jakarta.persistence-api + ${version.jakarta.persistence} + + + * + * + + + + + jakarta.security.enterprise + jakarta.security.enterprise-api + ${version.jakarta.security.enterprise} + + + * + * + + + + + jakarta.servlet + jakarta.servlet-api + ${version.jakarta.servlet.jakarta-servlet-api} + + + * + * + + + + + + jakarta.validation + jakarta.validation-api + ${version.jakarta.validation.jakarta-validation-api} + + + * + * + + + + + jakarta.websocket + jakarta.websocket-api + ${version.jakarta.websocket.jakarta-websocket-api} + + + * + * + + + + + jakarta.websocket + jakarta.websocket-client-api + ${version.jakarta.websocket.jakarta-websocket-api} + + + * + * + + + + org.apache.avro avro @@ -58,6 +276,18 @@ + + org.glassfish + jakarta.faces + ${version.org.glassfish.jakarta.faces} + + + * + * + + + + org.hibernate.search hibernate-search-mapper-orm-outbox-polling @@ -70,6 +300,95 @@ + + org.jboss.weld + weld-api + ${version.org.jboss.weld.weld-api} + + + * + * + + + + + org.jboss.weld + weld-core-impl + ${version.org.jboss.weld.weld} + + + * + * + + + + + org.jboss.weld + weld-lite-extension-translator + ${version.org.jboss.weld.weld} + + + * + * + + + + + org.jboss.weld + weld-spi + ${version.org.jboss.weld.weld-api} + + + * + * + + + + + org.jboss.weld.module + weld-ejb + ${version.org.jboss.weld.weld} + + + * + * + + + + + org.jboss.weld.module + weld-jsf + ${version.org.jboss.weld.weld} + + + * + * + + + + + org.jboss.weld.module + weld-jta + ${version.org.jboss.weld.weld} + + + * + * + + + + + org.jboss.weld.module + weld-web + ${version.org.jboss.weld.weld} + + + * + * + + + + org.wildfly.deployment wildfly-ee-9-deployment-transformer diff --git a/ee/src/main/java/org/jboss/as/ee/component/deployers/EECleanUpProcessor.java b/ee/src/main/java/org/jboss/as/ee/component/deployers/EECleanUpProcessor.java index ec97cda64075..24a5a0a8a49e 100644 --- a/ee/src/main/java/org/jboss/as/ee/component/deployers/EECleanUpProcessor.java +++ b/ee/src/main/java/org/jboss/as/ee/component/deployers/EECleanUpProcessor.java @@ -5,6 +5,7 @@ package org.jboss.as.ee.component.deployers; import org.jboss.as.ee.component.Attachments; +import org.jboss.as.ee.logging.EeLogger; import org.jboss.as.server.deployment.DeploymentPhaseContext; import org.jboss.as.server.deployment.DeploymentUnit; import org.jboss.as.server.deployment.DeploymentUnitProcessingException; @@ -44,10 +45,19 @@ public void undeploy(final DeploymentUnit context) { @Override public void handleEvent(ServiceController serviceController, LifecycleEvent lifecycleEvent) { if(lifecycleEvent == LifecycleEvent.DOWN) { - FactoryFinderCache.clearClassLoader(module.getClassLoader()); + clearFactoryFinderCache(module); controller.removeListener(this); } } }); } + + private void clearFactoryFinderCache(Module module) { + try { + FactoryFinderCache.clearClassLoader(module.getClassLoader()); + } catch (NoClassDefFoundError e) { + // FactoryFinderCache is only available when the JBoss fork of Jakarta EL is used + EeLogger.ROOT_LOGGER.debugf("Cannot load FactoryFinderCache class -- cache clearing will not be performed"); + } + } } diff --git a/ee/src/main/java/org/jboss/as/ee/managedbean/component/ManagedBeanComponentDescription.java b/ee/src/main/java/org/jboss/as/ee/managedbean/component/ManagedBeanComponentDescription.java index bbfe46f7a08a..83f4d8590adb 100644 --- a/ee/src/main/java/org/jboss/as/ee/managedbean/component/ManagedBeanComponentDescription.java +++ b/ee/src/main/java/org/jboss/as/ee/managedbean/component/ManagedBeanComponentDescription.java @@ -10,7 +10,7 @@ import org.jboss.msc.service.ServiceName; /** - * Component descriptor for {@link jakarta.annotation.ManagedBean} managed beans. + * Component descriptor for {@code jakarta.annotation.ManagedBean} managed beans. * * This is only here so that other interested processors can tell if a given component is a managed bean, * it does not add anything to the component description. diff --git a/ee/src/main/java/org/jboss/as/ee/managedbean/processors/ManagedBeanAnnotationProcessor.java b/ee/src/main/java/org/jboss/as/ee/managedbean/processors/ManagedBeanAnnotationProcessor.java index bdeaa39a6479..7172599d6747 100644 --- a/ee/src/main/java/org/jboss/as/ee/managedbean/processors/ManagedBeanAnnotationProcessor.java +++ b/ee/src/main/java/org/jboss/as/ee/managedbean/processors/ManagedBeanAnnotationProcessor.java @@ -5,12 +5,12 @@ package org.jboss.as.ee.managedbean.processors; +import static org.jboss.as.ee.logging.EeLogger.ROOT_LOGGER; + import java.lang.reflect.Modifier; import java.util.Arrays; import java.util.List; -import jakarta.annotation.ManagedBean; - import org.jboss.as.ee.logging.EeLogger; import org.jboss.as.ee.component.ComponentConfiguration; import org.jboss.as.ee.component.EEModuleDescription; @@ -39,27 +39,45 @@ import org.jboss.jandex.DotName; import org.jboss.metadata.property.PropertyReplacer; -import static org.jboss.as.ee.logging.EeLogger.ROOT_LOGGER; - /** * Deployment unit processor responsible for scanning a deployment to find classes with {@code jakarta.annotation.ManagedBean} annotations. - * Note: This processor only supports JSR-316 compliant managed beans. So it will not handle complimentary spec additions (ex. Jakarta Enterprise Beans). + * Note: This processor only supports JSR-316 compliant managed beans. So it will not handle complementary spec additions (ex. Jakarta Enterprise Beans). * * @author John E. Bailey */ public class ManagedBeanAnnotationProcessor implements DeploymentUnitProcessor { - static final DotName MANAGED_BEAN_ANNOTATION_NAME = DotName.createSimple(ManagedBean.class.getName()); + static final DotName MANAGED_BEAN_ANNOTATION_NAME = DotName.createSimple("jakarta.annotation.ManagedBean"); + + /** Whether the jakarta.annotation.ManagedBean class exists. It was removed in Jakarta Annotations 3.0 */ + private static final boolean HAS_MANAGED_BEAN; + + static { + boolean hasManagedBean = false; + try { + ManagedBeanAnnotationProcessor.class.getClassLoader().loadClass("jakarta.annotation.ManagedBean"); + hasManagedBean = true; + } catch (Throwable ignored) { + // ignore + } + HAS_MANAGED_BEAN = hasManagedBean; + } /** * Check the deployment annotation index for all classes with the @ManagedBean annotation. For each class with the * annotation, collect all the required information to create a managed bean instance, and attach it to the context. * * @param phaseContext the deployment unit context - * @throws DeploymentUnitProcessingException + * @throws DeploymentUnitProcessingException if the annotation is applied to something other than a class * */ public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException { + + if (!HAS_MANAGED_BEAN) { + // We're running Jakarta Annotations 3.0 or later. Managed beans no longer exist. + return; + } + final DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit(); final EEResourceReferenceProcessorRegistry registry = deploymentUnit.getAttachment(org.jboss.as.ee.component.Attachments.RESOURCE_REFERENCE_PROCESSOR_REGISTRY); final EEModuleDescription moduleDescription = deploymentUnit.getAttachment(org.jboss.as.ee.component.Attachments.EE_MODULE_DESCRIPTION); @@ -93,7 +111,7 @@ public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitPro // Add the view ViewDescription viewDescription = new ViewDescription(componentDescription, beanClassName); viewDescription.getConfigurators().addFirst(new ViewConfigurator() { - public void configure(final DeploymentPhaseContext context, final ComponentConfiguration componentConfiguration, final ViewDescription description, final ViewConfiguration configuration) throws DeploymentUnitProcessingException { + public void configure(final DeploymentPhaseContext context, final ComponentConfiguration componentConfiguration, final ViewDescription description, final ViewConfiguration configuration) { // Add MB association interceptors configuration.addClientPostConstructInterceptor(ManagedBeanCreateInterceptor.FACTORY, InterceptorOrder.ClientPostConstruct.INSTANCE_CREATE); final ClassLoader classLoader = componentConfiguration.getModuleClassLoader(); @@ -113,10 +131,9 @@ public void configure(final DeploymentPhaseContext context, final ComponentConfi /** * Returns true if the passed managedBeanClass meets the requirements set by the Managed bean spec about * bean implementation classes. The passed managedBeanClass must not be an interface and must not be final or abstract. - * If it passes these requirements then this method returns true. Else it returns false. * * @param managedBeanClass The session bean class - * @return + * @return {@code true} if {@code managedBeanClass} meets the requirements, otherwise {@code false} */ private static boolean assertManagedBeanClassValidity(final ClassInfo managedBeanClass) { final short flags = managedBeanClass.flags(); diff --git a/ee/src/main/java/org/jboss/as/ee/managedbean/processors/ManagedBeanSubDeploymentMarkingProcessor.java b/ee/src/main/java/org/jboss/as/ee/managedbean/processors/ManagedBeanSubDeploymentMarkingProcessor.java index 87e04d38340d..da6451e61173 100644 --- a/ee/src/main/java/org/jboss/as/ee/managedbean/processors/ManagedBeanSubDeploymentMarkingProcessor.java +++ b/ee/src/main/java/org/jboss/as/ee/managedbean/processors/ManagedBeanSubDeploymentMarkingProcessor.java @@ -5,6 +5,8 @@ package org.jboss.as.ee.managedbean.processors; +import java.util.List; + import org.jboss.as.ee.structure.DeploymentType; import org.jboss.as.ee.structure.DeploymentTypeMarker; import org.jboss.as.server.deployment.Attachments; @@ -18,22 +20,39 @@ import org.jboss.jandex.DotName; import org.jboss.jandex.Index; -import jakarta.annotation.ManagedBean; -import java.util.List; - /** * Processor that only runs for ear deployments where no application.xml is provided. It examines jars in the ear to determine - * sub-deployments containing {@link ManagedBean managed beans}. + * sub-deployments containing {@code jakarta.annotation.ManagedBean managed beans}. * * @author Jaikiran Pai */ public class ManagedBeanSubDeploymentMarkingProcessor implements DeploymentUnitProcessor { - private static final DotName MANAGED_BEAN = DotName.createSimple(ManagedBean.class.getName()); + private static final DotName MANAGED_BEAN = DotName.createSimple("jakarta.annotation.ManagedBean"); + + /** Whether the jakarta.annotation.ManagedBean class exists. It was removed in Jakarta Annotations 3.0 */ + private static final boolean HAS_MANAGED_BEAN; + + static { + boolean hasManagedBean = false; + try { + ManagedBeanAnnotationProcessor.class.getClassLoader().loadClass("jakarta.annotation.ManagedBean"); + hasManagedBean = true; + } catch (Throwable ignored) { + // ignore + } + HAS_MANAGED_BEAN = hasManagedBean; + } @Override public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException { + + if (!HAS_MANAGED_BEAN) { + // We're running Jakarta Annotations 3.0 or later. Managed beans no longer exist. + return; + } + final DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit(); if (!DeploymentTypeMarker.isType(DeploymentType.EAR, deploymentUnit)) { return; diff --git a/jsf/subsystem/src/main/java/org/jboss/as/jsf/logging/JSFLogger.java b/jsf/subsystem/src/main/java/org/jboss/as/jsf/logging/JSFLogger.java index 1574f368ca0f..eb3bd720b218 100644 --- a/jsf/subsystem/src/main/java/org/jboss/as/jsf/logging/JSFLogger.java +++ b/jsf/subsystem/src/main/java/org/jboss/as/jsf/logging/JSFLogger.java @@ -37,17 +37,17 @@ public interface JSFLogger extends BasicLogger { */ JSFLogger ROOT_LOGGER = Logger.getMessageLogger(JSFLogger.class, "org.jboss.as.jsf"); - @LogMessage(level = WARN) - @Message(id = 1, value = "WildFlyConversationAwareViewHandler was improperly initialized. Expected ViewHandler parent.") - void viewHandlerImproperlyInitialized(); +// @LogMessage(level = WARN) +// @Message(id = 1, value = "WildFlyConversationAwareViewHandler was improperly initialized. Expected ViewHandler parent.") +// void viewHandlerImproperlyInitialized(); - @LogMessage(level = ERROR) - @Message(id = 2, value = "Could not load Jakarta Server Faces managed bean class: %s") - void managedBeanLoadFail(String managedBean); +// @LogMessage(level = ERROR) +// @Message(id = 2, value = "Could not load Jakarta Server Faces managed bean class: %s") +// void managedBeanLoadFail(String managedBean); - @LogMessage(level = ERROR) - @Message(id = 3, value = "Jakarta Server Faces managed bean class %s has no default constructor") - void managedBeanNoDefaultConstructor(String managedBean); +// @LogMessage(level = ERROR) +// @Message(id = 3, value = "Jakarta Server Faces managed bean class %s has no default constructor") +// void managedBeanNoDefaultConstructor(String managedBean); @LogMessage(level = ERROR) @Message(id = 4, value = "Failed to parse %s, Jakarta Server Faces artifacts defined in this file will not be available") @@ -80,8 +80,8 @@ public interface JSFLogger extends BasicLogger { // @Message(id = 12, value = "Thread local injection container not set") // IllegalStateException noThreadLocalInjectionContainer(); - @Message(id = 13, value = "@ManagedBean is only allowed at class level %s") - String invalidManagedBeanAnnotation(AnnotationTarget target); +// @Message(id = 13, value = "@ManagedBean is only allowed at class level %s") +// String invalidManagedBeanAnnotation(AnnotationTarget target); @Message(id = 14, value = "Default Jakarta Server Faces implementation slot '%s' is invalid") DeploymentUnitProcessingException invalidDefaultJSFImpl(String defaultJsfVersion); diff --git a/preview/galleon-local/pom.xml b/preview/galleon-local/pom.xml index 121b88ba38e2..1c87f76aea38 100644 --- a/preview/galleon-local/pom.xml +++ b/preview/galleon-local/pom.xml @@ -30,6 +30,15 @@ + + jakarta.el + jakarta.el-api + + + jakarta.enterprise + jakarta.enterprise.cdi-el-api + + org.apache.avro avro diff --git a/preview/galleon-local/src/main/resources/modules/system/layers/base/jakarta/el/api/main/module.xml b/preview/galleon-local/src/main/resources/modules/system/layers/base/jakarta/el/api/main/module.xml new file mode 100644 index 000000000000..cc97f109eeee --- /dev/null +++ b/preview/galleon-local/src/main/resources/modules/system/layers/base/jakarta/el/api/main/module.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + diff --git a/preview/galleon-local/src/main/resources/modules/system/layers/base/jakarta/enterprise/api/main/module.xml b/preview/galleon-local/src/main/resources/modules/system/layers/base/jakarta/enterprise/api/main/module.xml new file mode 100644 index 000000000000..5af55fbd49a8 --- /dev/null +++ b/preview/galleon-local/src/main/resources/modules/system/layers/base/jakarta/enterprise/api/main/module.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testsuite/integration/basic/pom.xml b/testsuite/integration/basic/pom.xml index bb07e4ed8e66..f3e572af81a0 100644 --- a/testsuite/integration/basic/pom.xml +++ b/testsuite/integration/basic/pom.xml @@ -59,6 +59,7 @@ none ${modular.jdk.args} --add-opens=java.base/javax.crypto=ALL-UNNAMED --add-opens=java.base/sun.security.validator=ALL-UNNAMED --add-opens=java.base/sun.security.x509=ALL-UNNAMED --add-opens=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.xml/com.sun.org.apache.xalan.internal.xsltc.trax=ALL-UNNAMED + @@ -1645,6 +1646,19 @@ + + org.codehaus.mojo + build-helper-maven-plugin + + + + add-ee-test-source + generate-test-sources + + + @@ -3427,6 +3441,10 @@ + + jakarta.enterprise + jakarta.enterprise.cdi-el-api + org.wildfly.arquillian wildfly-arquillian-container-bootable @@ -3578,6 +3596,12 @@ -Dts.preview + + + jakarta.enterprise + jakarta.enterprise.cdi-el-api + + @@ -3670,6 +3694,25 @@ + + + test.feature.pack.preview.profile + + + testsuite.ee.galleon.pack.artifactId + wildfly-preview-feature-pack + + + + + jakarta.enterprise + jakarta.enterprise.cdi-el-api + + + diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryInjectionTestCase.java b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryInjectionTestCase.java similarity index 96% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryInjectionTestCase.java rename to testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryInjectionTestCase.java index c95e25c008ad..a43e9607d3f2 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryInjectionTestCase.java +++ b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryInjectionTestCase.java @@ -15,7 +15,7 @@ import org.junit.runner.RunWith; /** - * A test for injection via env-entry in web.xml + * A test for managed bean injection via env-entry in web.xml * * @author Stuart Douglas */ @@ -26,7 +26,6 @@ public class EnvEntryInjectionTestCase { public static WebArchive deployment() { WebArchive war = ShrinkWrap.create(WebArchive.class, "war-example.war"); war.addClasses( - EnvEntryInjectionServlet.class, EnvEntryManagedBean.class, EnvEntryInjectionTestCase.class ); diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryManagedBean.java b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryManagedBean.java similarity index 95% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryManagedBean.java rename to testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryManagedBean.java index 260f9c0cfd8b..ffc0230b6ba8 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryManagedBean.java +++ b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryManagedBean.java @@ -10,6 +10,7 @@ /** * @author Stuart Douglas */ +@SuppressWarnings("deprecation") @ManagedBean public class EnvEntryManagedBean { diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/noncomponent/ComponentResourceInjection.java b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/noncomponent/ComponentResourceInjection.java similarity index 72% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/noncomponent/ComponentResourceInjection.java rename to testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/noncomponent/ComponentResourceInjection.java index 554c374a496c..e2455b43f9ee 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/noncomponent/ComponentResourceInjection.java +++ b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/noncomponent/ComponentResourceInjection.java @@ -9,10 +9,13 @@ import jakarta.transaction.UserTransaction; /** - * This class is a managed bean, and it's resource injection should be able to be looked up + * This class is a managed bean, and it's resource injection should be able to be looked up. + * In the ee11 source tree this is an {@code @Singleton} as the {@code @ManagedBean} + * annotation is not available in EE 11. * * @author Stuart Douglas */ +@SuppressWarnings("deprecation") @ManagedBean public class ComponentResourceInjection { diff --git a/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/persistencecontextref/PcBean.java b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/persistencecontextref/PcBean.java new file mode 100644 index 000000000000..079e4ee63000 --- /dev/null +++ b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/persistencecontextref/PcBean.java @@ -0,0 +1,27 @@ +/* + * Copyright The WildFly Authors + * SPDX-License-Identifier: Apache-2.0 + */ +package org.jboss.as.test.integration.ee.injection.resource.persistencecontextref; + +import jakarta.annotation.ManagedBean; +import jakarta.persistence.EntityManager; + +/** + * Managed bean with persistence unit definitions. + * In the ee11 source tree this is an {@code @Singleton} as the {@code @ManagedBean} + * annotation is not available in EE 11. + * @author Stuart Douglas + */ +@SuppressWarnings("deprecation") +@ManagedBean("pcManagedBean") +public class PcBean extends AbstractPcBean { + + //this one is injected via deployment descriptor + private EntityManager mypc2; + + @Override + public EntityManager getMypc2() { + return mypc2; + } +} diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/persistenceunitref/PuManagedBean.java b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/persistenceunitref/PuBean.java similarity index 84% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/persistenceunitref/PuManagedBean.java rename to testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/persistenceunitref/PuBean.java index f96499bcc6dc..48cab2ee8b04 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/persistenceunitref/PuManagedBean.java +++ b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/persistenceunitref/PuBean.java @@ -10,10 +10,14 @@ /** * Managed bean with persistence unit definitions. + * In the ee11 source tree this is an {@code @Singleton} as the {@code @ManagedBean} + * annotation is not available in EE 11. + * * @author Stuart Douglas */ +@SuppressWarnings("deprecation") @ManagedBean("puManagedBean") -public class PuManagedBean { +public class PuBean { @PersistenceUnit(unitName = "mypc") private EntityManagerFactory mypu; diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/producer/ProducerInjectionTestCase.java b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/producer/ProducerInjectionTestCase.java similarity index 100% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/producer/ProducerInjectionTestCase.java rename to testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/producer/ProducerInjectionTestCase.java diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/producer/SimpleBeanServlet.java b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/producer/SimpleBeanServlet.java similarity index 100% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/producer/SimpleBeanServlet.java rename to testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/producer/SimpleBeanServlet.java diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/producer/SimpleManagedBean.java b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/producer/SimpleManagedBean.java similarity index 100% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/producer/SimpleManagedBean.java rename to testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/producer/SimpleManagedBean.java diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/producer/SimpleProducerBean.java b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/producer/SimpleProducerBean.java similarity index 100% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/producer/SimpleProducerBean.java rename to testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/producer/SimpleProducerBean.java diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/DatasourceManagedBean.java b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/DatasourceBean.java similarity index 59% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/DatasourceManagedBean.java rename to testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/DatasourceBean.java index 452dcd6c37e2..fc816c85ced7 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/DatasourceManagedBean.java +++ b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/DatasourceBean.java @@ -5,14 +5,20 @@ package org.jboss.as.test.integration.ee.injection.resource.resourceref; -import jakarta.annotation.ManagedBean; import javax.sql.DataSource; +import jakarta.annotation.ManagedBean; + /** + * Used in ResourceRefTestCase to test datasource injection via res-ref. + * In the ee11 source tree this is an {@code @Singleton} as the {@code @ManagedBean} + * annotation is not available in EE 11. + * * @author Stuart Douglas */ +@SuppressWarnings("deprecation") @ManagedBean("datasourceManagedBean") -public class DatasourceManagedBean { +public class DatasourceBean { private DataSource ds; diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/support/managedbean/ComplicatedManagedBean.java b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/support/managedbean/ComplicatedManagedBean.java similarity index 100% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/support/managedbean/ComplicatedManagedBean.java rename to testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/support/managedbean/ComplicatedManagedBean.java diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/support/managedbean/InterceptedManagedBean.java b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/support/managedbean/InterceptedManagedBean.java similarity index 100% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/support/managedbean/InterceptedManagedBean.java rename to testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/support/managedbean/InterceptedManagedBean.java diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/support/managedbean/ManagedBeanConstructTestCase.java b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/support/managedbean/ManagedBeanConstructTestCase.java similarity index 100% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/support/managedbean/ManagedBeanConstructTestCase.java rename to testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/support/managedbean/ManagedBeanConstructTestCase.java diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/support/managedbean/ManagedBeanWithInject.java b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/support/managedbean/ManagedBeanWithInject.java similarity index 100% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/support/managedbean/ManagedBeanWithInject.java rename to testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/ee/injection/support/managedbean/ManagedBeanWithInject.java diff --git a/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/jpa/mockprovider/classtransformer/TestPersistenceProvider.java b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/jpa/mockprovider/classtransformer/TestPersistenceProvider.java new file mode 100644 index 000000000000..7b03c3f43ed2 --- /dev/null +++ b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/jpa/mockprovider/classtransformer/TestPersistenceProvider.java @@ -0,0 +1,14 @@ +/* + * Copyright The WildFly Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package org.jboss.as.test.integration.jpa.mockprovider.classtransformer; + +/** + * EE 10 variant of AbstractTestPersistenceProvider + * + * @author Brian Stansberry + */ +public class TestPersistenceProvider extends AbstractTestPersistenceProvider { +} diff --git a/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/jpa/mockprovider/skipquerydetach/TestPersistenceProvider.java b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/jpa/mockprovider/skipquerydetach/TestPersistenceProvider.java new file mode 100644 index 000000000000..85096685f9b9 --- /dev/null +++ b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/jpa/mockprovider/skipquerydetach/TestPersistenceProvider.java @@ -0,0 +1,14 @@ +/* + * Copyright The WildFly Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package org.jboss.as.test.integration.jpa.mockprovider.skipquerydetach; + +/** + * EE 10 variant of AbstractTestPersistenceProvider + * + * @author Brian Stansberry + */ +public class TestPersistenceProvider extends AbstractTestPersistenceProvider { +} diff --git a/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/jpa/mockprovider/txtimeout/TestPersistenceProvider.java b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/jpa/mockprovider/txtimeout/TestPersistenceProvider.java new file mode 100644 index 000000000000..29c8df3d50af --- /dev/null +++ b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/jpa/mockprovider/txtimeout/TestPersistenceProvider.java @@ -0,0 +1,14 @@ +/* + * Copyright The WildFly Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package org.jboss.as.test.integration.jpa.mockprovider.txtimeout; + +/** + * EE 10 variant of AbstractTestPersistenceProvider. + *c + * @author Brian Stansberry + */ +public class TestPersistenceProvider extends AbstractTestPersistenceProvider { +} diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/implicitcomponents/ImplicitComponentTestCase.java b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/weld/implicitcomponents/ImplicitComponentTestCase.java similarity index 100% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/implicitcomponents/ImplicitComponentTestCase.java rename to testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/weld/implicitcomponents/ImplicitComponentTestCase.java diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/implicitcomponents/ManagedBean1.java b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/weld/implicitcomponents/ManagedBean1.java similarity index 100% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/implicitcomponents/ManagedBean1.java rename to testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/weld/implicitcomponents/ManagedBean1.java diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/implicitcomponents/ManagedBean2.java b/testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/weld/implicitcomponents/ManagedBean2.java similarity index 100% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/implicitcomponents/ManagedBean2.java rename to testsuite/integration/basic/src/test/ee10/java/org/jboss/as/test/integration/weld/implicitcomponents/ManagedBean2.java diff --git a/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/ee/injection/resource/noncomponent/ComponentResourceInjection.java b/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/ee/injection/resource/noncomponent/ComponentResourceInjection.java new file mode 100644 index 000000000000..6104a6ca0448 --- /dev/null +++ b/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/ee/injection/resource/noncomponent/ComponentResourceInjection.java @@ -0,0 +1,23 @@ +/* + * Copyright The WildFly Authors + * SPDX-License-Identifier: Apache-2.0 + */ +package org.jboss.as.test.integration.ee.injection.resource.noncomponent; + +import jakarta.annotation.Resource; +import jakarta.ejb.Singleton; +import jakarta.transaction.UserTransaction; + +/** + * This class is an EE component, and it's resource injection should be able to be looked up. + * In the ee11 source tree this is an {@code @ManagedBean}, a type that is not available in EE 11. + * + * @author Stuart Douglas + */ +@Singleton +public class ComponentResourceInjection { + + @Resource + private UserTransaction userTransaction; + +} diff --git a/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/ee/injection/resource/persistencecontextref/PcBean.java b/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/ee/injection/resource/persistencecontextref/PcBean.java new file mode 100644 index 000000000000..f01a97bff89a --- /dev/null +++ b/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/ee/injection/resource/persistencecontextref/PcBean.java @@ -0,0 +1,27 @@ +/* + * Copyright The WildFly Authors + * SPDX-License-Identifier: Apache-2.0 + */ +package org.jboss.as.test.integration.ee.injection.resource.persistencecontextref; + +import jakarta.ejb.Singleton; +import jakarta.persistence.EntityManager; + +/** + * Managed bean with persistence unit definitions. + * In the ee11 source tree this is an {@code @ManagedBean}, a type that is not available in EE 11. + * + * @author Stuart Douglas + */ +@Singleton(name="pcManagedBean") +public class PcBean extends AbstractPcBean { + + + //this one is injected via deployment descriptor + private EntityManager mypc2; + + @Override + public EntityManager getMypc2() { + return mypc2; + } +} diff --git a/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/ee/injection/resource/persistenceunitref/PuBean.java b/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/ee/injection/resource/persistenceunitref/PuBean.java new file mode 100644 index 000000000000..f52774f2c51b --- /dev/null +++ b/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/ee/injection/resource/persistenceunitref/PuBean.java @@ -0,0 +1,41 @@ +/* + * Copyright The WildFly Authors + * SPDX-License-Identifier: Apache-2.0 + */ +package org.jboss.as.test.integration.ee.injection.resource.persistenceunitref; + +import jakarta.ejb.Singleton; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceUnit; + +/** + * Managed bean with persistence unit definitions. + * In the ee11 source tree this is an {@code @ManagedBean}, a type that is not available in EE 11. + * + * @author Stuart Douglas + */ +@Singleton(name="puManagedBean") +public class PuBean { + + @PersistenceUnit(unitName = "mypc") + private EntityManagerFactory mypu; + + //this one will be overridden via deployment descriptor to be otherpc + @PersistenceUnit(unitName = "mypc", name = "otherPcBinding") + private EntityManagerFactory otherpc; + + //this one is injected via deployment descriptor + private EntityManagerFactory mypu2; + + public EntityManagerFactory getMypu2() { + return mypu2; + } + + public EntityManagerFactory getMypu() { + return mypu; + } + + public EntityManagerFactory getOtherpc() { + return otherpc; + } +} diff --git a/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/DatasourceBean.java b/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/DatasourceBean.java new file mode 100644 index 000000000000..80bb5517bc94 --- /dev/null +++ b/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/DatasourceBean.java @@ -0,0 +1,26 @@ +/* + * Copyright The WildFly Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package org.jboss.as.test.integration.ee.injection.resource.resourceref; + +import javax.sql.DataSource; + +import jakarta.ejb.Singleton; + +/** + * Used in ResourceRefTestCase to test datasource injection via res-ref. + * In the ee11 source tree this is an {@code @ManagedBean}, a type that is not available in EE 11. + * + * @author Stuart Douglas + */ +@Singleton(name="datasourceManagedBean") +public class DatasourceBean { + + private DataSource ds; + + public DataSource getDataSource() { + return ds; + } +} diff --git a/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/jpa/mockprovider/classtransformer/TestPersistenceProvider.java b/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/jpa/mockprovider/classtransformer/TestPersistenceProvider.java new file mode 100644 index 000000000000..9b6db84e5734 --- /dev/null +++ b/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/jpa/mockprovider/classtransformer/TestPersistenceProvider.java @@ -0,0 +1,22 @@ +/* + * Copyright The WildFly Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package org.jboss.as.test.integration.jpa.mockprovider.classtransformer; + +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceConfiguration; + +/** + * EE 11 variant of AbstractTestPersistenceProvider + * + * @author Brian Stansberry + */ +public class TestPersistenceProvider extends AbstractTestPersistenceProvider { + + @Override + public EntityManagerFactory createEntityManagerFactory(PersistenceConfiguration configuration) { + return null; + } +} diff --git a/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/jpa/mockprovider/skipquerydetach/TestPersistenceProvider.java b/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/jpa/mockprovider/skipquerydetach/TestPersistenceProvider.java new file mode 100644 index 000000000000..8ce061be7990 --- /dev/null +++ b/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/jpa/mockprovider/skipquerydetach/TestPersistenceProvider.java @@ -0,0 +1,22 @@ +/* + * Copyright The WildFly Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package org.jboss.as.test.integration.jpa.mockprovider.skipquerydetach; + +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceConfiguration; + +/** + * EE 11 variant of AbstractTestPersistenceProvider + * + * @author Brian Stansberry + */ +public class TestPersistenceProvider extends AbstractTestPersistenceProvider { + + @Override + public EntityManagerFactory createEntityManagerFactory(PersistenceConfiguration configuration) { + return null; + } +} diff --git a/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/jpa/mockprovider/txtimeout/TestPersistenceProvider.java b/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/jpa/mockprovider/txtimeout/TestPersistenceProvider.java new file mode 100644 index 000000000000..6a514d02957b --- /dev/null +++ b/testsuite/integration/basic/src/test/ee11/java/org/jboss/as/test/integration/jpa/mockprovider/txtimeout/TestPersistenceProvider.java @@ -0,0 +1,22 @@ +/* + * Copyright The WildFly Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package org.jboss.as.test.integration.jpa.mockprovider.txtimeout; + +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceConfiguration; + +/** + * EE 11 variant of AbstractTestPersistenceProvider. + *c + * @author Brian Stansberry + */ +public class TestPersistenceProvider extends AbstractTestPersistenceProvider { + + @Override + public EntityManagerFactory createEntityManagerFactory(PersistenceConfiguration configuration) { + return null; + } +} diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/DuplicateGlobalBindingInjectionTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/DuplicateGlobalBindingInjectionTestCase.java index 98608c677c79..45c2184c84af 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/DuplicateGlobalBindingInjectionTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/DuplicateGlobalBindingInjectionTestCase.java @@ -30,7 +30,6 @@ public static WebArchive deployment1() { WebArchive war = ShrinkWrap.create(WebArchive.class, "dep1.war"); war.addClasses( EnvEntryInjectionServlet.class, - EnvEntryManagedBean.class, DuplicateGlobalBindingInjectionTestCase.class); war.addAsWebInfResource(getWebXml(), "web.xml"); return war; @@ -43,7 +42,6 @@ public static WebArchive deployment2() { // war.addPackage(DuplicateGlobalBindingInjectionTestCase.class.getPackage()); war.addClasses( EnvEntryInjectionServlet.class, - EnvEntryManagedBean.class, DuplicateGlobalBindingInjectionTestCase.class); war.addAsWebInfResource(getWebXml(), "web.xml"); return war; @@ -82,12 +80,6 @@ private static StringAsset getWebXml() { " \n" + " \n" + "\n" + - " \n" + - " " + EnvEntryManagedBean.class.getName() + "/existingString\n" + - " bye\n" + - " java.lang.String\n" + - " \n" + - "\n" + ""); } } diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryInjectionServletTestCase-web.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryInjectionServletTestCase-web.xml new file mode 100644 index 000000000000..06bdd18b0eec --- /dev/null +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryInjectionServletTestCase-web.xml @@ -0,0 +1,23 @@ + + + + + + + + foo + injection! + + org.jboss.as.test.integration.ee.injection.resource.enventry.EnvEntryInjectionServlet + field + + + + \ No newline at end of file diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryInjectionServletTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryInjectionServletTestCase.java index b36d5a889750..289356b89c5a 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryInjectionServletTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryInjectionServletTestCase.java @@ -32,8 +32,8 @@ public class EnvEntryInjectionServletTestCase { @Deployment public static WebArchive deployment() { WebArchive war = ShrinkWrap.create(WebArchive.class, "war-example.war"); - war.addClasses(EnvEntryInjectionServlet.class, EnvEntryManagedBean.class); - war.addAsWebInfResource(EnvEntryInjectionServletTestCase.class.getPackage(), "EnvEntryInjectionTestCase-web.xml", "web.xml"); + war.addClasses(EnvEntryInjectionServlet.class); + war.addAsWebInfResource(EnvEntryInjectionServletTestCase.class.getPackage(), "EnvEntryInjectionServletTestCase-web.xml", "web.xml"); return war; } diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryInjectionTestCase-web.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryInjectionTestCase-web.xml index 9cdce56ef2e2..9a8da1a3a6ff 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryInjectionTestCase-web.xml +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/enventry/EnvEntryInjectionTestCase-web.xml @@ -5,21 +5,15 @@ ~ SPDX-License-Identifier: Apache-2.0 --> + - - foo - injection! - - org.jboss.as.test.integration.ee.injection.resource.enventry.EnvEntryInjectionServlet - field - - - org.jboss.as.test.integration.ee.injection.resource.enventry.EnvEntryManagedBean/existingString bye diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/Bean1.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/Bean1.java index aa38f1224f6d..3dec7950c003 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/Bean1.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/Bean1.java @@ -4,13 +4,13 @@ */ package org.jboss.as.test.integration.ee.injection.resource.multipleinterceptors; -import jakarta.annotation.ManagedBean; +import jakarta.ejb.Stateless; import jakarta.interceptor.Interceptors; /** * @author Stuart Douglas */ -@ManagedBean("bean1") +@Stateless(name="bean1") @Interceptors(MyInterceptor.class) public class Bean1 { } diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/Bean2.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/Bean2.java index c36bf1c74365..43ca4ecefd51 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/Bean2.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/Bean2.java @@ -4,13 +4,13 @@ */ package org.jboss.as.test.integration.ee.injection.resource.multipleinterceptors; -import jakarta.annotation.ManagedBean; +import jakarta.ejb.Stateless; import jakarta.interceptor.Interceptors; /** * @author Stuart Douglas */ -@ManagedBean("bean2") +@Stateless(name="bean2") @Interceptors(MyInterceptor.class) public class Bean2 { } diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/BindingsOnInterceptorTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/BindingsOnInterceptorTestCase.java index 306983c59fdc..2584e174b86f 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/BindingsOnInterceptorTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/BindingsOnInterceptorTestCase.java @@ -29,15 +29,15 @@ public class BindingsOnInterceptorTestCase { @Deployment public static Archive deployment() { WebArchive war = ShrinkWrap.create(WebArchive.class, "multiple-bindings-interceptors.war"); - war.addClasses(Bean1.class, Bean2.class, BindingsOnInterceptorTestCase.class, MyInterceptor.class, SimpleManagedBean.class); + war.addClasses(Bean1.class, Bean2.class, BindingsOnInterceptorTestCase.class, MyInterceptor.class, SimpleStatelessBean.class); return war; } @Test public void testCorrectBinding() throws NamingException { InitialContext context = new InitialContext(); - Object result = context.lookup("java:module/env/" + MyInterceptor.class.getName() + "/simpleManagedBean"); - Assert.assertTrue(result instanceof SimpleManagedBean); + Object result = context.lookup("java:module/env/" + MyInterceptor.class.getName() + "/simpleStatelessBean"); + Assert.assertTrue(result instanceof SimpleStatelessBean); } } diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/MyInterceptor.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/MyInterceptor.java index 5bb07cc054ee..0590c70ee8d5 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/MyInterceptor.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/MyInterceptor.java @@ -14,10 +14,10 @@ public class MyInterceptor { /** - * This should create a binding for java:module/env/org.jboss.as.test.integration.injection.resource.multiple.MyInterceptor/simpleManagedBean + * This should create a binding for java:module/env/org.jboss.as.test.integration.injection.resource.multiple.MyInterceptor/simpleStatelessBean */ - @Resource(lookup="java:module/simpleManagedBean") - private SimpleManagedBean simpleManagedBean; + @Resource(lookup="java:module/simpleStatelessBean") + private SimpleStatelessBean simpleStatelessBean; @AroundInvoke public Object intercept(InvocationContext context ) throws Exception { diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/SimpleManagedBean.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/SimpleStatelessBean.java similarity index 65% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/SimpleManagedBean.java rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/SimpleStatelessBean.java index 62c9f0d2ad90..801f429b5282 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/SimpleManagedBean.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/multipleinterceptors/SimpleStatelessBean.java @@ -4,11 +4,11 @@ */ package org.jboss.as.test.integration.ee.injection.resource.multipleinterceptors; -import jakarta.annotation.ManagedBean; +import jakarta.ejb.Stateless; /** * @author Stuart Douglas */ -@ManagedBean("simpleManagedBean") -public class SimpleManagedBean { +@Stateless(name="simpleStatelessBean") +public class SimpleStatelessBean { } diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/persistencecontextref/PcManagedBean.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/persistencecontextref/AbstractPcBean.java similarity index 75% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/persistencecontextref/PcManagedBean.java rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/persistencecontextref/AbstractPcBean.java index e5a646b82988..8d54ccdac336 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/persistencecontextref/PcManagedBean.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/persistencecontextref/AbstractPcBean.java @@ -2,19 +2,20 @@ * Copyright The WildFly Authors * SPDX-License-Identifier: Apache-2.0 */ + package org.jboss.as.test.integration.ee.injection.resource.persistencecontextref; -import jakarta.annotation.ManagedBean; import jakarta.ejb.EJB; import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceContext; /** - * Managed bean with persistence unit definitions. + * Abstract superclass for EE components with persistence unit definitions. + * Concrete implementations using different component tupes are in src/test/ee10/java and src/test/ee11/java. + * * @author Stuart Douglas */ -@ManagedBean("pcManagedBean") -public class PcManagedBean { +public abstract class AbstractPcBean { @PersistenceContext(unitName = "mypc") private EntityManager mypc; @@ -26,13 +27,7 @@ public class PcManagedBean { @EJB SFSB sfsb; - - //this one is injected via deployment descriptor - private EntityManager mypc2; - - public EntityManager getMypc2() { - return mypc2; - } + public abstract EntityManager getMypc2(); public EntityManager getMypc() { return mypc; @@ -49,5 +44,4 @@ public boolean unsynchronizedIsNotJoinedToTX() { public boolean synchronizedIsJoinedToTX() { return sfsb.synchronizedIsJoinedToTX(); } - } diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/persistencecontextref/PersistenceContextRefTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/persistencecontextref/PersistenceContextRefTestCase.java index a48e5ad05bef..3fc15e841ffc 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/persistencecontextref/PersistenceContextRefTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/persistencecontextref/PersistenceContextRefTestCase.java @@ -61,14 +61,14 @@ public static Archive deploy() { @Test public void testCorrectPersistenceUnitInjectedFromAnnotation() throws NamingException { - PcManagedBean bean = getManagedBean(); + PcBean bean = getManagedBean(); bean.getMypc().getMetamodel().entity(PcMyEntity.class); } @Test public void testCorrectPersistenceUnitInjectedFromAnnotation2() throws NamingException { try { - PcManagedBean bean = getManagedBean(); + PcBean bean = getManagedBean(); bean.getMypc().getMetamodel().entity(PcOtherEntity.class); Assert.fail(); } catch (IllegalArgumentException expected) { @@ -79,7 +79,7 @@ public void testCorrectPersistenceUnitInjectedFromAnnotation2() throws NamingExc @Test public void testCorrectPersistenceUnitInjectedFromPersistenceUnitRef() throws NamingException { try { - PcManagedBean bean = getManagedBean(); + PcBean bean = getManagedBean(); bean.getOtherpc().getMetamodel().entity(PcMyEntity.class); Assert.fail(); } catch (IllegalArgumentException expected) { @@ -89,20 +89,20 @@ public void testCorrectPersistenceUnitInjectedFromPersistenceUnitRef() throws Na @Test public void testCorrectPersistenceUnitInjectedFromPersistenceUnitRef2() throws NamingException { - PcManagedBean bean = getManagedBean(); + PcBean bean = getManagedBean(); bean.getOtherpc().getMetamodel().entity(PcOtherEntity.class); } @Test public void testCorrectPersistenceUnitInjectedFromRefInjectionTarget() throws NamingException { - PcManagedBean bean = getManagedBean(); + PcBean bean = getManagedBean(); bean.getMypc2().getMetamodel().entity(PcMyEntity.class); } @Test public void testCorrectPersistenceUnitInjectedFromRefInjectionTarget2() throws NamingException { try { - PcManagedBean bean = getManagedBean(); + PcBean bean = getManagedBean(); bean.getMypc2().getMetamodel().entity(PcOtherEntity.class); Assert.fail(); } catch (IllegalArgumentException expected) { @@ -112,21 +112,21 @@ public void testCorrectPersistenceUnitInjectedFromRefInjectionTarget2() throws N @Test public void testUnsynchronizedPCisNotJoinedToTransaction() throws NamingException { - PcManagedBean bean = getManagedBean(); + PcBean bean = getManagedBean(); boolean isJoined = bean.unsynchronizedIsNotJoinedToTX(); Assert.assertFalse("Unsynchronized entity manager should not of been joined to the JTA transaction but was",isJoined); } @Test public void testSynchronizedPCisJoinedToTransaction() throws NamingException { - PcManagedBean bean = getManagedBean(); + PcBean bean = getManagedBean(); boolean isJoined = bean.synchronizedIsJoinedToTX(); Assert.assertTrue("Synchronized entity manager should of been joined to the JTA transaction but was not",isJoined); } - private PcManagedBean getManagedBean() throws NamingException { + private PcBean getManagedBean() throws NamingException { InitialContext initialContext = new InitialContext(); - PcManagedBean bean = (PcManagedBean) initialContext.lookup("java:module/pcManagedBean"); + PcBean bean = (PcBean) initialContext.lookup("java:module/pcManagedBean"); assertNotNull(bean); return bean; } @@ -154,7 +154,7 @@ private static StringAsset getWebXml() { " AnotherPuBinding\n" + " mypc\n" + " " + - " " + PcManagedBean.class.getName() + "" + + " " + PcBean.class.getName() + "" + " mypc2" + " \n" + " \n" + diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/persistenceunitref/PersistenceUnitRefTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/persistenceunitref/PersistenceUnitRefTestCase.java index 5129ffa6113b..aaaf58179858 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/persistenceunitref/PersistenceUnitRefTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/persistenceunitref/PersistenceUnitRefTestCase.java @@ -62,14 +62,14 @@ public static Archive deploy() { @Test public void testCorrectPersistenceUnitInjectedFromAnnotation() throws NamingException { - PuManagedBean bean = getManagedBean(); + PuBean bean = getManagedBean(); bean.getMypu().getMetamodel().entity(PuMyEntity.class); } @Test public void testCorrectPersistenceUnitInjectedFromAnnotation2() throws NamingException { try { - PuManagedBean bean = getManagedBean(); + PuBean bean = getManagedBean(); bean.getMypu().getMetamodel().entity(PuOtherEntity.class); } catch (IllegalArgumentException e) { //all is fine! @@ -81,7 +81,7 @@ public void testCorrectPersistenceUnitInjectedFromAnnotation2() throws NamingExc @Test public void testCorrectPersistenceUnitInjectedFromPersistenceUnitRef() throws NamingException { try { - PuManagedBean bean = getManagedBean(); + PuBean bean = getManagedBean(); bean.getOtherpc().getMetamodel().entity(PuMyEntity.class); } catch (IllegalArgumentException e) { //all is fine! @@ -92,20 +92,20 @@ public void testCorrectPersistenceUnitInjectedFromPersistenceUnitRef() throws Na @Test public void testCorrectPersistenceUnitInjectedFromPersistenceUnitRef2() throws NamingException { - PuManagedBean bean = getManagedBean(); + PuBean bean = getManagedBean(); bean.getOtherpc().getMetamodel().entity(PuOtherEntity.class); } @Test public void testCorrectPersistenceUnitInjectedFromRefInjectionTarget() throws NamingException { - PuManagedBean bean = getManagedBean(); + PuBean bean = getManagedBean(); bean.getMypu2().getMetamodel().entity(PuMyEntity.class); } @Test public void testCorrectPersistenceUnitInjectedFromRefInjectionTarget2() throws NamingException { try { - PuManagedBean bean = getManagedBean(); + PuBean bean = getManagedBean(); bean.getMypu2().getMetamodel().entity(PuOtherEntity.class); } catch (IllegalArgumentException e) { //all is fine! @@ -115,9 +115,9 @@ public void testCorrectPersistenceUnitInjectedFromRefInjectionTarget2() throws N } - private PuManagedBean getManagedBean() throws NamingException { + private PuBean getManagedBean() throws NamingException { InitialContext initialContext = new InitialContext(); - PuManagedBean bean = (PuManagedBean) initialContext.lookup("java:module/puManagedBean"); + PuBean bean = (PuBean) initialContext.lookup("java:module/puManagedBean"); assertNotNull(bean); return bean; } @@ -140,7 +140,7 @@ private static StringAsset getWebXml() { " AnotherPuBinding\n" + " mypc\n" + " " + - " "+ PuManagedBean.class.getName()+""+ + " "+ PuBean.class.getName()+""+ " mypu2" + " \n" + " \n" + diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/ResourceRefTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/ResourceRefTestCase.java index 92f5be0e3fad..62eee38c21ab 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/ResourceRefTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/ResourceRefTestCase.java @@ -31,7 +31,7 @@ * Tests that @Resource bindings on interceptors that are applied to multiple * components without their own naming context work properly, and do not try * and create two duplicate bindings in the same namespace. - * + *

* Migration test from EJB Testsuite (ejbthree-1823, ejbthree-1858) to AS7 [JIRA JBQA-5483]. * - ResourceHandler when resource-ref type is not specified. * - EJBContext is configured through ejb-jar.xml as a resource-env-ref. @@ -49,7 +49,7 @@ public static Archive deployment() { WebArchive war = ShrinkWrap.create(WebArchive.class, "managed-bean.war"); war.addAsWebInfResource(ResourceRefTestCase.class.getPackage(),"web.xml", "web.xml"); war.addAsWebInfResource(ResourceRefTestCase.class.getPackage(),"jboss-web.xml", "jboss-web.xml"); - war.addClasses(ResourceRefTestCase.class, DatasourceManagedBean.class, CreateQueueSetupTask.class); + war.addClasses(ResourceRefTestCase.class, DatasourceBean.class, CreateQueueSetupTask.class); JavaArchive jar = ShrinkWrap.create(JavaArchive.class, "resource-ref-test.jar"); jar.addClasses(ResourceRefBean.class, ResourceRefRemote.class, StatelessBean.class, StatelessBeanRemote.class, ResUrlChecker.class, ResUrlCheckerBean.class); @@ -78,7 +78,7 @@ public void testIgnoredDependency() throws NamingException { @Test public void testInjection() throws NamingException { InitialContext context = new InitialContext(); - DatasourceManagedBean bean = (DatasourceManagedBean)context.lookup("java:module/datasourceManagedBean"); + DatasourceBean bean = (DatasourceBean)context.lookup("java:module/datasourceManagedBean"); Assert.assertNotNull(bean.getDataSource()); } diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/web.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/web.xml index 3420d2c7146f..974a8220df88 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/web.xml +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/resourceref/web.xml @@ -13,7 +13,7 @@ ds java:jboss/datasources/ExampleDS - org.jboss.as.test.integration.ee.injection.resource.resourceref.DatasourceManagedBean + org.jboss.as.test.integration.ee.injection.resource.resourceref.DatasourceBean ds diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/Bean1.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/Bean1.java index dabee3fb9ad7..373736cf7aa3 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/Bean1.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/Bean1.java @@ -4,21 +4,21 @@ */ package org.jboss.as.test.integration.ee.injection.resource.superclass; -import jakarta.annotation.ManagedBean; +import jakarta.ejb.Stateless; /** * @author Stuart Douglas */ -@ManagedBean("bean1") +@Stateless(name="bean1") public class Bean1 extends SuperBean { - public SimpleManagedBean getBean() { - return simpleManagedBean; + public SimpleStatelessBean getBean() { + return simpleStatelessBean; } /** * We override the superclass method. These should be no injection done - * @param simpleString + * @param simpleString the string */ public void setSimpleString(final String simpleString) { super.setSimpleString(simpleString); diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/Bean2.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/Bean2.java index d20144bd372f..420fccffc839 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/Bean2.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/Bean2.java @@ -4,17 +4,17 @@ */ package org.jboss.as.test.integration.ee.injection.resource.superclass; -import jakarta.annotation.ManagedBean; import jakarta.annotation.Resource; +import jakarta.ejb.Stateless; /** * @author Stuart Douglas */ -@ManagedBean("bean2") +@Stateless(name="bean2") public class Bean2 extends SuperBean { - public SimpleManagedBean getBean() { - return simpleManagedBean; + public SimpleStatelessBean getBean() { + return simpleStatelessBean; } int setCount = 0; diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/SimpleManagedBean.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/SimpleStatelessBean.java similarity index 64% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/SimpleManagedBean.java rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/SimpleStatelessBean.java index d27d6f0f429c..f94228691b13 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/SimpleManagedBean.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/SimpleStatelessBean.java @@ -4,11 +4,11 @@ */ package org.jboss.as.test.integration.ee.injection.resource.superclass; -import jakarta.annotation.ManagedBean; +import jakarta.ejb.Stateless; /** * @author Stuart Douglas */ -@ManagedBean("simpleManagedBean") -public class SimpleManagedBean { +@Stateless(name="simpleStatelessBean") +public class SimpleStatelessBean { } diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/SuperBean.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/SuperBean.java index 5a14b3d63421..36f601202031 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/SuperBean.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/SuperBean.java @@ -14,8 +14,8 @@ public class SuperBean { /** * This should create a binding for java:module/env/org.jboss.as.test.integration.injection.resource.superclass.SuperBean/simpleManagedBean */ - @Resource(lookup = "java:module/simpleManagedBean") - protected SimpleManagedBean simpleManagedBean; + @Resource(lookup = "java:module/simpleStatelessBean") + protected SimpleStatelessBean simpleStatelessBean; private String simpleString; diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/SuperClassInjectionTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/SuperClassInjectionTestCase.java index a12d2f93cfe4..dc4de3869780 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/SuperClassInjectionTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/injection/resource/superclass/SuperClassInjectionTestCase.java @@ -29,7 +29,7 @@ public class SuperClassInjectionTestCase { @Deployment public static Archive deployment() { WebArchive war = ShrinkWrap.create(WebArchive.class, "multiple-bindings-superclass.war"); - war.addClasses(Bean1.class, Bean2.class, SuperClassInjectionTestCase.class, SuperBean.class, SimpleManagedBean.class); + war.addClasses(Bean1.class, Bean2.class, SuperClassInjectionTestCase.class, SuperBean.class, SimpleStatelessBean.class); war.addAsWebInfResource(SuperClassInjectionTestCase.class.getPackage(), "web.xml", "web.xml"); return war; } @@ -37,8 +37,8 @@ public static Archive deployment() { @Test public void testCorrectBinding() throws NamingException { InitialContext context = new InitialContext(); - Object result = context.lookup("java:module/env/" + SuperBean.class.getName() + "/simpleManagedBean"); - Assert.assertTrue(result instanceof SimpleManagedBean); + Object result = context.lookup("java:module/env/" + SuperBean.class.getName() + "/simpleStatelessBean"); + Assert.assertTrue(result instanceof SimpleStatelessBean); } @@ -46,14 +46,14 @@ public void testCorrectBinding() throws NamingException { public void testSubClass1Injected() throws NamingException { InitialContext context = new InitialContext(); Bean1 result = (Bean1) context.lookup("java:module/bean1"); - Assert.assertTrue(result.getBean() instanceof SimpleManagedBean); + Assert.assertTrue(result.getBean() instanceof SimpleStatelessBean); } @Test public void testSubClass2Injected() throws NamingException { InitialContext context = new InitialContext(); Bean2 result = (Bean2) context.lookup("java:module/bean2"); - Assert.assertTrue(result.getBean() instanceof SimpleManagedBean); + Assert.assertTrue(result.getBean() instanceof SimpleStatelessBean); } //AS7-6500 diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/classtransformer/TestPersistenceProvider.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/classtransformer/AbstractTestPersistenceProvider.java similarity index 94% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/classtransformer/TestPersistenceProvider.java rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/classtransformer/AbstractTestPersistenceProvider.java index 5cc6299a8c56..c981d5104ad1 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/classtransformer/TestPersistenceProvider.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/classtransformer/AbstractTestPersistenceProvider.java @@ -8,17 +8,18 @@ import java.lang.reflect.Proxy; import java.util.HashMap; import java.util.Map; + import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.spi.PersistenceProvider; import jakarta.persistence.spi.PersistenceUnitInfo; import jakarta.persistence.spi.ProviderUtil; /** - * TestPersistenceProvider + * Abstract test PersistenceProvider. EE-version-specific subclasses extend this. * * @author Scott Marlow */ -public class TestPersistenceProvider implements PersistenceProvider { +public abstract class AbstractTestPersistenceProvider implements PersistenceProvider { // key = pu name private static Map persistenceUnitInfo = new HashMap(); @@ -84,3 +85,4 @@ public static void clearLastPersistenceUnitInfo() { persistenceUnitInfo.clear(); } } + diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/classtransformer/ClassFileTransformerTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/classtransformer/ClassFileTransformerTestCase.java index 7665d7538819..93b0752f223f 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/classtransformer/ClassFileTransformerTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/classtransformer/ClassFileTransformerTestCase.java @@ -41,6 +41,7 @@ public class ClassFileTransformerTestCase { public static Archive deploy() { JavaArchive persistenceProvider = ShrinkWrap.create(JavaArchive.class, "testpersistenceprovider.jar"); persistenceProvider.addClasses( + AbstractTestPersistenceProvider.class, TestClassTransformer.class, TestEntityManagerFactory.class, TestPersistenceProvider.class, diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/skipquerydetach/TestPersistenceProvider.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/skipquerydetach/AbstractTestPersistenceProvider.java similarity index 94% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/skipquerydetach/TestPersistenceProvider.java rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/skipquerydetach/AbstractTestPersistenceProvider.java index 1bb226defb8e..19777cede455 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/skipquerydetach/TestPersistenceProvider.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/skipquerydetach/AbstractTestPersistenceProvider.java @@ -15,11 +15,11 @@ import jakarta.persistence.spi.ProviderUtil; /** - * TestPersistenceProvider + * Abstract test PersistenceProvider. EE-version-specific subclasses extend this. * * @author Scott Marlow */ -public class TestPersistenceProvider implements PersistenceProvider { +public abstract class AbstractTestPersistenceProvider implements PersistenceProvider { // key = pu name private static Map persistenceUnitInfo = new HashMap(); diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/skipquerydetach/SkipquerydetachTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/skipquerydetach/SkipquerydetachTestCase.java index 35571f064f38..97a59ef3cc1a 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/skipquerydetach/SkipquerydetachTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/skipquerydetach/SkipquerydetachTestCase.java @@ -37,6 +37,7 @@ public class SkipquerydetachTestCase { public static Archive deploy() { JavaArchive persistenceProvider = ShrinkWrap.create(JavaArchive.class, ARCHIVE_NAME + ".jar"); persistenceProvider.addClasses( + AbstractTestPersistenceProvider.class, TestClassTransformer.class, TestEntityManagerFactory.class, TestEntityManager.class, diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/txtimeout/TestPersistenceProvider.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/txtimeout/AbstractTestPersistenceProvider.java similarity index 94% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/txtimeout/TestPersistenceProvider.java rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/txtimeout/AbstractTestPersistenceProvider.java index af3c78763372..733097ae8d22 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/txtimeout/TestPersistenceProvider.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/txtimeout/AbstractTestPersistenceProvider.java @@ -8,17 +8,18 @@ import java.lang.reflect.Proxy; import java.util.HashMap; import java.util.Map; + import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.spi.PersistenceProvider; import jakarta.persistence.spi.PersistenceUnitInfo; import jakarta.persistence.spi.ProviderUtil; /** - * TestPersistenceProvider + * Abstract test PersistenceProvider. EE-version-specific subclasses extend this. * * @author Scott Marlow */ -public class TestPersistenceProvider implements PersistenceProvider { +public abstract class AbstractTestPersistenceProvider implements PersistenceProvider { // key = pu name private static Map persistenceUnitInfo = new HashMap(); diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/txtimeout/TxTimeoutTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/txtimeout/TxTimeoutTestCase.java index 89afd4d80229..c685fc06c1bc 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/txtimeout/TxTimeoutTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/mockprovider/txtimeout/TxTimeoutTestCase.java @@ -38,6 +38,7 @@ public class TxTimeoutTestCase { public static Archive deploy() { JavaArchive persistenceProvider = ShrinkWrap.create(JavaArchive.class, ARCHIVE_NAME + ".jar"); persistenceProvider.addClasses( + AbstractTestPersistenceProvider.class, TestEntityManagerFactory.class, TestEntityManager.class, TestPersistenceProvider.class diff --git a/testsuite/integration/microprofile/pom.xml b/testsuite/integration/microprofile/pom.xml index 35c0a6de6711..275b54794d23 100644 --- a/testsuite/integration/microprofile/pom.xml +++ b/testsuite/integration/microprofile/pom.xml @@ -35,8 +35,6 @@ none standalone-microprofile.xml - - src/test/jakarta/java wildfly-standard-expansion-bom diff --git a/testsuite/integration/smoke/pom.xml b/testsuite/integration/smoke/pom.xml index 6b74c54b51c5..27c21d1ec20f 100644 --- a/testsuite/integration/smoke/pom.xml +++ b/testsuite/integration/smoke/pom.xml @@ -610,6 +610,19 @@ + + org.codehaus.mojo + build-helper-maven-plugin + + + + add-ee-test-source + generate-test-sources + + + diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/BeanParent.java b/testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/BeanParent.java similarity index 100% rename from testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/BeanParent.java rename to testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/BeanParent.java diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/BeanWithSimpleInjected.java b/testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/BeanWithSimpleInjected.java similarity index 100% rename from testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/BeanWithSimpleInjected.java rename to testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/BeanWithSimpleInjected.java diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/CDIBinding.java b/testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/CDIBinding.java similarity index 76% rename from testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/CDIBinding.java rename to testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/CDIBinding.java index 9b890e75823d..396c387e9fb9 100644 --- a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/CDIBinding.java +++ b/testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/CDIBinding.java @@ -8,8 +8,10 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; @@ -17,8 +19,8 @@ /** * @author Jozef Hartinger */ -@Target({ TYPE, METHOD }) -@Retention(RUNTIME) +@Target({ ElementType.TYPE, ElementType.METHOD }) +@Retention(RetentionPolicy.RUNTIME) @Inherited @InterceptorBinding public @interface CDIBinding { diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/CDIInterceptor.java b/testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/CDIInterceptor.java similarity index 100% rename from testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/CDIInterceptor.java rename to testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/CDIInterceptor.java diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/CDIManagedBean.java b/testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/CDIManagedBean.java similarity index 100% rename from testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/CDIManagedBean.java rename to testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/CDIManagedBean.java diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/InterceptorBean.java b/testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/InterceptorBean.java similarity index 100% rename from testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/InterceptorBean.java rename to testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/InterceptorBean.java diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/InterceptorFromParent.java b/testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/InterceptorFromParent.java similarity index 100% rename from testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/InterceptorFromParent.java rename to testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/InterceptorFromParent.java diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/ManagedBeanTestCase.java b/testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/ManagedBeanTestCase.java similarity index 100% rename from testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/ManagedBeanTestCase.java rename to testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/ManagedBeanTestCase.java diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/OtherInterceptorBean.java b/testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/OtherInterceptorBean.java similarity index 100% rename from testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/OtherInterceptorBean.java rename to testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/OtherInterceptorBean.java diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/SimpleManagedBean.java b/testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/SimpleManagedBean.java similarity index 100% rename from testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/SimpleManagedBean.java rename to testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/SimpleManagedBean.java diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/SimpleProducerBean.java b/testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/SimpleProducerBean.java similarity index 100% rename from testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/managedbean/SimpleProducerBean.java rename to testsuite/integration/smoke/src/test/ee10/java/org/jboss/as/test/smoke/managedbean/SimpleProducerBean.java diff --git a/testsuite/layers-expansion/pom.xml b/testsuite/layers-expansion/pom.xml index aaa393eeed73..f9c98906acdb 100644 --- a/testsuite/layers-expansion/pom.xml +++ b/testsuite/layers-expansion/pom.xml @@ -671,7 +671,7 @@ ${full.maven.groupId} - wildfly-preview-feature-pack + ${testsuite.full.galleon.pack.artifactId} ${full.maven.version} false false diff --git a/testsuite/pom.xml b/testsuite/pom.xml index 69c202f4618d..0fb472408217 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -167,6 +167,9 @@ none + + + ee10 @@ -319,6 +322,26 @@ false + + org.codehaus.mojo + build-helper-maven-plugin + + + + add-ee-test-source + + none + + add-test-source + + + + src/test/${additional.ee.test.source}/java + + + + + @@ -468,6 +491,8 @@ ts.preview wildfly-preview-expansion-bom + + ee11 domain @@ -485,6 +510,10 @@ ts.bootable.preview + + + ee11 + integration preview @@ -503,7 +532,10 @@ + wildfly-preview-expansion-bom wildfly-test-feature-pack-preview + + ee11