[jboss-cvs] JBossAS SVN: r85598 - in projects/jboss-deployers/trunk: deployers-vfs/src/test/java/org/jboss/test/deployers and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sat Mar 7 07:27:52 EST 2009


Author: alesj
Date: 2009-03-07 07:27:52 -0500 (Sat, 07 Mar 2009)
New Revision: 85598

Removed:
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JBossXBDeployerHelper.java
Modified:
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JBossXBDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/MultipleJBossXBDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/MultipleObjectModelFactoryDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/MultipleSchemaResolverDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/ObjectModelFactoryDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/SchemaResolverDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/UnmarshallerFactoryDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTestDelegate.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/validate/test/DeployersValidateInputTestCase.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/bootstrap/bootstrap.xml
   projects/jboss-deployers/trunk/pom.xml
Log:
[JBDEPLOY-173]; change to 2.0.1-SNAPSHOT XB and VFS 2.2.0-SNAPSHOT, moving JBossXBDeployerHelper out of deployers.


Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTestDelegate.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTestDelegate.java	2009-03-07 11:44:21 UTC (rev 85597)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTestDelegate.java	2009-03-07 12:27:52 UTC (rev 85598)
@@ -22,7 +22,6 @@
 package org.jboss.test.deployers;
 
 import java.net.URL;
-
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
@@ -38,7 +37,7 @@
 import org.jboss.deployers.plugins.main.MainDeployerImpl;
 import org.jboss.deployers.spi.deployer.Deployers;
 import org.jboss.test.kernel.junit.MicrocontainerTestDelegate;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
+import org.jboss.xb.binding.resolver.MutableSchemaResolver;
 import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
 
 /**
@@ -57,9 +56,9 @@
    
    static
    {
-      DefaultSchemaResolver resolver = (DefaultSchemaResolver) SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
-      resolver.addClassBinding("urn:jboss:classloader:1.0", VFSClassLoaderFactory10.class);
-      resolver.addClassBinding("urn:jboss:classloading:1.0", ClassLoadingMetaData10.class);
+      MutableSchemaResolver resolver = SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
+      resolver.mapURIToClass("urn:jboss:classloader:1.0", VFSClassLoaderFactory10.class);
+      resolver.mapURIToClass("urn:jboss:classloading:1.0", ClassLoadingMetaData10.class);
 
       // TODO add a negating class filter to jboss-classloader
       ClassFilter classFilter = new ClassFilter()

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/validate/test/DeployersValidateInputTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/validate/test/DeployersValidateInputTestCase.java	2009-03-07 11:44:21 UTC (rev 85597)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/validate/test/DeployersValidateInputTestCase.java	2009-03-07 12:27:52 UTC (rev 85598)
@@ -36,6 +36,7 @@
 import org.jboss.test.deployers.vfs.deployer.validate.support.MyVirtualFile;
 import org.jboss.test.deployers.vfs.deployer.validate.support.TestXmlDeployer;
 import org.jboss.virtual.VirtualFile;
+import org.jboss.xb.binding.JBossXBException;
 
 /**
  * Validate deployers.
@@ -85,7 +86,9 @@
          catch(Exception e)
          {
             assertInstanceOf(e, DeploymentException.class);
-            assertInstanceOf(e.getCause(), IOException.class);
+            Throwable cause = e.getCause();
+            if (IOException.class.isInstance(cause) == false && JBossXBException.class.isInstance(cause) == false)
+               fail("Illegal exception cause: " + cause);
          }
       }
    }

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/bootstrap/bootstrap.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/bootstrap/bootstrap.xml	2009-03-07 11:44:21 UTC (rev 85597)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/bootstrap/bootstrap.xml	2009-03-07 12:27:52 UTC (rev 85598)
@@ -36,10 +36,10 @@
    <!-- The holder for deployers that do real deployment -->
    <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl">
       <constructor><parameter><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
+      <property name="mgtObjectCreator"><inject bean="ManagedObjectCreator"/></property>
       <!-- Accept any implementor of deployer -->
       <incallback method="addDeployer"/>
       <uncallback method="removeDeployer"/>
-      <property name="mgtObjectCreator"><inject bean="ManagedObjectCreator"/></property>
    </bean>
 
    <!-- A declared structure descriptor deployer -->

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JBossXBDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JBossXBDeployer.java	2009-03-07 11:44:21 UTC (rev 85597)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JBossXBDeployer.java	2009-03-07 12:27:52 UTC (rev 85598)
@@ -21,6 +21,8 @@
 */
 package org.jboss.deployers.vfs.spi.deployer;
 
