diff --git a/rules/rules-reviewed/eap8/eap6/eap8.ejb.windup.xml b/rules/rules-reviewed/eap8/eap6/eap8.ejb.windup.xml
new file mode 100644
index 000000000..7c6acd9f2
--- /dev/null
+++ b/rules/rules-reviewed/eap8/eap6/eap8.ejb.windup.xml
@@ -0,0 +1,71 @@
+
+
+
+
+ This ruleset provides analysis of removed EJB methods in JBoss EAP 8.
+
+
+
+
+
+
+
+ eap8
+
+
+
+
+
+
+ METHOD_CALL
+
+
+ METHOD_CALL
+
+
+
+
+
+ Methods relying on `java.security.Identity` have been removed from the Jakarta Enterprise Beans 4.0 specification and api.
+ Use `Principal.getCallerPrincipal()` instead.
+
+ eap8
+
+
+
+
+
+
+ METHOD_CALL
+
+
+
+
+ Method was deprecated and has now been removed from the Jakarta Enterprise Beans 4.0 specification and api.
+ Use the JNDI naming context `java:comp/env` to access enterprise bean's environment.
+
+ eap8
+
+
+
+
+
+
+ METHOD_CALL
+
+
+
+
+ Methods relying on Jakarta XML RPC have been removed from the Jakarta Enterprise Beans 4.0 specification and api.
+
+ eap8
+
+
+
+
+
diff --git a/rules/rules-reviewed/eap8/eap6/tests/data/ejb/EJBContextMethodsTest.java b/rules/rules-reviewed/eap8/eap6/tests/data/ejb/EJBContextMethodsTest.java
new file mode 100644
index 000000000..1caef2257
--- /dev/null
+++ b/rules/rules-reviewed/eap8/eap6/tests/data/ejb/EJBContextMethodsTest.java
@@ -0,0 +1,32 @@
+package data.ejb;
+
+
+import javax.ejb.EJBContext;
+import javax.ejb.SessionContext;
+import javax.annotation.Resource;
+import java.security.Identity;
+import java.util.Properties;
+import javax.xml.rpc.handler.MessageContext;
+
+
+public class EJBContextMethodsTest {
+
+ @Resource
+ private EJBContext context;
+
+ // Inject the Session Context
+ @Resource
+ private SessionContext sessionCtx;
+
+ public String securityCalls(Identity role) {
+
+ try {
+ Identity caller = context.getCallerIdentity();
+ boolean inRole = context.isCallerInRole(role);
+ Properties env = context.getEnvironment();
+ MessageContext mCx = sessionCtx.getMessageContext();
+ }catch(Exception e){
+ System.out.println(e.getMessage());
+ }
+ }
+}
\ No newline at end of file
diff --git a/rules/rules-reviewed/eap8/eap6/tests/eap8.ejb.windup.test.xml b/rules/rules-reviewed/eap8/eap6/tests/eap8.ejb.windup.test.xml
new file mode 100644
index 000000000..c017d349f
--- /dev/null
+++ b/rules/rules-reviewed/eap8/eap6/tests/eap8.ejb.windup.test.xml
@@ -0,0 +1,48 @@
+
+
+ data/ejb
+ ../eap8.ejb.windup.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file