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

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

Author: anil.saldhana at jboss.com
Date: 2008-02-22 12:16:16 -0500 (Fri, 22 Feb 2008)
New Revision: 70041

Modified:
   trunk/server/src/main/org/jboss/deployment/EarSecurityDeployer.java
   trunk/server/src/main/org/jboss/deployment/security/AbstractSecurityDeployer.java
   trunk/server/src/main/org/jboss/deployment/security/EarJaccPolicy.java
   trunk/server/src/main/org/jboss/deployment/security/EjbJaccPolicy.java
Log:
JBAS-4858: update the service ctr

Modified: trunk/server/src/main/org/jboss/deployment/EarSecurityDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EarSecurityDeployer.java	2008-02-22 16:00:15 UTC (rev 70040)
+++ trunk/server/src/main/org/jboss/deployment/EarSecurityDeployer.java	2008-02-22 17:16:16 UTC (rev 70041)
@@ -55,5 +55,5 @@
    protected String getJaccPolicyName()
    {
       return EarJaccPolicy.class.getName();
-   }
+   } 
 }
\ No newline at end of file

Modified: trunk/server/src/main/org/jboss/deployment/security/AbstractSecurityDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/security/AbstractSecurityDeployer.java	2008-02-22 16:00:15 UTC (rev 70040)
+++ trunk/server/src/main/org/jboss/deployment/security/AbstractSecurityDeployer.java	2008-02-22 17:16:16 UTC (rev 70041)
@@ -131,7 +131,7 @@
       //Provide a constructor for the service bean 
       ServiceConstructorMetaData serviceConstructor = new ServiceConstructorMetaData();
       serviceConstructor.setSignature(new String[] { String.class.getName(), 
-            metaData.getClass().getName(),Boolean.class.getName()});
+            this.getMetaDataClassType().getName(),Boolean.class.getName()});
       serviceConstructor.setParameters(new Object[] {contextId,deployment, Boolean.TRUE});
       createJaccPolicyBean(serviceConstructor, unit);
    }
@@ -189,7 +189,7 @@
     * Get the top level service bean meta data
     * @return
     */
-   protected abstract ServiceMetaData getServiceMetaData(); 
+   protected abstract ServiceMetaData getServiceMetaData();  
    
    /**
     * Qualify the object name with parent name just to avoid conflicts

Modified: trunk/server/src/main/org/jboss/deployment/security/EarJaccPolicy.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/security/EarJaccPolicy.java	2008-02-22 16:00:15 UTC (rev 70040)
+++ trunk/server/src/main/org/jboss/deployment/security/EarJaccPolicy.java	2008-02-22 17:16:16 UTC (rev 70041)
@@ -54,4 +54,4 @@
    {
       //nothing to do here
    } 
-}
+}
\ No newline at end of file

Modified: trunk/server/src/main/org/jboss/deployment/security/EjbJaccPolicy.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/security/EjbJaccPolicy.java	2008-02-22 16:00:15 UTC (rev 70040)
+++ trunk/server/src/main/org/jboss/deployment/security/EjbJaccPolicy.java	2008-02-22 17:16:16 UTC (rev 70041)
@@ -27,7 +27,7 @@
 import org.jboss.ejb.EJBPermissionMapping;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
-import org.jboss.metadata.ejb.jboss.JBossMetaDataWrapper;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
 
 //$Id$
 
@@ -37,20 +37,20 @@
  *  @since  Feb 18, 2008 
  *  @version $Revision$
  */
-public class EjbJaccPolicy<T extends JBossMetaDataWrapper> extends JaccPolicy<JBossMetaDataWrapper>
+public class EjbJaccPolicy<T extends JBossMetaData> extends JaccPolicy<JBossMetaData>
 { 
    public EjbJaccPolicy(String id)
    {
       super(id); 
    }
 
-   public EjbJaccPolicy(String id, JBossMetaDataWrapper metaData, Boolean standaloneDeployment)
+   public EjbJaccPolicy(String id, JBossMetaData metaData, Boolean standaloneDeployment)
    {
       super(id, metaData, standaloneDeployment); 
    }
 
    @Override
-   protected void createPermissions(JBossMetaDataWrapper metaData, PolicyConfiguration policyConfiguration) 
+   protected void createPermissions(JBossMetaData metaData, PolicyConfiguration policyConfiguration) 
    throws PolicyContextException
    {
       JBossEnterpriseBeansMetaData beans = metaData.getEnterpriseBeans();
@@ -60,4 +60,4 @@
                                                            policyConfiguration);
       } 
    } 
-}
+}
\ No newline at end of file