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
+
+
+
+
+
+
+
+
+
@@ -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