User: stark
Date: 01/02/14 13:20:03
Modified: security/src/main/org/jboss/ejb Container.java
ContainerFactory.java
Log:
Updated SecurityInterceptor to be independent of any JAAS classes
and refactored security proxy layer to simplify the model.
Revision Changes Path
1.2 +7 -16 contrib/security/src/main/org/jboss/ejb/Container.java
Index: Container.java
===================================================================
RCS file:
/products/cvs/ejboss/contrib/security/src/main/org/jboss/ejb/Container.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Container.java 2001/02/12 09:21:25 1.1
+++ Container.java 2001/02/14 21:20:03 1.2
@@ -67,7 +67,7 @@
* @see ContainerFactory
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="[EMAIL PROTECTED]">Marc Fleury</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class Container
{
@@ -98,8 +98,8 @@
// This is the realm mapping
protected RealmMapping rm;
- protected Object statelessSecurityProxy;
- protected Object statefulSecurityProxy;
+ /** The custom security proxy used by the SecurityInterceptor */
+ protected Object securityProxy;
// This is a cache for method permissions
private HashMap methodPermissionsCache = new HashMap();
@@ -148,22 +148,13 @@
return rm;
}
- public void setStatelessSecurityProxy(Object proxy)
+ public void setSecurityProxy(Object proxy)
{
- this.statelessSecurityProxy = proxy;
+ this.securityProxy = proxy;
}
- public Object getStatelessSecurityProxy()
+ public Object getSecurityProxy()
{
- return statelessSecurityProxy;
- }
-
- public void setStatefulSecurityProxy(Object proxy)
- {
- this.statefulSecurityProxy = proxy;
- }
- public Object getStatefulSecurityProxy()
- {
- return statefulSecurityProxy;
+ return securityProxy;
}
/**
1.2 +7 -22 contrib/security/src/main/org/jboss/ejb/ContainerFactory.java
Index: ContainerFactory.java
===================================================================
RCS file:
/products/cvs/ejboss/contrib/security/src/main/org/jboss/ejb/ContainerFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContainerFactory.java 2001/02/12 09:21:25 1.1
+++ ContainerFactory.java 2001/02/14 21:20:03 1.2
@@ -79,7 +79,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
* @author Peter Antman ([EMAIL PROTECTED])
*
-* @version $Revision: 1.1 $
+* @version $Revision: 1.2 $
*/
public class ContainerFactory
extends org.jboss.util.ServiceMBeanSupport
@@ -761,34 +761,19 @@
}
// Set security proxies
- String statelessProxyClassName = bean.getStatelessSecurityProxy();
- String statefulProxyClassName = bean.getStatefulSecurityProxy();
- if( statelessProxyClassName != null )
+ String securityProxyClassName = bean.getSecurityProxy();
+ if( securityProxyClassName != null )
{
try
{
- Class proxyClass = cl.loadClass(statelessProxyClassName);
+ Class proxyClass = cl.loadClass(securityProxyClassName);
Object proxy = proxyClass.newInstance();
- container.setStatelessSecurityProxy(proxy);
- System.out.println("setStatelessSecurityProxy, "+proxy);
+ container.setSecurityProxy(proxy);
+ System.out.println("setSecurityProxy, "+proxy);
}
catch(Exception e)
{
- throw new DeploymentException("Missing StatelessSecurityProxy (in
jboss.xml or standardjboss.xml): " + conf.getContainerInvoker() +" - " + e);
- }
- }
- if( statefulProxyClassName != null )
- {
- try
- {
- Class proxyClass = cl.loadClass(statefulProxyClassName);
- Object proxy = proxyClass.newInstance();
- container.setStatefulSecurityProxy(proxy);
- System.out.println("setStatefulSecurityProxy, "+proxy);
- }
- catch(Exception e)
- {
- throw new DeploymentException("Missing StatefulSecurityProxy (in
jboss.xml or standardjboss.xml): " + conf.getContainerInvoker() +" - " + e);
+ throw new DeploymentException("Missing SecurityProxy (in jboss.xml
or standardjboss.xml): " + conf.getContainerInvoker() +" - " + e);
}
}
