From be6b6ed4af07ce8d40dace520bbe587291134896 Mon Sep 17 00:00:00 2001
From: Scott Marlow <smarlow@redhat.com>
Date: Mon, 16 May 2022 12:43:07 -0400
Subject: [PATCH 1/2] update for 988, add JSF changes for
 src/com/sun/ts/tests/ejb30/lite/packaging

Signed-off-by: Scott Marlow <smarlow@redhat.com>
---
 install/jakartaee/other/vehicle.properties    |  26 +-
 .../datasource/global/Client.java.template    |  11 +-
 .../packaging/war/datasource/global/build.xml |   3 +-
 .../datasource/singleton/Client.java.template |   2 +-
 .../singleton/JsfClient.java.template         | 161 ++++++++++++
 .../war/datasource/singleton/build.xml        |   3 +-
 .../war/datasource/stateful/JsfClient.java    |  59 +++++
 .../war/datasource/stateful/build.xml         |   3 +-
 .../packaging/war/enventry/JsfClient.java     | 237 ++++++++++++++++++
 .../lite/packaging/war/enventry/build.xml     |   3 +-
 .../mbean/interceptor/business/JsfClient.java | 160 ++++++++++++
 .../war/mbean/interceptor/business/build.xml  |   4 +-
 .../invocationcontext/JsfClient.java          | 124 +++++++++
 .../interceptor/invocationcontext/build.xml   |   3 +-
 .../interceptor/lifecycle/JsfClient.java      | 120 +++++++++
 .../war/mbean/interceptor/lifecycle/build.xml |   3 +-
 .../interceptor/lifecyclecdi/JsfClient.java   |  76 ++++++
 .../mbean/interceptor/lifecyclecdi/build.xml  |   3 +-
 .../lifecycleejbcdi/JsfClient.java            |  78 ++++++
 .../interceptor/lifecycleejbcdi/build.xml     |   1 +
 .../war/servletcontextlistener/JsfClient.java |  65 +++++
 .../war/servletcontextlistener/build.xml      |   3 +-
 .../packaging/war/webinflib/JsfClient.java    | 166 ++++++++++++
 .../lite/packaging/war/webinflib/build.xml    |   1 +
 .../war/webinflibonly/JsfClient.java          |  52 ++++
 .../packaging/war/webinflibonly/build.xml     |   2 +
 .../war/xmloverride/ejbref/JsfClient.java     |  66 +++++
 .../war/xmloverride/ejbref/build.xml          |   1 +
 28 files changed, 1421 insertions(+), 15 deletions(-)
 create mode 100644 src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/singleton/JsfClient.java.template
 create mode 100644 src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/stateful/JsfClient.java
 create mode 100644 src/com/sun/ts/tests/ejb30/lite/packaging/war/enventry/JsfClient.java
 create mode 100644 src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/business/JsfClient.java
 create mode 100644 src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/invocationcontext/JsfClient.java
 create mode 100644 src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecycle/JsfClient.java
 create mode 100644 src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecyclecdi/JsfClient.java
 create mode 100644 src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecycleejbcdi/JsfClient.java
 create mode 100644 src/com/sun/ts/tests/ejb30/lite/packaging/war/servletcontextlistener/JsfClient.java
 create mode 100644 src/com/sun/ts/tests/ejb30/lite/packaging/war/webinflib/JsfClient.java
 create mode 100644 src/com/sun/ts/tests/ejb30/lite/packaging/war/webinflibonly/JsfClient.java
 create mode 100644 src/com/sun/ts/tests/ejb30/lite/packaging/war/xmloverride/ejbref/JsfClient.java

diff --git a/install/jakartaee/other/vehicle.properties b/install/jakartaee/other/vehicle.properties
index 3f7bcf36a6..c1e38b65cf 100644
--- a/install/jakartaee/other/vehicle.properties
+++ b/install/jakartaee/other/vehicle.properties
@@ -274,14 +274,36 @@ com/sun/ts/tests/ejb30/lite/xmloverride/ejbref/JsfClient.java  = ejblitejsf
 com/sun/ts/tests/ejb30/lite/packaging/embed  = ejbembed
 com/sun/ts/tests/ejb30/lite/packaging/war  = ejbliteservlet ejbliteservlet2 ejblitejsf ejblitejsp
 com/sun/ts/tests/ejb30/lite/packaging/war/datasource/global  = ejblitejsf
-
 com/sun/ts/tests/ejb30/lite/basic/singleton/Client.java = ejbliteservlet ejbliteservlet2 ejblitejsp 
 com/sun/ts/tests/ejb30/lite/basic/singleton/JsfClient.java = ejblitejsf 
 com/sun/ts/tests/ejb30/lite/basic/stateful/Client.java = ejbliteservlet ejbliteservlet2 ejblitejsp 
 com/sun/ts/tests/ejb30/lite/basic/stateful/JsfClient.java = ejblitejsf 
 com/sun/ts/tests/ejb30/lite/basic/stateless/Client.java = ejbliteservlet ejbliteservlet2 ejblitejsp 
 com/sun/ts/tests/ejb30/lite/basic/stateless/JsfClient.java = ejblitejsf 
-
+com/sun/ts/tests/ejb30/lite/packaging/war/datasource/singleton/JsfClient.java = ejblitejsf
+com/sun/ts/tests/ejb30/lite/packaging/war/datasource/singleton/Client.java = ejbliteservlet ejbliteservlet2 ejblitejsp
+com/sun/ts/tests/ejb30/lite/packaging/war/datasource/stateful/JsfClient.java = ejblitejsf
+com/sun/ts/tests/ejb30/lite/packaging/war/datasource/stateful/Client.java = ejbliteservlet ejbliteservlet2 ejblitejsp
+com/sun/ts/tests/ejb30/lite/packaging/war/enventry/JsfClient.java = ejblitejsf
+com/sun/ts/tests/ejb30/lite/packaging/war/enventry/Client.java = ejbliteservlet ejbliteservlet2 ejblitejsp
+com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/business/JsfClient.java = ejblitejsf
+com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/business/Client.java = ejbliteservlet ejbliteservlet2 ejblitejsp
+com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/invocationcontext/JsfClient.java = ejblitejsf
+com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/invocationcontext/Client.java = ejbliteservlet ejbliteservlet2 ejblitejsp
+com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecycle/JsfClient.java = ejblitejsf
+com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecycle/Client.java = ejbliteservlet ejbliteservlet2 ejblitejsp
+com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecyclecdi/JsfClient.java = ejblitejsf
+com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecyclecdi/Client.java = ejbliteservlet ejbliteservlet2 ejblitejsp
+com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecycleejbcdi/JsfClient.java = ejblitejsf
+com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecycleejbcdi/Client.java = ejbliteservlet ejbliteservlet2 ejblitejsp
+com/sun/ts/tests/ejb30/lite/packaging/war/servletcontextlistener/JsfClient.java = ejblitejsf
+com/sun/ts/tests/ejb30/lite/packaging/war/servletcontextlistener/Client.java = ejbliteservlet ejbliteservlet2 ejblitejsp
+com/sun/ts/tests/ejb30/lite/packaging/war/webinflib/JsfClient.java = ejblitejsf
+com/sun/ts/tests/ejb30/lite/packaging/war/webinflib/Client.java = ejbliteservlet ejbliteservlet2 ejblitejsp
+com/sun/ts/tests/ejb30/lite/packaging/war/webinflibonly/JsfClient.java = ejblitejsf
+com/sun/ts/tests/ejb30/lite/packaging/war/webinflibonly/Client.java = ejbliteservlet ejbliteservlet2 ejblitejsp
+com/sun/ts/tests/ejb30/lite/packaging/war/xmloverride/ejbref/JsfClient.java = ejblitejsf
+com/sun/ts/tests/ejb30/lite/packaging/war/xmloverride/ejbref/Client.java = ejbliteservlet ejbliteservlet2 ejblitejsp
 com/sun/ts/tests/ejb30/lite/naming/context/Client.java#lookup = ejbliteservlet ejbliteservlet2 ejblitejsf ejblitejsp
 com/sun/ts/tests/ejb30/timer = ejbliteservlet 
 
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/global/Client.java.template b/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/global/Client.java.template
index 8d433dc956..48f1bcca0e 100644
--- a/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/global/Client.java.template
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/global/Client.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -18,6 +18,7 @@ package com.sun.ts.tests.ejb30.lite.packaging.war.datasource.global;
 
 import static com.sun.ts.tests.ejb30.lite.packaging.war.datasource.common.DataSourceTest.verifyDataSource;
 
