[jboss-cvs] JBossAS SVN: r78642 - in trunk/server/src: main/org/jboss/deployment and 1 other directory.

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

Author: alex.loubyansky at jboss.com
Date: 2008-09-17 08:38:46 -0400 (Wed, 17 Sep 2008)
New Revision: 78642

Modified:
   trunk/server/src/etc/deployers/ear-deployer-jboss-beans.xml
   trunk/server/src/main/org/jboss/deployment/AppParsingDeployer.java
   trunk/server/src/main/org/jboss/deployment/EARStructure.java
Log:
JBAS-4193

Modified: trunk/server/src/etc/deployers/ear-deployer-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/ear-deployer-jboss-beans.xml	2008-09-17 11:55:59 UTC (rev 78641)
+++ trunk/server/src/etc/deployers/ear-deployer-jboss-beans.xml	2008-09-17 12:38:46 UTC (rev 78642)
@@ -8,11 +8,13 @@
 
    <bean name="EARStructureDeployer" class="org.jboss.deployment.EARStructure">
      <property name="comparatorClassName">org.jboss.system.deployers.LegacyDeploymentContextComparator</property>
+     <!-- uncomment to disable xml validation property name="useValidation">false</property -->
    </bean>
 
    <!-- application.xml parsing deployer -->
    <bean name="AppParsingDeployer" class="org.jboss.deployment.AppParsingDeployer">
-      <!-- TODO JBAS-4193 property name="useValidation">false</property -->
+     <!-- uncomment to disable xml validation property name="useValidation">false</property -->
+     <!-- in case xml validation is disabled, it's also better to turn off schema validation property name="useSchemaValidation">false</property -->
    </bean>
    <!-- Implicit ear contents identifying deployer for ears without
       an application.xml

Modified: trunk/server/src/main/org/jboss/deployment/AppParsingDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/AppParsingDeployer.java	2008-09-17 11:55:59 UTC (rev 78641)
+++ trunk/server/src/main/org/jboss/deployment/AppParsingDeployer.java	2008-09-17 12:38:46 UTC (rev 78642)
@@ -29,6 +29,7 @@
 import org.jboss.metadata.client.spec.ApplicationClientMetaData;
 import org.jboss.metadata.ear.spec.EarMetaData;
 import org.jboss.metadata.ear.spec.ModuleMetaData;
+import org.jboss.metadata.ear.spec.ModulesMetaData;
 import org.jboss.metadata.ejb.spec.EjbJarMetaData;
 import org.jboss.metadata.web.spec.WebMetaData;
 import org.jboss.virtual.VirtualFile;
@@ -77,12 +78,13 @@
    {
       EarMetaData ear = super.parse(unit,file, root);
       List<DeploymentUnit> children = unit.getChildren();
-      if(children != null)
+      ModulesMetaData modules = ear.getModules();
+      if(children != null && modules != null)
       {
          for(DeploymentUnit child : children)
          {
             String moduleName = child.getSimpleName();
-            ModuleMetaData module = ear.getModules().get(moduleName);
+            ModuleMetaData module = modules.get(moduleName);
             if(module != null && module.getAlternativeDD() != null)
             {
                VirtualFile altDDFile = unit.getRoot().getChild(module.getAlternativeDD());

Modified: trunk/server/src/main/org/jboss/deployment/EARStructure.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EARStructure.java	2008-09-17 11:55:59 UTC (rev 78641)
+++ trunk/server/src/main/org/jboss/deployment/EARStructure.java	2008-09-17 12:38:46 UTC (rev 78642)
@@ -71,10 +71,14 @@
    private VirtualFileFilter earLibFilter = DEFAULT_EAR_LIB_FILTER;
    /** The schema resolver used to determine which schema to use for application.xml/jboss-app.xml */
    private SchemaBindingResolver resolver = SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
+   /** unmarshaller factory */
+   UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
    /** The root in classpath flag */
    private boolean includeEarRootInClasspath = true;
    /** The ear child context comparator */
    private String comparatorClassName;
+   /** whether to validate deployment descriptors */
+   private boolean useValidation = true;
 
    /**
     * Set the relative order to 1000 by default
@@ -144,8 +148,8 @@
 
          boolean scan = true;
 
-         UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
          Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
+         unmarshaller.setValidation(useValidation);
          EarMetaData specMetaData = null;
          JBossAppMetaData appMetaData = null;
          if (applicationXml != null)
@@ -443,4 +447,9 @@
    {
       this.comparatorClassName = comparatorClassName;
    }
+   
+   public void setUseValidation(boolean validateXml)
+   {
+      this.useValidation = validateXml;
+   }
 }