User: oleg
Date: 01/01/09 17:24:00
Modified: src/main/org/jboss/ejb Container.java ContainerFactory.java
Log:
Package structure for security stuff improved.
Classes from "system" package moved to "security" package.
Added "security/plugins" and "security/plugins/samples" packages.
Added JaasServerLoginModule and AbstractServerLoginModule classes
by Edward Kenworthy <[EMAIL PROTECTED]>
(file based implementation for JAAS security).
Revision Changes Path
1.34 +8 -6 jboss/src/main/org/jboss/ejb/Container.java
Index: Container.java
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/Container.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Container.java 2000/12/07 15:44:09 1.33
+++ Container.java 2001/01/10 01:23:59 1.34
@@ -40,8 +40,8 @@
import javax.sql.DataSource;
import org.jboss.logging.Logger;
-import org.jboss.system.EJBSecurityManager;
-import org.jboss.system.RealmMapping;
+import org.jboss.security.EJBSecurityManager;
+import org.jboss.security.RealmMapping;
import org.jboss.metadata.BeanMetaData;
import org.jboss.metadata.EnvEntryMetaData;
@@ -67,7 +67,7 @@
* @see ContainerFactory
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="[EMAIL PROTECTED]">Marc Fleury</a>
- * @version $Revision: 1.33 $
+ * @version $Revision: 1.34 $
*/
public abstract class Container
{
@@ -219,9 +219,11 @@
*/
public Set getMethodPermissions( Method m, boolean home )
{
- Set permissions = (Set) methodPermissionsCache.get( m );
- if (permissions == null)
- {
+ Set permissions;
+
+ if (methodPermissionsCache.containsKey(m)) {
+ permissions = (Set) methodPermissionsCache.get( m );
+ } else {
permissions = getBeanMetaData().getMethodPermissions(m.getName(),
m.getParameterTypes(), !home);
methodPermissionsCache.put(m, permissions);
}
1.62 +3 -3 jboss/src/main/org/jboss/ejb/ContainerFactory.java
Index: ContainerFactory.java
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/ContainerFactory.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ContainerFactory.java 2000/12/18 10:22:59 1.61
+++ ContainerFactory.java 2001/01/10 01:23:59 1.62
@@ -51,8 +51,8 @@
import org.jboss.verifier.event.VerificationEvent;
import org.jboss.verifier.event.VerificationListener;
-import org.jboss.system.EJBSecurityManager;
-import org.jboss.system.RealmMapping;
+import org.jboss.security.EJBSecurityManager;
+import org.jboss.security.RealmMapping;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
@@ -79,7 +79,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
* @author Peter Antman ([EMAIL PROTECTED])
*
-* @version $Revision: 1.61 $
+* @version $Revision: 1.62 $
*/
public class ContainerFactory
extends org.jboss.util.ServiceMBeanSupport