+import java.io.Serializable;
 import java.sql.Connection;
 
 import jakarta.annotation.PostConstruct;
@@ -28,11 +29,15 @@ import jakarta.ejb.EJB;
 import javax.sql.DataSource;
 
 import com.sun.ts.tests.ejb30.common.helper.Helper;
-import com.sun.ts.tests.ejb30.common.lite.EJBLiteClientBase;
+import com.sun.ts.tests.ejb30.common.lite.EJBLiteJsfClientBase;
 import com.sun.ts.tests.ejb30.lite.packaging.war.datasource.common.DataSourceIF;
 
+@jakarta.inject.Named("client")
+@jakarta.enterprise.context.RequestScoped
+public class Client extends EJBLiteJsfClientBase implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
-public class Client extends EJBLiteClientBase {
     @EJB
     private DataSourceIF dataSourceBean;
     
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/global/build.xml b/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/global/build.xml
index e65e2cfc39..02bb6cf6a7 100644
--- a/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/global/build.xml
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/global/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -38,6 +38,7 @@
     <ts.vehicles name="${app.name}" buildleveloverride="2"
       classes="
         com/sun/ts/tests/ejb30/common/helper/ServiceLocator.class,
+        com/sun/ts/tests/ejb30/common/lite/EJBLiteJsfClientBase.class,
         com/sun/ts/tests/ejb30/lite/packaging/war/datasource/common/DataSourceIF.class,
         com/sun/ts/tests/ejb30/lite/packaging/war/datasource/common/ComponentBase.class,
         com/sun/ts/tests/ejb30/lite/packaging/war/datasource/common/DataSourceTest.class,
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/singleton/Client.java.template b/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/singleton/Client.java.template
index c0c00cf578..e1331ca33d 100644
--- a/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/singleton/Client.java.template
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/singleton/Client.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/singleton/JsfClient.java.template b/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/singleton/JsfClient.java.template
new file mode 100644
index 0000000000..0533c017f4
--- /dev/null
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/singleton/JsfClient.java.template
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id: Client.java 58883 2009-07-30 03:09:37Z cf126330 $
+ */
+package com.sun.ts.tests.ejb30.lite.packaging.war.datasource.singleton;
+
+import static com.sun.ts.tests.ejb30.lite.packaging.war.datasource.common.DataSourceTest.verifyDataSource;
+
+import java.io.Serializable;
+import java.sql.Connection;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
+import jakarta.annotation.sql.DataSourceDefinition;
+import jakarta.annotation.sql.DataSourceDefinitions;
+import jakarta.ejb.EJB;
+import javax.sql.DataSource;
+
+import com.sun.ts.tests.ejb30.common.helper.Helper;
+import com.sun.ts.tests.ejb30.common.lite.EJBLiteJsfClientBase;
+import com.sun.ts.tests.ejb30.lite.packaging.war.datasource.common.DataSourceIF;
+
+
+// url is to be ignored
+@DataSourceDefinitions({
+@DataSourceDefinition(name="java:comp/env/compds",
+        className="@className@",
+        portNumber=@portNumber@,
+        serverName="@serverName@",
+        databaseName="@databaseName@",
+        user="@user@",
+        password="@password@",
+        
+        description="ds1",
+        initialPoolSize=1,
+        isolationLevel=Connection.TRANSACTION_READ_COMMITTED,
+        loginTimeout=300,
+        maxIdleTime=1000,
+        maxPoolSize=2,
+        minPoolSize=1,
+        transactional=false,
+        properties={@jdbc.datasource.props@},
+        url="jdbc:derby://${derby.server}:${derby.port}/${derby.dbName};create=true"
+),
+@DataSourceDefinition(name="java:comp/env/compds2",
+        className="@className@",
+        portNumber=@portNumber@,
+        serverName="@serverName@",
+        databaseName="@databaseName@",
+        user="@user@",
+        properties={@jdbc.datasource.props@},
+        password="@password@")
+})
+
+@jakarta.inject.Named("client")
+@jakarta.enterprise.context.RequestScoped
+public class JsfClient extends EJBLiteJsfClientBase implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @EJB
+    private DataSourceIF dataSourceBean;
+    
+    @Resource
+    private DataSourceMBean dataSourceMBean;
+    
+    @Resource
+    private DataSourceRepeatableBean dataSourceRBean;
+    
+    @Resource(lookup="java:comp/env/compds")
+    private DataSource compds;
+    
+    @Resource(lookup="java:comp/env/compds2")
+    private DataSource compds2;
+    
+    @Resource(lookup="java:comp/env/defaultds")
+    private DataSource defaultds;
+    
+    @Resource(lookup="java:comp/env/defaultds2")
+    private DataSource defaultds2;
+    
+    @Resource(lookup="java:module/env/moduleds")
+    private DataSource moduleds;
+  
+    @Resource(lookup="java:module/env/moduleds2")
+    private DataSource moduleds2;
+    
+    @SuppressWarnings("unused")
+    @PostConstruct
+    private void postConstruct() {
+        boolean c = true;
+        Helper.getLogger().info("In postConstruct of " + this);
+        
+        verifyDataSource(getReasonBuffer(), c, "java:comp/env/defaultds", "java:comp/env/defaultds2", 
+                                               "java:comp/env/compds", "java:comp/env/compds2",
+                                               "java:module/env/moduleds", "java:module/env/moduleds2");
+        verifyDataSource(getReasonBuffer(), c, defaultds, defaultds2, compds, compds2, moduleds, moduleds2);
+
+        verifyDataSource(getReasonBuffer(), c, compds, compds2);
+    }
+    
+    /*
+     * @testName: postConstructRecords
+     * @test_Strategy: look up the data sources declared with annotation in this class, 
+     * and verify the injected datasource inside PostConstruct method.
+     */
+    public void postConstructRecords() {
+        appendReason("Test result verified inside postConstruct method.");
+    }
+    
+    /*
+     * @testName: postConstructRecordsEJB
+     * @test_Strategy: look up the data sources declared with annotation in EJB, 
+     * and verify the injected datasource inside its PostConstruct method.
+     */
+    public void postConstructRecordsEJB() {
+        appendReason(dataSourceBean.getPostConstructRecords());
+    }
+    
+    /*
+     * @testName: postConstructRecordsMBean
+     * @test_Strategy: look up the data sources declared with annotation in managed bean, 
+     * and verify the injected datasource inside its PostConstruct method.
+     */
+    public void postConstructRecordsMBean() {
+        appendReason(dataSourceMBean.getPostConstructRecords());
+    }
+    
+    /*
+     * @testName: postConstructRecordsMBeanRepeatable
+     * @test_Strategy: look up the data sources declared with repeatable annotation in managed bean, 
+     * and verify the injected datasource inside its PostConstruct method.
+     */
+    public void postConstructRecordsMBeanRepeatable() {
+        appendReason(dataSourceRBean.getPostConstructRecords());
+    }
+    
+    /*
+     * @testName: getConnectionEJB
+     * @test_Strategy: call getConnection() on the datasource
+     */
+    public void getConnectionEJB() {
+        appendReason(dataSourceBean.getConnection());
+    }
+}
+
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/singleton/build.xml b/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/singleton/build.xml
index 63d85bf09a..5a589aef8d 100644
--- a/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/singleton/build.xml
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/singleton/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -38,6 +38,7 @@
     <ts.vehicles name="${app.name}" buildleveloverride="2"
       classes="
         com/sun/ts/tests/ejb30/common/helper/ServiceLocator.class,