+import org.jboss.xb.binding.JBossXBDeployerHelper;
+
 /**
  * JBoss XB deployer.
  *
@@ -56,7 +58,13 @@
 
    protected UnmarshallerFactory<Boolean> createUnmarshallerFactory()
    {
-      return getHelper();
+      return new UnmarshallerFactory<Boolean>()
+      {
+         public void setFeature(String featureName, Boolean flag) throws Exception
+         {
+            getHelper().setFeature(featureName, flag);
+         }
+      };
    }
 
    protected Boolean fromString(String value)

Deleted: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JBossXBDeployerHelper.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JBossXBDeployerHelper.java	2009-03-07 11:44:21 UTC (rev 85597)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JBossXBDeployerHelper.java	2009-03-07 12:27:52 UTC (rev 85598)
@@ -1,297 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.deployers.vfs.spi.deployer;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.logging.Logger;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.xb.annotations.JBossXmlSchema;
-import org.jboss.xb.binding.ObjectModelFactory;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
-import org.xml.sax.InputSource;
-
-/**
- * JBossXB deployer helper.
- * TODO - remove this once we have new XB anf VFS.
- *
- * @param <T> the expected type
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- */
-public class JBossXBDeployerHelper<T> implements org.jboss.deployers.vfs.spi.deployer.UnmarshallerFactory<Boolean>
-{
-   /** The log */
-   private Logger log = Logger.getLogger(JBossXBDeployerHelper.class);
-
-   /** Unmarshaller factory */
-   private static final UnmarshallerFactory factory = UnmarshallerFactory.newInstance();
-
-   /** The singleton schema resolver */
-   private static DefaultSchemaResolver resolver = (DefaultSchemaResolver)SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
-
-   /** The output */
-   private Class<T> output;
-
-   /** Whether the Unmarshaller will use schema validation */
-   private boolean useSchemaValidation = true;
-
-   /** Whether to validate */
-   private boolean useValidation = true;
-
-   /**
-    * Create a new SchemaResolverDeployer.
-    *
-    * @param output the output
-    * @throws IllegalArgumentException for a null output
-    */
-   protected JBossXBDeployerHelper(Class<T> output)
-   {
-      if (output == null)
-         throw new IllegalArgumentException("Null output.");
-      this.output = output;
-   }
-
-   public void setFeature(String featureName, Boolean flag) throws Exception
-   {
-      factory.setFeature(featureName, flag);
-   }
-
-   /**
-    * Get the useSchemaValidation.
-    *
-    * @return the useSchemaValidation.
-    */
-   public boolean isUseSchemaValidation()
-   {
-      return useSchemaValidation;
-   }
-
-   /**
-    * Set the useSchemaValidation.
-    *
-    * @param useSchemaValidation the useSchemaValidation.
-    */
-   public void setUseSchemaValidation(boolean useSchemaValidation)
-   {
-      this.useSchemaValidation = useSchemaValidation;
-   }
-
-   /**
-    * Get the useValidation.
-    *
-    * @return the useValidation.
-    */
-   public boolean isUseValidation()
-   {
-      return useValidation;
-   }
-
-   /**
-    * Set the useValidation.
-    *
-    * @param useValidation the useValidation.
-    */
-   public void setUseValidation(boolean useValidation)
-   {
-      this.useValidation = useValidation;
-   }
-
-   /**
-    * Add class binding.
-    *
-    * @param namespace the namespace
-    * @param metadata the metadata
-    */
-   public static void addClassBinding(String namespace, Class<?> metadata)
-   {
-      resolver.addClassBinding(namespace, metadata);
-   }
-
-   /**
-    * Remove class binding.
-    *
-    * @param namespace the namespace
-    */
-   public static void removeClassBinding(String namespace)
-   {
-      resolver.removeClassBinding(namespace);
-   }
-
-   /**
-    * Find the namespace on class/package
-    *
-    * @param metadata the metadata class
-    * @return jboss xml schema namespace
-    */
-   public static String findNamespace(Class<?> metadata)
-   {
-      JBossXmlSchema jBossXmlSchema = metadata.getAnnotation(JBossXmlSchema.class);
-      if (jBossXmlSchema == null)
-      {
-         Package pckg = metadata.getPackage();
-         if (pckg != null)
-            jBossXmlSchema = pckg.getAnnotation(JBossXmlSchema.class);
-      }
-      return jBossXmlSchema != null ? jBossXmlSchema.namespace() : null;
-   }
-
-   /**
-    * Parse file to output metadata.
-    *
-    * @param file the file to parse
-    * @return new metadata instance
-    * @throws Exception for any error
-    */
-   public T parse(VirtualFile file) throws Exception
-   {
-      return parse(output, file);
-   }
-
-   /**
-    * Parse the file to create metadata instance.
-    *
-    * @param <U> the expect type
-    * @param expectedType the expected type
-    * @param file the file
-    * @return new metadata instance
-    * @throws Exception for any error
-    */
-   public <U> U parse(Class<U> expectedType, VirtualFile file) throws Exception
-   {
-      if (expectedType == null)
-         throw new IllegalArgumentException("Null expected type");
-      if (file == null)
-         throw new IllegalArgumentException("Null file");
-
-      log.debug("Parsing file: "+file+" for type: " + expectedType);
-      Unmarshaller unmarshaller = factory.newUnmarshaller();
-      unmarshaller.setSchemaValidation(isUseSchemaValidation());
-      unmarshaller.setValidation(isUseValidation());
-      InputStream is = openStreamAndValidate(file);
-      Object parsed;
-      try
-      {
-         InputSource source = new InputSource(is);
-         source.setSystemId(file.toURI().toString());
-         parsed = unmarshaller.unmarshal(source, resolver);
-      }
-      finally
-      {
-         try
-         {
-            is.close();
-         }
-         catch (Exception ignored)
-         {
-         }
-      }
-      if (parsed == null)
-         throw new DeploymentException("The xml " + file.getPathName() + " is not well formed!");
-
-      log.debug("Parsed file: "+file+" to: "+parsed);
-      return expectedType.cast(parsed);
-   }
-
-   /**
-    * Parse the file using object model factory.
-    *
-    * @param file the file to parse
-    * @param root the previous root
-    * @param omf the object model factory
-    * @return new metadata instance
-    * @throws Exception for any error
-    */
-   public T parse(VirtualFile file, T root, ObjectModelFactory omf) throws Exception
-   {
-      return parse(output, file, root, omf);
-   }
-
-   /**
-    * Parse the file using object model factory.
-    *
-    * @param <U> the expect type
-    * @param expectedType the expected type
-    * @param file the file to parse
-    * @param root the previous root
-    * @param omf the object model factory
-    * @return new metadata instance
-    * @throws Exception for any error
-    */
-   public <U> U parse(Class<U> expectedType, VirtualFile file, U root, ObjectModelFactory omf) throws Exception
-   {
-      if (file == null)
-         throw new IllegalArgumentException("Null file");
-
-      log.debug("Parsing file: "+file+" for deploymentType: " + expectedType);
-
-      Unmarshaller unmarshaller = factory.newUnmarshaller();
-      unmarshaller.setSchemaValidation(isUseSchemaValidation());
-      unmarshaller.setValidation(isUseValidation());
-      InputStream is = openStreamAndValidate(file);
-      Object parsed;
-      try
-      {
-         InputSource source = new InputSource(is);
-         source.setSystemId(file.toURI().toString());
-         parsed = unmarshaller.unmarshal(source, omf, root);
-      }
-      finally
-      {
-         try
-         {
-            is.close();
-         }
-         catch (Exception ignored)
-         {
-         }
-      }
-      if (parsed == null)
-         throw new DeploymentException("The xml " + file.getPathName() + " is not well formed!");
-
-      log.debug("Parsed file: "+file+" to: "+parsed);
-      return expectedType.cast(parsed);
-   }
-
-   /**
-    * Open stream and validate if not null.
-    *
-    * @param file the virtual file
-    * @return non-null input stream
-    * @throws Exception for any error or if file's stream is null
-    */
-   protected static InputStream openStreamAndValidate(VirtualFile file) throws Exception
-   {
-      if (file == null)
-         throw new IllegalArgumentException("Null file");
-
-      InputStream inputStream = SecurityActions.openStream(file);
-      if (inputStream == null)
-         throw new IOException("Null file stream: " + file);
-
-      return inputStream;
-   }
-}
\ No newline at end of file

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/MultipleJBossXBDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/MultipleJBossXBDeployer.java	2009-03-07 11:44:21 UTC (rev 85597)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/MultipleJBossXBDeployer.java	2009-03-07 12:27:52 UTC (rev 85598)
@@ -23,6 +23,8 @@
 
 import java.util.Map;
 
+import org.jboss.xb.binding.JBossXBDeployerHelper;
+
 /**
  * MultipleJBossXBDeployer.
  *

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/MultipleObjectModelFactoryDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/MultipleObjectModelFactoryDeployer.java	2009-03-07 11:44:21 UTC (rev 85597)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/MultipleObjectModelFactoryDeployer.java	2009-03-07 12:27:52 UTC (rev 85598)
@@ -24,7 +24,9 @@
 import java.util.Map;
 
 import org.jboss.virtual.VirtualFile;
+import org.jboss.virtual.VFSInputSource;
 import org.jboss.xb.binding.ObjectModelFactory;
+import org.xml.sax.InputSource;
 
 /**
  * MultipleObjectModelFactoryDeployer.
@@ -55,8 +57,9 @@
       ObjectModelFactory objectModelFactory = getObjectModelFactory(expectedType, file, tRoot);
       if (objectModelFactory == null)
          log.warn("ObjectModelFactory factory is null, expectedType=" + expectedType + ", file=" + file);
-      
-      return getHelper().parse(expectedType, file, tRoot, objectModelFactory);
+
+      InputSource source = new VFSInputSource(file);
+      return getHelper().parse(expectedType, source, tRoot, objectModelFactory);
    }
 
    /**

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/MultipleSchemaResolverDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/MultipleSchemaResolverDeployer.java	2009-03-07 11:44:21 UTC (rev 85597)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/MultipleSchemaResolverDeployer.java	2009-03-07 12:27:52 UTC (rev 85598)
@@ -26,8 +26,11 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.jboss.virtual.VirtualFile;
+import org.jboss.virtual.VFSInputSource;
 import org.jboss.xb.annotations.JBossXmlConstants;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.xb.binding.JBossXBDeployerHelper;
+import org.xml.sax.InputSource;
 
 /**
  * MultipleSchemaResolverDeployer.
@@ -106,6 +109,7 @@
 
    protected <U> U parse(Class<U> expectedType, VirtualFile file, Object root) throws Exception
    {
-      return getHelper().parse(expectedType, file);
+      InputSource source = new VFSInputSource(file);
+      return getHelper().parse(expectedType, source);
    }
 }
\ No newline at end of file

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/ObjectModelFactoryDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/ObjectModelFactoryDeployer.java	2009-03-07 11:44:21 UTC (rev 85597)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/ObjectModelFactoryDeployer.java	2009-03-07 12:27:52 UTC (rev 85598)
@@ -23,7 +23,9 @@
 
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.virtual.VirtualFile;
+import org.jboss.virtual.VFSInputSource;
 import org.jboss.xb.binding.ObjectModelFactory;
+import org.xml.sax.InputSource;
 
 /**
  * ObjectModelFactoryDeployer extends the AbstractParsingDeployer to add an
@@ -53,7 +55,8 @@
    @Override
    protected T parse(VFSDeploymentUnit unit, VirtualFile file, T root) throws Exception
    {
-      return getHelper().parse(file, root, getObjectModelFactory(root));
+      InputSource source = new VFSInputSource(file);
+      return getHelper().parse(source, root, getObjectModelFactory(root));
    }
 
    /**

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/SchemaResolverDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/SchemaResolverDeployer.java	2009-03-07 11:44:21 UTC (rev 85597)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/SchemaResolverDeployer.java	2009-03-07 12:27:52 UTC (rev 85598)
@@ -23,15 +23,18 @@
 
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.virtual.VirtualFile;
+import org.jboss.virtual.VFSInputSource;
 import org.jboss.xb.annotations.JBossXmlConstants;
+import org.jboss.xb.binding.JBossXBDeployerHelper;
+import org.xml.sax.InputSource;
 
 /**
  * SchemaResolverDeployer.
  * 
  * @param <T> the expected type 
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @author Scott.Stark at jboss.org
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  * @version $Revision 1.1 $
  */
 public class SchemaResolverDeployer<T> extends JBossXBDeployer<T>
