[Jibx-cvs] core/build/src/org/jibx/schema/codegen PackageOrganizer.java, NONE, 1.1 CodeGenerator.ja

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/jibx/core/build/src/org/jibx/schema/codegen
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8499/src/org/jibx/schema/codegen

Modified Files:
	CodeGenerator.java SchemaDocumentationGenerator.java 
	Refactory.java PackageHolder.java DataModelUtils.java 
Added Files:
	PackageOrganizer.java 
Removed Files:
	PackageDirectory.java extract-binding.xml 
Log Message:
Restructure bindings with distinct names for all, and all located in root of src directory; fix errors and inconsistencies from jUnit tests.

--- NEW FILE: PackageOrganizer.java ---
/*
 * Copyright (c) 2006-2007, Dennis M. Sosnoski All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
 * following conditions are met:
 * 
 * Redistributions of source code must retain the above copyright notice, this list of conditions and the following
 * disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
 * following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of
 * JiBX nor the names of its contributors may be used to endorse or promote products derived from this software without
 * specific prior written permission.
 * 
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

package org.jibx.schema.codegen;

import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

import org.jibx.util.InsertionOrderedMap;

/**
 * Organizer for package information. This handles the conversions from namespace URIs to package names, and organizes
 * the packages in a tree structure.
 * 
 * @author Dennis M. Sosnoski
 */
public class PackageOrganizer
{
    /** Empty array used for defaults. */
    private static final String[] EMPTY_STRING_ARRAY = new String[0];

    //
    // Instance data

    /** Base directory for code generation. */
    private final File m_generateDirectory;

    /** Leading URI text to be matched (paired with replacement values). These values are matched using case-insensitive
     comparisons. */
    private String[] m_namespaceLeadMatches;

    /** Replacement text for URI matches (paired with leading URI texts). */
    private String[] m_namespaceLeadReplaces;

    /** Map from schema namespace URI to package (empty if unused). */
    private Map m_namespacePackageMap;

    /** Map from package to base directory for code generation (empty if unused). */
    private Map m_packageDirectoryMap;

    /** Array of case-insensitive strings to be discarded from start of authority component of URI when converting to
     package name. The default is the string "www." */
    private String[] m_authorityDiscards = new String[] { "www." };

    /** Map from namespace URI to package information. This is used in combination with the name-package map, since
     multiple URIs may be converted to the same package name. */
    private Map m_uriPackageMap;

    /** Map from package name to package information. This is used in combination with the URI-package map. */
    private InsertionOrderedMap m_namePackageMap;

    /** Package to use for no-namespace schema components. */
    private String m_noNamespacePackage;

    /**
     * Constructor.
     * 
     * @param basedir default base directory for code generation
     * @param npkg default package for no-namespace schema components
     */
    public PackageOrganizer(File basedir, String npkg) {
        m_generateDirectory = basedir;
        m_namespaceLeadMatches = EMPTY_STRING_ARRAY;
        m_namespaceLeadReplaces = EMPTY_STRING_ARRAY;
        m_namespacePackageMap = Collections.EMPTY_MAP;
        m_packageDirectoryMap = Collections.EMPTY_MAP;
        m_uriPackageMap = new HashMap();
        m_namePackageMap = new InsertionOrderedMap();
        m_noNamespacePackage = npkg;
        m_namePackageMap.put("", new PackageHolder("", basedir, null));
    }

    /**
     * Set the namespace lead replacement patterns. This consists of lead texts to be matches and paired replacement
     * texts. When a particular lead text is found in a URI the replacement text is substituted.
     * 
     * @param leads
     * @param repls
     */
    public void setNamespaceLeadReplaces(String[] leads, String[] repls) {
        m_namespaceLeadMatches = leads;
    }

    /**
     * Set map from namespace URIs to packages.
     * 
     * @param map String-to-String map
     */
    public void setNSPackageMap(Map map) {
        m_namespacePackageMap = map;
    }

