"scott.stark@jboss.org" wrote:
Most ee descriptor has an alt-dd child of the root element, so one way to handle this would be to extend AbstractParsingDeployerWithOutput to have an alt-dd property that specifies element name of the alt-dd

<application version="1.4"
 xmlns="http://java.sun.com/xml/ns/j2ee"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
 http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
 <module>
 <ejb>ejb.jar</ejb>
 <alt-dd>altDD_ejb.xml</alt-dd>
 </module>
 <module>
 <java>client.jar</java>
 <alt-dd>altDD_client.xml</alt-dd>
 </module>
</application>

I am trying to make it work. I don't see how I can add an attachment in the EARStructure. Instead, I am doing this in the AppParsingDeployer. I override the parse(..) method like (for now just for ejb)

protected EarMetaData parse(VFSDeploymentUnit unit, VirtualFile file, EarMetaData root) throws Exception
 {
 VirtualFile earRoot = file.getParent().getParent();
 EarMetaData earMetaData = super.parse(unit, file, root);
 ModulesMetaData modules = earMetaData.getModules();
 if(modules != null && modules.size() > 0)
 {
 for(ModuleMetaData module : modules)
 {
 String alternativeDD = module.getAlternativeDD();
 if(alternativeDD != null && module.getType() == ModuleType.Ejb)
 {
 VirtualFile altDDFile = earRoot.getChild(alternativeDD);
 unit.addAttachment("ejb.altDD", altDDFile);
 }
 }
 }
 return earMetaData;
 }

protected void init(VFSDeploymentUnit unit, EjbJarMetaData metaData, VirtualFile file) throws Exception
 {
 VFSDeploymentUnit earUnit = unit.getParent();
 if(earUnit != null)
 {
 VirtualFile altDD = (VirtualFile) earUnit.getAttachment("ejb.altDD");
 if(altDD != null)
 file = altDD;
 }
 super.init(unit, metaData, file);
 }

A bit more generalized, how does this look? The change that is in this example in the EjbParsingDeployer could probably be in the SchemaResolverDeployer?

Index: org/jboss/deployment/AppParsingDeployer.java
+ protected EarMetaData parse(VFSDeploymentUnit unit, VirtualFile file, EarMetaData root) throws Exception
+ {
+ EarMetaData ear = super.parse(unit,file, root);
+ List<DeploymentUnit> children = unit.getChildren();
+ if(children != null)
+ {
+ for(DeploymentUnit child : children)
+ {
+ String moduleName = child.getSimpleName();
+ ModuleMetaData module = ear.getModules().get(moduleName);
+ if(module != null && module.getAlternativeDD() != null)
+ {
+ VirtualFile altDDFile = unit.getRoot().getChild(module.getAlternativeDD());
+ if(altDDFile == null)
+ throw new IllegalStateException("Failed to locate alternative DD '" + module.getAlternativeDD() + "' in " + unit.getRoot().getPathName());
+ child.addAttachment(child.getSimpleName() + ".altDD", altDDFile);
+ log.info("attached alt-dd " + altDDFile + " for " + child.getSimpleName());
+ }
+ }
+ }
+
+ return ear;
+ }
 }
Index: org/jboss/deployment/EjbParsingDeployer.java
 @Override
- protected void init(VFSDeploymentUnit unit, EjbJarMetaData metaData, VirtualFile file) throws Exception
+ protected EjbJarMetaData parse(VFSDeploymentUnit unit, VirtualFile file, EjbJarMetaData root) throws Exception
 {
- super.init(unit, metaData, file);
+ VirtualFile altDDFile = (VirtualFile) unit.getAttachment(unit.getSimpleName() + ".altDD");
+ if(altDDFile != null)
+ {
+ log.info("using alt-dd: " + altDDFile);
+ file = altDDFile;
+ }
+ return super.parse(unit, file, root);
 }

I don't have strong preferences here. If it looks more logical then I'll do it that way.

Except as it is done now, getOutput() is available only in the module deployer. The deployer that is attaching the altDD value (AppParsingDeployer in this case) has to use class names explicitly? I did it that way because the key construction was identical everywhere and that looked easier to me.

I've committed the change (with a testcase) to the SchemaResolverDeployer's parse(..) method

VirtualFile altDD = (VirtualFile) unit.getAttachment(getOutput().getName() + ".altDD");
 if(altDD != null)
 file = altDD;

I am going to re-open the issue and do the same for ObjectModelFactoryDeployer. This is needed for the connector alt-dd in EARs.

Fixed in the AbstractVFSParsingDeployer.