[jboss-cvs] JBossAS SVN: r70068 - in projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3: deployers and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2008-02-25 16:36:31 -0500 (Mon, 25 Feb 2008)
New Revision: 70068

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3JmxDeployment.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
Log:
JBAS-5182: turn off EJB3 Jacc Permissions population

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java	2008-02-25 19:58:43 UTC (rev 70067)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java	2008-02-25 21:36:31 UTC (rev 70068)
@@ -77,8 +77,7 @@
 import org.jboss.ejb3.javaee.JavaEEModule;
 import org.jboss.ejb3.pool.Pool;
 import org.jboss.ejb3.pool.PoolFactory;
-import org.jboss.ejb3.pool.PoolFactoryRegistry;
-import org.jboss.ejb3.security.JaccHelper;
+import org.jboss.ejb3.pool.PoolFactoryRegistry; 
 import org.jboss.ejb3.security.SecurityDomainManager;
 import org.jboss.ejb3.statistics.InvocationStatistics;
 import org.jboss.ejb3.tx.UserTransactionImpl;
@@ -765,8 +764,6 @@
       if (pool != null) pool.setInjectors(injectors2);
 
       createCallbackHandler();
-
-      JaccHelper.configureContainer(jaccContextId, this);
       
       // If we're clustered, find our partition name
       findPartitionName();

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java	2008-02-25 19:58:43 UTC (rev 70067)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java	2008-02-25 21:36:31 UTC (rev 70068)
@@ -119,9 +119,6 @@
 
    protected MessageDestinationResolver messageDestinationResolver;
 
-   //The JACC PolicyConfiguration
-   PolicyConfiguration pc;
-
    public Ejb3Deployment(DeploymentUnit unit, DeploymentScope deploymentScope, JBossMetaData metaData, PersistenceUnitsMetaData persistenceUnitsMetaData,
          Ejb3Deployer deployer)
    {
@@ -373,7 +370,7 @@
       {
          long start = System.currentTimeMillis();
 
-         pc = createPolicyConfiguration();
+         //pc = createPolicyConfiguration();
 
          deploy();
 
@@ -413,7 +410,7 @@
             registerEJBContainer(con);
          }
 
-         putJaccInService(pc, unit);
+         //putJaccInService(pc, unit);
       }
       catch (Exception ex)
       {

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3JmxDeployment.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3JmxDeployment.java	2008-02-25 19:58:43 UTC (rev 70067)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3JmxDeployment.java	2008-02-25 21:36:31 UTC (rev 70068)
@@ -24,8 +24,7 @@
 import javax.security.jacc.PolicyConfiguration;
 
 import org.jboss.deployment.DeploymentInfo;
-import org.jboss.ejb3.javaee.JavaEEComponent;
-import org.jboss.ejb3.security.JaccHelper;
+import org.jboss.ejb3.javaee.JavaEEComponent; 
 import org.jboss.logging.Logger;
 
 /**
@@ -53,21 +52,12 @@
 
    protected PolicyConfiguration createPolicyConfiguration() throws Exception
    {
-      return JaccHelper.initialiseJacc(getJaccContextId());
-
+	   throw new IllegalStateException("This method should not be called"); 	   
    }
 
    protected void putJaccInService(PolicyConfiguration pc, DeploymentUnit unit)
    {
-      try
-      {
-         JaccHelper.putJaccInService(pc, deploymentInfo);
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-
+	   throw new IllegalStateException("This method should not be called"); 
    }
 
    public DependencyPolicy createDependencyPolicy(JavaEEComponent component)

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java	2008-02-25 19:58:43 UTC (rev 70067)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java	2008-02-25 21:36:31 UTC (rev 70068)
@@ -30,8 +30,7 @@
 import org.jboss.ejb3.Ejb3Deployment;
 import org.jboss.ejb3.MCKernelAbstraction;
 import org.jboss.ejb3.javaee.JavaEEComponent;
-import org.jboss.ejb3.metadata.jpa.spec.PersistenceUnitsMetaData;
-import org.jboss.ejb3.security.JaccHelper;
+import org.jboss.ejb3.metadata.jpa.spec.PersistenceUnitsMetaData; 
 import org.jboss.kernel.Kernel;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
@@ -61,19 +60,12 @@
 
    protected PolicyConfiguration createPolicyConfiguration() throws Exception
    {
-      return JaccHelper.initialiseJacc(getJaccContextId());
+	   throw new IllegalStateException("This method should not be called"); 
    }
 
    protected void putJaccInService(PolicyConfiguration pc, DeploymentUnit ejb3Unit)
    {
-      try
-      {
-         JaccHelper.putJaccInService(pc, jbossUnit);
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
+	   throw new IllegalStateException("This method should not be called"); 
    }
 
    public DependencyPolicy createDependencyPolicy(JavaEEComponent component)