Move some classes from security/ee package

Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
eclipse-ee4j · Oct 14, 2023 · 3aa0e34 · 3aa0e34
1 parent ab6951f
commit 3aa0e34
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 21 deletions.
diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/InvocationInfo.java b/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.ee.CachedPermission;
+import com.sun.enterprise.security.authorize.cache.CachedPermission;
 import org.glassfish.ejb.deployment.descriptor.EjbRemovalInfo;
 
 /**

diff --git a/...jb-container/src/main/java/org/glassfish/ejb/security/application/EJBSecurityManager.java b/...jb-container/src/main/java/org/glassfish/ejb/security/application/EJBSecurityManager.java
@@ -23,9 +23,9 @@
 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.PermissionCache;
-import com.sun.enterprise.security.ee.PermissionCacheFactory;
 import com.sun.enterprise.security.ee.SecurityUtil;
 import com.sun.enterprise.security.ee.audit.AppServerAuditManager;
 import com.sun.logging.LogDomains;

diff --git a/...e/authorize/EJBPolicyContextDelegate.java → ...y/authorize/EJBPolicyContextDelegate.java b/...e/authorize/EJBPolicyContextDelegate.java → ...y/authorize/EJBPolicyContextDelegate.java
@@ -14,16 +14,14 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.security.ee.authorize;
+package com.sun.enterprise.security.authorize;
 
 import java.lang.reflect.Method;
 
 import org.glassfish.api.invocation.ComponentInvocation;
 import org.glassfish.ejb.api.EJBInvocation;
 import org.jvnet.hk2.annotations.Service;
 
-import com.sun.enterprise.security.authorize.PolicyContextDelegate;
-
 /**
  * This class is primarily a delegate for PolicyContextHandler related queries But also handles Authorization of
  * WebServiceInvocations

diff --git a/...ver/security/core-ee/src/main/java/com/sun/enterprise/security/authorize/HandlerData.java b/...ver/security/core-ee/src/main/java/com/sun/enterprise/security/authorize/HandlerData.java
@@ -20,8 +20,7 @@
 import org.glassfish.internal.api.Globals;
 
 import com.sun.enterprise.security.SecurityContext;
-import com.sun.enterprise.security.ee.PermissionCacheFactory;
-
+import com.sun.enterprise.security.authorize.cache.PermissionCacheFactory;
 import jakarta.servlet.http.HttpServletRequest;
 
 /**

diff --git a/...erprise/security/ee/CachedPermission.java → ...ity/authorize/cache/CachedPermission.java b/...erprise/security/ee/CachedPermission.java → ...ity/authorize/cache/CachedPermission.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;
+package com.sun.enterprise.security.authorize.cache;
 
 import java.security.Permission;
 

diff --git a/...ise/security/ee/CachedPermissionImpl.java → ...authorize/cache/CachedPermissionImpl.java b/...ise/security/ee/CachedPermissionImpl.java → ...authorize/cache/CachedPermissionImpl.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;
+package com.sun.enterprise.security.authorize.cache;
 
 import java.security.Permission;
 

diff --git a/...terprise/security/ee/PermissionCache.java → ...rity/authorize/cache/PermissionCache.java b/...terprise/security/ee/PermissionCache.java → ...rity/authorize/cache/PermissionCache.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;
+package com.sun.enterprise.security.authorize.cache;
 
 import java.security.AllPermission;
 import java.security.CodeSource;
@@ -30,9 +30,8 @@
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
+import com.sun.enterprise.security.authorize.cache.CachedPermissionImpl.Epoch;
 import com.sun.enterprise.security.common.AppservAccessController;
-import com.sun.enterprise.security.ee.CachedPermissionImpl.Epoch;
 import com.sun.logging.LogDomains;
 
 import jakarta.security.jacc.PolicyContext;

diff --git a/...e/security/ee/PermissionCacheFactory.java → ...thorize/cache/PermissionCacheFactory.java b/...e/security/ee/PermissionCacheFactory.java → ...thorize/cache/PermissionCacheFactory.java
@@ -14,8 +14,9 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.security.ee;
+package com.sun.enterprise.security.authorize.cache;
 
+import com.sun.enterprise.security.ee.J2EESecurityManager;
 import java.security.CodeSource;
 import java.security.Permission;
 import java.security.Policy;

diff --git a/...er/security/core-ee/src/main/java/com/sun/enterprise/security/ee/J2EESecurityManager.java b/...er/security/core-ee/src/main/java/com/sun/enterprise/security/ee/J2EESecurityManager.java
@@ -20,7 +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.ssl.SSLUtils;
 
 /**

diff --git a/...core-ee/src/main/java/com/sun/enterprise/security/web/integration/WebSecurityManager.java b/...core-ee/src/main/java/com/sun/enterprise/security/web/integration/WebSecurityManager.java
@@ -18,7 +18,7 @@
 package com.sun.enterprise.security.web.integration;
 
 import static com.sun.enterprise.security.authorize.PolicyContextHandlerImpl.HTTP_SERVLET_REQUEST;
-import static com.sun.enterprise.security.ee.PermissionCacheFactory.createPermissionCache;
+import static com.sun.enterprise.security.authorize.cache.PermissionCacheFactory.createPermissionCache;
 import static com.sun.enterprise.security.web.integration.GlassFishToExousiaConverter.getConstraintsFromBundle;
 import static com.sun.enterprise.security.web.integration.GlassFishToExousiaConverter.getSecurityRoleRefsFromBundle;
 import static java.util.logging.Level.FINE;
@@ -56,10 +56,10 @@
 import com.sun.enterprise.security.SecurityServicesUtil;
 import com.sun.enterprise.security.audit.AuditManager;
 import com.sun.enterprise.security.authorize.PolicyContextHandlerImpl;
-import com.sun.enterprise.security.ee.CachedPermission;
-import com.sun.enterprise.security.ee.CachedPermissionImpl;
-import com.sun.enterprise.security.ee.PermissionCache;
-import com.sun.enterprise.security.ee.PermissionCacheFactory;
+import com.sun.enterprise.security.authorize.cache.CachedPermission;
+import com.sun.enterprise.security.authorize.cache.CachedPermissionImpl;
+import com.sun.enterprise.security.authorize.cache.PermissionCache;
+import com.sun.enterprise.security.authorize.cache.PermissionCacheFactory;
 import com.sun.enterprise.security.ee.SecurityUtil;
 import com.sun.enterprise.security.ee.audit.AppServerAuditManager;
 

diff --git a/...s.security/src/main/java/com/sun/enterprise/security/jmac/provider/config/PipeHelper.java b/...s.security/src/main/java/com/sun/enterprise/security/jmac/provider/config/PipeHelper.java
@@ -59,10 +59,10 @@
 import com.sun.enterprise.security.SecurityServicesUtil;
 import com.sun.enterprise.security.appclient.ConfigXMLParser;
 import com.sun.enterprise.security.audit.AuditManager;
+import com.sun.enterprise.security.authorize.EJBPolicyContextDelegate;
 import com.sun.enterprise.security.common.AppservAccessController;
 import com.sun.enterprise.security.common.ClientSecurityContext;
 import com.sun.enterprise.security.ee.audit.AppServerAuditManager;
-import com.sun.enterprise.security.ee.authorize.EJBPolicyContextDelegate;
 import com.sun.enterprise.security.jmac.AuthMessagePolicy;
 import com.sun.enterprise.security.jmac.ConfigDomainParser;
 import com.sun.enterprise.security.jmac.WebServicesDelegate;