Merge pull request wildfly-security-incubator#156 from Skyllarr/migra…

…te-ejb-security-to-jakarta Migrate ejb-security example to Jakarta EE10
schlijo · Jan 17, 2023 · 2140f90 · 2140f90
2 parents 6bbae80 + fbe416f
commit 2140f90
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 19 deletions.
diff --git a/ejb-security/configure-elytron.cli b/ejb-security/configure-elytron.cli
@@ -22,17 +22,14 @@ 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)
 
 # 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
@@ -7,32 +7,53 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <version.org.wildfly.wildfly-ejb-client-bom>20.0.0.Final</version.org.wildfly.wildfly-ejb-client-bom>
-        <version.org.wildfly.security.wildfly-elytron>1.19.0.Final</version.org.wildfly.security.wildfly-elytron>
-        <version.org.jboss.spec.javax.annotation.jboss-annotations-api_1.3._spec>2.0.1.Final</version.org.jboss.spec.javax.annotation.jboss-annotations-api_1.3._spec>
         <version.org.wildfly.plugins.wildfly-maven-plugins>2.0.2.Final</version.org.wildfly.plugins.wildfly-maven-plugins>
         <version.org.apache.maven.plugins.maven-ejb-plugins>3.2</version.org.apache.maven.plugins.maven-ejb-plugins>
+        <version.wildfly>27.0.1.Final</version.wildfly>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.wildfly.bom</groupId>
+                <artifactId>wildfly-ee-with-tools</artifactId>
+                <scope>import</scope>
+                <type>pom</type>
+                <version>${version.wildfly}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.wildfly</groupId>
             <artifactId>wildfly-ejb-client-bom</artifactId>
-            <version>${version.org.wildfly.wildfly-ejb-client-bom}</version>
             <type>pom</type>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron</artifactId>
-            <version>${version.org.wildfly.security.wildfly-elytron}</version>
         </dependency>
         <dependency>
-            <groupId>org.jboss.spec.javax.annotation</groupId>
-            <artifactId>jboss-annotations-api_1.3_spec</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/jakarta.platform/jakarta.jakartaee-api -->
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
+            <version>10.0.0</version>
             <scope>provided</scope>
-            <version>${version.org.jboss.spec.javax.annotation.jboss-annotations-api_1.3._spec}</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

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
@@ -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
@@ -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
@@ -21,7 +21,7 @@
             <credential-store name="mycredstore">
                 <attributes>
                     <attribute name="keyStoreType" value="JCEKS"/>
-                    <attribute name="location" value="/PATH/TO/mycredstore.cs"></attribute>
+                    <attribute name="location" value="/tmp/mycredstore.cs"></attribute>
                 </attributes>
                 <protection-parameter-credentials>
                     <clear-password password="StorePassword"/>