"adrian@jboss.org" wrote:

4) In StructureDeployerWrapper, ignore StructureDeployers where this
property is false when the candidateAnnotationScanning is enabled.

 public boolean determineStructure(StructureContext context) throws DeploymentException
 {
 if (context == null)
 throw new IllegalArgumentException("Null context");

 if (supportsCandidateAnnotations() == false)
 return false;

We probably need to keep the found information somewhere.

e.g. on StructureContext

Set<Class<? extends Annotation>> foundAnnotations;

 // Create subdeployments for the ear modules
 for (EarModule mod : modules)
 {
 String fileName = mod.getFileName();
 if (fileName != null && (fileName = fileName.trim()).length() > 0)
 {
 try
 {
 VirtualFile module = file.getChild(fileName);
 if (module == null)
 {
 throw new RuntimeException(fileName
 + " module listed in application.xml does not exist within .ear "
 + file.getName());
 }
 // Ask the deployers to analyze this
 if (structureContext.determineChildStructure(module) == false)
 {
 throw new RuntimeException(fileName
 + " module listed in application.xml is not a recognized deployment, .ear: "
 + file.getName());
 }
// SET MODULE's TYPE HERE
 }
 catch (IOException e)
 {
 throw new RuntimeException(fileName
 + " module listed in application.xml does not exist within .ear "
 + file.getName(), e);
 }
 }
 }

"adrian@jboss.org" wrote:

You don't want to do basic recognition. If the structure doesn't support
annotation scanning then you don't want to add to the ear.
e.g. a -service.xml shouldn't be added to the ear if it isn't listed in
application/jboss-app.xml

 if (context.isCandidateAnnotationScanning() && deployer.supportsCandidateAnnotations() == false)
 return false;

I've added this to AbstractStructureDeployer:

 /**
 * Create deployment resource loader.
 *
 * @param root the deployment root
 * @return new deployment resource loader
 */
 protected abstract DeploymentResourceLoader createDeploymentResourceLoader(VirtualFile root);

 /**
 * Create annotation environment.
 *
 * @param classLoader the classloader
 * @return new annotation environment
 */
 protected abstract AnnotationEnvironment createAnnotationEnvironment(ClassLoader classLoader);

 /**
 * Check for candidate annotations.
 *
 * @param context the structure context
 * @param roots the roots to check
 */
 protected void checkCandidateAnnotations(StructureContext context, VirtualFile... roots)
 {
 if (roots == null || roots.length == 0)
 throw new IllegalArgumentException("Null or empty roots");

 if (candidateAnnotations == null || candidateAnnotations.isEmpty())
 return;

 for(VirtualFile root : roots)
 {
 DeploymentResourceLoader loader = createDeploymentResourceLoader(root);
 ClassLoader cl = new DeploymentResourceClassLoader(loader);
 AnnotationEnvironment env = createAnnotationEnvironment(cl);
 for (Class<? extends Annotation> annotationClass : candidateAnnotations)
 {
 if (env.hasClassAnnotatedWith(annotationClass))
 {
 context.addFoundAnnotation(annotationClass);
 }
 }
 }
 }

"adrian@jboss.org" wrote:

Having said that I don't see why the getters for DeploymentResourceLoader and AnnotatedEnvironment are abstract. There should be default implementations in the abstract class.

"alesj" wrote:

Where MockEARStructureDepolyer then checks in
Module's StructureContext if we have any matching annotation.

 private Integer determineType(StructureContext context, VirtualFile archive) throws Exception
 {
 boolean recognised = context.determineChildStructure(archive);
 if (recognised)
 {
 StructureContext subContext = context.getChildContext(archive);
 Set<Class<? extends Annotation>> foundAnnotations = subContext.getFoundAnnotations();
 if (foundAnnotations.contains(Stateless.class))
 return J2eeModuleMetaData.EJB;
 }

 public StructureContext(VirtualFile root, VirtualFile parent, VirtualFile file, StructureMetaData metaData, VFSStructuralDeployers deployers, StructureContext parentContext)
 {
 ...
 this.parentContext = parentContext;
 if (parentContext != null)
 {
 // ADD CHILD INFO HERE
 }
 }

"adrian@jboss.org" wrote:
I don't really understand what you are trying to do,
but children are described by the ContextInfos of the StructureMetaData.