    /**
     * Set map from package to base generation directory. If this is unset all packages are generated under the default
     * base directory, as are any packages not covered by this map. All subpackages of a package go under the parent
     * package unless otherwise specified by this map.
     * 
     * @param map String-to-File map
     */
    public void setPackageDirMap(Map map) {
        m_packageDirectoryMap = map;
    }

    /**
     * Check if a character is a hex digit.
     * 
     * @param chr
     * @return hex digit flag
     */
    private boolean isHexChar(char chr) {
        return (chr >= '0' && chr <= '9') || (chr >= 'a' && chr <= 'z') || (chr >= 'A' && chr <= 'Z');
    }

    /**
     * Get value of character as hex digit.
     * 
     * @param chr
     * @return hex digit value
     */
    private int hexValue(char chr) {
        if (chr >= '0' && chr <= '9') {
            return chr - '0';
        } else {
            return Character.toLowerCase(chr) - 'a' + 10;
        }
    }

    /**
     * Check if a character is an ASCII alpha character.
     * 
     * @param chr
     * @return alpha character flag
     */
    private static boolean isAsciiAlpha(char chr) {
        return (chr >= 'a' && chr <= 'z') || (chr >= 'A' && chr <= 'Z');
    }

    /**
     * Check if a character is an ASCII numeric character.
     * 
     * @param chr
     * @return numeric character flag
     */
    private static boolean isAsciiNum(char chr) {
        return chr >= '0' && chr <= '9';
    }

    /**
     * Check if a character is an ASCII alpha or numeric character.
     * 
     * @param chr
     * @return alpha or numeric character flag
     */
    private static boolean isAsciiAlphaNum(char chr) {
        return isAsciiAlpha(chr) || isAsciiNum(chr);
    }

    /**
     * Convert namespace URI to package name.
     * 
     * @param uri
     * @return package name
     */
    public String uriToPackage(String uri) {

        // first check for no-namespace namespace
        if (uri.length() == 0) {
            return m_noNamespacePackage;
        }

        // substitute URI lead text matches
        String pname = uri.toLowerCase();
        for (int i = 0; i < m_namespaceLeadMatches.length; i++) {
            String lead = m_namespaceLeadMatches[i];
            if (pname.startsWith(lead)) {
                pname = m_namespaceLeadReplaces[i] + pname.substring(lead.length());
                break;
            }
        }

        // force expected path separator characters
        pname = pname.replace('\\', '/');

        // discard leading scheme in namespace URI
        int split = pname.indexOf(':');
        if (split > 0 && isAsciiAlpha(pname.charAt(0))) {
            boolean scheme = true;
            for (int i = 0; i < split; i++) {
                char chr = pname.charAt(i);
                if (!isAsciiAlphaNum(chr) && chr != '-' && chr != '+' && chr != '.') {
                    scheme = false;
                    break;
                }
            }
            if (scheme) {
                pname = pname.substring(split + 1);
            }
        }

        // delete any port number component
        int base = pname.indexOf(':');
        if (base > 0) {
            int tail;
            for (tail = base + 1; tail < pname.length(); tail++) {
                if (!isAsciiNum(pname.charAt(tail))) {
                    break;
                }
            }
            pname = pname.substring(0, base) + pname.substring(tail);
        }

        // preprocess authority, if present, discarding leading matches
        if (pname.startsWith("//")) {
            pname = pname.substring(2);
            for (int i = 0; i < m_authorityDiscards.length; i++) {
                String match = m_authorityDiscards[i];
                if (pname.startsWith(match)) {
                    pname = pname.substring(match.length());
                }
            }
        }

        // treat '@' the same as authority (e.g. 'mailto:dm...@so...')
        pname = pname.replace('@', '.');

        // find end of authority (or first directory in path, don't care)
        int end = pname.indexOf('/');
        if (end < 0) {
            end = pname.length();
        }

        // reverse order of components in authority
        StringBuffer buff = new StringBuffer(pname.length());
        int mark = end;
        while ((split = pname.lastIndexOf('.', --mark)) >= 0) {
            if (buff.length() > 0) {
                buff.append(pname, split, mark + 1);
            } else {
                buff.append(pname, split + 1, mark + 1);
            }
            mark = split;
        }
        if (mark >= 0) {
            if (buff.length() > 0) {
                buff.append('.');
            }
            buff.append(pname, 0, mark + 1);
        }
        buff.append(pname.substring(end));

        // finish by converting path separators and special characters
        int index = 0;
        boolean first = true;
        while (index < buff.length()) {
            char chr = buff.charAt(index);
            boolean delete = false;
            if (chr == '.') {
                if (first) {
                    delete = true;
                } else {
                    first = true;
                }
            } else if (chr == '/') {
                if (first) {
                    delete = true;
                } else {
                    buff.setCharAt(index, '.');
                    first = true;
                }
            } else if (chr == '+') {
                buff.setCharAt(index, '_');
                first = false;
            } else if (chr == '%') {
                if (index + 2 < buff.length()) {
                    char chr1 = buff.charAt(index + 1);
                    char chr2 = buff.charAt(index + 2);
                    if (isHexChar(chr1) && isHexChar(chr2)) {
                        buff.setCharAt(index, (char)(hexValue(chr1) * 16 + hexValue(chr2)));
                        buff.delete(index + 1, index + 3);
                        continue;
                    }
                } else {
                    delete = true;
                }
            } else if (isAsciiAlpha(chr) || (!first && isAsciiNum(chr))) {
                first = false;
            } else {
                delete = true;
            }
            if (delete) {
                buff.deleteCharAt(index);
            } else {
                index++;
            }
        }
        if (first && buff.length() > 0) {
            buff.setLength(buff.length() - 1);
        }
        return buff.toString();
    }