+        com/sun/ts/tests/ejb30/common/lite/EJBLiteJsfClientBase.class,
         com/sun/ts/tests/ejb30/lite/packaging/war/datasource/common/DataSourceIF.class,
         com/sun/ts/tests/ejb30/lite/packaging/war/datasource/common/ComponentBase.class,
         com/sun/ts/tests/ejb30/lite/packaging/war/datasource/common/DataSourceTest.class,
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/stateful/JsfClient.java b/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/stateful/JsfClient.java
new file mode 100644
index 0000000000..e1a1d8de7e
--- /dev/null
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/stateful/JsfClient.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+package com.sun.ts.tests.ejb30.lite.packaging.war.datasource.stateful;
+
+import java.io.Serializable;
+
+import com.sun.ts.tests.ejb30.common.lite.EJBLiteJsfClientBase;
+import com.sun.ts.tests.ejb30.lite.packaging.war.datasource.common.DataSourceIF;
+
+import jakarta.ejb.EJB;
+
+@jakarta.inject.Named("client")
+@jakarta.enterprise.context.RequestScoped
+public class JsfClient extends EJBLiteJsfClientBase implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @EJB
+  private DataSourceIF dataSourceBean;
+
+  /*
+   * @testName: postConstructRecordsEJB
+   * 
+   * @test_Strategy: look up the data sources declared with annotation in EJB,
+   * and verify the injected datasource inside its PostConstruct method.
+   */
+  public void postConstructRecordsEJB() {
+    appendReason(dataSourceBean.getPostConstructRecords());
+  }
+
+  /*
+   * @testName: postConstructRecordsInterceptor
+   * 
+   * @test_Strategy: look up the data sources declared with annotation in
+   * Interceptor1, and verify the injected datasource inside its PostConstruct
+   * method.
+   */
+  public void postConstructRecordsInterceptor() {
+    appendReason(dataSourceBean.getPostConstructRecords());
+  }
+
+}
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/stateful/build.xml b/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/stateful/build.xml
index 20f7a86a19..3047e6a945 100644
--- a/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/stateful/build.xml
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/datasource/stateful/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -38,6 +38,7 @@
     <ts.vehicles name="${app.name}" buildleveloverride="2"
       classes="
         com/sun/ts/tests/ejb30/common/helper/ServiceLocator.class,
+        com/sun/ts/tests/ejb30/common/lite/EJBLiteJsfClientBase.class,
         com/sun/ts/tests/ejb30/lite/packaging/war/datasource/common/DataSourceIF.class,
         com/sun/ts/tests/ejb30/lite/packaging/war/datasource/common/ComponentBase.class,
         com/sun/ts/tests/ejb30/lite/packaging/war/datasource/common/DataSourceTest.class,
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/enventry/JsfClient.java b/src/com/sun/ts/tests/ejb30/lite/packaging/war/enventry/JsfClient.java
new file mode 100644
index 0000000000..36dbd873b4
--- /dev/null
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/enventry/JsfClient.java
@@ -0,0 +1,237 @@
+/*
+ * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+package com.sun.ts.tests.ejb30.lite.packaging.war.enventry;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.io.Serializable;
+
+import com.sun.ts.tests.ejb30.common.helper.ServiceLocator;
+import com.sun.ts.tests.ejb30.common.lite.EJBLiteJsfClientBase;
+import jakarta.annotation.Resource;
+import jakarta.ejb.EJB;
+
+/**
+ * env-entry declared in all web.xml and ejb-jar.xml. Verify that env-entry
+ * declared in web.xml are accessible in EJB; env-entry declared in all EJBs are
+ * accessible in web; env-entry declared in one EJB are accessible to other
+ * EJBs; the default name for @Resource injections are bound to FQC/fieldName,
+ * not fieldName.
+ */
+@jakarta.inject.Named("client")
+@jakarta.enterprise.context.RequestScoped
+public class JsfClient extends EJBLiteJsfClientBase implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @EJB
+  private OneBean one;
+
+  @EJB
+  private TwoBean two;
+
+  @EJB
+  private ThreeBean three;
+
+  @Resource(description = "declared in web.xml")
+  private String myString;
+
+  @Resource(name = "myChar")
+  private char myChar;
+
+  @Resource(lookup = "java:comp/env/com.sun.ts.tests.ejb30.lite.packaging.war.enventry.OneBean/myString", description = "declared in ejb-jar.xml#OneBean")
+  private String myStringFromOne;
+
+  @Resource(lookup = "java:comp/env/com.sun.ts.tests.ejb30.lite.packaging.war.enventry.OneBean/myChar")
+  private char myCharFromOne;
+
+  @Resource(lookup = "java:comp/env/com.sun.ts.tests.ejb30.lite.packaging.war.enventry.TwoBean/myString", description = "declared in ejb-jar.xml#TwoBean")
+  private String myStringFromTwo;
+
+  @Resource(lookup = "java:comp/env/com.sun.ts.tests.ejb30.lite.packaging.war.enventry.TwoBean/myChar")
+  private char myCharFromTwo;
+
+  @Resource(lookup = "java:comp/env/com.sun.ts.tests.ejb30.lite.packaging.war.enventry.ThreeBean/myString", description = "declared in ejb-jar.xml#ThreeBean")
+  private String myStringFromThree;
+
+  @Resource(lookup = "java:comp/env/com.sun.ts.tests.ejb30.lite.packaging.war.enventry.ThreeBean/myChar")
+  private char myCharFromThree;
+
+  @Resource(lookup = "java:module/ModuleName")
+  private String moduleNameInjected;
+
+  @Resource(lookup = "java:app/AppName")
+  private String appNameInjected;
+
+  // injected in web.xml
+  private boolean myBooleanTrue2;
+
+  /*
+   * @testName: injectedIntoClient
+   * 
+   * @test_Strategy: verify env-entry declared in web.xml and ejb-jar.xml and
+   * injected into Client class.
+   */
+  public void injectedIntoClient() {
+    verify();
+  }
+
+  /*
+   * @testName: injectedIntoOneBean
+   * 
+   * @test_Strategy: verify env-entry declared in web.xml and ejb-jar.xml and
+   * injected into OneBean.
+   */
+  public void injectedIntoOneBean() {
+    appendReason(one.getInjectionRecords());
+    assertEquals("", true, one.getInjectionStatus());
+  }
+
+  /*
+   * @testName: injectedIntoTwoBean
+   * 
+   * @test_Strategy: verify env-entry declared in web.xml and ejb-jar.xml and
+   * injected into TwoBean.
+   */
+  public void injectedIntoTwoBean() {
+    appendReason(two.getInjectionRecords());
+    assertEquals("", true, two.getInjectionStatus());
+  }
+
+  /*
+   * @testName: injectedIntoThreeBean
+   * 
+   * @test_Strategy: verify env-entry declared in web.xml and ejb-jar.xml and
+   * injected into ThreeBean.
+   */
+  public void injectedIntoThreeBean() {
+    appendReason(three.getInjectionRecords());
+    assertEquals("", true, three.getInjectionStatus());
+  }
+
+  /*
+   * @testName: injectedIntoOneBeanInterceptors
+   * 
+   * @test_Strategy: verify env-entry declared in web.xml and ejb-jar.xml and
+   * injected into 4 interceptors associated with OneBean. Interceptor0 is
+   * declared as the default interceptor for all beans in ejb-jar.xml.
+   * Interceptor1 and Interceptor2 are class-level interceptors via annotation.
+   * Interceptor3 is a method-level interceptor annotated on
+   * BeanBase.getInjectionStatus and BeanBase.getInjectionRecords methods.
+   * 
+   * This test verifies that: 1. env-entry declared in web.xml and ejb-jar.xml
+   * are visible to interceptors, including default interceptors and class-level
+   * interceptors. 2. injections in interceptors should have ocurred when
+   * PostConstruct is called. 3. PostConstruct on the superclass of an
+   * interceptor is called before PostConstruct on interceptor class itself. 4.
+   * default name for an injection field is <FQN>/<field-name>, used in
+   * InterceptorBase.myStringComponent. 5. env-entry injections into
+   * method-level interceptors are performed properly.
+   * 
+   * This test does not verify the order of interception (i.e., if Interceptor0
+   * is triggered before Interceptor1) at request time. The focus of these tests
+   * is that injections into interceptors and their superclass are supported,
+   * and that superclass PostConstruct is called before subclass PostConstruct.
+   * 
+   * For method-level interceptors there is no way to verify injection result in
+   * a PostConstruct method.This can only be done in the context of a business
+   * method.
+   * 
+   */
+  public void injectedIntoOneBeanInterceptors() {
+    injectedIntoInterceptors(one);
+  }
+
+  /*
+   * @testName: injectedIntoTwoBeanInterceptors
+   * 
+   * @test_Strategy: see previous test
+   */
+  public void injectedIntoTwoBeanInterceptors() {
+    injectedIntoInterceptors(two);
+  }
+
+  /*
+   * @testName: injectedIntoThreeBeanInterceptors
+   * 
+   * @test_Strategy: see previous test
+   */
+  public void injectedIntoThreeBeanInterceptors() {
+    injectedIntoInterceptors(three);
+  }
+
+  /*
+   * @testName: appNameModuleName
+   * 
+   * @test_Strategy:
+   */
+  public void appNameModuleName() {
+    String lookup = "java:module/ModuleName";
+    String expected = getModuleName();
+    String actual = (String) ServiceLocator.lookupNoTry(lookup);
+    assertEquals("Check " + lookup, expected, actual);
+    assertEquals("Check moduleNameInjected ", expected, moduleNameInjected);
+
+    lookup = "java:app/AppName";
+    actual = (String) ServiceLocator.lookupNoTry(lookup);
+    assertEquals("Check " + lookup, expected, actual);
+    assertEquals("Check appNameInjected ", expected, appNameInjected);
+  }
+
+  /*
+   * @testName: appNameModuleNameFromEJB
+   * 
+   * @test_Strategy:
+   */
+  public void appNameModuleNameFromEJB() {
+    BeanBase[] beans = { one, two, three };
+    for (BeanBase b : beans) {
+      appendReason(b.appNameModuleName(getModuleName()));
+    }
+  }
+
+  private void verify() {
+    assertEquals("Check myString from web.xml: ", " web.xml ${java.home} ",
+        myString);
+    assertEquals("Check myString from OneBean: ", " OneBean ${java.home} ",
+        myStringFromOne);
+    assertEquals("Check myString from TwoBean: ", " TwoBean ${java.home} ",
+        myStringFromTwo);
+    assertEquals("Check myString from  ThreeBean: ", " ThreeBean ${java.home} ",
+        myStringFromThree);
+
+    assertEquals("Check myChar from web.xml: ", ' ', myChar);
+    assertEquals("Check myChar from OneBean: ", ' ', myCharFromOne);
+    assertEquals("Check myChar from TwoBean: ", '2', myCharFromTwo);
+    assertEquals("Check myChar from ThreeBean: ", '3', myCharFromThree);
+
+    assertEquals("Check myBooleanTrue2 from web.xml: ", true, myBooleanTrue2);
+  }
+
+  private void injectedIntoInterceptors(BeanBase b) {
+    List<List<String>> records = new ArrayList<List<String>>();
+    b.getInjectionRecordsForInterceptors(records);
+    appendReason(records);
+    assertEquals("4 record-lists for 4 interceptors ", 4, records.size());
+    for (List<String> list : records) {
+      assertEquals("2 records for each interceptor ", 2, list.size());
+    }
+  }
+}
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/enventry/build.xml b/src/com/sun/ts/tests/ejb30/lite/packaging/war/enventry/build.xml
index 6576ef7984..805fa15f0e 100644
--- a/src/com/sun/ts/tests/ejb30/lite/packaging/war/enventry/build.xml
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/enventry/build.xml
@@ -23,7 +23,8 @@
    
     <target name="package">
         <ts.vehicles name="${app.name}" buildleveloverride="2" classes="