@@ -129,6 +132,8 @@
    {
       if (file == null)
          throw new IllegalArgumentException("Null file");
-      return getHelper().parse(file);
+
+      InputSource source = new VFSInputSource(file);
+      return getHelper().parse(source);
    }
 }

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/UnmarshallerFactoryDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/UnmarshallerFactoryDeployer.java	2009-03-07 11:44:21 UTC (rev 85597)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/UnmarshallerFactoryDeployer.java	2009-03-07 12:27:52 UTC (rev 85598)
@@ -53,6 +53,7 @@
 
    /**
     * Create unmarshaller factory wrapper.
+    *
     * @return the unmarshaller factory
     */
    protected abstract UnmarshallerFactory<U> createUnmarshallerFactory();

Modified: projects/jboss-deployers/trunk/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/pom.xml	2009-03-07 11:44:21 UTC (rev 85597)
+++ projects/jboss-deployers/trunk/pom.xml	2009-03-07 12:27:52 UTC (rev 85598)
@@ -21,7 +21,7 @@
   </scm>
 
   <properties>
-    <version.jboss.vfs>2.1.0.GA</version.jboss.vfs>
+    <version.jboss.vfs>2.2.0-SNAPSHOT</version.jboss.vfs>
     <version.jboss.man>2.0.0.GA</version.jboss.man>
     <version.jboss.mdr>2.0.1.GA</version.jboss.mdr>
     <version.jboss.microcontainer>2.2.0-SNAPSHOT</version.jboss.microcontainer>
@@ -30,7 +30,7 @@
     <version.jboss.common.core>2.2.10.GA</version.jboss.common.core>
     <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
     <version.jboss.logging.log4j>2.0.5.GA</version.jboss.logging.log4j>
-    <version.jbossxb>2.0.0.GA</version.jbossxb>
+    <version.jbossxb>2.0.1-SNAPSHOT</version.jbossxb>
     <version.jboss.aop>2.0.0.SP1</version.jboss.aop>
     <version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
     <version.junit>4.4</version.junit>




More information about the jboss-cvs-commits mailing list