    /**
     * Get package information based on package name.
     * 
     * @param pname
     * @return package information
     */
    public PackageHolder getPackage(String pname) {
        PackageHolder pkg = (PackageHolder)m_namePackageMap.get(pname);
        if (pkg == null) {

            // package doesn't exist yet, start by finding the parent package
            int split = pname.lastIndexOf('.');
            PackageHolder parent;
            if (split >= 0) {
                parent = getPackage(pname.substring(0, split));
            } else if (pname.length() > 0) {
                parent = getPackage("");
            } else {
                return new PackageHolder("", m_generateDirectory, null);
            }

            // check for specified generation directory
            File gendir = (File)m_packageDirectoryMap.get(pname);
            if (gendir == null) {
                File pardir = parent.getGenerateDirectory();
                if (pardir != null) {

                    // set directory path based on parent directory
                    gendir = new File(pardir, pname.substring(split + 1));
                }
            }

            // create the package information
            pkg = new PackageHolder(pname, gendir, parent);
            m_namePackageMap.put(pname, pkg);

        }
        return pkg;
    }

    /**
     * Get the information for a package.
     * 
     * @param uri corresponding namespace URI (non-<code>null</code>, empty string for no namespace)
     * @return package information
     */
    public PackageHolder getPackageForUri(String uri) {

        // first check for existing package
        PackageHolder pkg = (PackageHolder)m_uriPackageMap.get(uri);
        if (pkg == null) {

            // first check direct mapping of namespace URI to package name
            String pname = null;
            if (m_namespacePackageMap != null) {
                pname = (String)m_namespacePackageMap.get(uri);
            }

            // otherwise convert URI to package name
            if (pname == null) {
                pname = uriToPackage(uri);
            }

            // get package and add to map
            pkg = getPackage(pname);
            m_uriPackageMap.put(uri, pkg);

        }
        return pkg;
    }

    /**
     * Get the defined packages. The returned list is guaranteed to be ordered such that parent packages precede child
     * packages.
     * 
     * @return packages
     */
    public ArrayList getPackages() {
        ArrayList keys = m_namePackageMap.keyList();
        ArrayList packs = new ArrayList();
        for (int i = 0; i < keys.size(); i++) {
            packs.add(m_namePackageMap.get(keys.get(i)));
        }
        return packs;
    }
}
--- extract-binding.xml DELETED ---

