[jboss-cvs] JBossAS SVN: r66193 - trunk/server/src/main/org/jboss/deployment.

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

Author: scott.stark at jboss.org
Date: 2007-10-16 15:02:16 -0400 (Tue, 16 Oct 2007)
New Revision: 66193

Modified:
   trunk/server/src/main/org/jboss/deployment/EARStructure.java
Log:
Use a schema resolver used to determine which schema to use for application.xml/jboss-app.xml 

Modified: trunk/server/src/main/org/jboss/deployment/EARStructure.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EARStructure.java	2007-10-16 18:56:58 UTC (rev 66192)
+++ trunk/server/src/main/org/jboss/deployment/EARStructure.java	2007-10-16 19:02:16 UTC (rev 66193)
@@ -31,15 +31,15 @@
 import org.jboss.deployers.spi.structure.StructureMetaData;
 import org.jboss.deployers.vfs.spi.structure.VFSStructuralDeployers;
 import org.jboss.deployers.vfs.spi.structure.helpers.AbstractStructureDeployer;
-import org.jboss.metadata.ear.jboss.JBoss50AppMetaData;
 import org.jboss.metadata.ear.jboss.JBossAppMetaData;
 import org.jboss.metadata.ear.jboss.ServiceModuleMetaData;
 import org.jboss.metadata.ear.spec.AbstractModule;
 import org.jboss.metadata.ear.spec.ConnectorModuleMetaData;
-import org.jboss.metadata.ear.spec.Ear50MetaData;
+import org.jboss.metadata.ear.spec.EarMetaData;
 import org.jboss.metadata.ear.spec.EjbModuleMetaData;
 import org.jboss.metadata.ear.spec.JavaModuleMetaData;
 import org.jboss.metadata.ear.spec.ModuleMetaData;
+import org.jboss.metadata.ear.spec.ModulesMetaData;
 import org.jboss.metadata.ear.spec.WebModuleMetaData;
 import org.jboss.virtual.VFSUtils;
 import org.jboss.virtual.VirtualFile;
@@ -47,8 +47,8 @@
 import org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter;
 import org.jboss.xb.binding.Unmarshaller;
 import org.jboss.xb.binding.UnmarshallerFactory;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
-import org.jboss.xb.builder.JBossXBBuilder;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
 
 /**
  * Structure deployer for EARs.
@@ -56,7 +56,7 @@
  * @author Bill Burke
  * @author Scott.Stark at jboss.org
  * @author adrian at jboss.org
- * @version $Revision: 1.1 $
+ * @version $Revision$
  */
 public class EARStructure extends AbstractStructureDeployer
 {
@@ -69,7 +69,10 @@
     * The ear/lib filter
     */
    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();
 
+
    /**
     * Set the relative order to 1000 by default
     *
@@ -102,6 +105,23 @@
       this.earLibFilter = earLibFilter;
    }
 
+   /**
+    * Get the schema resolver
+    * @param resolver
+    */
+   public SchemaBindingResolver getResolver()
+   {
+      return resolver;
+   }
+   /**
+    * Set the schema resolver
+    * @param resolver
+    */
+   public void setResolver(SchemaBindingResolver resolver)
+   {
+      this.resolver = resolver;
+   }
+
    public boolean determineStructure(VirtualFile root, VirtualFile parent, VirtualFile file, StructureMetaData metaData, VFSStructuralDeployers deployers)
    {
       ContextInfo context = null;
@@ -121,15 +141,14 @@
 
          UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
          Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
-         Ear50MetaData specMetaData = null;
-         JBoss50AppMetaData appMetaData = null;
+         EarMetaData specMetaData = null;
+         JBossAppMetaData appMetaData = null;
          if (applicationXml != null)
          {
             InputStream in = applicationXml.openStream();
-            SchemaBinding schema = JBossXBBuilder.build(Ear50MetaData.class);
             try
             {
-               specMetaData = (Ear50MetaData) unmarshaller.unmarshal(in, schema);
+               specMetaData = (EarMetaData) unmarshaller.unmarshal(in, resolver);
             }
             finally
             {
@@ -140,10 +159,9 @@
          if (jbossAppXml != null)
          {
             InputStream in = jbossAppXml.openStream();
-            SchemaBinding schema = JBossXBBuilder.build(JBoss50AppMetaData.class);
             try
             {
-               appMetaData = (JBoss50AppMetaData) unmarshaller.unmarshal(in, schema);
+               appMetaData = (JBossAppMetaData) unmarshaller.unmarshal(in, resolver);
                if (specMetaData != null)
                   appMetaData.setOverridenMetaData(specMetaData);
             }
@@ -193,7 +211,7 @@
          }
 
          // Create subdeployments for the ear modules
-         List<ModuleMetaData> modules = appMetaData.getMergedModules();
+         ModulesMetaData modules = appMetaData.getMergedModules();
          for (ModuleMetaData mod : modules)
          {
             String fileName = mod.getFileName();
@@ -258,7 +276,7 @@
       if (archives != null)
       {
          String earPath = root.getPathName();
-         List<ModuleMetaData> modules = appMetaData.getModules();
+         ModulesMetaData modules = appMetaData.getModules();
          for (VirtualFile vfArchive : archives)
          {
             String filename = earRelativePath(earPath, vfArchive.getPathName());


Property changes on: trunk/server/src/main/org/jboss/deployment/EARStructure.java
___________________________________________________________________
Name: svn:keywords
   + Revision