User: starksm Date: 01/11/04 20:09:36 Modified: src/main/org/jboss/ejb Tag: Branch_2_4 Container.java ContainerFactory.java Log: Change the EJBSecurityManager interface to SecurityManager Revision Changes Path No revision No revision 1.44.2.6 +5 -5 jboss/src/main/org/jboss/ejb/Container.java Index: Container.java =================================================================== RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/Container.java,v retrieving revision 1.44.2.5 retrieving revision 1.44.2.6 diff -u -r1.44.2.5 -r1.44.2.6 --- Container.java 2001/11/02 08:42:32 1.44.2.5 +++ Container.java 2001/11/05 04:09:36 1.44.2.6 @@ -41,7 +41,7 @@ import javax.sql.DataSource; import org.jboss.logging.Logger; -import org.jboss.security.EJBSecurityManager; +import org.jboss.security.SecurityManager; import org.jboss.security.RealmMapping; import org.jboss.deployment.DeploymentException; @@ -70,7 +70,7 @@ * @author Rickard Öberg ([EMAIL PROTECTED]) * @author <a href="[EMAIL PROTECTED]">Marc Fleury</a> * @author [EMAIL PROTECTED] - * @version $Revision: 1.44.2.5 $ + * @version $Revision: 1.44.2.6 $ */ public abstract class Container { @@ -100,7 +100,7 @@ protected TransactionManager tm; // This is the SecurityManager - protected EJBSecurityManager sm; + protected SecurityManager sm; // This is the realm mapping protected RealmMapping rm; @@ -182,12 +182,12 @@ return tm; } - public void setSecurityManager(EJBSecurityManager sm) + public void setSecurityManager(SecurityManager sm) { this.sm = sm; } - public EJBSecurityManager getSecurityManager() + public SecurityManager getSecurityManager() { return sm; } 1.77.2.5 +3 -3 jboss/src/main/org/jboss/ejb/ContainerFactory.java Index: ContainerFactory.java =================================================================== RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/ContainerFactory.java,v retrieving revision 1.77.2.4 retrieving revision 1.77.2.5 diff -u -r1.77.2.4 -r1.77.2.5 --- ContainerFactory.java 2001/11/02 08:42:32 1.77.2.4 +++ ContainerFactory.java 2001/11/05 04:09:36 1.77.2.5 @@ -58,7 +58,7 @@ import org.jboss.metadata.ConfigurationMetaData; import org.jboss.metadata.XmlLoadable; import org.jboss.metadata.XmlFileLoader; -import org.jboss.security.EJBSecurityManager; +import org.jboss.security.SecurityManager; import org.jboss.security.RealmMapping; import org.jboss.util.MBeanProxy; import org.jboss.verifier.BeanVerifier; @@ -82,7 +82,7 @@ * @author Peter Antman ([EMAIL PROTECTED]) * @author Scott Stark([EMAIL PROTECTED]) * -* @version $Revision: 1.77.2.4 $ +* @version $Revision: 1.77.2.5 $ */ public class ContainerFactory extends org.jboss.util.ServiceMBeanSupport @@ -783,7 +783,7 @@ confSecurityDomain = securityDomain; System.out.println("lookup securityDomain manager name: "+confSecurityDomain); Object securityMgr = iniCtx.lookup(confSecurityDomain); - EJBSecurityManager ejbS = (EJBSecurityManager) securityMgr; + SecurityManager ejbS = (SecurityManager) securityMgr; RealmMapping rM = (RealmMapping) securityMgr; container.setSecurityManager( ejbS ); container.setRealmMapping( rM );
_______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development