Skip to content

Commit 781b74f

Browse files
authored
Merge pull request #32813 from OpenLiberty/revert-32728-32585-JPA-CDI-Integration
Revert "32585 jpa cdi integration"
2 parents 84ea6f2 + 539343c commit 781b74f

File tree

39 files changed

+1
-1782
lines changed

39 files changed

+1
-1782
lines changed

dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1711,11 +1711,6 @@
17111711
<artifactId>jakarta.servlet-api</artifactId>
17121712
<version>6.1.0</version>
17131713
</dependency>
1714-
<dependency>
1715-
<groupId>jakarta.tck.arquillian</groupId>
1716-
<artifactId>tck-porting-lib</artifactId>
1717-
<version>11.0.1</version>
1718-
</dependency>
17191714
<dependency>
17201715
<groupId>jakarta.transaction</groupId>
17211716
<artifactId>jakarta.transaction-api</artifactId>

dev/cnf/oss_dependencies.maven

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,6 @@ jakarta.servlet.jsp:jakarta.servlet.jsp-api:4.0.0
338338
jakarta.servlet:jakarta.servlet-api:5.0.0
339339
jakarta.servlet:jakarta.servlet-api:6.0.0
340340
jakarta.servlet:jakarta.servlet-api:6.1.0
341-
jakarta.tck.arquillian:tck-porting-lib:11.0.1
342341
jakarta.transaction:jakarta.transaction-api:1.3.3
343342
jakarta.transaction:jakarta.transaction-api:2.0.1
344343
jakarta.validation:jakarta.validation-api:3.0.2

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

Lines changed: 0 additions & 13 deletions
This file was deleted.

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
*******************************************************************************/
1010
package com.ibm.ws.cdi.internal.interfaces;
1111

12-
import java.util.Optional;
13-
14-
import com.ibm.websphere.csi.J2EEName;
1512
import com.ibm.ws.cdi.CDIException;
1613

1714
/**
@@ -92,9 +89,4 @@ public interface ContextBeginnerEnder extends AutoCloseable {
9289
@Override
9390
public void close();
9491

95-
/**
96-
* Returns the J2EEName of the ComponentMetaData extracted in extractComponentMetaData, or an empty Optional if extractComponentMetaData hasn't been called
97-
*/
98-
Optional<J2EEName> getJ2EEName();
99-
10092
}

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
*******************************************************************************/
1010
package com.ibm.ws.cdi.liberty;
1111

12-
import java.util.Optional;
13-
14-
import com.ibm.websphere.csi.J2EEName;
1512
import com.ibm.websphere.ras.Tr;
1613
import com.ibm.websphere.ras.TraceComponent;
1714
import com.ibm.ws.cdi.CDIException;
@@ -160,11 +157,6 @@ public ContextBeginnerEnder clone() {
160157
return new ContextBeginnerEnderImpl(newTheadContextClassLoader, cmd, cmdLogStringSuffix, tcclLogStringSuffix);
161158
}
162159

163-
@Override
164-
public Optional<J2EEName> getJ2EEName() {
165-
return Optional.ofNullable(cmd.getJ2EEName());
166-
}
167-
168160
public static ContextBeginnerEnderImpl getCurrentlyActive() {
169161
return currentlyActive.get();
170162
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,3 @@ PROVIDER_FATAL_CWWJP9993E.explanation=The Java Persistence API (JPA) provider ha
344344
PROVIDER_FATAL_CWWJP9993E.useraction=See the JPA provider documentation.
345345

346346
#-------------------------------------------------------------------------------
347-
FAILED_TO_CREATE_PU_BEAN_CWWJP9994W=CWWJP9994W: Could not create beans for PersistenceUnit {0} because: {1}. It is not injectable.
348-
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.
349-
FAILED_TO_CREATE_PU_BEAN_CWWJP9994W.useraction=Resolve the exception.
350-
351-
#-------------------------------------------------------------------------------

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

Lines changed: 0 additions & 7 deletions
This file was deleted.

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

Lines changed: 0 additions & 2 deletions
This file was deleted.

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

Lines changed: 0 additions & 23 deletions
This file was deleted.

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

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)