Re: [jboss-dev] HEAD build broken AGAIN

The following patch fixes it (makes it compile) for me, but I don't know whether this is correct so I'm not committing it. It would be really nice if one day I could resynch with HEAD without having to spend an hour figuring out how to make it build or boot. :-) server module: [ejort@warjort server]$ svn diff Index: src/main/org/jboss/deployment/security/JaccPolicyUtil.java =================================================================== --- src/main/org/jboss/deployment/security/JaccPolicyUtil.java (revision 66421) +++ src/main/org/jboss/deployment/security/JaccPolicyUtil.java (working copy) @@ -131,7 +131,7 @@ else if(metadata instanceof JBossMetaData) { JBossMetaData jmd = (JBossMetaData)metadata; - IEnterpriseBeansMetaData<JBossEnterpriseBeanMetaData> beans = jmd.getEnterpriseBeans(); + JBossEnterpriseBeansMetaData beans = jmd.getEnterpriseBeans(); for(JBossEnterpriseBeanMetaData bmd : beans) { EJBPermissionMapping.createPermissions(bmd, policyConfiguration); Index: src/main/org/jboss/ejb/EjbUtil50.java =================================================================== --- src/main/org/jboss/ejb/EjbUtil50.java (revision 66421) +++ src/main/org/jboss/ejb/EjbUtil50.java (working copy) @@ -202,7 +202,7 @@ if (targetUnit.getAttachment(JBossMetaData.class) != null) { JBossMetaData appMD = targetUnit.getAttachment(JBossMetaData.class); - IEnterpriseBeanMetaData<JBossEnterpriseBeanMetaData> beanMD = appMD.getEnterpriseBean(ejbName); + IEnterpriseBeanMetaData beanMD = appMD.getEnterpriseBean(ejbName); if (beanMD != null) { @@ -234,7 +234,7 @@ if (unit.getAttachment(JBossMetaData.class) != null) { JBossMetaData appMD = unit.getAttachment(JBossMetaData.class); - IEnterpriseBeanMetaData<JBossEnterpriseBeanMetaData> beanMD = appMD.getEnterpriseBean(link); + IEnterpriseBeanMetaData beanMD = appMD.getEnterpriseBean(link); if (beanMD != null) { ejbName = getJndiName(beanMD, isLocal); @@ -272,10 +272,10 @@ return ejbName; } - private static String getJndiName(IEnterpriseBeanMetaData<JBossEnterpriseBeanMetaData> ibeanMD, boolean isLocal) + private static String getJndiName(IEnterpriseBeanMetaData ibeanMD, boolean isLocal) { String jndiName = null; - JBossEnterpriseBeanMetaData beanMD = ibeanMD.cast(); + JBossEnterpriseBeanMetaData beanMD = (JBossEnterpriseBeanMetaData) ibeanMD; if (isLocal) { // Validate that there is a local home associated with this bean @@ -431,4 +431,4 @@ // Not found return null; } -} \ No newline at end of file +} Index: src/main/org/jboss/ejb/deployers/EjbDeployer.java =================================================================== --- src/main/org/jboss/ejb/deployers/EjbDeployer.java (revision 66421) +++ src/main/org/jboss/ejb/deployers/EjbDeployer.java (working copy) @@ -245,7 +245,7 @@ dependencies.add(ccm); } // Add dependencies on the invoker services in use - IEnterpriseBeansMetaData<JBossEnterpriseBeanMetaData> beans = deployment.getEnterpriseBeans(); + IEnterpriseBeansMetaData beans = deployment.getEnterpriseBeans(); Iterator<JBossEnterpriseBeanMetaData> beansIter = beans.iterator(); HashSet<String> invokerNames = new HashSet<String>(); HashSet<String> beanDepends = new HashSet<String>(); web[ejort@warjort webservices]$ svn diff Index: src/main/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java =================================================================== --- src/main/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java (revision 66421) +++ src/main/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java (working copy) @@ -82,7 +82,7 @@ if (ejbLink == null) throw new IllegalStateException("ejb-link cannot be null"); - IEnterpriseBeanMetaData<JBossEnterpriseBeanMetaData> beanMetaData = jbmd.getEnterpriseBean(ejbLink); + IEnterpriseBeanMetaData beanMetaData = jbmd.getEnterpriseBean(ejbLink); if (beanMetaData == null) throw new IllegalStateException("Cannot obtain bean meta data for: " + ejbLink); @@ -103,4 +103,4 @@ WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); return wsMetaData != null && unit.getAllMetaData(JBossMetaData.class).size() > 0; } -} \ No newline at end of file +} Index: src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB21.java =================================================================== --- src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB21.java (revision 66421) +++ src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB21.java (working copy) @@ -77,7 +77,7 @@ private void buildEnterpriseBeansMetaData(EJBArchiveMetaData umd, JBossMetaData jbmd) { List<EJBMetaData> targetBeans = new ArrayList<EJBMetaData>(); - IEnterpriseBeansMetaData<JBossEnterpriseBeanMetaData> sourceBeans = jbmd.getEnterpriseBeans(); + JBossEnterpriseBeansMetaData sourceBeans = jbmd.getEnterpriseBeans(); Iterator<JBossEnterpriseBeanMetaData> it = sourceBeans.iterator(); while (it.hasNext()) { services module: