You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2004/01/02 05:31:45 UTC
cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/util ConfigurationUtil.java ContextManager.java URLPattern.java
djencks 2004/01/01 20:31:45
Modified: modules/core/src/java/org/apache/geronimo/connector/deployment
ConnectorDeploymentPlanner.java
modules/core/src/java/org/apache/geronimo/security
AbstractModuleConfiguration.java
AbstractSecurityRealm.java
EJBModuleConfiguration.java GeronimoPolicy.java
GeronimoPolicyConfiguration.java
GeronimoPolicyConfigurationFactory.java
LoginModuleWrapper.java ModuleConfiguration.java
PolicyConfigurationEJB.java
PolicyConfigurationGeneric.java
PolicyConfigurationWeb.java
PolicyContextHandlerContainerSubject.java
PolicyContextHandlerHttpServletRequest.java
PolicyContextHandlerSOAPMessage.java
RoleMappingConfiguration.java SecurityRealm.java
SecurityService.java WebModuleConfiguration.java
modules/core/src/java/org/apache/geronimo/security/providers
PropertiesFileLoginModule.java
PropertiesFileSecurityRealm.java
SQLLoginModule.java
modules/core/src/java/org/apache/geronimo/security/util
ConfigurationUtil.java ContextManager.java
URLPattern.java
Log:
import cleanup and organization
Revision Changes Path
1.10 +1 -3 incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/deployment/ConnectorDeploymentPlanner.java
Index: ConnectorDeploymentPlanner.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/deployment/ConnectorDeploymentPlanner.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ConnectorDeploymentPlanner.java 28 Dec 2003 23:06:42 -0000 1.9
+++ ConnectorDeploymentPlanner.java 2 Jan 2004 04:31:44 -0000 1.10
@@ -85,7 +85,6 @@
import org.apache.geronimo.kernel.deployment.service.MBeanMetadata;
import org.apache.geronimo.kernel.deployment.task.CreateClassSpace;
import org.apache.geronimo.kernel.deployment.task.DeployGeronimoMBean;
-import org.apache.geronimo.kernel.deployment.task.RegisterMBeanInstance;
import org.apache.geronimo.kernel.deployment.task.StartMBeanInstance;
import org.apache.geronimo.kernel.jmx.JMXUtil;
import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
@@ -110,7 +109,6 @@
public static GeronimoMBeanInfo getGeronimoMBeanInfo() {
return AbstractDeploymentPlanner.getGeronimoMBeanInfo(ConnectorDeploymentPlanner.class.getName());
}
-
/**
* Deploys the specified URL. If this deployer can deploy the specified
1.3 +1 -3 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/AbstractModuleConfiguration.java
Index: AbstractModuleConfiguration.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/AbstractModuleConfiguration.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractModuleConfiguration.java 28 Dec 2003 19:34:05 -0000 1.2
+++ AbstractModuleConfiguration.java 2 Jan 2004 04:31:44 -0000 1.3
@@ -60,12 +60,10 @@
import javax.management.InstanceNotFoundException;
import javax.management.MBeanRegistrationException;
-import javax.management.ObjectName;
import javax.security.jacc.PolicyConfiguration;
import javax.security.jacc.PolicyConfigurationFactory;
import javax.security.jacc.PolicyContextException;
-import org.apache.geronimo.kernel.jmx.JMXUtil;
import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
1.4 +2 -2 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/AbstractSecurityRealm.java
Index: AbstractSecurityRealm.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/AbstractSecurityRealm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractSecurityRealm.java 28 Dec 2003 19:34:05 -0000 1.3
+++ AbstractSecurityRealm.java 2 Jan 2004 04:31:44 -0000 1.4
@@ -55,8 +55,8 @@
*/
package org.apache.geronimo.security;
-import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
+import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
/**
1.5 +12 -13 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/EJBModuleConfiguration.java
Index: EJBModuleConfiguration.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/EJBModuleConfiguration.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EJBModuleConfiguration.java 28 Dec 2003 20:13:06 -0000 1.4
+++ EJBModuleConfiguration.java 2 Jan 2004 04:31:44 -0000 1.5
@@ -55,22 +55,21 @@
*/
package org.apache.geronimo.security;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashSet;
+
+import javax.security.jacc.PolicyConfiguration;
+
+import org.apache.geronimo.deployment.model.ejb.AssemblyDescriptor;
import org.apache.geronimo.deployment.model.geronimo.ejb.EjbJar;
-import org.apache.geronimo.deployment.model.geronimo.j2ee.RoleMappings;
-import org.apache.geronimo.deployment.model.geronimo.j2ee.Role;
-import org.apache.geronimo.deployment.model.geronimo.j2ee.Realm;
import org.apache.geronimo.deployment.model.geronimo.j2ee.Principal;
-import org.apache.geronimo.deployment.model.ejb.AssemblyDescriptor;
+import org.apache.geronimo.deployment.model.geronimo.j2ee.Realm;
+import org.apache.geronimo.deployment.model.geronimo.j2ee.Role;
+import org.apache.geronimo.deployment.model.geronimo.j2ee.RoleMappings;
import org.apache.geronimo.deployment.model.j2ee.SecurityRole;
-import org.apache.geronimo.security.util.ConfigurationUtil;
import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
-import org.apache.geronimo.kernel.service.GeronimoOperationInfo;
-import org.apache.geronimo.kernel.service.GeronimoParameterInfo;
-
-import javax.security.jacc.PolicyConfiguration;
-import java.util.HashSet;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
+import org.apache.geronimo.security.util.ConfigurationUtil;
/**
1.3 +7 -8 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/GeronimoPolicy.java
Index: GeronimoPolicy.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/GeronimoPolicy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GeronimoPolicy.java 18 Nov 2003 05:17:17 -0000 1.2
+++ GeronimoPolicy.java 2 Jan 2004 04:31:44 -0000 1.3
@@ -55,16 +55,15 @@
*/
package org.apache.geronimo.security;
-import org.apache.geronimo.security.util.ContextManager;
+import java.security.CodeSource;
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.security.Policy;
+import java.security.ProtectionDomain;
import javax.security.jacc.PolicyConfigurationFactory;
-import javax.security.jacc.PolicyContextException;
import javax.security.jacc.PolicyContext;
-import java.security.Policy;
-import java.security.PermissionCollection;
-import java.security.CodeSource;
-import java.security.ProtectionDomain;
-import java.security.Permission;
+import javax.security.jacc.PolicyContextException;
/**
1.3 +2 -2 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/GeronimoPolicyConfiguration.java
Index: GeronimoPolicyConfiguration.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/GeronimoPolicyConfiguration.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GeronimoPolicyConfiguration.java 18 Nov 2003 05:17:17 -0000 1.2
+++ GeronimoPolicyConfiguration.java 2 Jan 2004 04:31:44 -0000 1.3
@@ -55,8 +55,8 @@
*/
package org.apache.geronimo.security;
-import java.security.ProtectionDomain;
import java.security.Permission;
+import java.security.ProtectionDomain;
/**
1.3 +5 -4 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/GeronimoPolicyConfigurationFactory.java
Index: GeronimoPolicyConfigurationFactory.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/GeronimoPolicyConfigurationFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GeronimoPolicyConfigurationFactory.java 18 Nov 2003 05:17:17 -0000 1.2
+++ GeronimoPolicyConfigurationFactory.java 2 Jan 2004 04:31:44 -0000 1.3
@@ -55,11 +55,12 @@
*/
package org.apache.geronimo.security;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.security.jacc.PolicyConfiguration;
import javax.security.jacc.PolicyConfigurationFactory;
import javax.security.jacc.PolicyContextException;
-import javax.security.jacc.PolicyConfiguration;
-import java.util.Map;
-import java.util.HashMap;
/**
1.5 +12 -11 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/LoginModuleWrapper.java
Index: LoginModuleWrapper.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/LoginModuleWrapper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LoginModuleWrapper.java 12 Nov 2003 13:07:06 -0000 1.4
+++ LoginModuleWrapper.java 2 Jan 2004 04:31:44 -0000 1.5
@@ -55,19 +55,20 @@
*/
package org.apache.geronimo.security;
-import org.apache.geronimo.security.util.ContextManager;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.Principal;
+import java.security.PrivilegedActionException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
-import javax.security.auth.spi.LoginModule;
import javax.security.auth.Subject;
-import javax.security.auth.login.LoginException;
import javax.security.auth.callback.CallbackHandler;
-import java.util.Map;
-import java.util.Set;
-import java.util.Iterator;
-import java.security.Principal;
-import java.security.PrivilegedActionException;
-import java.security.AccessControlContext;
-import java.security.AccessController;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
+
+import org.apache.geronimo.security.util.ContextManager;
/**
1.2 +1 -5 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/ModuleConfiguration.java
Index: ModuleConfiguration.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/ModuleConfiguration.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModuleConfiguration.java 28 Dec 2003 19:34:05 -0000 1.1
+++ ModuleConfiguration.java 2 Jan 2004 04:31:44 -0000 1.2
@@ -55,10 +55,6 @@
*/
package org.apache.geronimo.security;
-import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
-
-import javax.management.ObjectName;
-import javax.management.MBeanRegistration;
import java.util.Collection;
import java.util.HashSet;
1.2 +11 -14 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/PolicyConfigurationEJB.java
Index: PolicyConfigurationEJB.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/PolicyConfigurationEJB.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PolicyConfigurationEJB.java 18 Nov 2003 05:17:17 -0000 1.1
+++ PolicyConfigurationEJB.java 2 Jan 2004 04:31:44 -0000 1.2
@@ -55,23 +55,20 @@
*/
package org.apache.geronimo.security;
-import sun.security.util.BitArray;
-
-import javax.security.jacc.PolicyContextException;
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.security.Permissions;
+import java.security.Principal;
+import java.security.ProtectionDomain;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Enumeration;
-import java.util.Collection;
import java.util.Iterator;
-import java.util.Collections;
-import java.util.BitSet;
-import java.security.PermissionCollection;
-import java.security.Permission;
-import java.security.ProtectionDomain;
-import java.security.Principal;
-import java.security.Permissions;
-import org.apache.geronimo.security.util.ContextManager;
+import javax.security.jacc.PolicyContextException;
/**
1.2 +11 -10 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/PolicyConfigurationGeneric.java
Index: PolicyConfigurationGeneric.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/PolicyConfigurationGeneric.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PolicyConfigurationGeneric.java 18 Nov 2003 05:17:17 -0000 1.1
+++ PolicyConfigurationGeneric.java 2 Jan 2004 04:31:44 -0000 1.2
@@ -55,18 +55,19 @@
*/
package org.apache.geronimo.security;
-import javax.security.jacc.PolicyContextException;
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.security.Permissions;
+import java.security.Principal;
+import java.security.ProtectionDomain;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Enumeration;
-import java.util.Collection;
import java.util.Iterator;
-import java.util.Collections;
-import java.security.PermissionCollection;
-import java.security.Permission;
-import java.security.ProtectionDomain;
-import java.security.Principal;
-import java.security.Permissions;
+
+import javax.security.jacc.PolicyContextException;
/**
1.2 +11 -10 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/PolicyConfigurationWeb.java
Index: PolicyConfigurationWeb.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/PolicyConfigurationWeb.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PolicyConfigurationWeb.java 18 Nov 2003 05:17:17 -0000 1.1
+++ PolicyConfigurationWeb.java 2 Jan 2004 04:31:44 -0000 1.2
@@ -55,18 +55,19 @@
*/
package org.apache.geronimo.security;
-import javax.security.jacc.PolicyContextException;
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.security.Permissions;
+import java.security.Principal;
+import java.security.ProtectionDomain;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Enumeration;
-import java.util.Collection;
import java.util.Iterator;
-import java.util.Collections;
-import java.security.PermissionCollection;
-import java.security.Permission;
-import java.security.ProtectionDomain;
-import java.security.Principal;
-import java.security.Permissions;
+
+import javax.security.jacc.PolicyContextException;
/**
1.2 +5 -4 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/PolicyContextHandlerContainerSubject.java
Index: PolicyContextHandlerContainerSubject.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/PolicyContextHandlerContainerSubject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PolicyContextHandlerContainerSubject.java 8 Nov 2003 06:25:34 -0000 1.1
+++ PolicyContextHandlerContainerSubject.java 2 Jan 2004 04:31:44 -0000 1.2
@@ -55,10 +55,11 @@
*/
package org.apache.geronimo.security;
-import javax.security.jacc.PolicyContextHandler;
-import javax.security.jacc.PolicyContextException;
-import javax.security.auth.Subject;
import java.security.AccessController;
+
+import javax.security.auth.Subject;
+import javax.security.jacc.PolicyContextException;
+import javax.security.jacc.PolicyContextHandler;
/**
1.2 +2 -2 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/PolicyContextHandlerHttpServletRequest.java
Index: PolicyContextHandlerHttpServletRequest.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/PolicyContextHandlerHttpServletRequest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PolicyContextHandlerHttpServletRequest.java 8 Nov 2003 06:25:34 -0000 1.1
+++ PolicyContextHandlerHttpServletRequest.java 2 Jan 2004 04:31:44 -0000 1.2
@@ -55,8 +55,8 @@
*/
package org.apache.geronimo.security;
-import javax.security.jacc.PolicyContextHandler;
import javax.security.jacc.PolicyContextException;
+import javax.security.jacc.PolicyContextHandler;
/**
1.2 +2 -2 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/PolicyContextHandlerSOAPMessage.java
Index: PolicyContextHandlerSOAPMessage.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/PolicyContextHandlerSOAPMessage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PolicyContextHandlerSOAPMessage.java 8 Nov 2003 06:25:34 -0000 1.1
+++ PolicyContextHandlerSOAPMessage.java 2 Jan 2004 04:31:44 -0000 1.2
@@ -55,8 +55,8 @@
*/
package org.apache.geronimo.security;
-import javax.security.jacc.PolicyContextHandler;
import javax.security.jacc.PolicyContextException;
+import javax.security.jacc.PolicyContextHandler;
/**
1.2 +3 -2 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/RoleMappingConfiguration.java
Index: RoleMappingConfiguration.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/RoleMappingConfiguration.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RoleMappingConfiguration.java 8 Nov 2003 05:29:07 -0000 1.1
+++ RoleMappingConfiguration.java 2 Jan 2004 04:31:44 -0000 1.2
@@ -55,9 +55,10 @@
*/
package org.apache.geronimo.security;
+import java.util.Collection;
+
import javax.security.jacc.PolicyConfiguration;
import javax.security.jacc.PolicyContextException;
-import java.util.Collection;
/**
1.4 +4 -4 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/SecurityRealm.java
Index: SecurityRealm.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/SecurityRealm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SecurityRealm.java 28 Dec 2003 20:13:06 -0000 1.3
+++ SecurityRealm.java 2 Jan 2004 04:31:44 -0000 1.4
@@ -55,11 +55,11 @@
*/
package org.apache.geronimo.security;
-import org.apache.geronimo.core.service.Component;
-import org.apache.regexp.RE;
+import java.util.Set;
import javax.security.auth.login.AppConfigurationEntry;
-import java.util.Set;
+
+import org.apache.regexp.RE;
/**
1.5 +2 -2 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/SecurityService.java
Index: SecurityService.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/SecurityService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SecurityService.java 28 Dec 2003 20:13:06 -0000 1.4
+++ SecurityService.java 2 Jan 2004 04:31:44 -0000 1.5
@@ -57,8 +57,8 @@
import java.security.AccessController;
import java.util.Collection;
-import java.util.Iterator;
import java.util.Collections;
+import java.util.Iterator;
import javax.management.ObjectName;
import javax.security.auth.login.Configuration;
1.5 +1 -3 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/WebModuleConfiguration.java
Index: WebModuleConfiguration.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/WebModuleConfiguration.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WebModuleConfiguration.java 28 Dec 2003 20:13:06 -0000 1.4
+++ WebModuleConfiguration.java 2 Jan 2004 04:31:44 -0000 1.5
@@ -68,8 +68,6 @@
import org.apache.geronimo.deployment.model.geronimo.j2ee.RoleMappings;
import org.apache.geronimo.deployment.model.geronimo.web.WebApp;
import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
-import org.apache.geronimo.kernel.service.GeronimoOperationInfo;
-import org.apache.geronimo.kernel.service.GeronimoParameterInfo;
import org.apache.geronimo.security.util.ConfigurationUtil;
1.2 +8 -7 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/providers/PropertiesFileLoginModule.java
Index: PropertiesFileLoginModule.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/providers/PropertiesFileLoginModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PropertiesFileLoginModule.java 18 Nov 2003 05:17:18 -0000 1.1
+++ PropertiesFileLoginModule.java 2 Jan 2004 04:31:44 -0000 1.2
@@ -55,16 +55,17 @@
*/
package org.apache.geronimo.security.providers;
-import javax.security.auth.spi.LoginModule;
+import java.io.IOException;
+import java.util.Map;
+
import javax.security.auth.Subject;
-import javax.security.auth.login.LoginException;
-import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.NameCallback;
import javax.security.auth.callback.PasswordCallback;
-import java.util.Map;
-import java.io.IOException;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
/**
1.3 +14 -14 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/providers/PropertiesFileSecurityRealm.java
Index: PropertiesFileSecurityRealm.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/providers/PropertiesFileSecurityRealm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PropertiesFileSecurityRealm.java 28 Dec 2003 19:34:05 -0000 1.2
+++ PropertiesFileSecurityRealm.java 2 Jan 2004 04:31:44 -0000 1.3
@@ -55,22 +55,22 @@
*/
package org.apache.geronimo.security.providers;
-import org.apache.geronimo.security.AbstractSecurityRealm;
-import org.apache.geronimo.security.GeronimoSecurityException;
-import org.apache.geronimo.kernel.management.State;
-import org.apache.regexp.RE;
-
-import javax.security.auth.login.AppConfigurationEntry;
-import java.util.Set;
-import java.util.Properties;
-import java.util.HashSet;
-import java.util.Enumeration;
-import java.util.Collections;
-import java.util.HashMap;
-import java.net.URI;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.net.URI;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.security.auth.login.AppConfigurationEntry;
+
+import org.apache.geronimo.security.AbstractSecurityRealm;
+import org.apache.geronimo.security.GeronimoSecurityException;
+import org.apache.regexp.RE;
/**
1.4 +7 -6 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/providers/SQLLoginModule.java
Index: SQLLoginModule.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/providers/SQLLoginModule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SQLLoginModule.java 28 Dec 2003 19:34:05 -0000 1.3
+++ SQLLoginModule.java 2 Jan 2004 04:31:44 -0000 1.4
@@ -55,16 +55,17 @@
*/
package org.apache.geronimo.security.providers;
+import java.io.IOException;
+import java.util.Map;
+
import javax.security.auth.Subject;
-import javax.security.auth.spi.LoginModule;
-import javax.security.auth.login.LoginException;
-import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.NameCallback;
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.callback.UnsupportedCallbackException;
-import java.util.Map;
-import java.io.IOException;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
/**
1.3 +24 -23 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/util/ConfigurationUtil.java
Index: ConfigurationUtil.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/util/ConfigurationUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConfigurationUtil.java 18 Nov 2003 05:17:18 -0000 1.2
+++ ConfigurationUtil.java 2 Jan 2004 04:31:44 -0000 1.3
@@ -55,34 +55,35 @@
*/
package org.apache.geronimo.security.util;
-import org.apache.geronimo.deployment.model.geronimo.web.WebApp;
-import org.apache.geronimo.deployment.model.web.SecurityConstraint;
-import org.apache.geronimo.deployment.model.web.WebResourceCollection;
-import org.apache.geronimo.deployment.model.j2ee.SecurityRole;
-import org.apache.geronimo.deployment.model.j2ee.SecurityRoleRef;
-import org.apache.geronimo.deployment.model.geronimo.ejb.EjbJar;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import javax.security.jacc.EJBMethodPermission;
+import javax.security.jacc.EJBRoleRefPermission;
+import javax.security.jacc.PolicyConfiguration;
+import javax.security.jacc.PolicyContext;
+import javax.security.jacc.PolicyContextException;
+import javax.security.jacc.PolicyContextHandler;
+import javax.security.jacc.WebResourcePermission;
+import javax.security.jacc.WebUserDataPermission;
+
+import org.apache.geronimo.deployment.model.ejb.AssemblyDescriptor;
import org.apache.geronimo.deployment.model.ejb.EnterpriseBeans;
import org.apache.geronimo.deployment.model.ejb.Entity;
-import org.apache.geronimo.deployment.model.ejb.Session;
-import org.apache.geronimo.deployment.model.ejb.AssemblyDescriptor;
-import org.apache.geronimo.deployment.model.ejb.MethodPermission;
import org.apache.geronimo.deployment.model.ejb.ExcludeList;
import org.apache.geronimo.deployment.model.ejb.Method;
+import org.apache.geronimo.deployment.model.ejb.MethodPermission;
import org.apache.geronimo.deployment.model.ejb.RpcBean;
+import org.apache.geronimo.deployment.model.ejb.Session;
+import org.apache.geronimo.deployment.model.geronimo.ejb.EjbJar;
+import org.apache.geronimo.deployment.model.geronimo.web.WebApp;
+import org.apache.geronimo.deployment.model.j2ee.SecurityRole;
+import org.apache.geronimo.deployment.model.j2ee.SecurityRoleRef;
+import org.apache.geronimo.deployment.model.web.SecurityConstraint;
+import org.apache.geronimo.deployment.model.web.WebResourceCollection;
import org.apache.geronimo.security.GeronimoSecurityException;
-import javax.security.jacc.PolicyConfiguration;
-import javax.security.jacc.WebResourcePermission;
-import javax.security.jacc.WebUserDataPermission;
-import javax.security.jacc.PolicyContextException;
-import javax.security.jacc.EJBMethodPermission;
-import javax.security.jacc.EJBRoleRefPermission;
-import javax.security.jacc.PolicyContextHandler;
-import javax.security.jacc.PolicyContext;
-import java.util.HashSet;
-import java.util.HashMap;
-import java.util.Iterator;
-
/**
* A collection of utility functions that assist with the configuration of
@@ -107,7 +108,7 @@
*/
public static void registerPolicyContextHandler(PolicyContextHandler handler, boolean replace) throws PolicyContextException {
String[] keys = handler.getKeys();
-
+
for (int i=0; i<keys.length; i++) {
PolicyContext.registerHandler(keys[i], handler, replace);
}
1.4 +13 -12 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/util/ContextManager.java
Index: ContextManager.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/util/ContextManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContextManager.java 23 Nov 2003 17:43:01 -0000 1.3
+++ ContextManager.java 2 Jan 2004 04:31:44 -0000 1.4
@@ -55,19 +55,20 @@
*/
package org.apache.geronimo.security.util;
-import org.apache.geronimo.security.GeronimoSecurityPermission;
-import org.apache.geronimo.security.RealmPrincipal;
-
-import javax.security.jacc.EJBRoleRefPermission;
-import javax.security.jacc.WebRoleRefPermission;
-import javax.security.auth.Subject;
-import java.util.Stack;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Iterator;
import java.security.AccessControlContext;
import java.security.AccessControlException;
import java.security.Principal;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Stack;
+
+import javax.security.auth.Subject;
+import javax.security.jacc.EJBRoleRefPermission;
+import javax.security.jacc.WebRoleRefPermission;
+
+import org.apache.geronimo.security.GeronimoSecurityPermission;
+import org.apache.geronimo.security.RealmPrincipal;
/**
@@ -137,7 +138,7 @@
public static Principal getCallerPrincipal() {
Iterator iter = contexts.peek().subject.getPrincipals(RealmPrincipal.class).iterator();
-
+
assert iter.hasNext();
return (RealmPrincipal)iter.next();
1.2 +2 -2 incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/util/URLPattern.java
Index: URLPattern.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/util/URLPattern.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- URLPattern.java 8 Nov 2003 05:57:07 -0000 1.1
+++ URLPattern.java 2 Jan 2004 04:31:44 -0000 1.2
@@ -56,9 +56,9 @@
package org.apache.geronimo.security.util;
+import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.Collection;
/**