Author: wolfc
Date: 2007-06-29 09:22:35 -0400 (Fri, 29 Jun 2007)
New Revision: 63743
Modified:
trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
trunk/server/src/main/org/jboss/deployment/security/JaccPolicyUtil.java
trunk/server/src/main/org/jboss/deployment/security/SecurityDeployer.java
Log:
Fixed deployer inputs/outputs
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java 2007-06-28 23:43:26 UTC (rev 63742)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java 2007-06-29 13:22:35 UTC (rev 63743)
@@ -31,6 +31,7 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployment.security.JaccPolicyUtil;
import org.jboss.ejb3.DeploymentScope;
import org.jboss.ejb3.EJB3Deployer;
import org.jboss.ejb3.Ejb3Deployment;
@@ -61,7 +62,7 @@
*/
public EJBRegistrationDeployer()
{
- setOutput(Ejb3Deployment.class);
+ setOutputs(Ejb3Deployment.class.getName(), JaccPolicyUtil.IGNORE_ME_NAME);
}
public List<String> getAllowedSuffixes()
@@ -162,7 +163,7 @@
}
unit.addAttachment(Ejb3Deployment.class, deployment);
// TODO: temporarily disable the security deployment
- unit.addAttachment("org.jboss.deployment.security.ignoreMe", true, Boolean.class);
+ unit.addAttachment(JaccPolicyUtil.IGNORE_ME_NAME, 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-06-28 23:43:26 UTC (rev 63742)
+++ trunk/server/src/main/org/jboss/deployment/security/JaccPolicyUtil.java 2007-06-29 13:22:35 UTC (rev 63743)
@@ -50,6 +50,7 @@
*/
public class JaccPolicyUtil
{
+ public static String IGNORE_ME_NAME = "org.jboss.deployment.security.ignoreMe";
/**
* Given a deployment unit, get all the deployments underneath
@@ -94,7 +95,7 @@
public static boolean isEJBDeployment(VFSDeploymentUnit du)
{
// TODO: this is temporary EJB3 logic
- Boolean ignoreMe = du.getAttachment("org.jboss.deployment.security.ignoreMe", Boolean.class);
+ Boolean ignoreMe = du.getAttachment(IGNORE_ME_NAME, Boolean.class);
if(ignoreMe != null && ignoreMe)
return false;
boolean ejbxml = du.getMetaDataFile("ejb-jar.xml") != null;
Modified: trunk/server/src/main/org/jboss/deployment/security/SecurityDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/security/SecurityDeployer.java 2007-06-28 23:43:26 UTC (rev 63742)
+++ trunk/server/src/main/org/jboss/deployment/security/SecurityDeployer.java 2007-06-29 13:22:35 UTC (rev 63743)
@@ -24,6 +24,7 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import javax.management.ObjectName;
@@ -63,6 +64,12 @@
public SecurityDeployer()
{
setTopLevelOnly(true);
+
+ // see getMetaData
+ setInputs(WebMetaData.class.getName(), ApplicationMetaData.class.getName(), BeanMetaData.class.getName(),
+ //TODO: EJB3 hack
+ JaccPolicyUtil.IGNORE_ME_NAME);
+
setOutputs("jboss.jacc");
}