-        com/sun/ts/tests/ejb30/common/helper/ServiceLocator.class
+        com/sun/ts/tests/ejb30/common/helper/ServiceLocator.class,
+        com/sun/ts/tests/ejb30/common/lite/EJBLiteJsfClientBase.class,
         ">
         </ts.vehicles>
     </target>
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/business/JsfClient.java b/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/business/JsfClient.java
new file mode 100644
index 0000000000..a0f624b5ef
--- /dev/null
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/business/JsfClient.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+package com.sun.ts.tests.ejb30.lite.packaging.war.mbean.interceptor.business;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.io.Serializable;
+
+import com.sun.ts.tests.ejb30.common.helper.Helper;
+import com.sun.ts.tests.ejb30.lite.interceptor.common.business.InterceptorIF;
+import jakarta.annotation.Resource;
+
+@jakarta.inject.Named("client")
+@jakarta.enterprise.context.RequestScoped
+public class JsfClient
+    extends com.sun.ts.tests.ejb30.lite.interceptor.common.business.JsfClientBase implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  // @Resource(lookup = "java:module/InterceptorBean")
+  @Resource
+  private InterceptorBean bean;
+
+  // @Resource(lookup = "java:module/InterceptorOverrideBean")
+  @Resource
+  private InterceptorOverrideBean overrideBean;
+
+  // @Resource(lookup = "java:module/InterceptorOverride34Bean")
+  @Resource
+  private InterceptorOverride34Bean override34Bean;
+
+  @Override
+  protected InterceptorIF getBean() {
+    return bean;
+  }
+
+  @Override
+  protected InterceptorIF getOverride34Bean() {
+    return override34Bean;
+  }
+
+  @Override
+  protected InterceptorIF getOverrideBean() {
+    return overrideBean;
+  }
+
+  /*
+   * @testName: allInterceptors
+   * 
+   * @test_Strategy: all interceptors (Interceptor1-7) at default, class-level,
+   * and method-level should be invoked, as well as AroundInvoke methods on bean
+   * class.
+   */
+  /*
+   * @testName: excludeDefaultInterceptors
+   * 
+   * @test_Strategy: all interceptors except default interceptors should be
+   * invoked in the correct order.
+   */
+  @Override
+  public void excludeDefaultInterceptors() {
+    List<String> history = new ArrayList<String>();
+    String[] expected = {
+        // default interceptors
+        "InterceptorBaseBase", "InterceptorBase", "Interceptor2",
+        "InterceptorBaseBase", "InterceptorBase", "Interceptor1",
+        "InterceptorBaseBase", "InterceptorBase", "Interceptor3",
+
+        // class-level interceptors
+        "InterceptorBaseBase", "InterceptorBase", "Interceptor5",
+        "InterceptorBaseBase", "InterceptorBase", "Interceptor4",
+
+        // method-level interceptors
+        "InterceptorBaseBase", "InterceptorBase", "Interceptor6",
+        "InterceptorBaseBase", "InterceptorBase", "Interceptor7",
+
+        // AroundInvoke methods on bean superclass and bean class
+        "InterceptorBeanBase", "InterceptorBean" };
+    getBean().excludeDefaultInterceptors(history);
+    appendReason(Helper.compareResultList(expected, history));
+  }
+
+  /*
+   * @testName: excludeClassInterceptors
+   * 
+   * @test_Strategy: all interceptors except class interceptors should be
+   * invoked in the correct order.
+   */
+  @Override
+  public void excludeClassInterceptors() {
+    List<String> history = new ArrayList<String>();
+    String[] expected = {
+        // no default interceptors, no class interceptors
+
+        // method-level interceptors
+        "InterceptorBaseBase", "InterceptorBase", "Interceptor6",
+        "InterceptorBaseBase", "InterceptorBase", "Interceptor7",
+
+        // AroundInvoke methods on bean superclass and bean class
+        "InterceptorBeanBase", "InterceptorBean" };
+    getBean().excludeClassInterceptors(history);
+    appendReason(Helper.compareResultList(expected, history));
+  }
+
+  /*
+   * @testName: overrideInterceptorMethod
+   * 
+   * @test_Strategy: If an interceptor method is overridden, it is no longer
+   * invoked, whether the overriding method is an interceptor method or not.
+   * This test also excludes default and class-level interceptors.
+   */
+  /*
+   * @testName: overrideBeanInterceptorMethod
+   * 
+   * @test_Strategy: If an interceptor method is overridden, it is no longer
+   * invoked. This test override with a non-interceptor method. This test also
+   * excludes default and class-level interceptors.
+   */
+  /*
+   * @testName: overrideBeanInterceptorMethod2
+   * 
+   * @test_Strategy: If an interceptor method is overridden, it is no longer
+   * invoked. This test override with a non-interceptor method. This test also
+   * excludes default and declares no class-level interceptors.
+   */
+  /*
+   * @testName: overrideBeanInterceptorMethod3
+   * 
+   * @test_Strategy: If an interceptor method is overridden, it is no longer
+   * invoked. This test override with an interceptor method.
+   */
+  /*
+   * @testName: overrideBeanInterceptorMethod4
+   * 
+   * @test_Strategy: If an interceptor method is overridden, it is no longer
+   * invoked. This test override with an interceptor method.
+   */
+  /*
+   * @testName: skipProceed
+   * 
+   * @test_Strategy:
+   */
+}
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/business/build.xml b/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/business/build.xml
index 3ce3f9627d..8be8b11e27 100644
--- a/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/business/build.xml
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/business/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -33,6 +33,8 @@
 	com/sun/ts/tests/ejb30/lite/interceptor/common/business/InterceptorBase.class,
 	com/sun/ts/tests/ejb30/lite/interceptor/common/business/InterceptorOverrideBase.class,
 	com/sun/ts/tests/ejb30/lite/interceptor/common/business/ClientBase.class,
