[jboss-cvs] JBossAS SVN: r62121 - in branches/Branch_5_0/server/src: main/org/jboss/deployment/security and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 5 01:56:17 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-04-05 01:56:17 -0400 (Thu, 05 Apr 2007)
New Revision: 62121
Modified:
branches/Branch_5_0/server/src/etc/deployers/security-deployer-beans.xml
branches/Branch_5_0/server/src/main/org/jboss/deployment/security/JaccPolicyUtil.java
branches/Branch_5_0/server/src/main/org/jboss/deployment/security/SecurityDeployer.java
branches/Branch_5_0/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
branches/Branch_5_0/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
Log:
Only add a jacc policy dependency if the unit has the jacc policy bean metdata
Modified: branches/Branch_5_0/server/src/etc/deployers/security-deployer-beans.xml
===================================================================
--- branches/Branch_5_0/server/src/etc/deployers/security-deployer-beans.xml 2007-04-05 04:52:39 UTC (rev 62120)
+++ branches/Branch_5_0/server/src/etc/deployers/security-deployer-beans.xml 2007-04-05 05:56:17 UTC (rev 62121)
@@ -21,6 +21,7 @@
<value>xml</value>
<value>beans</value>
<value>deployer</value>
+ <value>sar</value>
</set>
</property>
</bean>
Modified: branches/Branch_5_0/server/src/main/org/jboss/deployment/security/JaccPolicyUtil.java
===================================================================
--- branches/Branch_5_0/server/src/main/org/jboss/deployment/security/JaccPolicyUtil.java 2007-04-05 04:52:39 UTC (rev 62120)
+++ branches/Branch_5_0/server/src/main/org/jboss/deployment/security/JaccPolicyUtil.java 2007-04-05 05:56:17 UTC (rev 62121)
@@ -96,15 +96,19 @@
* @param unit
* @return
*/
- public static ServiceAttributeMetaData getServiceAttributeMetaData(DeploymentUnit unit)
+ public static void getServiceAttributeMetaData(DeploymentUnit unit,
+ List<ServiceAttributeMetaData> attrs)
{
- ServiceAttributeMetaData jaccAttr = new ServiceAttributeMetaData();
- jaccAttr.setName("JaccPolicy");
- ServiceDependencyValueMetaData jaccDepends = new ServiceDependencyValueMetaData();
- jaccDepends.setDependency(getJaccPolicyServiceName(unit));
- jaccDepends.setProxyType("attribute");
- jaccAttr.setValue(jaccDepends);
- return jaccAttr;
+ if( unit.getAttachment("jboss.jaccpolicy") != null )
+ {
+ ServiceAttributeMetaData jaccAttr = new ServiceAttributeMetaData();
+ jaccAttr.setName("JaccPolicy");
+ ServiceDependencyValueMetaData jaccDepends = new ServiceDependencyValueMetaData();
+ jaccDepends.setDependency(getJaccPolicyServiceName(unit));
+ jaccDepends.setProxyType("attribute");
+ jaccAttr.setValue(jaccDepends);
+ attrs.add(jaccAttr);
+ }
}
//TODO:Replace with ejb3 deployment logic
Modified: branches/Branch_5_0/server/src/main/org/jboss/deployment/security/SecurityDeployer.java
===================================================================
--- branches/Branch_5_0/server/src/main/org/jboss/deployment/security/SecurityDeployer.java 2007-04-05 04:52:39 UTC (rev 62120)
+++ branches/Branch_5_0/server/src/main/org/jboss/deployment/security/SecurityDeployer.java 2007-04-05 05:56:17 UTC (rev 62121)
@@ -66,8 +66,16 @@
//Ignore some of the extensions
String contextId = unit.getSimpleName();
- if(contextId.endsWith("xml"))
- return;
+ for(String suffix : ignoreSuffixes)
+ {
+ String dotSuffix = "." + suffix;
+ if(contextId.endsWith(dotSuffix))
+ {
+ log.debug("Ignoring: "+contextId);
+ return;
+ }
+ }
+
//Create a Service Bean for the JACC Policy
ServiceMetaData jaccPolicy = new ServiceMetaData();
jaccPolicy.setCode(JaccPolicy.class.getName());
Modified: branches/Branch_5_0/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
===================================================================
--- branches/Branch_5_0/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java 2007-04-05 04:52:39 UTC (rev 62120)
+++ branches/Branch_5_0/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java 2007-04-05 05:56:17 UTC (rev 62121)
@@ -179,7 +179,7 @@
//Add a dependence on the jacc policy
//TODO: Do it only if the deployment is security enabled
- attrs.add(JaccPolicyUtil.getServiceAttributeMetaData(unit));
+ JaccPolicyUtil.getServiceAttributeMetaData(unit, attrs);
ejbModule.setAttributes(attrs);
List<ServiceDependencyMetaData> dependencies = new ArrayList<ServiceDependencyMetaData>();
Modified: branches/Branch_5_0/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- branches/Branch_5_0/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java 2007-04-05 04:52:39 UTC (rev 62120)
+++ branches/Branch_5_0/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java 2007-04-05 05:56:17 UTC (rev 62121)
@@ -622,7 +622,7 @@
//Add a dependence on the JaccPolicy
//TODO: Do it only if the war is security enabled
List<ServiceAttributeMetaData> attrs = new ArrayList<ServiceAttributeMetaData>();
- attrs.add(JaccPolicyUtil.getServiceAttributeMetaData(unit));
+ JaccPolicyUtil.getServiceAttributeMetaData(unit, attrs);
webModule.setAttributes(attrs);
// TODO could create multiple components for the deployment
More information about the jboss-cvs-commits
mailing list