Author: scabanovich Date: 2010-09-10 06:13:32 -0400 (Fri, 10 Sep 2010) New Revision: 24859 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/FileSet.java Log: https://jira.jboss.org/browse/JBIDE-7044 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2010-09-10 09:37:28 UTC (rev 24858) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2010-09-10 10:13:32 UTC (rev 24859) @@ -329,19 +329,15 @@ fileSet.add(f.getFullPath(), ts); } } + else if(path.segmentCount() == srcs[i].segmentCount() + 2 + && "META-INF".equals(path.segments()[path.segmentCount() - 2])) { + addBeansXML(f, fileSet); + } return false; } } if(webinf != null && webinf.isPrefixOf(path)) { - if(f.getName().equals("beans.xml")) { - XModelObject beansXML = EclipseResourceUtil.getObjectByResource(f); - if(beansXML == null) { - beansXML = EclipseResourceUtil.createObjectForResource(f); - } - if(beansXML != null) { - fileSet.setBeanXML(f.getFullPath(), beansXML); - } - } + addBeansXML(f, fileSet); } } @@ -371,6 +367,18 @@ } } + + private void addBeansXML(IFile f, FileSet fileSet) { + if(f.getName().equals("beans.xml")) { + XModelObject beansXML = EclipseResourceUtil.getObjectByResource(f); + if(beansXML == null) { + beansXML = EclipseResourceUtil.createObjectForResource(f); + } + if(beansXML != null) { + fileSet.setBeanXML(f.getFullPath(), beansXML); + } + } + } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2010-09-10 09:37:28 UTC (rev 24858) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2010-09-10 10:13:32 UTC (rev 24859) @@ -271,6 +271,7 @@ childPaths = workingCopy.childPaths; typeDefinitions = workingCopy.typeDefinitions; annotations = workingCopy.annotations; + beanXMLs = workingCopy.beanXMLs; project.getDelegate().update(); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/FileSet.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/FileSet.java 2010-09-10 09:37:28 UTC (rev 24858) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/FileSet.java 2010-09-10 10:13:32 UTC (rev 24859) @@ -84,6 +84,7 @@ public void setBeanXML(IPath f, XModelObject o) { beanXMLs.put(f, o); + allpaths.add(f); } }