Merge pull request #32817 from benjamin-confino/32585-JPA-CDI-Integration

32585 jpa cdi integration

Author: benjamin-confino

dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml

@@ -1711,6 +1711,11 @@
       <artifactId>jakarta.servlet-api</artifactId>
       <version>6.1.0</version>
     </dependency>
+    <dependency>
+      <groupId>jakarta.tck.arquillian</groupId>
+      <artifactId>tck-porting-lib</artifactId>
+      <version>11.0.1</version>
+    </dependency>
     <dependency>
       <groupId>jakarta.transaction</groupId>
       <artifactId>jakarta.transaction-api</artifactId>

dev/cnf/oss_dependencies.maven

@@ -338,6 +338,7 @@ jakarta.servlet.jsp:jakarta.servlet.jsp-api:4.0.0
 jakarta.servlet:jakarta.servlet-api:5.0.0
 jakarta.servlet:jakarta.servlet-api:6.0.0
 jakarta.servlet:jakarta.servlet-api:6.1.0
+jakarta.tck.arquillian:tck-porting-lib:11.0.1
 jakarta.transaction:jakarta.transaction-api:1.3.3
 jakarta.transaction:jakarta.transaction-api:2.0.1
 jakarta.validation:jakarta.validation-api:3.0.2

dev/com.ibm.websphere.appserver.features/visibility/auto/io.openliberty.jpaContainer32-cdi.feature

@@ -0,0 +1,13 @@
+-include= ~${workspace}/cnf/resources/bnd/feature.props
+symbolicName=io.openliberty.jpaContainer32-cdi
+visibility=private
+IBM-App-ForceRestart: install, \
+ uninstall
+IBM-Provision-Capability: \
+  osgi.identity; filter:="(osgi.identity=io.openliberty.cdi-4.1)", \
+  osgi.identity; filter:="(osgi.identity=io.openliberty.persistenceContainer-3.2)"
+-bundles=com.ibm.ws.jpa.container.v32.cdi
+IBM-Install-Policy: when-satisfied
+kind=beta
+edition=core
+WLP-Activation-Type: parallel

dev/com.ibm.ws.cdi.internal/src/com/ibm/ws/cdi/internal/interfaces/ContextBeginnerEnder.java

@@ -9,6 +9,9 @@
  *******************************************************************************/
 package com.ibm.ws.cdi.internal.interfaces;
 
+import java.util.Optional;
+
+import com.ibm.websphere.csi.J2EEName;
 import com.ibm.ws.cdi.CDIException;
 
 /**
@@ -89,4 +92,9 @@ public interface ContextBeginnerEnder extends AutoCloseable {
     @Override
     public void close();
 
+    /**
+     * Returns the J2EEName of the ComponentMetaData extracted in extractComponentMetaData, or an empty Optional if extractComponentMetaData hasn't been called
+     */
+    Optional<J2EEName> getJ2EEName();
+
 }

dev/com.ibm.ws.cdi.weld/src/com/ibm/ws/cdi/liberty/ContextBeginnerEnderImpl.java

@@ -9,6 +9,9 @@
  *******************************************************************************/
 package com.ibm.ws.cdi.liberty;
 
+import java.util.Optional;
+
+import com.ibm.websphere.csi.J2EEName;
 import com.ibm.websphere.ras.Tr;
 import com.ibm.websphere.ras.TraceComponent;
 import com.ibm.ws.cdi.CDIException;
@@ -157,6 +160,11 @@ public ContextBeginnerEnder clone() {
         return new ContextBeginnerEnderImpl(newTheadContextClassLoader, cmd, cmdLogStringSuffix, tcclLogStringSuffix);
     }
 
+    @Override
+    public Optional<J2EEName> getJ2EEName() {
+        return Optional.ofNullable(cmd.getJ2EEName());
+    }
+
     public static ContextBeginnerEnderImpl getCurrentlyActive() {
         return currentlyActive.get();
     }

dev/com.ibm.ws.jpa.container.core/resources/com/ibm/ws/jpa/jpa.nlsprops

@@ -344,3 +344,8 @@ PROVIDER_FATAL_CWWJP9993E.explanation=The Java Persistence API (JPA) provider ha
 PROVIDER_FATAL_CWWJP9993E.useraction=See the JPA provider documentation.
 
 #-------------------------------------------------------------------------------
+FAILED_TO_CREATE_PU_BEAN_CWWJP9994W=CWWJP9994W: The server cannot create beans for the {0} PersistenceUnit because: {1}.
+FAILED_TO_CREATE_PU_BEAN_CWWJP9994W.explanation=An exception occurred when CDI attempted to create the bean for a persistence unit. CDI cannot inject an entity manager, an entity manager factory, or utility classes related to that persistence unit.
+FAILED_TO_CREATE_PU_BEAN_CWWJP9994W.useraction=Resolve the exception.
+
+#-------------------------------------------------------------------------------

dev/com.ibm.ws.jpa.container.v32.cdi/.classpath

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

dev/com.ibm.ws.jpa.container.v32.cdi/.gitignore

@@ -0,0 +1,2 @@
+/bin/
+/generated/

dev/com.ibm.ws.jpa.container.v32.cdi/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.ibm.ws.jpa.container.v32.cdi</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>bndtools.core.bndbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>bndtools.core.bndnature</nature>
+	</natures>
+</projectDescription>

dev/com.ibm.ws.jpa.container.v32.cdi/.settings/bndtools.core.prefs

@@ -0,0 +1,2 @@
+compileErrorAction=build
+eclipse.preferences.version=1