+        com/sun/ts/tests/ejb30/lite/interceptor/common/business/InterceptorIF.class,
+        com/sun/ts/tests/ejb30/lite/interceptor/common/business/JsfClientBase.class,
 	com/sun/ts/tests/ejb30/lite/interceptor/common/business/Interceptor1.class,
 	com/sun/ts/tests/ejb30/lite/interceptor/common/business/Interceptor2.class,
 	com/sun/ts/tests/ejb30/lite/interceptor/common/business/Interceptor3.class,
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/invocationcontext/JsfClient.java b/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/invocationcontext/JsfClient.java
new file mode 100644
index 0000000000..7e726e4fc8
--- /dev/null
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/invocationcontext/JsfClient.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+package com.sun.ts.tests.ejb30.lite.packaging.war.mbean.interceptor.invocationcontext;
+
+import java.io.Serializable;
+
+import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
+import com.sun.ts.tests.ejb30.common.invocationcontext.InvocationContextIF;
+import com.sun.ts.tests.ejb30.common.invocationcontext.InvocationContextTestImpl;
+import com.sun.ts.tests.ejb30.common.lite.EJBLiteJsfClientBase;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
+
+@jakarta.inject.Named("client")
+@jakarta.enterprise.context.RequestScoped
+public class JsfClient extends EJBLiteJsfClientBase implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @Resource(lookup = "java:module/InvocationContextBean")
+  // @Resource()
+  private InvocationContextIF bean;
+
+  @Resource(lookup = "java:module/InvocationContextInterceptorBean")
+  // @Resource()
+  private InvocationContextIF bean2;
+
+  private InvocationContextIF[] beans = new InvocationContextIF[2];
+
+  @SuppressWarnings("unused")
+  @PostConstruct
+  private void postConstruct() {
+    beans[0] = bean;
+    beans[1] = bean2;
+  }
+
+  /*
+   * @testName: setParametersIllegalArgumentException
+   * 
+   * @test_Strategy:
+   */
+  public void setParametersIllegalArgumentException()
+      throws TestFailedException {
+    InvocationContextTestImpl.setParametersIllegalArgumentException(beans);
+  }
+
+  /*
+   * @testName: getTarget
+   * 
+   * @test_Strategy: the bean business method getTarget return the identity
+   * hashcode for the bean instance, which is compared to the result of
+   * InvocationContext.getTarget()'s. They should be the same. This test is
+   * executed for AroundInvoke methods in both the bean class and in interceptor
+   * class.
+   */
+  public void getTarget() throws TestFailedException {
+    InvocationContextTestImpl.getTarget(beans);
+  }
+
+  /*
+   * @testName: getContextData
+   * 
+   * @test_Strategy: Put context data in interceptor method and verify it inside
+   * finally block after executing business method. This test is executed for
+   * AroundInvoke methods in both the bean class and in interceptor class.
+   */
+  public void getContextData() throws TestFailedException {
+    InvocationContextTestImpl.getContextData(beans);
+  }
+
+  /*
+   * @testName: getTimer
+   * 
+   * @test_Strategy: InvocatioinContext.getTimer() returns null for lifecycle
+   * and around-invoke methods.
+   */
+  public void getTimer() throws TestFailedException {
+    InvocationContextTestImpl.getTimer(beans);
+  }
+
+  /*
+   * @testName: getSetParameters
+   * 
+   * @test_Strategy: the bean business method getSetParametersEmpty takes no
+   * params. InvocationContext.getParameters() should return null or empty
+   * params. Setting params to a non-empty array should result in
+   * IllegalArgumentException. The bean business method getSetParameters takes 2
+   * String params, verified and modified in interceptor. The client should get
+   * the result based on the new params.
+   */
+  public void getSetParameters() throws TestFailedException {
+    InvocationContextTestImpl.getSetParametersEmpty(beans);
+    InvocationContextTestImpl.getSetParameters(beans);
+  }
+
+  /*
+   * @testName: proceedAgain
+   * 
+   * @test_Strategy: call proceed() from interceptor method. The first call
+   * results in TestFailedException, and the subsequent proceed() call returns
+   * true. Expecting TestFailedException from the first proceed call, and true
+   * value from the second proceed call.
+   */
+  public void proceedAgain() throws TestFailedException {
+    InvocationContextTestImpl.proceedAgain(beans);
+  }
+}
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/invocationcontext/build.xml b/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/invocationcontext/build.xml
index e0661a9439..fbaa2dca96 100644
--- a/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/invocationcontext/build.xml
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/invocationcontext/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -27,6 +27,7 @@
       classes="
   com/sun/ts/tests/ejb30/common/helper/TestFailedException.class,
   com/sun/ts/tests/ejb30/common/invocationcontext/InvocationContextIF.class,
+  com/sun/ts/tests/ejb30/common/lite/EJBLiteJsfClientBase.class,
   com/sun/ts/tests/ejb30/common/invocationcontext/InvocationContextTestImpl.class,
   com/sun/ts/tests/ejb30/common/invocationcontext/InvocationContextBase.class,
   com/sun/ts/tests/ejb30/common/invocationcontext/InterceptorForAll.class
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecycle/JsfClient.java b/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecycle/JsfClient.java
new file mode 100644
index 0000000000..966d7afe7b
--- /dev/null
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecycle/JsfClient.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+package com.sun.ts.tests.ejb30.lite.packaging.war.mbean.interceptor.lifecycle;
+
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.sun.ts.tests.ejb30.common.helper.Helper;
+import com.sun.ts.tests.ejb30.common.helper.ServiceLocator;
+import com.sun.ts.tests.ejb30.lite.interceptor.common.lifecycle.InterceptorIF;
+import jakarta.annotation.PreDestroy;
+import jakarta.annotation.Resource;
+
+@jakarta.inject.Named("client")
+@jakarta.enterprise.context.RequestScoped
+public class JsfClient extends
+    com.sun.ts.tests.ejb30.lite.interceptor.common.lifecycle.JsfClientBase implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  private InterceptorIF bean;
+
+  private InterceptorIF overrideBean;
+
+  private InterceptorIF override34Bean;
+
+  @Override
+  protected InterceptorIF getBean() {
+    return bean;
+  }
+
+  @Override
+  protected InterceptorIF getOverride34Bean() {
+    return override34Bean;
+  }
+
+  @Override
+  protected InterceptorIF getOverrideBean() {
+    return overrideBean;
+  }
+
+  @SuppressWarnings("unused")
+  @PreDestroy
+  private void preDestroy() {
+    Helper.getLogger().info("In PreDestroy of " + this);
+  }
+
+  @Resource(lookup = "java:module/InterceptorBean", type = InterceptorBean.class)
+  protected void setBean(InterceptorIF b) {
+    bean = b;
+  }
+
+  @Resource(lookup = "java:module/InterceptorOverrideBean", type = InterceptorOverrideBean.class)
+  protected void setOverrideBean(InterceptorIF b) {
+    overrideBean = b;
+  }
+
+  @Resource(lookup = "java:module/InterceptorOverride34Bean", type = InterceptorOverride34Bean.class)
+  protected void setOverride34Bean(InterceptorIF b) {
+    override34Bean = b;
+  }
+
+  /*
+   * @testName: allInterceptors
+   * 
+   * @test_Strategy: all interceptors class-level should be invoked, as well as
+   * PostConstruct methods on bean class. For Interceptor8, the PostConstruct
+   * methods from super and super-super classes are overridden and therefore are
+   * not invoked.
+   */
+  /*
+   * @testName: overrideBeanInterceptorMethod
+   * 
+   * @test_Strategy: If a PostConstruct method is overridden, it is no longer
+   * invoked. This test override with a non-PostConstruct method. This test also
+   * excludes default and class-level interceptors.
+   */
+  /*
+   * @testName: overrideBeanInterceptorMethod3
+   * 
+   * @test_Strategy: If a PostConstruct method is overridden, it is no longer
+   * invoked. This test override with a PostConstruct method.
+   */
+
+  /*
+   * @testName: identityHashCode
+   * 
+   * @test_Strategy:
+   */
+  public void identityHashCode() {
+    Set<Integer> instances = new HashSet<Integer>();
+    for (int i = 0; i < 50; i++) {
+      AManagedBean b = (AManagedBean) ServiceLocator
+          .lookupNoTry("java:module/AManagedBean");
+      int c = b.identityHashCode();
+      assertEquals("Existing instance: " + b + "?", false,
+          instances.contains(c));
+      instances.add(c);
+    }
+    appendReason(instances);
+  }
+}
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecycle/build.xml b/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecycle/build.xml
index 2ed4fd8ef9..a2eb9e9417 100644
--- a/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecycle/build.xml
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecycle/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -32,6 +32,7 @@
   com/sun/ts/tests/ejb30/lite/interceptor/common/lifecycle/InterceptorBase.class,
   com/sun/ts/tests/ejb30/lite/interceptor/common/lifecycle/InterceptorOverrideBase.class,
   com/sun/ts/tests/ejb30/lite/interceptor/common/lifecycle/ClientBase.class,