Index: CodeGenerator.java
===================================================================
RCS file: /cvsroot/jibx/core/build/src/org/jibx/schema/codegen/CodeGenerator.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** CodeGenerator.java	22 Aug 2008 02:33:36 -0000	1.24
--- CodeGenerator.java	28 Aug 2008 06:38:04 -0000	1.25
***************
*** 39,51 ****
  import java.util.Set;

- import javax.xml.parsers.DocumentBuilder;
- import javax.xml.parsers.DocumentBuilderFactory;
- import javax.xml.parsers.ParserConfigurationException;
- 
  import org.apache.log4j.Level;
  import org.apache.log4j.Logger;
  import org.eclipse.jdt.core.dom.AST;
- import org.jibx.binding.model.BindingDirectory;
  import org.jibx.binding.model.BindingHolder;
  import org.jibx.binding.model.ElementBase;
  import org.jibx.binding.model.FormatElement;
--- 39,47 ----
  import java.util.Set;

  import org.apache.log4j.Level;
  import org.apache.log4j.Logger;
  import org.eclipse.jdt.core.dom.AST;
  import org.jibx.binding.model.BindingHolder;
+ import org.jibx.binding.model.BindingOrganizer;
  import org.jibx.binding.model.ElementBase;
  import org.jibx.binding.model.FormatElement;
***************
*** 54,57 ****
--- 50,54 ----
  import org.jibx.binding.model.StructureElement;
  import org.jibx.extras.DocumentComparator;
+ import org.jibx.runtime.BindingDirectory;
  import org.jibx.runtime.IBindingFactory;
  import org.jibx.runtime.IMarshallingContext;
***************
*** 61,65 ****
  import org.jibx.runtime.impl.UnmarshallingContext;
  import org.jibx.schema.INamed;
- import org.jibx.schema.IReference;
  import org.jibx.schema.SchemaUtils;
  import org.jibx.schema.SchemaVisitor;
--- 58,61 ----
***************
*** 71,78 ****
  import org.jibx.schema.codegen.custom.SchemasetCustom;
  import org.jibx.schema.elements.AnnotatedBase;
- import org.jibx.schema.elements.AnnotationElement;
  import org.jibx.schema.elements.CommonTypeDerivation;
  import org.jibx.schema.elements.ComplexTypeElement;
- import org.jibx.schema.elements.DocumentationElement;
  import org.jibx.schema.elements.ElementElement;
  import org.jibx.schema.elements.FilteredSegmentList;
--- 67,72 ----
***************
*** 91,95 ****
  import org.jibx.schema.validation.ValidationVisitor;
  import org.jibx.util.InsertionOrderedSet;
- import org.w3c.dom.Document;
  import org.xmlpull.v1.XmlPullParserException;

--- 85,88 ----
***************
*** 135,139 ****
              SchemaTypes.UNSIGNED_LONG.getQName(), SchemaTypes.LONG.getQName(),
              SchemaTypes.UNSIGNED_SHORT.getQName(), SchemaTypes.SHORT.getQName()
!             };

      /** Mask for schema elements which derive from a type. */
--- 128,132 ----
              SchemaTypes.UNSIGNED_LONG.getQName(), SchemaTypes.LONG.getQName(),
              SchemaTypes.UNSIGNED_SHORT.getQName(), SchemaTypes.SHORT.getQName()
!         };

      /** Mask for schema elements which derive from a type. */
***************
*** 165,169 ****

      /** Package directory for generated classes. */
!     private PackageDirectory m_packageDirectory;

      /** Definitions to be generated (may be global schema definitions, or reused nested components with classes). */
--- 158,162 ----

      /** Package directory for generated classes. */
!     private PackageOrganizer m_packageDirectory;

      /** Definitions to be generated (may be global schema definitions, or reused nested components with classes). */
