[jboss-cvs] JBossAS SVN: r85643 - projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer.

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

Author: alex.loubyansky at jboss.com
Date: 2009-03-09 09:12:46 -0400 (Mon, 09 Mar 2009)
New Revision: 85643

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/MultipleSchemaResolverDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/SchemaResolverDeployer.java
Log:
JBDEPLOY-173

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-09 10:55:34 UTC (rev 85642)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JBossXBDeployer.java	2009-03-09 13:12:46 UTC (rev 85643)
@@ -21,7 +21,7 @@
 */
 package org.jboss.deployers.vfs.spi.deployer;
 
-import org.jboss.xb.binding.JBossXBDeployerHelper;
+import org.jboss.xb.util.JBossXBHelper;
 
 /**
  * JBoss XB deployer.
@@ -32,7 +32,7 @@
 public abstract class JBossXBDeployer<T> extends UnmarshallerFactoryDeployer<T, Boolean>
 {
    /** The helper */
-   private JBossXBDeployerHelper<T> helper;
+   private JBossXBHelper<T> helper;
 
    /**
     * Create a new SchemaResolverDeployer.
@@ -43,7 +43,7 @@
    public JBossXBDeployer(Class<T> output)
    {
       super(output);
-      this.helper = new JBossXBDeployerHelper<T>(output);
+      this.helper = new JBossXBHelper<T>(output);
    }
 
    /**
@@ -51,7 +51,7 @@
     *
     * @return the helper
     */
-   protected JBossXBDeployerHelper<T> getHelper()
+   protected JBossXBHelper<T> getHelper()
    {
       return helper;
    }

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-09 10:55:34 UTC (rev 85642)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/MultipleJBossXBDeployer.java	2009-03-09 13:12:46 UTC (rev 85643)
@@ -23,7 +23,7 @@
 
 import java.util.Map;
 
-import org.jboss.xb.binding.JBossXBDeployerHelper;
+import org.jboss.xb.util.JBossXBHelper;
 
 /**
  * MultipleJBossXBDeployer.
@@ -34,7 +34,7 @@
 public abstract class MultipleJBossXBDeployer<T> extends MultipleVFSParsingDeployer<T>
 {
    /** The helper */
-   private JBossXBDeployerHelper<T> helper;
+   private JBossXBHelper<T> helper;
 
    /** The features */
    private Map<String, Boolean> features;
@@ -47,7 +47,7 @@
    public MultipleJBossXBDeployer(Class<T> output, Map<String, Class<?>> mappings, String suffix, Class<?> suffixClass)
    {
       super(output, mappings, suffix, suffixClass);
-      this.helper = new JBossXBDeployerHelper<T>(output);
+      this.helper = new JBossXBHelper<T>(output);
    }
 
    /**
@@ -55,7 +55,7 @@
     *
     * @return the helper
     */
-   protected JBossXBDeployerHelper<T> getHelper()
+   protected JBossXBHelper<T> getHelper()
    {
       return helper;
    }

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-09 10:55:34 UTC (rev 85642)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/MultipleSchemaResolverDeployer.java	2009-03-09 13:12:46 UTC (rev 85643)
@@ -29,7 +29,7 @@
 import org.jboss.virtual.VirtualFile;
 import org.jboss.virtual.VFSInputSource;
 import org.jboss.xb.annotations.JBossXmlConstants;
-import org.jboss.xb.binding.JBossXBDeployerHelper;
+import org.jboss.xb.util.JBossXBHelper;
 import org.xml.sax.InputSource;
 
 /**
@@ -85,14 +85,14 @@
    {
       if (excluded.contains(metadata) == false)
       {
-         String namespace = JBossXBDeployerHelper.findNamespace(metadata);
+         String namespace = JBossXBHelper.findNamespace(metadata);
          if (namespace == null || JBossXmlConstants.DEFAULT.equals(namespace))
             throw new IllegalArgumentException(
                   "Registering schema with JBossXB is enabled, but cannot find namespace on class or package: " + metadata +
                   ", perhaps missing @JBossXmlSchema or using default namespace attribute."
             );
 
-         JBossXBDeployerHelper.addClassBinding(namespace, metadata);
+         JBossXBHelper.addClassBinding(namespace, metadata);
          namespaces.add(namespace);
       }
    }
@@ -103,7 +103,7 @@
    public void destroy()
    {
       for (String namespace : namespaces)
-         JBossXBDeployerHelper.removeClassBinding(namespace);
+         JBossXBHelper.removeClassBinding(namespace);
       namespaces.clear();
    }
 

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-09 10:55:34 UTC (rev 85642)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/SchemaResolverDeployer.java	2009-03-09 13:12:46 UTC (rev 85643)
@@ -25,7 +25,7 @@
 import org.jboss.virtual.VirtualFile;
 import org.jboss.virtual.VFSInputSource;
 import org.jboss.xb.annotations.JBossXmlConstants;
-import org.jboss.xb.binding.JBossXBDeployerHelper;
+import org.jboss.xb.util.JBossXBHelper;
 import org.xml.sax.InputSource;
 
 /**
@@ -93,14 +93,14 @@
    {
       if (isRegisterWithJBossXB())
       {
-         namespace = JBossXBDeployerHelper.findNamespace(getOutput());
+         namespace = JBossXBHelper.findNamespace(getOutput());
          if (namespace == null || JBossXmlConstants.DEFAULT.equals(namespace))
             throw new IllegalArgumentException(
                   "RegisterWithJBossXB is enabled, but cannot find namespace on class or package: " + getOutput() +
                   ", perhaps missing @JBossXmlSchema or using default namespace attribute."
             );
 
-         JBossXBDeployerHelper.addClassBinding(namespace, getOutput());
+         JBossXBHelper.addClassBinding(namespace, getOutput());
       }
    }
 
@@ -112,7 +112,7 @@
       if (isRegisterWithJBossXB())
       {
          // namespace should exist, since we got past create
-         JBossXBDeployerHelper.removeClassBinding(namespace);
+         JBossXBHelper.removeClassBinding(namespace);
       }
    }