+  com/sun/ts/tests/ejb30/lite/interceptor/common/lifecycle/JsfClientBase.class,
   com/sun/ts/tests/ejb30/lite/interceptor/common/lifecycle/Interceptor1.class,
   com/sun/ts/tests/ejb30/lite/interceptor/common/lifecycle/Interceptor2.class,
   com/sun/ts/tests/ejb30/lite/interceptor/common/lifecycle/Interceptor3.class,
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecyclecdi/JsfClient.java b/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecyclecdi/JsfClient.java
new file mode 100644
index 0000000000..c5d7e90caf
--- /dev/null
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecyclecdi/JsfClient.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+package com.sun.ts.tests.ejb30.lite.packaging.war.mbean.interceptor.lifecyclecdi;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.sun.ts.tests.ejb30.common.helper.Helper;
+import com.sun.ts.tests.ejb30.common.lite.EJBLiteJsfClientBase;
+import jakarta.annotation.Resource;
+import jakarta.enterprise.context.ApplicationScoped;
+
+/**
+ * This test directory contains an empty beans.xml that will be packaged in WAR
+ * as WEB-INF/beans.xml. This is to verify when CDI is enabled, the overriding
+ * of ManagedBean's lifecycle methods still works. The similar tests without
+ * beans.xml are in ../lifecycle.
+ */
+@jakarta.inject.Named("client")
+@ApplicationScoped
+public class JsfClient extends EJBLiteJsfClientBase implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @Resource
+  private OverrideBean overrideBean;
+
+  @Resource
+  private OverrideWithPostConstructBean overrideWithPostConstructBean;
+
+  /*
+   * @testName: overrideWithRegularMethod
+   * 
+   * @test_Strategy: If a PostConstruct method is overridden, it is no longer
+   * invoked. This test override with a non-PostConstruct method. This test also
+   * excludes default and class-level interceptors.
+   */
+  public void overrideWithRegularMethod() {
+    checkPostConstructRecords(overrideBean, new String[] { "OverrideBean" });
+  }
+
+  /*
+   * @testName: overrideWithPostConstructBean
+   * 
+   * @test_Strategy: If a PostConstruct method is overridden, it is no longer
+   * invoked. This test override with a PostConstruct method.
+   */
+  public void overrideWithPostConstructBean() {
+    checkPostConstructRecords(overrideWithPostConstructBean,
+        new String[] { "OverrideWithPostConstructBean" });
+  }
+
+  protected void checkPostConstructRecords(OverrideBeanBase b,
+      String[] expectedPostConstruct) {
+    List<String> actualPostConstruct = b.getPostConstructRecords();
+    appendReason(
+        Helper.compareResultList(expectedPostConstruct, actualPostConstruct));
+  }
+}
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecyclecdi/build.xml b/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecyclecdi/build.xml
index f93c116622..6fab145f04 100644
--- a/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecyclecdi/build.xml
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecyclecdi/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,6 +24,7 @@
   <target name="package">
     <ts.vehicles name="${app.name}" buildleveloverride="2"
       classes="
+  com/sun/ts/tests/ejb30/common/lite/EJBLiteJsfClientBase.class
   com/sun/ts/tests/ejb30/lite/interceptor/common/lifecycle/HistorySingletonBean.class
           ">
     </ts.vehicles>
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecycleejbcdi/JsfClient.java b/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecycleejbcdi/JsfClient.java
new file mode 100644
index 0000000000..0b894771cc
--- /dev/null
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecycleejbcdi/JsfClient.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+package com.sun.ts.tests.ejb30.lite.packaging.war.mbean.interceptor.lifecycleejbcdi;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.sun.ts.tests.ejb30.common.helper.Helper;
+import com.sun.ts.tests.ejb30.common.lite.EJBLiteJsfClientBase;
+import jakarta.inject.Inject;
+
+/**
+ * This test directory contains an empty beans.xml that will be packaged in WAR
+ * as WEB-INF/beans.xml. This is to verify when CDI is enabled, the overriding
+ * of EJB's lifecycle methods still works. The similar tests without beans.xml
+ * are in ejb30/lite/interceptor. This test directory is the same as
+ * ../lifecyclecdi, except that this test directory uses 2 EJB and @Inject,
+ * instead of ManagedBean.
+ */
+@jakarta.inject.Named("client")
+@jakarta.enterprise.context.RequestScoped
+public class JsfClient extends EJBLiteJsfClientBase implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  // @EJB
+  @Inject
+  private OverrideBean overrideBean;
+
+  // @EJB
+  @Inject
+  private OverrideWithPostConstructBean overrideWithPostConstructBean;
+
+  /*
+   * @testName: overrideWithRegularMethod
+   * 
+   * @test_Strategy: If a PostConstruct method is overridden, it is no longer
+   * invoked. This test override with a non-PostConstruct method.
+   */
+  public void overrideWithRegularMethod() {
+    checkPostConstructRecords(overrideBean, new String[] { "OverrideBean" });
+  }
+
+  /*
+   * @testName: overrideWithPostConstructBean
+   * 
+   * @test_Strategy: If a PostConstruct method is overridden, it is no longer
+   * invoked. This test override with a PostConstruct method.
+   */
+  public void overrideWithPostConstructBean() {
+    checkPostConstructRecords(overrideWithPostConstructBean,
+        new String[] { "OverrideWithPostConstructBean" });
+  }
+
+  protected void checkPostConstructRecords(OverrideBeanBase b,
+      String[] expectedPostConstruct) {
+    List<String> actualPostConstruct = b.getPostConstructRecords();
+    appendReason(
+        Helper.compareResultList(expectedPostConstruct, actualPostConstruct));
+  }
+}
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecycleejbcdi/build.xml b/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecycleejbcdi/build.xml
index 30d433cefe..a20ec6ff11 100644
--- a/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecycleejbcdi/build.xml
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/mbean/interceptor/lifecycleejbcdi/build.xml
@@ -24,6 +24,7 @@
   <target name="package">
     <ts.vehicles name="${app.name}" buildleveloverride="2"
       classes="
+  com/sun/ts/tests/ejb30/common/lite/EJBLiteJsfClientBase.class,
   com/sun/ts/tests/ejb30/lite/interceptor/common/lifecycle/HistorySingletonBean.class
           ">
     </ts.vehicles>
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/servletcontextlistener/JsfClient.java b/src/com/sun/ts/tests/ejb30/lite/packaging/war/servletcontextlistener/JsfClient.java
new file mode 100644
index 0000000000..c83b26b037
--- /dev/null
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/servletcontextlistener/JsfClient.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+package com.sun.ts.tests.ejb30.lite.packaging.war.servletcontextlistener;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.sun.ts.tests.ejb30.common.helper.ServiceLocator;
+import com.sun.ts.tests.ejb30.common.lite.EJBLiteJsfClientBase;
+import com.sun.ts.tests.ejb30.lite.basic.common.Basic1IF;
+import jakarta.annotation.PostConstruct;
+
+@jakarta.inject.Named("client")
+@jakarta.enterprise.context.RequestScoped
+public class JsfClient extends EJBLiteJsfClientBase implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  private List<Basic1IF> beans = new ArrayList<Basic1IF>();
+
+  @SuppressWarnings("unused")
+  @PostConstruct
+  private void postConstruct() {
+    beans.add(
+        (Basic1IF) ServiceLocator.lookupByShortNameNoTry("ejb/statelessBean"));
+    beans.add(
+        (Basic1IF) ServiceLocator.lookupByShortNameNoTry("ejb/statefulBean"));
+    beans.add(
+        (Basic1IF) ServiceLocator.lookupByShortNameNoTry("ejb/singletonBean"));
+  }
+
+  /*
+   * @testName: onlyOneTest
+   * 
+   * @test_Strategy: The test logic is in ServletContextListener. The webapp
+   * initialization will fail if test expectations are not met, assuming
+   * contextInitialized method is invoked. This http request by this test method
+   * does nothing else. Since a ServletContextListener is only called once per
+   * webapp loading, there should be only one test for this directory. Also
+   * verifies that ejb injected into TestServletContextListener can also be
+   * looked up inside the test client (both are web components).
+   */
+  public void onlyOneTest() {
+    appendReason("Test logics are in ServletContextListener class");
+    TestServletContextListener.add(beans);
+  }
+}
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/servletcontextlistener/build.xml b/src/com/sun/ts/tests/ejb30/lite/packaging/war/servletcontextlistener/build.xml
index 48eb80411d..737bed8fb4 100644
--- a/src/com/sun/ts/tests/ejb30/lite/packaging/war/servletcontextlistener/build.xml
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/servletcontextlistener/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -26,6 +26,7 @@
         <ts.vehicles name="${app.name}" buildleveloverride="2" classes="
 	    com/sun/ts/tests/ejb30/lite/basic/common/Basic1IF.class,
 	    com/sun/ts/tests/ejb30/lite/basic/common/BasicBeanBase.class,
+	    com/sun/ts/tests/ejb30/common/lite/EJBLiteJsfClientBase.class,
             com/sun/ts/tests/ejb30/common/helper/ServiceLocator.class
 	">
         </ts.vehicles>
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/webinflib/JsfClient.java b/src/com/sun/ts/tests/ejb30/lite/packaging/war/webinflib/JsfClient.java
new file mode 100644
index 0000000000..4735809967
--- /dev/null
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/webinflib/JsfClient.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+package com.sun.ts.tests.ejb30.lite.packaging.war.webinflib;
+
+import static com.sun.ts.tests.ejb30.common.helper.ServiceLocator.lookupByShortNameNoTry;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import com.sun.ts.tests.ejb30.common.helper.ServiceLocator;
+import com.sun.ts.tests.ejb30.common.lite.EJBLiteJsfClientBase;
+import jakarta.annotation.Resource;
+import jakarta.transaction.UserTransaction;
+
+/**
+ * .war packaging of EJB classes are used in many other test directories. This
+ * directory covers uncommon packaging structures. Also covers: same class
+ * loader, and same naming context between web components and EJBs, and across
+ * multiple EJBs packaged in the same .war
+ */
+@jakarta.inject.Named("client")
+@jakarta.enterprise.context.RequestScoped
+public class JsfClient extends EJBLiteJsfClientBase implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  private static final String CLIENT_REF_NAME_PREFIX = JsfClient.class.getName();
+
+  private BeanBase one;
+
+  private BeanBase two;
+
+  private BeanBase three;
+
+  @Resource
+  private UserTransaction ut;
+
+  private List<BeanBase> beans;
+
+  @Override
+  public void setup(String[] args, Properties p) {
+    super.setup(args, p);
+    beans = new ArrayList<BeanBase>();
+    one = (BeanBase) ServiceLocator
+        .lookupNoTry("java:global/" + getModuleName() + "/OneBean");
+    two = (BeanBase) ServiceLocator
+        .lookupNoTry("java:global/" + getModuleName() + "/TwoBean");
+    three = (BeanBase) ServiceLocator
+        .lookupNoTry("java:global/" + getModuleName() + "/ThreeBean");
+    beans.add(one);
+    beans.add(two);
+    beans.add(three);
+  }
+
+  // related issue 8297
+  /*
+   * @testName: circularInjection
+   * 
+   * @test_Strategy: package a stateless bean class in WEB-INF/lib/1.jar, and a
+   * singleton bean class in WEB-INF/lib/2.jar, and a stateful in
+   * WEB-INF/classes. Circular injections.
+   */
+  public void circularInjection() {
+    for (BeanBase b : beans) {
+      assertEquals(b.getInjectionRecords(), true, b.getInjectionStatus());
+    }
+  }
+
+  /*
+   * @testName: sameClassLoader
+   * 
+   * @test_Strategy: EJBs packaged in a .war have the same class loading
+   * requirements as other non-EJB classes packaged in a .war.
+   */
+  public void sameClassLoader() {
+    int expected = System.identityHashCode(getClass().getClassLoader());
+    for (BeanBase b : beans) {
+      assertEquals(null, expected, b.getClassLoaderId());
+    }
+  }
+
+  /*
+   * @testName: clientToBeanClassLookup
+   * 
+   * @test_Strategy: client looking up ejb-ref injections in bean class. It must
+   * succeed since cleint and ejb packaged together share the same naming. Not
+   * for standalone client.
+   */
+  public void clientToBeanClassLookup() {
+    for (BeanBase b : beans) {
+      OneBean b1 = (OneBean) lookupByShortNameNoTry(
+          b.getRefNamePrefix() + "/one");
+      TwoBean b2 = (TwoBean) lookupByShortNameNoTry(
+          b.getRefNamePrefix() + "/two");
+      ThreeBean b3 = (ThreeBean) lookupByShortNameNoTry(
+          b.getRefNamePrefix() + "/three");
+      verifyBeans(b1, b2, b3);
+    }
+
+    UserTransaction u = (UserTransaction) lookupByShortNameNoTry(
+        BeanBase.class.getName() + "/ut");
+    assertNotEquals(null, u, null);
+  }
+
+  /*
+   * @testName: beanClassToClientLookup
+   * 
+   * @test_Strategy: bean looking up resource injected into client. It must
+   * succeed since cleint and ejb packaged together share the same naming. Not
+   * for standalone client.
+   */
+  public void beanClassToClientLookup() {
+    for (BeanBase b : beans) {
+      UserTransaction u = (UserTransaction) b
+          .beanClassToClientLookup(CLIENT_REF_NAME_PREFIX + "/ut");
+      assertNotEquals(null, u, null);
+    }
+  }
+
+  /*
+   * @testName: crossEJBLookup
+   * 
+   * @test_Strategy: EJBContext looking up ejb-ref injected into other beans. It
+   * must succeed since ejbs packaged together share the same naming context.
+   */
+  public void crossEJBLookup() {
+    for (BeanBase lookupFrom : beans) {
+      for (BeanBase lookupDest : beans) {
+        // look up all the OneBeans injected into One, Two, and Three.
+        // A totoal of 27 lookups
+        OneBean b1 = (OneBean) lookupFrom
+            .lookupWithEJBContext(lookupDest.getRefNamePrefix() + "/one");
+        TwoBean b2 = (TwoBean) lookupFrom
+            .lookupWithEJBContext(lookupDest.getRefNamePrefix() + "/two");
+        ThreeBean b3 = (ThreeBean) lookupFrom
+            .lookupWithEJBContext(lookupDest.getRefNamePrefix() + "/three");
+        verifyBeans(b1, b2, b3);
+      }
+    }
+  }
+
+  private void verifyBeans(Object b1, Object b2, Object b3) {
+    assertEquals(null, one, b1);
+    assertEquals(null, two, b2);
+    assertEquals(null, three, b3);
+  }
+}
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/webinflib/build.xml b/src/com/sun/ts/tests/ejb30/lite/packaging/war/webinflib/build.xml
index 57b96ba2d0..34da03a3ef 100644
--- a/src/com/sun/ts/tests/ejb30/lite/packaging/war/webinflib/build.xml
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/webinflib/build.xml
@@ -26,6 +26,7 @@
         <jar destfile="${dist.dir}/${pkg.dir}/1.jar">
             <fileset dir="${class.dir}" 
                 includes="com/sun/ts/tests/ejb30/lite/packaging/war/webinflib/OneBean.class,
