-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge Spring Integration - Meeds-io/MIPs#57 (#34)
- Loading branch information
Showing
5 changed files
with
195 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
175 changes: 175 additions & 0 deletions
175
sso-saml-plugin/src/main/patches/javax.persistence.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,175 @@ | ||
| diff -uNr picketlink-orig/org/jboss/security/acl/ACLEntryImpl.java picketlink/org/jboss/security/acl/ACLEntryImpl.java | ||
| --- picketlink-orig/org/jboss/security/acl/ACLEntryImpl.java 2013-10-08 17:01:34.000000000 +0100 | ||
| +++ picketlink/org/jboss/security/acl/ACLEntryImpl.java 2023-12-21 09:00:31.807478000 +0100 | ||
| @@ -23,14 +23,14 @@ | ||
|
|
||
| import java.io.Serializable; | ||
|
|
||
| -import javax.persistence.Entity; | ||
| -import javax.persistence.GeneratedValue; | ||
| -import javax.persistence.Id; | ||
| -import javax.persistence.ManyToOne; | ||
| -import javax.persistence.PostLoad; | ||
| -import javax.persistence.PrePersist; | ||
| -import javax.persistence.Table; | ||
| -import javax.persistence.Transient; | ||
| +import jakarta.persistence.Entity; | ||
| +import jakarta.persistence.GeneratedValue; | ||
| +import jakarta.persistence.Id; | ||
| +import jakarta.persistence.ManyToOne; | ||
| +import jakarta.persistence.PostLoad; | ||
| +import jakarta.persistence.PrePersist; | ||
| +import jakarta.persistence.Table; | ||
| +import jakarta.persistence.Transient; | ||
|
|
||
| import org.jboss.security.PicketBoxMessages; | ||
| import org.jboss.security.identity.Identity; | ||
| diff -uNr picketlink-orig/org/jboss/security/acl/ACLImpl.java picketlink/org/jboss/security/acl/ACLImpl.java | ||
| --- picketlink-orig/org/jboss/security/acl/ACLImpl.java 2013-10-08 17:01:34.000000000 +0100 | ||
| +++ picketlink/org/jboss/security/acl/ACLImpl.java 2023-12-21 09:00:31.811478000 +0100 | ||
| @@ -28,15 +28,15 @@ | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| -import javax.persistence.CascadeType; | ||
| -import javax.persistence.Column; | ||
| -import javax.persistence.Entity; | ||
| -import javax.persistence.FetchType; | ||
| -import javax.persistence.GeneratedValue; | ||
| -import javax.persistence.Id; | ||
| -import javax.persistence.OneToMany; | ||
| -import javax.persistence.Table; | ||
| -import javax.persistence.Transient; | ||
| +import jakarta.persistence.CascadeType; | ||
| +import jakarta.persistence.Column; | ||
| +import jakarta.persistence.Entity; | ||
| +import jakarta.persistence.FetchType; | ||
| +import jakarta.persistence.GeneratedValue; | ||
| +import jakarta.persistence.Id; | ||
| +import jakarta.persistence.OneToMany; | ||
| +import jakarta.persistence.Table; | ||
| +import jakarta.persistence.Transient; | ||
|
|
||
| import org.hibernate.annotations.Cascade; | ||
| import org.jboss.security.PicketBoxMessages; | ||
| diff -uNr picketlink-orig/org/jboss/security/acl/JPAPersistenceStrategy.java picketlink/org/jboss/security/acl/JPAPersistenceStrategy.java | ||
| --- picketlink-orig/org/jboss/security/acl/JPAPersistenceStrategy.java 2013-10-08 17:01:34.000000000 +0100 | ||
| +++ picketlink/org/jboss/security/acl/JPAPersistenceStrategy.java 2023-12-21 09:00:31.819478000 +0100 | ||
| @@ -5,11 +5,11 @@ | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| -import javax.persistence.EntityManager; | ||
| -import javax.persistence.EntityManagerFactory; | ||
| -import javax.persistence.EntityTransaction; | ||
| -import javax.persistence.NoResultException; | ||
| -import javax.persistence.Persistence; | ||
| +import jakarta.persistence.EntityManager; | ||
| +import jakarta.persistence.EntityManagerFactory; | ||
| +import jakarta.persistence.EntityTransaction; | ||
| +import jakarta.persistence.NoResultException; | ||
| +import jakarta.persistence.Persistence; | ||
|
|
||
| import org.jboss.security.PicketBoxMessages; | ||
| import org.jboss.security.authorization.Resource; | ||
| diff -uNr picketlink-orig/org/jboss/security/acl/Util.java picketlink/org/jboss/security/acl/Util.java | ||
| --- picketlink-orig/org/jboss/security/acl/Util.java 2013-10-08 17:01:34.000000000 +0100 | ||
| +++ picketlink/org/jboss/security/acl/Util.java 2023-12-21 09:00:31.819478000 +0100 | ||
| @@ -112,7 +112,7 @@ | ||
| /** | ||
| * <p> | ||
| * Obtains an {@code Object} that can represent the specified resource uniquely. It first tries to find | ||
| - * a {@code Field} annotated with a {@code javax.persistence.Id} annotation. If such field is found, the | ||
| + * a {@code Field} annotated with a {@code jakarta.persistence.Id} annotation. If such field is found, the | ||
| * method tries to read the field's value. If no annotated field is found, this method just tries to | ||
| * invoke a {@code getId()} method on the resource. | ||
| * </p> | ||
| @@ -125,10 +125,10 @@ | ||
| { | ||
| Class<? extends Resource> resourceClass = resource.getClass(); | ||
| Object resourceKey = null; | ||
| - // first search for a field with a javax.persistence.Id annotation. | ||
| + // first search for a field with a jakarta.persistence.Id annotation. | ||
| for (Field field : resourceClass.getDeclaredFields()) | ||
| { | ||
| - if (field.getAnnotation(javax.persistence.Id.class) != null) | ||
| + if (field.getAnnotation(jakarta.persistence.Id.class) != null) | ||
| { | ||
| // found a field - try to get its value reflectively. | ||
| try | ||
| diff -uNr picketlink-orig/org/picketlink/identity/federation/core/sts/registry/AbstractJPARegistry.java picketlink/org/picketlink/identity/federation/core/sts/registry/AbstractJPARegistry.java | ||
| --- picketlink-orig/org/picketlink/identity/federation/core/sts/registry/AbstractJPARegistry.java 2015-02-23 17:06:38.000000000 +0100 | ||
| +++ picketlink/org/picketlink/identity/federation/core/sts/registry/AbstractJPARegistry.java 2023-12-21 09:00:31.819478000 +0100 | ||
| @@ -21,8 +21,8 @@ | ||
| import org.picketlink.common.PicketLinkLogger; | ||
| import org.picketlink.common.PicketLinkLoggerFactory; | ||
|
|
||
| -import javax.persistence.EntityManagerFactory; | ||
| -import javax.persistence.Persistence; | ||
| +import jakarta.persistence.EntityManagerFactory; | ||
| +import jakarta.persistence.Persistence; | ||
|
|
||
| /** | ||
| * @author <a href="mailto:[email protected]">Pedro Silva</a> | ||
| diff -uNr picketlink-orig/org/picketlink/identity/federation/core/sts/registry/JPABasedRevocationRegistry.java picketlink/org/picketlink/identity/federation/core/sts/registry/JPABasedRevocationRegistry.java | ||
| --- picketlink-orig/org/picketlink/identity/federation/core/sts/registry/JPABasedRevocationRegistry.java 2015-02-23 17:06:38.000000000 +0100 | ||
| +++ picketlink/org/picketlink/identity/federation/core/sts/registry/JPABasedRevocationRegistry.java 2023-12-21 09:00:31.823478000 +0100 | ||
| @@ -17,8 +17,8 @@ | ||
| */ | ||
| package org.picketlink.identity.federation.core.sts.registry; | ||
|
|
||
| -import javax.persistence.EntityManager; | ||
| -import javax.persistence.EntityTransaction; | ||
| +import jakarta.persistence.EntityManager; | ||
| +import jakarta.persistence.EntityTransaction; | ||
|
|
||
| /** | ||
| * <p> | ||
| diff -uNr picketlink-orig/org/picketlink/identity/federation/core/sts/registry/JPABasedTokenRegistry.java picketlink/org/picketlink/identity/federation/core/sts/registry/JPABasedTokenRegistry.java | ||
| --- picketlink-orig/org/picketlink/identity/federation/core/sts/registry/JPABasedTokenRegistry.java 2015-08-21 10:05:52.000000000 +0100 | ||
| +++ picketlink/org/picketlink/identity/federation/core/sts/registry/JPABasedTokenRegistry.java 2023-12-21 09:00:31.823478000 +0100 | ||
| @@ -18,8 +18,8 @@ | ||
|
|
||
| package org.picketlink.identity.federation.core.sts.registry; | ||
|
|
||
| -import javax.persistence.EntityManager; | ||
| -import javax.persistence.EntityTransaction; | ||
| +import jakarta.persistence.EntityManager; | ||
| +import jakarta.persistence.EntityTransaction; | ||
| import java.io.IOException; | ||
|
|
||
| /** | ||
| diff -uNr picketlink-orig/org/picketlink/identity/federation/core/sts/registry/RevokedToken.java picketlink/org/picketlink/identity/federation/core/sts/registry/RevokedToken.java | ||
| --- picketlink-orig/org/picketlink/identity/federation/core/sts/registry/RevokedToken.java 2015-02-23 17:06:38.000000000 +0100 | ||
| +++ picketlink/org/picketlink/identity/federation/core/sts/registry/RevokedToken.java 2023-12-21 09:00:31.823478000 +0100 | ||
| @@ -17,9 +17,9 @@ | ||
| */ | ||
| package org.picketlink.identity.federation.core.sts.registry; | ||
|
|
||
| -import javax.persistence.Column; | ||
| -import javax.persistence.Entity; | ||
| -import javax.persistence.Id; | ||
| +import jakarta.persistence.Column; | ||
| +import jakarta.persistence.Entity; | ||
| +import jakarta.persistence.Id; | ||
|
|
||
| /** | ||
| * <p> | ||
| diff -uNr picketlink-orig/org/picketlink/identity/federation/core/sts/registry/SecurityToken.java picketlink/org/picketlink/identity/federation/core/sts/registry/SecurityToken.java | ||
| --- picketlink-orig/org/picketlink/identity/federation/core/sts/registry/SecurityToken.java 2015-02-23 17:06:38.000000000 +0100 | ||
| +++ picketlink/org/picketlink/identity/federation/core/sts/registry/SecurityToken.java 2023-12-21 09:00:31.823478000 +0100 | ||
| @@ -17,10 +17,10 @@ | ||
| */ | ||
| package org.picketlink.identity.federation.core.sts.registry; | ||
|
|
||
| -import javax.persistence.Column; | ||
| -import javax.persistence.Entity; | ||
| -import javax.persistence.Id; | ||
| -import javax.persistence.Lob; | ||
| +import jakarta.persistence.Column; | ||
| +import jakarta.persistence.Entity; | ||
| +import jakarta.persistence.Id; | ||
| +import jakarta.persistence.Lob; | ||
| import java.io.ByteArrayInputStream; | ||
| import java.io.ByteArrayOutputStream; | ||
| import java.io.ObjectInputStream; |