Rename main package in security-ee module to include .ee

Before the security and security-ee modules both had the same main
package name.

Rename auth package to authentication in .ee package, and move the
GlassFish LoginModule/Realms combinations to a new package.

Rename JDBCDigest which had nothing to do with JDBC.

Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>

appserver/admingui/common/src/main/help/en/help/ref-realmsnew.html

@@ -75,7 +75,7 @@ <h4><a id="sthref198" name="sthref198"></a>New Realm</h4>
 <p><code>JDBC</code></p>
 </td>
 <td align="left" headers="r5c1-t6 r1c2-t6">
-<p><code>com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm</code></p>
+<p><code>com.sun.enterprise.security.ee.authentication.glassfish.jdbc.JDBCRealm</code></p>
 </td>
 </tr>
 <tr align="left" valign="top">

appserver/admingui/common/src/main/help/en/help/task-realmnew.html

@@ -85,7 +85,7 @@ <h4><a id="sthref81" name="sthref81"></a>To Create a Realm</h4>
 <p><code>JDBC</code></p>
 </td>
 <td align="left" headers="r5c1-t8 r1c2-t8">
-<p><code>com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm</code></p>
+<p><code>com.sun.enterprise.security.ee.authentication.glassfish.jdbc.JDBCRealm</code></p>
 </td>
 </tr>
 <tr align="left" valign="top">

appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/common/ClientClassLoaderDelegate.java

@@ -19,8 +19,7 @@
 import java.security.CodeSource;
 import java.security.PermissionCollection;
 import java.net.URLClassLoader;
