The way I see it, the Ejb3DescriptorHandler should not be using the AnnotationRepository, nor its MetaDataRepository replacement. Rather, the annotations should be another source of data for the org.jboss.metadata.* pojos. There are two ways this can be done. One would be to create another merged view similar to how the standard metadata is merged into the jboss metadata. Defining a merge(AnnotatedElement) api to map the annotations onto the jboss metadata view would be needed. The second would be to create a separate wrapped view similar to how the standardjboss.xml is handled. The wrapped view would be MetaDataRepository aware and look to it for the annotation based metdata. This is the approach I think is cleanest. View the original post : http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4101613#... Reply to the post : http://www.jboss.com/index.html?module=bb&op=posting&mode=reply&a...