diff --git a/ejb-security/configure-elytron.cli b/ejb-security/configure-elytron.cli index 346fde61..3ed50eb6 100644 --- a/ejb-security/configure-elytron.cli +++ b/ejb-security/configure-elytron.cli @@ -22,7 +22,7 @@ batch /subsystem=elytron/security-domain=fsSD:add(realms=[{realm=fsRealm, role-decoder=from-roles-attribute}], default-realm=fsRealm,permission-mapper=default-permission-mapper) # Add the filesystem security domain mapping in the EJB3 subsystem -/subsystem=ejb3/application-security-domain=other:add(security-domain=fsSD) +/subsystem=ejb3/application-security-domain=other:write-attribute(name=security-domain,value=fsSD) # Update the sasl-authentication-factory to use the fsSD security domain /subsystem=elytron/sasl-authentication-factory=application-sasl-authentication:write-attribute(name=security-domain, value=fsSD) @@ -30,9 +30,6 @@ batch # Update the sasl-authentication-factory to use SCRAM-SHA-512 /subsystem=elytron/sasl-authentication-factory=application-sasl-authentication:list-add(name=mechanism-configurations, value={mechanism-name=SCRAM-SHA-512}) -# Update the http-remoting-connector to use the application-sasl-authentication factory -/subsystem=remoting/http-connector=http-remoting-connector:write-attribute(name=sasl-authentication-factory,value=application-sasl-authentication) - # Run the batch commands run-batch diff --git a/ejb-security/pom.xml b/ejb-security/pom.xml index 1a87e7f1..178c99d7 100644 --- a/ejb-security/pom.xml +++ b/ejb-security/pom.xml @@ -7,32 +7,53 @@ UTF-8 1.8 1.8 - 20.0.0.Final - 1.19.0.Final - 2.0.1.Final 2.0.2.Final 3.2 + 27.0.1.Final + + + + org.wildfly.bom + wildfly-ee-with-tools + import + pom + ${version.wildfly} + + + + org.wildfly wildfly-ejb-client-bom - ${version.org.wildfly.wildfly-ejb-client-bom} pom compile org.wildfly.security wildfly-elytron - ${version.org.wildfly.security.wildfly-elytron} - org.jboss.spec.javax.annotation - jboss-annotations-api_1.3_spec + jakarta.annotation + jakarta.annotation-api + provided + + + + jakarta.platform + jakarta.jakartaee-api + 10.0.0 provided - ${version.org.jboss.spec.javax.annotation.jboss-annotations-api_1.3._spec} + + + jakarta.servlet + jakarta.servlet-api + provided + + diff --git a/ejb-security/src/main/java/org/wildfly/security/examples/RemoteClient.java b/ejb-security/src/main/java/org/wildfly/security/examples/RemoteClient.java index f0d3f2e8..240140bd 100644 --- a/ejb-security/src/main/java/org/wildfly/security/examples/RemoteClient.java +++ b/ejb-security/src/main/java/org/wildfly/security/examples/RemoteClient.java @@ -19,7 +19,7 @@ import java.util.Hashtable; -import javax.ejb.EJBAccessException; +import jakarta.ejb.EJBAccessException; import javax.naming.Context; import javax.naming.InitialContext; diff --git a/ejb-security/src/main/java/org/wildfly/security/examples/SecuredEJB.java b/ejb-security/src/main/java/org/wildfly/security/examples/SecuredEJB.java index b906973c..bc87f41b 100644 --- a/ejb-security/src/main/java/org/wildfly/security/examples/SecuredEJB.java +++ b/ejb-security/src/main/java/org/wildfly/security/examples/SecuredEJB.java @@ -18,11 +18,11 @@ import java.security.Principal; -import javax.annotation.Resource; -import javax.annotation.security.RolesAllowed; -import javax.ejb.Remote; -import javax.ejb.SessionContext; -import javax.ejb.Stateless; +import jakarta.annotation.Resource; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ejb.Remote; +import jakarta.ejb.SessionContext; +import jakarta.ejb.Stateless; import org.jboss.ejb3.annotation.SecurityDomain; diff --git a/ejb-security/src/main/resources/wildfly-config.xml b/ejb-security/src/main/resources/wildfly-config.xml index 79428db9..6ab2d69e 100644 --- a/ejb-security/src/main/resources/wildfly-config.xml +++ b/ejb-security/src/main/resources/wildfly-config.xml @@ -21,7 +21,7 @@ - +