-
-import com.sun.enterprise.security.perms.SMGlobalPolicyUtil;
+import com.sun.enterprise.security.ee.perms.SMGlobalPolicyUtil;
 import com.sun.enterprise.security.integration.PermsHolder;
 
 public class ClientClassLoaderDelegate {

appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/common/PermissionsUtil.java

@@ -15,9 +15,10 @@
  */
 package org.glassfish.appclient.common;
 
-import static com.sun.enterprise.security.perms.SMGlobalPolicyUtil.CLIENT_TYPE_CODESOURCE;
-import static com.sun.enterprise.security.perms.SMGlobalPolicyUtil.CommponentType.car;
+import static com.sun.enterprise.security.ee.perms.SMGlobalPolicyUtil.CLIENT_TYPE_CODESOURCE;
+import static com.sun.enterprise.security.ee.perms.SMGlobalPolicyUtil.CommponentType.car;
 
+import com.sun.enterprise.security.ee.perms.XMLPermissionsHandler;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -33,8 +34,6 @@
 
 import javax.xml.stream.XMLStreamException;
 
-import com.sun.enterprise.security.perms.XMLPermissionsHandler;
-
 public class PermissionsUtil {
 
     protected static final String PERMISSIONS_XML = "META-INF/permissions.xml";

appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/CarHandler.java

@@ -19,9 +19,8 @@
 
 import com.sun.enterprise.deploy.shared.AbstractArchiveHandler;
 import com.sun.enterprise.loader.ASURLClassLoader;
-import com.sun.enterprise.security.perms.PermsArchiveDelegate;
-import com.sun.enterprise.security.perms.SMGlobalPolicyUtil;
-
+import com.sun.enterprise.security.ee.perms.PermsArchiveDelegate;
+import com.sun.enterprise.security.ee.perms.SMGlobalPolicyUtil;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 

appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectorRuntime.java

@@ -61,7 +61,7 @@
 import com.sun.enterprise.resource.pool.monitor.ConnectionPoolProbeProviderUtil;
 import com.sun.enterprise.resource.pool.monitor.PoolMonitoringLevelListener;
 import com.sun.enterprise.security.SecurityServicesUtil;
-import com.sun.enterprise.security.jmac.callback.ContainerCallbackHandler;
+import com.sun.enterprise.security.ee.jmac.callback.ContainerCallbackHandler;
 import com.sun.enterprise.transaction.api.JavaEETransactionManager;
 import com.sun.logging.LogDomains;
 

appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/RarHandler.java

@@ -21,8 +21,8 @@
 import com.sun.appserv.connectors.internal.api.ConnectorsClassLoaderUtil;
 import com.sun.appserv.connectors.internal.api.ConnectorsUtil;
 import com.sun.enterprise.deploy.shared.AbstractArchiveHandler;
-import com.sun.enterprise.security.perms.PermsArchiveDelegate;
-import com.sun.enterprise.security.perms.SMGlobalPolicyUtil;
+import com.sun.enterprise.security.ee.perms.PermsArchiveDelegate;
+import com.sun.enterprise.security.ee.perms.SMGlobalPolicyUtil;
 import com.sun.logging.LogDomains;
 
 import jakarta.inject.Inject;

appserver/deployment/jakartaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarHandler.java

@@ -29,10 +29,10 @@
 import com.sun.enterprise.deployment.deploy.shared.Util;
 import com.sun.enterprise.deployment.io.DescriptorConstants;
 import com.sun.enterprise.deployment.util.DOLUtils;
+import com.sun.enterprise.security.ee.perms.EarEEPermissionsProcessor;
+import com.sun.enterprise.security.ee.perms.PermsArchiveDelegate;
+import com.sun.enterprise.security.ee.perms.SMGlobalPolicyUtil;
 import com.sun.enterprise.security.integration.DDPermissionsLoader;
-import com.sun.enterprise.security.perms.EarEEPermissionsProcessor;
-import com.sun.enterprise.security.perms.PermsArchiveDelegate;
-import com.sun.enterprise.security.perms.SMGlobalPolicyUtil;
 import com.sun.enterprise.universal.i18n.LocalStringsImpl;
 import com.sun.enterprise.util.LocalStringManagerImpl;
 import com.sun.enterprise.util.io.FileUtils;

appserver/ejb/ejb-container/src/main/java/com/sun/ejb/InvocationInfo.java

@@ -19,7 +19,7 @@
 import java.lang.reflect.Method;
 
 import com.sun.ejb.containers.interceptors.InterceptorManager;
-import com.sun.enterprise.security.authorize.cache.CachedPermission;
+import com.sun.enterprise.security.ee.authorize.cache.CachedPermission;
 import org.glassfish.ejb.deployment.descriptor.EjbRemovalInfo;
 
 /**

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/EjbJarHandler.java

@@ -21,8 +21,8 @@
 import com.sun.enterprise.deployment.io.DescriptorConstants;
 import com.sun.enterprise.deployment.util.DOLUtils;
 import com.sun.enterprise.loader.ASURLClassLoader;
-import com.sun.enterprise.security.perms.PermsArchiveDelegate;
-import com.sun.enterprise.security.perms.SMGlobalPolicyUtil;
+import com.sun.enterprise.security.ee.perms.PermsArchiveDelegate;
+import com.sun.enterprise.security.ee.perms.SMGlobalPolicyUtil;
 import com.sun.enterprise.util.LocalStringManagerImpl;
 
 import jakarta.inject.Inject;

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EJBSecurityManager.java

@@ -22,12 +22,12 @@
 import com.sun.enterprise.security.SecurityContext;
 import com.sun.enterprise.security.SecurityManager;
 import com.sun.enterprise.security.auth.login.LoginContextDriver;
-import com.sun.enterprise.security.authorize.PolicyContextHandlerImpl;
-import com.sun.enterprise.security.authorize.cache.PermissionCache;
-import com.sun.enterprise.security.authorize.cache.PermissionCacheFactory;
 import com.sun.enterprise.security.common.AppservAccessController;
 import com.sun.enterprise.security.ee.SecurityUtil;
 import com.sun.enterprise.security.ee.audit.AppServerAuditManager;
+import com.sun.enterprise.security.ee.authorize.PolicyContextHandlerImpl;
+import com.sun.enterprise.security.ee.authorize.cache.PermissionCache;
+import com.sun.enterprise.security.ee.authorize.cache.PermissionCacheFactory;
 import com.sun.logging.LogDomains;
 
 import jakarta.security.jacc.EJBMethodPermission;

appserver/security/core-ee/exclude.xml

@@ -35,16 +35,16 @@
     -->
     <Match>
     <Or>
-        <Class name="com.sun.enterprise.security.jauth.callback.CertStoreCallback"/>
-        <Class name="com.sun.enterprise.security.jauth.callback.SecretKeyCallback"/>
-        <Class name="com.sun.enterprise.security.jauth.callback.PrivateKeyCallback"/>
-        <Class name="com.sun.enterprise.security.jauth.callback.PrivateKeyCallback$IssuerSerialNumRequest"/>
-        <Class name="com.sun.enterprise.security.jauth.AuthException"/>
-        <Class name="com.sun.enterprise.security.jauth.callback.SecretKeyCallback$AliasRequest"/>
-        <Class name="com.sun.enterprise.security.jauth.callback.TrustStoreCallback"/>
-        <Class name="com.sun.enterprise.security.jauth.callback.PrivateKeyCallback$SubjectKeyIDRequest"/>
-        <Class name="com.sun.enterprise.security.jauth.callback.PasswordValidationCallback"/>
-        <Class name="com.sun.enterprise.security.jauth.callback.PrivateKeyCallback$AliasRequest"/>
+        <Class name="com.sun.enterprise.security.ee.jauth.callback.CertStoreCallback"/>
+        <Class name="com.sun.enterprise.security.ee.jauth.callback.SecretKeyCallback"/>
+        <Class name="com.sun.enterprise.security.ee.jauth.callback.PrivateKeyCallback"/>
+        <Class name="com.sun.enterprise.security.ee.jauth.callback.PrivateKeyCallback$IssuerSerialNumRequest"/>
+        <Class name="com.sun.enterprise.security.ee.jauth.AuthException"/>
+        <Class name="com.sun.enterprise.security.ee.jauth.callback.SecretKeyCallback$AliasRequest"/>
+        <Class name="com.sun.enterprise.security.ee.jauth.callback.TrustStoreCallback"/>
+        <Class name="com.sun.enterprise.security.ee.jauth.callback.PrivateKeyCallback$SubjectKeyIDRequest"/>
+        <Class name="com.sun.enterprise.security.ee.jauth.callback.PasswordValidationCallback"/>
+        <Class name="com.sun.enterprise.security.ee.jauth.callback.PrivateKeyCallback$AliasRequest"/>
     </Or>
     <Bug pattern="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS"/>
     </Match>
@@ -55,20 +55,20 @@
         the constructor exists and doesn't fail.  The object is thrown away.
     -->
     <Match>
-        <Class name="com.sun.enterprise.security.acl.RoleMapper"/>
+        <Class name="com.sun.enterprise.security.ee.acl.RoleMapper"/>
         <Method name="getDefaultP2RMappingClassName"/>
         <Bug pattern="DLS_DEAD_LOCAL_STORE"/>
     </Match>
 
     <!--
         Need to keep both method getUsername in
-        com.sun.enterprise.security.auth.digest.impl.KeyDigestAlgoParamImpl
+        com.sun.enterprise.security.ee.authentication.glassfish.digest.impl.KeyDigestAlgoParamImpl
         and method getUserName in
-        com.sun.enterprise.security.ee.auth.login.DigestCredentials
+        com.sun.enterprise.security.ee.authentication.glassfish.digest.DigestCredentials
         with names differing only in case, for compatibility.
     -->
     <Match>
-        <Class name="com.sun.enterprise.security.auth.digest.impl.KeyDigestAlgoParamImpl"/>
+        <Class name="com.sun.enterprise.security.ee.authentication.glassfish.digest.impl.KeyDigestAlgoParamImpl"/>
         <Method name="getUsername"/>
         <Bug pattern="NM_CONFUSING"/>
     </Match>

appserver/security/core-ee/pom.xml

@@ -213,7 +213,7 @@
                 <configuration>
                     <archive>
                         <manifestEntries>
-                            <probe-provider-class-names>com.sun.enterprise.security.auth.realm.RealmsProbeProvider,com.sun.enterprise.security.WebSecurityDeployerProbeProvider,com.sun.enterprise.security.EjbSecurityPolicyProbeProvider</probe-provider-class-names>
+                            <probe-provider-class-names>com.sun.enterprise.security.ee.auth.realm.RealmsProbeProvider,com.sun.enterprise.security.ee.WebSecurityDeployerProbeProvider,com.sun.enterprise.security.ee.EjbSecurityPolicyProbeProvider</probe-provider-class-names>
                         </manifestEntries>
                     </archive>
                 </configuration>

appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/J2EESecurityManager.java

@@ -20,8 +20,8 @@
 // IASRI 4660742 START
 // IASRI 4660742 END
 import java.util.PropertyPermission;
-import com.sun.enterprise.security.authorize.cache.CachedPermissionImpl;
-import com.sun.enterprise.security.authorize.cache.PermissionCache;
+import com.sun.enterprise.security.ee.authorize.cache.CachedPermissionImpl;
+import com.sun.enterprise.security.ee.authorize.cache.PermissionCache;
 import com.sun.enterprise.security.ssl.SSLUtils;
 
 /**

appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/JavaEESecurityLifecycle.java

@@ -35,9 +35,9 @@
 import org.glassfish.epicyro.config.module.configprovider.GFServerConfigProvider;
 
 import com.sun.enterprise.security.ContainerSecurityLifecycle;
-import com.sun.enterprise.security.jmac.AuthMessagePolicy;
-import com.sun.enterprise.security.jmac.ConfigDomainParser;
-import com.sun.enterprise.security.jmac.WebServicesDelegate;
+import com.sun.enterprise.security.ee.jmac.AuthMessagePolicy;
+import com.sun.enterprise.security.ee.jmac.ConfigDomainParser;
+import com.sun.enterprise.security.ee.jmac.WebServicesDelegate;
 import com.sun.logging.LogDomains;
 
 import jakarta.inject.Singleton;
@@ -60,7 +60,7 @@ public void postConstruct() {
 
     @Override
     public void onInitialization() {
-        SecurityManager securityManager = System.getSecurityManager();
+        java.lang.SecurityManager securityManager = System.getSecurityManager();
 
         // TODO: need someway to not override the SecMgr if the EmbeddedServer was
         // run with a different non-default SM.

appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityContainer.java

@@ -26,16 +26,15 @@
 
 import com.sun.enterprise.deployment.interfaces.SecurityRoleMapperFactoryMgr;
 import com.sun.enterprise.security.PolicyLoader;
-import com.sun.enterprise.security.web.integration.WebSecurityManagerFactory;
-
+import com.sun.enterprise.security.ee.web.integration.WebSecurityManagerFactory;
 import jakarta.inject.Inject;
 import jakarta.inject.Provider;
 
 /**
  * Security container service
  *
  */
-@Service(name = "com.sun.enterprise.security.ee.SecurityContainer")
+@Service(name = "com.sun.enterprise.security.ee.ee.SecurityContainer")
 public class SecurityContainer implements Container, PostConstruct {
 
     @Inject
@@ -107,7 +106,7 @@ private static void initRoleMapperFactory() // throws Exception
         Class c = null;
         // this should never fail.
         try {
-            c = Class.forName("com.sun.enterprise.security.acl.RoleMapperFactory");
+            c = Class.forName("com.sun.enterprise.security.ee.acl.RoleMapperFactory");
             if (c != null) {
                 o = c.newInstance();
                 if (o != null && o instanceof SecurityRoleMapperFactory) {

appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityDeployer.java

@@ -25,8 +25,8 @@
 import com.sun.enterprise.security.CNonceCacheFactory;
 import com.sun.enterprise.security.EjbSecurityPolicyProbeProvider;
 import com.sun.enterprise.security.WebSecurityDeployerProbeProvider;
-import com.sun.enterprise.security.web.integration.WebSecurityManager;
-import com.sun.enterprise.security.web.integration.WebSecurityManagerFactory;
+import com.sun.enterprise.security.ee.web.integration.WebSecurityManager;
+import com.sun.enterprise.security.ee.web.integration.WebSecurityManagerFactory;
 import com.sun.logging.LogDomains;
 
 import jakarta.inject.Inject;

appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecuritySniffer.java

@@ -41,7 +41,7 @@
 @Service(name = "Security")
 public class SecuritySniffer extends GenericSniffer {
 
-    final String[] containers = { "com.sun.enterprise.security.ee.SecurityContainer" };
+    final String[] containers = { "com.sun.enterprise.security.ee.ee.SecurityContainer" };
 
     @Inject
     private ServiceLocator habitat;

appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityUtil.java

@@ -49,7 +49,7 @@ public class SecurityUtil {
 
     private static final LocalStringManagerImpl localStrings = new LocalStringManagerImpl(SecurityUtil.class);
     private static final Logger _logger = LogDomains.getLogger(SecurityUtil.class, LogDomains.SECURITY_LOGGER);
-    public static final String VENDOR_PRESENT = "com.sun.enterprise.security.provider.jaccvendorpresent";
+    public static final String VENDOR_PRESENT = "com.sun.enterprise.security.ee.provider.jaccvendorpresent";
 
     // set in PolicyLoader from domain.xml
     private static final String REPOSITORY_HOME_PROP = "com.sun.enterprise.jaccprovider.property.repository";

appserver/security/core-ee/src/main/java/com/sun/enterprise/security/acl/EJBResource.java → appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/acl/EJBResource.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.security.acl;
+package com.sun.enterprise.security.ee.acl;
 
 import java.lang.reflect.Method;
 

appserver/security/core-ee/src/main/java/com/sun/enterprise/security/acl/Resource.java → appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/acl/Resource.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.security.acl;
+package com.sun.enterprise.security.ee.acl;
 
 /**
  * Abstract resource ..

appserver/security/core-ee/src/main/java/com/sun/enterprise/security/acl/RoleMapper.java → appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/acl/RoleMapper.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.security.acl;
+package com.sun.enterprise.security.ee.acl;
 
 import com.sun.enterprise.config.serverbeans.SecurityService;
 import com.sun.enterprise.security.common.AppservAccessController;

appserver/security/core-ee/src/main/java/com/sun/enterprise/security/acl/RoleMapperFactory.java → appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/acl/RoleMapperFactory.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.security.acl;
+package com.sun.enterprise.security.ee.acl;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

appserver/security/core-ee/src/main/java/com/sun/enterprise/security/acl/WebResource.java → appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/acl/WebResource.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.security.acl;
+package com.sun.enterprise.security.ee.acl;
 
 /**
  * @author Harish Prabandham

appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/auth/login/ProgrammaticLogin.java → appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/ProgrammaticLogin.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.security.ee.auth.login;
+package com.sun.enterprise.security.ee.authentication;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -32,7 +32,7 @@
 import com.sun.enterprise.security.auth.login.LoginContextDriver;
 import com.sun.enterprise.security.common.SecurityConstants;
 import com.sun.enterprise.security.common.Util;
-import com.sun.enterprise.security.web.integration.WebProgrammaticLogin;
+import com.sun.enterprise.security.ee.web.integration.WebProgrammaticLogin;
 import com.sun.logging.LogDomains;
 
 import jakarta.servlet.http.HttpServletRequest;

appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/auth/login/DigestCredentials.java → appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/DigestCredentials.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.security.ee.auth.login;
+package com.sun.enterprise.security.ee.authentication.glassfish.digest;
 
 import com.sun.enterprise.security.auth.digest.api.DigestAlgorithmParameter;