User: starksm
Date: 01/11/09 02:38:05
Modified: src/main/org/jboss/ejb Tag: Branch_2_4 Container.java
Log:
Change org.jboss.security.SecurityManager to org.jboss.security.AuthenticationManager
since SecurityManager clashes with the java.lang.SecurityManager
Revision Changes Path
No revision
No revision
1.44.2.7 +6 -6 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.6
retrieving revision 1.44.2.7
diff -u -r1.44.2.6 -r1.44.2.7
--- Container.java 2001/11/05 04:09:36 1.44.2.6
+++ Container.java 2001/11/09 10:38:04 1.44.2.7
@@ -41,7 +41,7 @@
import javax.sql.DataSource;
import org.jboss.logging.Logger;
-import org.jboss.security.SecurityManager;
+import org.jboss.security.AuthenticationManager;
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.6 $
+ * @version $Revision: 1.44.2.7 $
*/
public abstract class Container
{
@@ -99,8 +99,8 @@
// This is the TransactionManager
protected TransactionManager tm;
- // This is the SecurityManager
- protected SecurityManager sm;
+ // This is the AuthenticationManager
+ protected AuthenticationManager sm;
// This is the realm mapping
protected RealmMapping rm;
@@ -182,12 +182,12 @@
return tm;
}
- public void setSecurityManager(SecurityManager sm)
+ public void setSecurityManager(AuthenticationManager sm)
{
this.sm = sm;
}
- public SecurityManager getSecurityManager()
+ public AuthenticationManager getSecurityManager()
{
return sm;
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