***************
*** 171,175 ****

      /** Directory for constructed bindings. */
!     private BindingDirectory m_bindingDirectory;

      /**
--- 164,168 ----

      /** Directory for constructed bindings. */
!     private BindingOrganizer m_bindingDirectory;

      /**
***************
*** 241,245 ****
      public void validateSchemas(SchemaElement[] schemas) {

!         // validate the schemas and report any problems
          TreeWalker wlkr = new TreeWalker(m_validationContext, m_validationContext);
          s_logger.debug("Beginning schema prevalidation pass");
--- 234,243 ----
      public void validateSchemas(SchemaElement[] schemas) {

!         // start by clearing name registers for previously-validated schemas
!         for (Iterator iter = m_validationContext.iterateSchemas(); iter.hasNext();) {
!             ((SchemaElement)iter.next()).getRegister().reset();
!         }
!         
!         // run full schema validation
          TreeWalker wlkr = new TreeWalker(m_validationContext, m_validationContext);
          s_logger.debug("Beginning schema prevalidation pass");
***************
*** 253,257 ****
          s_logger.debug("Beginning schema registration pass");
          m_validationContext.clearTraversed();
-         // TODO: currently generating 'duplicate name' errors for everything, apparently because of context reuse
          for (int i = 0; i < schemas.length; i++) {
              wlkr.walkSchema(schemas[i], new RegistrationVisitor(m_validationContext));
--- 251,254 ----
***************
*** 275,279 ****
       */
      private SchemaElement[] load(ArrayList list) throws JiBXException, IOException {
!         IBindingFactory factory = org.jibx.runtime.BindingDirectory.getFactory(SchemaElement.class);
          IUnmarshallingContext ictx = factory.createUnmarshallingContext();
          int count = list.size();
--- 272,276 ----
       */
      private SchemaElement[] load(ArrayList list) throws JiBXException, IOException {
!         IBindingFactory factory = BindingDirectory.getFactory(SchemaUtils.XS_PREFIX_BINDING, SchemaElement.class);
          IUnmarshallingContext ictx = factory.createUnmarshallingContext();
          int count = list.size();
***************
*** 469,473 ****
              dfltpack = "";
          }
!         m_packageDirectory = new PackageDirectory(m_targetDir, dfltpack);

          // link each schema to a customization, creating a default customization if necessary
--- 466,470 ----
              dfltpack = "";
          }
!         m_packageDirectory = new PackageOrganizer(m_targetDir, dfltpack);

          // link each schema to a customization, creating a default customization if necessary
***************
*** 1273,1277 ****

          // build the actual class and binding structure
