[jboss-cvs] JBossAS SVN: r99907 - in trunk: ejb3/src/main/java/org/jboss/ejb3/deployers and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2010-01-25 11:48:40 -0500 (Mon, 25 Jan 2010)
New Revision: 99907

Modified:
   trunk/connector/src/main/java/org/jboss/resource/deployers/RARParserDeployer.java
   trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/AppClientParsingDeployer.java
   trunk/server/src/main/java/org/jboss/deployment/EjbParsingDeployer.java
   trunk/server/src/main/java/org/jboss/deployment/WebAppParsingDeployer.java
Log:
Fix EARAltDDDeploymentUnitTestCase, wrong deployer order.

Modified: trunk/connector/src/main/java/org/jboss/resource/deployers/RARParserDeployer.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/deployers/RARParserDeployer.java	2010-01-25 14:54:06 UTC (rev 99906)
+++ trunk/connector/src/main/java/org/jboss/resource/deployers/RARParserDeployer.java	2010-01-25 16:48:40 UTC (rev 99907)
@@ -71,6 +71,8 @@
       super(RARDeploymentMetaData.class, getCustomMappings());
       // Enable MO creation of RARDeploymentMetaData
       setBuildManagedObject(true);
+      // for alt-dd usage
+      addInput("org.jboss.metadata.ear.spec.EarMetaData");
    }
 
    protected <U> ObjectModelFactory getObjectModelFactory(Class<U> expectedType, String fileName, U root)

Modified: trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/AppClientParsingDeployer.java
===================================================================
--- trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/AppClientParsingDeployer.java	2010-01-25 14:54:06 UTC (rev 99906)
+++ trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/AppClientParsingDeployer.java	2010-01-25 16:48:40 UTC (rev 99907)
@@ -30,6 +30,7 @@
  * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
  * @author adrian at jboss.org
  * @author Scott.Stark at jboss.org
+ * @author ales.justin at jboss.org
  * @version $Revision$
  */
 public class AppClientParsingDeployer extends SchemaResolverDeployer<ApplicationClientMetaData>
@@ -38,6 +39,7 @@
    {
       super(ApplicationClientMetaData.class);
       setName("application-client.xml");
-   }
-   
+      // for alt-dd usage
+      addInput("org.jboss.metadata.ear.spec.EarMetaData");
+   }   
 }

Modified: trunk/server/src/main/java/org/jboss/deployment/EjbParsingDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/EjbParsingDeployer.java	2010-01-25 14:54:06 UTC (rev 99906)
+++ trunk/server/src/main/java/org/jboss/deployment/EjbParsingDeployer.java	2010-01-25 16:48:40 UTC (rev 99907)
@@ -23,6 +23,7 @@
 
 import org.jboss.aop.microcontainer.aspects.jmx.JMX;
 import org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer;
+import org.jboss.metadata.ear.spec.EarMetaData;
 import org.jboss.metadata.ejb.spec.EjbJarMetaData;
 
 /**
@@ -31,6 +32,7 @@
  * 
  * @author Scott.Stark at jboss.org
  * @author adrian at jboss.org
+ * @author ales.justin at jboss.org
  * @version $Revision$
  */
 @SuppressWarnings("deprecation")
@@ -44,6 +46,7 @@
    {
       super(EjbJarMetaData.class);
       setName("ejb-jar.xml");
+      // for alt-dd usage
+      addInput(EarMetaData.class);
    }
-
 }

Modified: trunk/server/src/main/java/org/jboss/deployment/WebAppParsingDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/WebAppParsingDeployer.java	2010-01-25 14:54:06 UTC (rev 99906)
+++ trunk/server/src/main/java/org/jboss/deployment/WebAppParsingDeployer.java	2010-01-25 16:48:40 UTC (rev 99907)
@@ -22,6 +22,7 @@
 package org.jboss.deployment;
 
 import org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer;
+import org.jboss.metadata.ear.spec.EarMetaData;
 import org.jboss.metadata.web.spec.WebMetaData;
 
 /**
@@ -30,6 +31,7 @@
  * 
  * @author Scott.Stark at jboss.org
  * @author adrian at jboss.org
+ * @author ales.justin at jboss.org
  * @version $Revision$
  */
 public class WebAppParsingDeployer extends SchemaResolverDeployer<WebMetaData>
@@ -38,6 +40,8 @@
    {
       super(WebMetaData.class);
       setName("web.xml");
+      // for alt-dd usage
+      addInput(EarMetaData.class);
    }
 
    /**
@@ -50,6 +54,7 @@
    {
       return getName();
    }
+
    /**
     * Set the virtual file path for the web-app descriptor in the
     * DeploymentContext.getMetaDataLocation. The standard path is web.xml
@@ -61,5 +66,4 @@
    {
       setName(webXmlPath);
    }
-
 }