[jboss-cvs] JBossAS SVN: r63218 - in trunk: server/src/main/org/jboss/deployment/security and 1 other directory.

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

Author: wolfc
Date: 2007-05-28 03:34:28 -0400 (Mon, 28 May 2007)
New Revision: 63218

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
   trunk/server/src/main/org/jboss/deployment/security/JaccPolicyUtil.java
Log:
EJBTHREE-974: security deployer ignores ejb3 deployments

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java	2007-05-26 16:02:09 UTC (rev 63217)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java	2007-05-28 07:34:28 UTC (rev 63218)
@@ -61,7 +61,8 @@
    {
       // make sure we run before the stage 2 deployer
       // TODO: what's is the proper relative order?
-      setRelativeOrder(COMPONENT_DEPLOYER - 1);
+      // TODO: make sure we run before the security deployer (for now)
+      setRelativeOrder(COMPONENT_DEPLOYER - 2);
    }
    
    public List<String> getAllowedSuffixes()
@@ -172,6 +173,8 @@
             return;
          }
          unit.addAttachment(Ejb3Deployment.class, deployment);
+         // TODO: temporarily disable the security deployment
+         unit.addAttachment("org.jboss.deployment.security.ignoreMe", true, Boolean.class);
       }
       catch (Exception e)
       {

Modified: trunk/server/src/main/org/jboss/deployment/security/JaccPolicyUtil.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/security/JaccPolicyUtil.java	2007-05-26 16:02:09 UTC (rev 63217)
+++ trunk/server/src/main/org/jboss/deployment/security/JaccPolicyUtil.java	2007-05-28 07:34:28 UTC (rev 63218)
@@ -91,6 +91,10 @@
    //TODO:Replace with ejb3 deployment logic
    public static boolean isEJBDeployment(DeploymentUnit du)
    {
+      // TODO: this is temporary EJB3 logic
+      Boolean ignoreMe = du.getAttachment("org.jboss.deployment.security.ignoreMe", Boolean.class);
+      if(ignoreMe != null && ignoreMe)
+         return false;
       boolean ejbxml = du.getMetaDataFile("ejb-jar.xml") != null;
       boolean jbossxml = du.getMetaDataFile("jboss.xml") != null;
       return  ejbxml || jbossxml;