!         m_bindingDirectory = new BindingDirectory(false, false, false, true, true);
          for (int i = 0; i < m_definitions.size(); i++) {

--- 1270,1274 ----

          // build the actual class and binding structure
!         m_bindingDirectory = new BindingOrganizer(false, false, false, true, true);
          for (int i = 0; i < m_definitions.size(); i++) {

***************
*** 1369,1373 ****
       * @return directory
       */
!     public BindingDirectory getBindingDirectory() {
          return m_bindingDirectory;
      }
--- 1366,1370 ----
       * @return directory
       */
!     public BindingOrganizer getBindingDirectory() {
          return m_bindingDirectory;
      }
***************
*** 1470,1474 ****
       * @return directory
       */
!     public PackageDirectory getPackageDirectory() {
          return m_packageDirectory;
      }
--- 1467,1471 ----
       * @return directory
       */
!     public PackageOrganizer getPackageDirectory() {
          return m_packageDirectory;
      }
***************
*** 1534,1561 ****
                          System.out.println("Loaded and validated " + fileset.size() + " schemas");

!                         // apply the customizations to the schema
                          inst.applyAndNormalize();
                          inst.pruneDefinitions();
-                         
-                         // revalidate and run the generation
                          inst.validateSchemas(schemas);
!                         String pack = inst.generate();
!                         inst.writeBindings("binding.xml", pack);
!                         
!                         // check if dump file to be output
!                         File dump = parms.getDumpFile();
!                         if (dump != null) {
!                             
!                             // delete the file it it already exists
!                             if (dump.exists()) {
!                                 dump.delete();
!                             }
!                             dump.createNewFile();

!                             // now print out the class details by package
!                             BufferedWriter writer = new BufferedWriter(new FileWriter(dump));
!                             DataModelUtils.writeImage(inst.m_packageDirectory, writer);
!                             writer.close();

                          }
                      }
--- 1531,1560 ----
                          System.out.println("Loaded and validated " + fileset.size() + " schemas");

!                         // apply the schema customizations and revalidate modified schema
                          inst.applyAndNormalize();
                          inst.pruneDefinitions();
                          inst.validateSchemas(schemas);
!                         if (!reportProblems(inst.m_validationContext)) {

!                             // generate code and bindings
!                             String pack = inst.generate();
!                             inst.writeBindings("binding.xml", pack);

+                             // check if dump file to be output
+                             File dump = parms.getDumpFile();
+                             if (dump != null) {
+                                 
+                                 // delete the file it it already exists
+                                 if (dump.exists()) {
+                                     dump.delete();
+                                 }
+                                 dump.createNewFile();
+                                 
+                                 // now print out the class details by package
+                                 BufferedWriter writer = new BufferedWriter(new FileWriter(dump));
+                                 DataModelUtils.writeImage(inst.m_packageDirectory, writer);
+                                 writer.close();
+                                 
+                             }
                          }
                      }

--- PackageDirectory.java DELETED ---

Index: Refactory.java
===================================================================
RCS file: /cvsroot/jibx/core/build/src/org/jibx/schema/codegen/Refactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Refactory.java	2 Aug 2008 12:10:03 -0000	1.2
--- Refactory.java	28 Aug 2008 06:38:04 -0000	1.3
***************
*** 42,47 ****
  import org.apache.log4j.Level;
  import org.apache.log4j.Logger;
! import org.jibx.binding.model.BindingDirectory;
  import org.jibx.extras.DocumentComparator;
  import org.jibx.runtime.IBindingFactory;
  import org.jibx.runtime.IMarshallingContext;
--- 42,48 ----
  import org.apache.log4j.Level;
  import org.apache.log4j.Logger;
! import org.jibx.binding.model.BindingOrganizer;
  import org.jibx.extras.DocumentComparator;
+ import org.jibx.runtime.BindingDirectory;
  import org.jibx.runtime.IBindingFactory;
  import org.jibx.runtime.IMarshallingContext;
***************
*** 150,154 ****

      /** Directory for constructed bindings. */
!     private BindingDirectory m_bindingDirectory;

      /**
--- 151,155 ----

      /** Directory for constructed bindings. */
