Merge pull request #1242 from starksm64/iss1229

Issue #1229, rename security to elytron-security

Author: starksm64

build-parent/pom.xml

@@ -486,12 +486,12 @@
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-security-deployment</artifactId>
+                <artifactId>quarkus-elytron-security-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-security-runtime</artifactId>
+                <artifactId>quarkus-elytron-security-runtime</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

docs/src/main/asciidoc/security-guide.adoc

@@ -19,14 +19,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-security</artifactId>
+        <artifactId>quarkus-elytron-security</artifactId>
         <groupId>io.quarkus</groupId>
         <version>1.0.0.Alpha1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-security-deployment</artifactId>
+    <artifactId>quarkus-elytron-security-deployment</artifactId>
     <name>Quarkus - Security - Deployment</name>
 
     <dependencies>
@@ -45,7 +45,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-security-runtime</artifactId>
+            <artifactId>quarkus-elytron-security-runtime</artifactId>
         </dependency>
 
         <dependency>

extensions/security/deployment/pom.xml renamed to extensions/elytron-security/deployment/pom.xml

@@ -33,11 +33,8 @@
 import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem;
 import io.quarkus.runtime.RuntimeValue;
-import io.quarkus.security.runtime.AuthConfig;
-import io.quarkus.security.runtime.MPRealmConfig;
-import io.quarkus.security.runtime.PropertiesRealmConfig;
+import io.quarkus.security.runtime.*;
 import io.quarkus.security.runtime.SecurityConfig;
-import io.quarkus.security.runtime.SecurityTemplate;
 import io.quarkus.undertow.ServletExtensionBuildItem;
 import io.undertow.security.idm.IdentityManager;
 import io.undertow.servlet.ServletExtension;
@@ -60,6 +57,10 @@
  */
 class SecurityDeploymentProcessor {
     private static final Logger log = Logger.getLogger(SecurityDeploymentProcessor.class.getName());
+    /** Prefix for the user to password mapping properties */
+    private static final String USERS_PREFIX = "quarkus.security.embedded.users";
+    /** Prefix for the user to password mapping properties */
+    private static final String ROLES_PREFIX = "quarkus.security.embedded.roles";
 
     SecurityConfig security;
 
@@ -142,18 +143,18 @@ AuthConfigBuildItem configureMPRealmConfig(SecurityTemplate template,
             // These are not being populated correctly by the core config Map logic for some reason, so reparse them here
             log.debugf("MPRealmConfig.users: %s", realmConfig.users);
             log.debugf("MPRealmConfig.roles: %s", realmConfig.roles);
-            Set<String> userKeys = QuarkusConfig.getNames("quarkus.security.embedded.users");
+            Set<String> userKeys = QuarkusConfig.getNames(USERS_PREFIX);
 
             log.debugf("userKeys: %s", userKeys);
             for (String key : userKeys) {
-                String pass = QuarkusConfig.getString("quarkus.security.embedded.users." + key, null, false);
+                String pass = QuarkusConfig.getString(USERS_PREFIX + '.' + key, null, false);
                 log.debugf("%s.pass = %s", key, pass);
                 realmConfig.users.put(key, pass);
             }
-            Set<String> roleKeys = QuarkusConfig.getNames("quarkus.security.embedded.roles");
+            Set<String> roleKeys = QuarkusConfig.getNames(ROLES_PREFIX);
             log.debugf("roleKeys: %s", roleKeys);
             for (String key : roleKeys) {
-                String roles = QuarkusConfig.getString("quarkus.security.embedded.roles." + key, null, false);
+                String roles = QuarkusConfig.getString(ROLES_PREFIX + '.' + key, null, false);
                 log.debugf("%s.roles = %s", key, roles);
                 realmConfig.roles.put(key, roles);
             }