+                com/sun/ts/tests/ejb30/common/lite/EJBLiteJsfClientBase.class,
                 com/sun/ts/tests/ejb30/common/helper/ServiceLocator.class"/>
         </jar>
         <jar destfile="${dist.dir}/${pkg.dir}/2.jar">
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/webinflibonly/JsfClient.java b/src/com/sun/ts/tests/ejb30/lite/packaging/war/webinflibonly/JsfClient.java
new file mode 100644
index 0000000000..8c028e13dc
--- /dev/null
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/webinflibonly/JsfClient.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+package com.sun.ts.tests.ejb30.lite.packaging.war.webinflibonly;
+
+/**
+ * See com.sun.ts.tests.ejb30.lite.packaging.war.webinflib.Client. All ejb
+ * classes are packaged under WEB-INF/lib/*.jar
+ */
+@jakarta.inject.Named("client")
+@jakarta.enterprise.context.RequestScoped
+public class JsfClient
+    extends com.sun.ts.tests.ejb30.lite.packaging.war.webinflib.JsfClient {
+  /*
+   * @testName: clientToBeanClassLookup
+   * 
+   * @test_Strategy: client looking up ejb-ref injections in bean class. It must
+   * succeed since client and ejb packaged together share the same naming. Not
+   * for standalone client.
+   */
+
+  /*
+   * @testName: beanClassToClientLookup
+   * 
+   * @test_Strategy: bean looking up resource injected into client. It must
+   * succeed since client and ejb packaged together share the same naming. Not
+   * for standalone client.
+   */
+
+  /*
+   * @testName: crossEJBLookup
+   * 
+   * @test_Strategy: EJBContext looking up ejb-ref injected into other beans. It
+   * must succeed since ejbs packaged together share the same naming context.
+   */
+}
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/webinflibonly/build.xml b/src/com/sun/ts/tests/ejb30/lite/packaging/war/webinflibonly/build.xml
index eb5c5e36e5..35c01e2e2a 100644
--- a/src/com/sun/ts/tests/ejb30/lite/packaging/war/webinflibonly/build.xml
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/webinflibonly/build.xml
@@ -28,6 +28,8 @@
             <fileset dir="${class.dir}" 
                 includes="com/sun/ts/tests/ejb30/lite/packaging/war/webinflib/BeanBase.class,
                 com/sun/ts/tests/ejb30/lite/packaging/war/webinflib/Client.class,
+                com/sun/ts/tests/ejb30/lite/packaging/war/webinflib/JsfClient.class,
+                com/sun/ts/tests/ejb30/lite/interceptor/common/business/JsfClientBase.class,
                 com/sun/ts/tests/ejb30/common/helper/ServiceLocator.class"/>
         </jar>
         <jar destfile="${dist.dir}/${pkg.dir}/1.jar">
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/xmloverride/ejbref/JsfClient.java b/src/com/sun/ts/tests/ejb30/lite/packaging/war/xmloverride/ejbref/JsfClient.java
new file mode 100644
index 0000000000..0801fd8710
--- /dev/null
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/xmloverride/ejbref/JsfClient.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+package com.sun.ts.tests.ejb30.lite.packaging.war.xmloverride.ejbref;
+
+import java.io.Serializable;
+
+import com.sun.ts.tests.ejb30.common.helper.ServiceLocator;
+import com.sun.ts.tests.ejb30.common.lite.EJBLiteJsfClientBase;
+import com.sun.ts.tests.ejb30.common.lite.NumberIF;
+import jakarta.ejb.EJB;
+
+@jakarta.inject.Named("client")
+@jakarta.enterprise.context.RequestScoped
+public class JsfClient extends EJBLiteJsfClientBase implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @EJB
+  // there are 2 beans implementing NumberIF, and so this @EJB is
+  // ambiguous. It's fully resolved in web.xml with ejb-link
+  private NumberIF overrideBean;
+
+  private TestBean getTestBean() {
+    return (TestBean) ServiceLocator
+        .lookupNoTry("java:global/" + getModuleName() + "/TestBean");
+  }
+
+  /*
+   * @testName: resolveByEjbLinkInXml
+   * 
+   * @test_Strategy: @EJB in TestBean is incomplete. But the corresponding
+   * ejb-local-ref in web.xml resolves it with ejb-link.
+   */
+  public void resolveByEjbLinkInXml() {
+    assertEquals("Check correct target EJB is resolved. ", 1,
+        overrideBean.getNumber());
+  }
+
+  /*
+   * @testName: availableInEjb
+   * 
+   * @test_Strategy: the ejb-local-ref declared in web.xml should be available
+   * for lookup in ejb components.
+   */
+  public void availableInEjb() {
+    assertEquals("Look up OverrideBean and invoke: ", 1,
+        getTestBean().getNumber());
+  }
+}
diff --git a/src/com/sun/ts/tests/ejb30/lite/packaging/war/xmloverride/ejbref/build.xml b/src/com/sun/ts/tests/ejb30/lite/packaging/war/xmloverride/ejbref/build.xml
index 71ce86939c..324520c4b5 100644
--- a/src/com/sun/ts/tests/ejb30/lite/packaging/war/xmloverride/ejbref/build.xml
+++ b/src/com/sun/ts/tests/ejb30/lite/packaging/war/xmloverride/ejbref/build.xml
@@ -25,6 +25,7 @@
   <target name="package">
     <ts.vehicles name="${app.name}" buildleveloverride="2"
       classes="
+        com/sun/ts/tests/ejb30/common/lite/EJBLiteClientBase.class,
         com/sun/ts/tests/ejb30/common/helper/ServiceLocator.class,
         com/sun/ts/tests/ejb30/lite/xmloverride/ejbref/XmlOverrideBean.class,
         com/sun/ts/tests/ejb30/lite/xmloverride/ejbref/XmlOverride2Bean.class

From 8f992b156ec7f3beb8d37a9c4adb750e8b0d93b7 Mon Sep 17 00:00:00 2001
From: Scott Marlow <smarlow@redhat.com>
Date: Wed, 18 May 2022 10:14:13 -0400
Subject: [PATCH 2/2] update for 988, remove leading slash from module name
 that is injected but not specified via setModuleName

Signed-off-by: Scott Marlow <smarlow@redhat.com>
---
 .../sun/ts/tests/ejb30/common/lite/EJBLiteJsfClientBase.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/sun/ts/tests/ejb30/common/lite/EJBLiteJsfClientBase.java b/src/com/sun/ts/tests/ejb30/common/lite/EJBLiteJsfClientBase.java
index 54c28bd81a..eab3f9fb1c 100644
--- a/src/com/sun/ts/tests/ejb30/common/lite/EJBLiteJsfClientBase.java
+++ b/src/com/sun/ts/tests/ejb30/common/lite/EJBLiteJsfClientBase.java
@@ -164,6 +164,9 @@ public void setReason(String reason) {
   }
 
   public String getModuleName() {
+    if (moduleName.startsWith("/")) {
+      return moduleName.substring(1);
+    }
     return moduleName;
   }