!     private BindingOrganizer m_bindingDirectory;

      /**
***************
*** 254,258 ****
       */
      private SchemaElement[] load(ArrayList list) throws JiBXException, IOException {
!         IBindingFactory factory = org.jibx.runtime.BindingDirectory.getFactory(SchemaElement.class);
          IUnmarshallingContext ictx = factory.createUnmarshallingContext();
          int count = list.size();
--- 255,259 ----
       */
      private SchemaElement[] load(ArrayList list) throws JiBXException, IOException {
!         IBindingFactory factory = BindingDirectory.getFactory(SchemaUtils.XS_PREFIX_BINDING, SchemaElement.class);
          IUnmarshallingContext ictx = factory.createUnmarshallingContext();
          int count = list.size();
***************
*** 596,600 ****
              OutputStream stream = new FileOutputStream(file);
              Writer writer = new OutputStreamWriter(stream, "utf-8");
!             IBindingFactory factory = org.jibx.runtime.BindingDirectory.getFactory(SchemaElement.class);
              IMarshallingContext ictx = factory.createMarshallingContext();
              ictx.setOutput(writer);
--- 597,601 ----
              OutputStream stream = new FileOutputStream(file);
              Writer writer = new OutputStreamWriter(stream, "utf-8");
!             IBindingFactory factory = BindingDirectory.getFactory(SchemaUtils.XS_PREFIX_BINDING, SchemaElement.class);
              IMarshallingContext ictx = factory.createMarshallingContext();
              ictx.setOutput(writer);

Index: PackageHolder.java
===================================================================
RCS file: /cvsroot/jibx/core/build/src/org/jibx/schema/codegen/PackageHolder.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PackageHolder.java	14 Jul 2008 21:10:02 -0000	1.8
--- PackageHolder.java	28 Aug 2008 06:38:05 -0000	1.9
***************
*** 28,32 ****
  import org.eclipse.jdt.core.dom.AST;
  import org.jibx.binding.generator.UniqueNameSet;
! import org.jibx.binding.model.BindingDirectory;
  import org.jibx.binding.model.BindingHolder;

--- 28,32 ----
  import org.eclipse.jdt.core.dom.AST;
  import org.jibx.binding.generator.UniqueNameSet;
! import org.jibx.binding.model.BindingOrganizer;
  import org.jibx.binding.model.BindingHolder;

***************
*** 196,200 ****
       * @param directory binding directory
       */
!     public void generate(AST ast, BindingDirectory directory) {
          for (int i = 0; i < m_classes.size(); i++) {
              ClassHolder clashold = (ClassHolder)m_classes.get(i);
--- 196,200 ----
       * @param directory binding directory
       */
!     public void generate(AST ast, BindingOrganizer directory) {
          for (int i = 0; i < m_classes.size(); i++) {
              ClassHolder clashold = (ClassHolder)m_classes.get(i);

Index: DataModelUtils.java
===================================================================
RCS file: /cvsroot/jibx/core/build/src/org/jibx/schema/codegen/DataModelUtils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DataModelUtils.java	18 Feb 2008 03:55:04 -0000	1.1
--- DataModelUtils.java	28 Aug 2008 06:38:05 -0000	1.2
***************
*** 38,42 ****
       * @return ordered list of class name-values array pairs
       */
!     public static StringObjectPair[] getImage(PackageDirectory directory) {
          ArrayList packs = directory.getPackages();
          ArrayList classdetails = new ArrayList();
--- 38,42 ----
       * @return ordered list of class name-values array pairs
       */
!     public static StringObjectPair[] getImage(PackageOrganizer directory) {
          ArrayList packs = directory.getPackages();
          ArrayList classdetails = new ArrayList();
***************
*** 57,61 ****
       * @throws IOException
       */
!     public static void writeImage(PackageDirectory directory, BufferedWriter writer) throws IOException {
          ArrayList packs = directory.getPackages();
          for (int i = 0; i < packs.size(); i++) {
--- 57,61 ----
       * @throws IOException
       */
!     public static void writeImage(PackageOrganizer directory, BufferedWriter writer) throws IOException {
          ArrayList packs = directory.getPackages();
          for (int i = 0; i < packs.size(); i++) {

Index: SchemaDocumentationGenerator.java
===================================================================
RCS file: /cvsroot/jibx/core/build/src/org/jibx/schema/codegen/SchemaDocumentationGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SchemaDocumentationGenerator.java	22 Aug 2008 02:32:30 -0000	1.1
--- SchemaDocumentationGenerator.java	28 Aug 2008 06:38:04 -0000	1.2
***************
*** 84,88 ****
       */
      public SchemaDocumentationGenerator() throws JiBXException {
!         m_factory = BindingDirectory.getFactory("extract_binding", "org.jibx.schema.codegen");
          int index = 0;
          String[] uris = m_factory.getNamespaces();
--- 84,88 ----
       */
      public SchemaDocumentationGenerator() throws JiBXException {
!         m_factory = BindingDirectory.getFactory("schema_extract_binding", "org.jibx.schema.codegen");
          int index = 0;
          String[] uris = m_factory.getNamespaces();