Index: cpa/src/main/java/org/castor/jdo/conf/ParamDescriptor.java
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/ParamDescriptor.java	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/ParamDescriptor.java	(working copy)
@@ -1,258 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 1.0.1</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package org.castor.jdo.conf;
-
-/**
- * Class ParamDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class ParamDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field elementDefinition
-     */
-    private boolean elementDefinition;
-
-    /**
-     * Field nsPrefix
-     */
-    private java.lang.String nsPrefix;
-
-    /**
-     * Field nsURI
-     */
-    private java.lang.String nsURI;
-
-    /**
-     * Field xmlName
-     */
-    private java.lang.String xmlName;
-
-    /**
-     * Field identity
-     */
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public ParamDescriptor() 
-     {
-        super();
-        nsURI = "http://castor.org/JDO";
-        xmlName = "param";
-        elementDefinition = true;
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _name
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Param target = (Param) object;
-                return target.getName();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Param target = (Param) object;
-                    target.setName( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return null;
-            }
-        };
-        desc.setHandler(handler);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _name
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _value
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_value", "value", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Param target = (Param) object;
-                return target.getValue();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Param target = (Param) object;
-                    target.setValue( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return null;
-            }
-        };
-        desc.setHandler(handler);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _value
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-    } //-- org.castor.jdo.conf.ParamDescriptor()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Method getAccessMode
-     * 
-     * 
-     * 
-     * @return AccessMode
-     */
-    public org.exolab.castor.mapping.AccessMode getAccessMode()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() 
-
-    /**
-     * Method getExtends
-     * 
-     * 
-     * 
-     * @return ClassDescriptor
-     */
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() 
-
-    /**
-     * Method getIdentity
-     * 
-     * 
-     * 
-     * @return FieldDescriptor
-     */
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()
-    {
-        return identity;
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() 
-
-    /**
-     * Method getJavaClass
-     * 
-     * 
-     * 
-     * @return Class
-     */
-    public java.lang.Class getJavaClass()
-    {
-        return org.castor.jdo.conf.Param.class;
-    } //-- java.lang.Class getJavaClass() 
-
-    /**
-     * Method getNameSpacePrefix
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpacePrefix()
-    {
-        return nsPrefix;
-    } //-- java.lang.String getNameSpacePrefix() 
-
-    /**
-     * Method getNameSpaceURI
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpaceURI()
-    {
-        return nsURI;
-    } //-- java.lang.String getNameSpaceURI() 
-
-    /**
-     * Method getValidator
-     * 
-     * 
-     * 
-     * @return TypeValidator
-     */
-    public org.exolab.castor.xml.TypeValidator getValidator()
-    {
-        return this;
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() 
-
-    /**
-     * Method getXMLName
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getXMLName()
-    {
-        return xmlName;
-    } //-- java.lang.String getXMLName() 
-
-    /**
-     * Method isElementDefinition
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean isElementDefinition()
-    {
-        return elementDefinition;
-    } //-- boolean isElementDefinition() 
-
-}
Index: cpa/src/main/java/org/castor/jdo/conf/DatabaseDescriptor.java
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/DatabaseDescriptor.java	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/DatabaseDescriptor.java	(working copy)
@@ -1,330 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 1.0.1</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package org.castor.jdo.conf;
-
-/**
- * Class DatabaseDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class DatabaseDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field elementDefinition
-     */
-    private boolean elementDefinition;
-
-    /**
-     * Field nsPrefix
-     */
-    private java.lang.String nsPrefix;
-
-    /**
-     * Field nsURI
-     */
-    private java.lang.String nsURI;
-
-    /**
-     * Field xmlName
-     */
-    private java.lang.String xmlName;
-
-    /**
-     * Field identity
-     */
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public DatabaseDescriptor() 
-     {
-        super();
-        nsURI = "http://castor.org/JDO";
-        xmlName = "database";
-        elementDefinition = true;
-        
-        //-- set grouping compositor
-        setCompositorAsSequence();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _name
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", org.exolab.castor.xml.NodeType.Attribute);
-        this.identity = desc;
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Database target = (Database) object;
-                return target.getName();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Database target = (Database) object;
-                    target.setName( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new java.lang.String();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _name
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _engine
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_engine", "engine", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Database target = (Database) object;
-                return target.getEngine();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Database target = (Database) object;
-                    target.setEngine( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return null;
-            }
-        };
-        desc.setHandler(handler);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _engine
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-            org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-        //-- _databaseChoice
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.castor.jdo.conf.DatabaseChoice.class, "_databaseChoice", "-error-if-this-is-used-", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Database target = (Database) object;
-                return target.getDatabaseChoice();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Database target = (Database) object;
-                    target.setDatabaseChoice( (org.castor.jdo.conf.DatabaseChoice) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new org.castor.jdo.conf.DatabaseChoice();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setContainer(true);
-        desc.setClassDescriptor(new org.castor.jdo.conf.DatabaseChoiceDescriptor());
-        desc.setNameSpaceURI("http://castor.org/JDO");
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _databaseChoice
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _mappingList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.castor.jdo.conf.Mapping.class, "_mappingList", "mapping", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Database target = (Database) object;
-                return target.getMapping();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Database target = (Database) object;
-                    target.addMapping( (org.castor.jdo.conf.Mapping) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new org.castor.jdo.conf.Mapping();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://castor.org/JDO");
-        desc.setRequired(true);
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _mappingList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-    } //-- org.castor.jdo.conf.DatabaseDescriptor()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Method getAccessMode
-     * 
-     * 
-     * 
-     * @return AccessMode
-     */
-    public org.exolab.castor.mapping.AccessMode getAccessMode()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() 
-
-    /**
-     * Method getExtends
-     * 
-     * 
-     * 
-     * @return ClassDescriptor
-     */
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() 
-
-    /**
-     * Method getIdentity
-     * 
-     * 
-     * 
-     * @return FieldDescriptor
-     */
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()
-    {
-        return identity;
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() 
-
-    /**
-     * Method getJavaClass
-     * 
-     * 
-     * 
-     * @return Class
-     */
-    public java.lang.Class getJavaClass()
-    {
-        return org.castor.jdo.conf.Database.class;
-    } //-- java.lang.Class getJavaClass() 
-
-    /**
-     * Method getNameSpacePrefix
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpacePrefix()
-    {
-        return nsPrefix;
-    } //-- java.lang.String getNameSpacePrefix() 
-
-    /**
-     * Method getNameSpaceURI
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpaceURI()
-    {
-        return nsURI;
-    } //-- java.lang.String getNameSpaceURI() 
-
-    /**
-     * Method getValidator
-     * 
-     * 
-     * 
-     * @return TypeValidator
-     */
-    public org.exolab.castor.xml.TypeValidator getValidator()
-    {
-        return this;
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() 
-
-    /**
-     * Method getXMLName
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getXMLName()
-    {
-        return xmlName;
-    } //-- java.lang.String getXMLName() 
-
-    /**
-     * Method isElementDefinition
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean isElementDefinition()
-    {
-        return elementDefinition;
-    } //-- boolean isElementDefinition() 
-
-}
Index: cpa/src/main/resources/org/castor/jdo/conf/jdo-conf.builder.properties
===================================================================
--- cpa/src/main/resources/org/castor/jdo/conf/jdo-conf.builder.properties	(revision 0)
+++ cpa/src/main/resources/org/castor/jdo/conf/jdo-conf.builder.properties	(revision 0)
@@ -0,0 +1,9 @@
+# Specifies whether the sources generated should be source compatible with
+# Java 1.4 or Java 5.  Legal values are "1.4" and "5.0".  When "5.0" is
+# selected, generated source will use Java 5 features such as generics and
+# annotations.
+#
+# Possible values:
+# - 1.4 
+# - 5.0 (default)
+org.exolab.castor.builder.javaVersion=5.0
Index: cpa/src/main/java/org/castor/jdo/conf/MappingDescriptor.java
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/MappingDescriptor.java	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/MappingDescriptor.java	(working copy)
@@ -1,219 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 1.0.1</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package org.castor.jdo.conf;
-
-/**
- * Class MappingDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class MappingDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field elementDefinition
-     */
-    private boolean elementDefinition;
-
-    /**
-     * Field nsPrefix
-     */
-    private java.lang.String nsPrefix;
-
-    /**
-     * Field nsURI
-     */
-    private java.lang.String nsURI;
-
-    /**
-     * Field xmlName
-     */
-    private java.lang.String xmlName;
-
-    /**
-     * Field identity
-     */
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public MappingDescriptor() 
-     {
-        super();
-        nsURI = "http://castor.org/JDO";
-        xmlName = "mapping";
-        elementDefinition = true;
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _href
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_href", "href", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Mapping target = (Mapping) object;
-                return target.getHref();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Mapping target = (Mapping) object;
-                    target.setHref( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return null;
-            }
-        };
-        desc.setHandler(handler);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _href
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-    } //-- org.castor.jdo.conf.MappingDescriptor()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Method getAccessMode
-     * 
-     * 
-     * 
-     * @return AccessMode
-     */
-    public org.exolab.castor.mapping.AccessMode getAccessMode()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() 
-
-    /**
-     * Method getExtends
-     * 
-     * 
-     * 
-     * @return ClassDescriptor
-     */
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() 
-
-    /**
-     * Method getIdentity
-     * 
-     * 
-     * 
-     * @return FieldDescriptor
-     */
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()
-    {
-        return identity;
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() 
-
-    /**
-     * Method getJavaClass
-     * 
-     * 
-     * 
-     * @return Class
-     */
-    public java.lang.Class getJavaClass()
-    {
-        return org.castor.jdo.conf.Mapping.class;
-    } //-- java.lang.Class getJavaClass() 
-
-    /**
-     * Method getNameSpacePrefix
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpacePrefix()
-    {
-        return nsPrefix;
-    } //-- java.lang.String getNameSpacePrefix() 
-
-    /**
-     * Method getNameSpaceURI
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpaceURI()
-    {
-        return nsURI;
-    } //-- java.lang.String getNameSpaceURI() 
-
-    /**
-     * Method getValidator
-     * 
-     * 
-     * 
-     * @return TypeValidator
-     */
-    public org.exolab.castor.xml.TypeValidator getValidator()
-    {
-        return this;
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() 
-
-    /**
-     * Method getXMLName
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getXMLName()
-    {
-        return xmlName;
-    } //-- java.lang.String getXMLName() 
-
-    /**
-     * Method isElementDefinition
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean isElementDefinition()
-    {
-        return elementDefinition;
-    } //-- boolean isElementDefinition() 
-
-}
Index: cpa/src/main/java/org/castor/jdo/conf/TransactionManagerDescriptor.java
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/TransactionManagerDescriptor.java	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/TransactionManagerDescriptor.java	(working copy)
@@ -1,255 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 1.0.1</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package org.castor.jdo.conf;
-
-/**
- * Class TransactionManagerDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class TransactionManagerDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field elementDefinition
-     */
-    private boolean elementDefinition;
-
-    /**
-     * Field nsPrefix
-     */
-    private java.lang.String nsPrefix;
-
-    /**
-     * Field nsURI
-     */
-    private java.lang.String nsURI;
-
-    /**
-     * Field xmlName
-     */
-    private java.lang.String xmlName;
-
-    /**
-     * Field identity
-     */
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public TransactionManagerDescriptor() 
-     {
-        super();
-        nsURI = "http://castor.org/JDO";
-        xmlName = "transaction-manager";
-        elementDefinition = true;
-        
-        //-- set grouping compositor
-        setCompositorAsSequence();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _name
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                TransactionManager target = (TransactionManager) object;
-                return target.getName();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    TransactionManager target = (TransactionManager) object;
-                    target.setName( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return null;
-            }
-        };
-        desc.setHandler(handler);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _name
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-            org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-        //-- _paramList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.castor.jdo.conf.Param.class, "_paramList", "param", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                TransactionManager target = (TransactionManager) object;
-                return target.getParam();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    TransactionManager target = (TransactionManager) object;
-                    target.addParam( (org.castor.jdo.conf.Param) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new org.castor.jdo.conf.Param();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://castor.org/JDO");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _paramList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-    } //-- org.castor.jdo.conf.TransactionManagerDescriptor()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Method getAccessMode
-     * 
-     * 
-     * 
-     * @return AccessMode
-     */
-    public org.exolab.castor.mapping.AccessMode getAccessMode()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() 
-
-    /**
-     * Method getExtends
-     * 
-     * 
-     * 
-     * @return ClassDescriptor
-     */
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() 
-
-    /**
-     * Method getIdentity
-     * 
-     * 
-     * 
-     * @return FieldDescriptor
-     */
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()
-    {
-        return identity;
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() 
-
-    /**
-     * Method getJavaClass
-     * 
-     * 
-     * 
-     * @return Class
-     */
-    public java.lang.Class getJavaClass()
-    {
-        return org.castor.jdo.conf.TransactionManager.class;
-    } //-- java.lang.Class getJavaClass() 
-
-    /**
-     * Method getNameSpacePrefix
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpacePrefix()
-    {
-        return nsPrefix;
-    } //-- java.lang.String getNameSpacePrefix() 
-
-    /**
-     * Method getNameSpaceURI
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpaceURI()
-    {
-        return nsURI;
-    } //-- java.lang.String getNameSpaceURI() 
-
-    /**
-     * Method getValidator
-     * 
-     * 
-     * 
-     * @return TypeValidator
-     */
-    public org.exolab.castor.xml.TypeValidator getValidator()
-    {
-        return this;
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() 
-
-    /**
-     * Method getXMLName
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getXMLName()
-    {
-        return xmlName;
-    } //-- java.lang.String getXMLName() 
-
-    /**
-     * Method isElementDefinition
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean isElementDefinition()
-    {
-        return elementDefinition;
-    } //-- boolean isElementDefinition() 
-
-}
Index: .classpath
===================================================================
--- .classpath	(revision 8028)
+++ .classpath	(working copy)
@@ -21,6 +21,7 @@
 	<classpathentry kind="src" output="cpa/eclipse" path="cpa/src/main/resources"/>
 	<classpathentry kind="src" output="cpa/eclipse" path="cpa/src/test/java"/>
 	<classpathentry kind="src" output="cpa/eclipse" path="cpa/src/test/resources"/>
+	<classpathentry kind="src" output="cpa/eclipse" path="cpa/target/generated-sources/castor"/>
 	<classpathentry kind="src" output="ddlgen/eclipse" path="ddlgen/src/main/java"/>
 	<classpathentry kind="src" output="ddlgen/eclipse" path="ddlgen/src/main/resources"/>
 	<classpathentry kind="src" output="ddlgen/eclipse" path="ddlgen/src/test/java"/>
Index: cpa/src/main/java/org/castor/jdo/conf/package.html
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/package.html	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/package.html	(working copy)
@@ -1,15 +0,0 @@
-<html>
-  <head>
-    <title>Castor JDO configuration</title>
-  </head>
-  <body>
-    <p>XML objects for loading the Castor JDO configuration file.</p>
-
-    <p>
-       The source in this package is generated using the
-       <a href="../../../exolab/castor/builder/package-summary.html">Castor Source Generator</a>
-       and the schema
-       <code>src/main/resources/org/castor/jdo/conf/jdo-conf.xsd</code>.
-    </p>
-  </body>
-</html>
Index: cpa/src/main/java/org/castor/jdo/conf/Mapping.java
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/Mapping.java	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/Mapping.java	(working copy)
@@ -1,141 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 1.0.1</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package org.castor.jdo.conf;
-
-  //---------------------------------/
- //- Imported classes and packages -/
-//---------------------------------/
-
-import org.exolab.castor.xml.Marshaller;
-import org.exolab.castor.xml.Unmarshaller;
-
-/**
- * Class Mapping.
- * 
- * @version $Revision$ $Date$
- */
-public class Mapping implements java.io.Serializable {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field _href
-     */
-    private java.lang.String _href;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public Mapping() 
-     {
-        super();
-    } //-- org.castor.jdo.conf.Mapping()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Returns the value of field 'href'.
-     * 
-     * @return String
-     * @return the value of field 'href'.
-     */
-    public java.lang.String getHref()
-    {
-        return this._href;
-    } //-- java.lang.String getHref() 
-
-    /**
-     * Method isValid
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean isValid()
-    {
-        try {
-            validate();
-        }
-        catch (org.exolab.castor.xml.ValidationException vex) {
-            return false;
-        }
-        return true;
-    } //-- boolean isValid() 
-
-    /**
-     * Method marshal
-     * 
-     * 
-     * 
-     * @param out
-     */
-    public void marshal(java.io.Writer out)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
-        Marshaller.marshal(this, out);
-    } //-- void marshal(java.io.Writer) 
-
-    /**
-     * Method marshal
-     * 
-     * 
-     * 
-     * @param handler
-     */
-    public void marshal(org.xml.sax.ContentHandler handler)
-        throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
-        Marshaller.marshal(this, handler);
-    } //-- void marshal(org.xml.sax.ContentHandler) 
-
-    /**
-     * Sets the value of field 'href'.
-     * 
-     * @param href the value of field 'href'.
-     */
-    public void setHref(java.lang.String href)
-    {
-        this._href = href;
-    } //-- void setHref(java.lang.String) 
-
-    /**
-     * Method unmarshal
-     * 
-     * 
-     * 
-     * @param reader
-     * @return Mapping
-     */
-    public static org.castor.jdo.conf.Mapping unmarshal(java.io.Reader reader)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        return (org.castor.jdo.conf.Mapping) Unmarshaller.unmarshal(org.castor.jdo.conf.Mapping.class, reader);
-    } //-- org.castor.jdo.conf.Mapping unmarshal(java.io.Reader) 
-
-    /**
-     * Method validate
-     * 
-     */
-    public void validate()
-        throws org.exolab.castor.xml.ValidationException
-    {
-        org.exolab.castor.xml.Validator validator = new org.exolab.castor.xml.Validator();
-        validator.validate(this);
-    } //-- void validate() 
-
-}
Index: cpa/src/main/resources/META-INF/MANIFEST.MF
===================================================================
--- cpa/src/main/resources/META-INF/MANIFEST.MF	(revision 8022)
+++ cpa/src/main/resources/META-INF/MANIFEST.MF	(working copy)
@@ -1,7 +1,10 @@
 Manifest-Version: 1.0
-Specification-Title: Spring ORM for Castor
-Implementation-Title: Spring ORM for Castor
-Sealed: true
+Specification-Title: Castor CPA
+Specification-Vendor: Intalio Inc.
+Specification-Version: $VERSION$$RELEASE$
+Implementation-Title: Castor
+Implementation-Vendor: Intalio Inc.
+Implementation-Version: $VERSION$$RELEASE$
 
 
 
Index: cpa/src/main/java/org/castor/jdo/conf/DataSourceDescriptor.java
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/DataSourceDescriptor.java	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/DataSourceDescriptor.java	(working copy)
@@ -1,257 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 1.0.1</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package org.castor.jdo.conf;
-
-/**
- * Class DataSourceDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class DataSourceDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field elementDefinition
-     */
-    private boolean elementDefinition;
-
-    /**
-     * Field nsPrefix
-     */
-    private java.lang.String nsPrefix;
-
-    /**
-     * Field nsURI
-     */
-    private java.lang.String nsURI;
-
-    /**
-     * Field xmlName
-     */
-    private java.lang.String xmlName;
-
-    /**
-     * Field identity
-     */
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public DataSourceDescriptor() 
-     {
-        super();
-        nsURI = "http://castor.org/JDO";
-        xmlName = "data-source";
-        elementDefinition = true;
-        
-        //-- set grouping compositor
-        setCompositorAsSequence();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _className
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_className", "class-name", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                DataSource target = (DataSource) object;
-                return target.getClassName();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    DataSource target = (DataSource) object;
-                    target.setClassName( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return null;
-            }
-        };
-        desc.setHandler(handler);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _className
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-        //-- _paramList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.castor.jdo.conf.Param.class, "_paramList", "param", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                DataSource target = (DataSource) object;
-                return target.getParam();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    DataSource target = (DataSource) object;
-                    target.addParam( (org.castor.jdo.conf.Param) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new org.castor.jdo.conf.Param();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://castor.org/JDO");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _paramList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-    } //-- org.castor.jdo.conf.DataSourceDescriptor()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Method getAccessMode
-     * 
-     * 
-     * 
-     * @return AccessMode
-     */
-    public org.exolab.castor.mapping.AccessMode getAccessMode()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() 
-
-    /**
-     * Method getExtends
-     * 
-     * 
-     * 
-     * @return ClassDescriptor
-     */
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() 
-
-    /**
-     * Method getIdentity
-     * 
-     * 
-     * 
-     * @return FieldDescriptor
-     */
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()
-    {
-        return identity;
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() 
-
-    /**
-     * Method getJavaClass
-     * 
-     * 
-     * 
-     * @return Class
-     */
-    public java.lang.Class getJavaClass()
-    {
-        return org.castor.jdo.conf.DataSource.class;
-    } //-- java.lang.Class getJavaClass() 
-
-    /**
-     * Method getNameSpacePrefix
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpacePrefix()
-    {
-        return nsPrefix;
-    } //-- java.lang.String getNameSpacePrefix() 
-
-    /**
-     * Method getNameSpaceURI
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpaceURI()
-    {
-        return nsURI;
-    } //-- java.lang.String getNameSpaceURI() 
-
-    /**
-     * Method getValidator
-     * 
-     * 
-     * 
-     * @return TypeValidator
-     */
-    public org.exolab.castor.xml.TypeValidator getValidator()
-    {
-        return this;
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() 
-
-    /**
-     * Method getXMLName
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getXMLName()
-    {
-        return xmlName;
-    } //-- java.lang.String getXMLName() 
-
-    /**
-     * Method isElementDefinition
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean isElementDefinition()
-    {
-        return elementDefinition;
-    } //-- boolean isElementDefinition() 
-
-}
Index: cpa/src/main/java/org/castor/jdo/conf/Param.java
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/Param.java	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/Param.java	(working copy)
@@ -1,167 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 1.0.1</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package org.castor.jdo.conf;
-
-  //---------------------------------/
- //- Imported classes and packages -/
-//---------------------------------/
-
-import org.exolab.castor.xml.Marshaller;
-import org.exolab.castor.xml.Unmarshaller;
-
-/**
- * Class Param.
- * 
- * @version $Revision$ $Date$
- */
-public class Param implements java.io.Serializable {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field _name
-     */
-    private java.lang.String _name;
-
-    /**
-     * Field _value
-     */
-    private java.lang.String _value;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public Param() 
-     {
-        super();
-    } //-- org.castor.jdo.conf.Param()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Returns the value of field 'name'.
-     * 
-     * @return String
-     * @return the value of field 'name'.
-     */
-    public java.lang.String getName()
-    {
-        return this._name;
-    } //-- java.lang.String getName() 
-
-    /**
-     * Returns the value of field 'value'.
-     * 
-     * @return String
-     * @return the value of field 'value'.
-     */
-    public java.lang.String getValue()
-    {
-        return this._value;
-    } //-- java.lang.String getValue() 
-
-    /**
-     * Method isValid
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean isValid()
-    {
-        try {
-            validate();
-        }
-        catch (org.exolab.castor.xml.ValidationException vex) {
-            return false;
-        }
-        return true;
-    } //-- boolean isValid() 
-
-    /**
-     * Method marshal
-     * 
-     * 
-     * 
-     * @param out
-     */
-    public void marshal(java.io.Writer out)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
-        Marshaller.marshal(this, out);
-    } //-- void marshal(java.io.Writer) 
-
-    /**
-     * Method marshal
-     * 
-     * 
-     * 
-     * @param handler
-     */
-    public void marshal(org.xml.sax.ContentHandler handler)
-        throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
-        Marshaller.marshal(this, handler);
-    } //-- void marshal(org.xml.sax.ContentHandler) 
-
-    /**
-     * Sets the value of field 'name'.
-     * 
-     * @param name the value of field 'name'.
-     */
-    public void setName(java.lang.String name)
-    {
-        this._name = name;
-    } //-- void setName(java.lang.String) 
-
-    /**
-     * Sets the value of field 'value'.
-     * 
-     * @param value the value of field 'value'.
-     */
-    public void setValue(java.lang.String value)
-    {
-        this._value = value;
-    } //-- void setValue(java.lang.String) 
-
-    /**
-     * Method unmarshal
-     * 
-     * 
-     * 
-     * @param reader
-     * @return Param
-     */
-    public static org.castor.jdo.conf.Param unmarshal(java.io.Reader reader)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        return (org.castor.jdo.conf.Param) Unmarshaller.unmarshal(org.castor.jdo.conf.Param.class, reader);
-    } //-- org.castor.jdo.conf.Param unmarshal(java.io.Reader) 
-
-    /**
-     * Method validate
-     * 
-     */
-    public void validate()
-        throws org.exolab.castor.xml.ValidationException
-    {
-        org.exolab.castor.xml.Validator validator = new org.exolab.castor.xml.Validator();
-        validator.validate(this);
-    } //-- void validate() 
-
-}
Index: cpa/src/main/java/org/castor/jdo/conf/TransactionDemarcationDescriptor.java
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/TransactionDemarcationDescriptor.java	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/TransactionDemarcationDescriptor.java	(working copy)
@@ -1,256 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 1.0.1</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package org.castor.jdo.conf;
-
-/**
- * Class TransactionDemarcationDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class TransactionDemarcationDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field elementDefinition
-     */
-    private boolean elementDefinition;
-
-    /**
-     * Field nsPrefix
-     */
-    private java.lang.String nsPrefix;
-
-    /**
-     * Field nsURI
-     */
-    private java.lang.String nsURI;
-
-    /**
-     * Field xmlName
-     */
-    private java.lang.String xmlName;
-
-    /**
-     * Field identity
-     */
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public TransactionDemarcationDescriptor() 
-     {
-        super();
-        nsURI = "http://castor.org/JDO";
-        xmlName = "transaction-demarcation";
-        elementDefinition = true;
-        
-        //-- set grouping compositor
-        setCompositorAsSequence();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _mode
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_mode", "mode", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                TransactionDemarcation target = (TransactionDemarcation) object;
-                return target.getMode();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    TransactionDemarcation target = (TransactionDemarcation) object;
-                    target.setMode( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return null;
-            }
-        };
-        desc.setHandler(handler);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _mode
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-        //-- _transactionManager
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.castor.jdo.conf.TransactionManager.class, "_transactionManager", "transaction-manager", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                TransactionDemarcation target = (TransactionDemarcation) object;
-                return target.getTransactionManager();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    TransactionDemarcation target = (TransactionDemarcation) object;
-                    target.setTransactionManager( (org.castor.jdo.conf.TransactionManager) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new org.castor.jdo.conf.TransactionManager();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://castor.org/JDO");
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _transactionManager
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-    } //-- org.castor.jdo.conf.TransactionDemarcationDescriptor()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Method getAccessMode
-     * 
-     * 
-     * 
-     * @return AccessMode
-     */
-    public org.exolab.castor.mapping.AccessMode getAccessMode()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() 
-
-    /**
-     * Method getExtends
-     * 
-     * 
-     * 
-     * @return ClassDescriptor
-     */
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() 
-
-    /**
-     * Method getIdentity
-     * 
-     * 
-     * 
-     * @return FieldDescriptor
-     */
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()
-    {
-        return identity;
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() 
-
-    /**
-     * Method getJavaClass
-     * 
-     * 
-     * 
-     * @return Class
-     */
-    public java.lang.Class getJavaClass()
-    {
-        return org.castor.jdo.conf.TransactionDemarcation.class;
-    } //-- java.lang.Class getJavaClass() 
-
-    /**
-     * Method getNameSpacePrefix
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpacePrefix()
-    {
-        return nsPrefix;
-    } //-- java.lang.String getNameSpacePrefix() 
-
-    /**
-     * Method getNameSpaceURI
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpaceURI()
-    {
-        return nsURI;
-    } //-- java.lang.String getNameSpaceURI() 
-
-    /**
-     * Method getValidator
-     * 
-     * 
-     * 
-     * @return TypeValidator
-     */
-    public org.exolab.castor.xml.TypeValidator getValidator()
-    {
-        return this;
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() 
-
-    /**
-     * Method getXMLName
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getXMLName()
-    {
-        return xmlName;
-    } //-- java.lang.String getXMLName() 
-
-    /**
-     * Method isElementDefinition
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean isElementDefinition()
-    {
-        return elementDefinition;
-    } //-- boolean isElementDefinition() 
-
-}
Index: cpa/pom.xml
===================================================================
--- cpa/pom.xml	(revision 8022)
+++ cpa/pom.xml	(working copy)
@@ -18,12 +18,75 @@
 	<name>Castor JDO - Persistence framework</name>
 	<description>TBD</description>
 
+	<developers>
+		<developer>
+			<name>Ralf Joachim</name>
+			<email>ralf.joachim@syscon-world.de</email>
+			<organization>Syscon</organization>
+			<roles>
+				<role>Castor JDO committer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
+		<developer>
+			<id>wguttmn</id>
+			<name>Werner Guttmann</name>
+			<email>wguttmn@codehaus.org</email>
+			<roles>
+				<role>Castor JDO committer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
+	</developers>
+
     <scm>
        <connection>scm:svn:http://svn.codehaus.org/castor/castor/trunk/cpa</connection>
        <developerConnection>scm:svn:https://svn.codehaus.org/castor/castor/trunk/cpa</developerConnection>
        <url>http://svn.castor.codehaus.org/browse/castor/castor/trunk/cpa</url>
     </scm>
 
+    <build>
+       <resources>
+          <resource>
+             <directory>target/generated-sources/castor</directory>
+             <includes>
+                <include>**/*.cdr</include>
+             </includes>
+          </resource>
+          <resource>
+             <directory>src/main/resources</directory>
+          </resource>
+       </resources>
+       <plugins>
+          <plugin>
+             <groupId>org.codehaus.mojo</groupId>
+             <artifactId>castor-maven-plugin</artifactId>
+             <version>2.0-SNAPSHOT</version>
+             <configuration>
+                <schema>${basedir}/src/main/resources/org/castor/jdo/conf/jdo-conf.xsd</schema>
+                <properties>${basedir}/src/main/resources/org/castor/jdo/conf/jdo-conf.builder.properties</properties>
+                <packaging>org.castor.jdo.conf</packaging>
+             </configuration>
+             <executions>
+                <execution>
+                   <goals>
+                      <goal>generate</goal>
+                   </goals>
+                </execution>
+             </executions>
+             <!-- 
+             <dependencies>
+               <dependency>
+                  <groupId>org.codehaus.castor</groupId>
+                  <artifactId>castor-codegen</artifactId>
+                  <version>1.3rc1</version>
+               </dependency>
+             </dependencies>
+              -->
+          </plugin>
+       </plugins>
+    </build>
+
 	<dependencies>
 
         <dependency>
Index: cpa/src/main/java/org/castor/jdo/conf/DatabaseChoiceDescriptor.java
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/DatabaseChoiceDescriptor.java	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/DatabaseChoiceDescriptor.java	(working copy)
@@ -1,290 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 1.0.1</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package org.castor.jdo.conf;
-
-/**
- * Class DatabaseChoiceDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class DatabaseChoiceDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field elementDefinition
-     */
-    private boolean elementDefinition;
-
-    /**
-     * Field nsPrefix
-     */
-    private java.lang.String nsPrefix;
-
-    /**
-     * Field nsURI
-     */
-    private java.lang.String nsURI;
-
-    /**
-     * Field xmlName
-     */
-    private java.lang.String xmlName;
-
-    /**
-     * Field identity
-     */
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public DatabaseChoiceDescriptor() 
-     {
-        super();
-        nsURI = "http://castor.org/JDO";
-        elementDefinition = false;
-        
-        //-- set grouping compositor
-        setCompositorAsChoice();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- initialize element descriptors
-        
-        //-- _driver
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.castor.jdo.conf.Driver.class, "_driver", "driver", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                DatabaseChoice target = (DatabaseChoice) object;
-                return target.getDriver();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    DatabaseChoice target = (DatabaseChoice) object;
-                    target.setDriver( (org.castor.jdo.conf.Driver) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new org.castor.jdo.conf.Driver();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://castor.org/JDO");
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _driver
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _dataSource
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.castor.jdo.conf.DataSource.class, "_dataSource", "data-source", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                DatabaseChoice target = (DatabaseChoice) object;
-                return target.getDataSource();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    DatabaseChoice target = (DatabaseChoice) object;
-                    target.setDataSource( (org.castor.jdo.conf.DataSource) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new org.castor.jdo.conf.DataSource();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://castor.org/JDO");
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _dataSource
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _jndi
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.castor.jdo.conf.Jndi.class, "_jndi", "jndi", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                DatabaseChoice target = (DatabaseChoice) object;
-                return target.getJndi();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    DatabaseChoice target = (DatabaseChoice) object;
-                    target.setJndi( (org.castor.jdo.conf.Jndi) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new org.castor.jdo.conf.Jndi();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://castor.org/JDO");
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _jndi
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-    } //-- org.castor.jdo.conf.DatabaseChoiceDescriptor()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Method getAccessMode
-     * 
-     * 
-     * 
-     * @return AccessMode
-     */
-    public org.exolab.castor.mapping.AccessMode getAccessMode()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() 
-
-    /**
-     * Method getExtends
-     * 
-     * 
-     * 
-     * @return ClassDescriptor
-     */
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() 
-
-    /**
-     * Method getIdentity
-     * 
-     * 
-     * 
-     * @return FieldDescriptor
-     */
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()
-    {
-        return identity;
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() 
-
-    /**
-     * Method getJavaClass
-     * 
-     * 
-     * 
-     * @return Class
-     */
-    public java.lang.Class getJavaClass()
-    {
-        return org.castor.jdo.conf.DatabaseChoice.class;
-    } //-- java.lang.Class getJavaClass() 
-
-    /**
-     * Method getNameSpacePrefix
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpacePrefix()
-    {
-        return nsPrefix;
-    } //-- java.lang.String getNameSpacePrefix() 
-
-    /**
-     * Method getNameSpaceURI
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpaceURI()
-    {
-        return nsURI;
-    } //-- java.lang.String getNameSpaceURI() 
-
-    /**
-     * Method getValidator
-     * 
-     * 
-     * 
-     * @return TypeValidator
-     */
-    public org.exolab.castor.xml.TypeValidator getValidator()
-    {
-        return this;
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() 
-
-    /**
-     * Method getXMLName
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getXMLName()
-    {
-        return xmlName;
-    } //-- java.lang.String getXMLName() 
-
-    /**
-     * Method isElementDefinition
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean isElementDefinition()
-    {
-        return elementDefinition;
-    } //-- boolean isElementDefinition() 
-
-}
Index: cpa/src/main/java/org/castor/jdo/conf/DatabaseChoice.java
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/DatabaseChoice.java	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/DatabaseChoice.java	(working copy)
@@ -1,193 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 1.0.1</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package org.castor.jdo.conf;
-
-  //---------------------------------/
- //- Imported classes and packages -/
-//---------------------------------/
-
-import org.exolab.castor.xml.Marshaller;
-import org.exolab.castor.xml.Unmarshaller;
-
-/**
- * Class DatabaseChoice.
- * 
- * @version $Revision$ $Date$
- */
-public class DatabaseChoice implements java.io.Serializable {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field _driver
-     */
-    private org.castor.jdo.conf.Driver _driver;
-
-    /**
-     * Field _dataSource
-     */
-    private org.castor.jdo.conf.DataSource _dataSource;
-
-    /**
-     * Field _jndi
-     */
-    private org.castor.jdo.conf.Jndi _jndi;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public DatabaseChoice() 
-     {
-        super();
-    } //-- org.castor.jdo.conf.DatabaseChoice()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Returns the value of field 'dataSource'.
-     * 
-     * @return DataSource
-     * @return the value of field 'dataSource'.
-     */
-    public org.castor.jdo.conf.DataSource getDataSource()
-    {
-        return this._dataSource;
-    } //-- org.castor.jdo.conf.DataSource getDataSource() 
-
-    /**
-     * Returns the value of field 'driver'.
-     * 
-     * @return Driver
-     * @return the value of field 'driver'.
-     */
-    public org.castor.jdo.conf.Driver getDriver()
-    {
-        return this._driver;
-    } //-- org.castor.jdo.conf.Driver getDriver() 
-
-    /**
-     * Returns the value of field 'jndi'.
-     * 
-     * @return Jndi
-     * @return the value of field 'jndi'.
-     */
-    public org.castor.jdo.conf.Jndi getJndi()
-    {
-        return this._jndi;
-    } //-- org.castor.jdo.conf.Jndi getJndi() 
-
-    /**
-     * Method isValid
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean isValid()
-    {
-        try {
-            validate();
-        }
-        catch (org.exolab.castor.xml.ValidationException vex) {
-            return false;
-        }
-        return true;
-    } //-- boolean isValid() 
-
-    /**
-     * Method marshal
-     * 
-     * 
-     * 
-     * @param out
-     */
-    public void marshal(java.io.Writer out)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
-        Marshaller.marshal(this, out);
-    } //-- void marshal(java.io.Writer) 
-
-    /**
-     * Method marshal
-     * 
-     * 
-     * 
-     * @param handler
-     */
-    public void marshal(org.xml.sax.ContentHandler handler)
-        throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
-        Marshaller.marshal(this, handler);
-    } //-- void marshal(org.xml.sax.ContentHandler) 
-
-    /**
-     * Sets the value of field 'dataSource'.
-     * 
-     * @param dataSource the value of field 'dataSource'.
-     */
-    public void setDataSource(org.castor.jdo.conf.DataSource dataSource)
-    {
-        this._dataSource = dataSource;
-    } //-- void setDataSource(org.castor.jdo.conf.DataSource) 
-
-    /**
-     * Sets the value of field 'driver'.
-     * 
-     * @param driver the value of field 'driver'.
-     */
-    public void setDriver(org.castor.jdo.conf.Driver driver)
-    {
-        this._driver = driver;
-    } //-- void setDriver(org.castor.jdo.conf.Driver) 
-
-    /**
-     * Sets the value of field 'jndi'.
-     * 
-     * @param jndi the value of field 'jndi'.
-     */
-    public void setJndi(org.castor.jdo.conf.Jndi jndi)
-    {
-        this._jndi = jndi;
-    } //-- void setJndi(org.castor.jdo.conf.Jndi) 
-
-    /**
-     * Method unmarshal
-     * 
-     * 
-     * 
-     * @param reader
-     * @return DatabaseChoice
-     */
-    public static org.castor.jdo.conf.DatabaseChoice unmarshal(java.io.Reader reader)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        return (org.castor.jdo.conf.DatabaseChoice) Unmarshaller.unmarshal(org.castor.jdo.conf.DatabaseChoice.class, reader);
-    } //-- org.castor.jdo.conf.DatabaseChoice unmarshal(java.io.Reader) 
-
-    /**
-     * Method validate
-     * 
-     */
-    public void validate()
-        throws org.exolab.castor.xml.ValidationException
-    {
-        org.exolab.castor.xml.Validator validator = new org.exolab.castor.xml.Validator();
-        validator.validate(this);
-    } //-- void validate() 
-
-}
Index: cpa/src/main/java/org/castor/jdo/conf/TransactionManager.java
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/TransactionManager.java	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/TransactionManager.java	(working copy)
@@ -1,292 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 1.0.1</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package org.castor.jdo.conf;
-
-  //---------------------------------/
- //- Imported classes and packages -/
-//---------------------------------/
-
-import org.exolab.castor.xml.Marshaller;
-import org.exolab.castor.xml.Unmarshaller;
-
-/**
- * Class TransactionManager.
- * 
- * @version $Revision$ $Date$
- */
-public class TransactionManager implements java.io.Serializable {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field _name
-     */
-    private java.lang.String _name = "local";
-
-    /**
-     * Field _paramList
-     */
-    private java.util.ArrayList _paramList;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public TransactionManager() 
-     {
-        super();
-        setName("local");
-        _paramList = new java.util.ArrayList();
-    } //-- org.castor.jdo.conf.TransactionManager()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Method addParam
-     * 
-     * 
-     * 
-     * @param vParam
-     */
-    public void addParam(org.castor.jdo.conf.Param vParam)
-        throws java.lang.IndexOutOfBoundsException
-    {
-        _paramList.add(vParam);
-    } //-- void addParam(org.castor.jdo.conf.Param) 
-
-    /**
-     * Method addParam
-     * 
-     * 
-     * 
-     * @param index
-     * @param vParam
-     */
-    public void addParam(int index, org.castor.jdo.conf.Param vParam)
-        throws java.lang.IndexOutOfBoundsException
-    {
-        _paramList.add(index, vParam);
-    } //-- void addParam(int, org.castor.jdo.conf.Param) 
-
-    /**
-     * Method clearParam
-     * 
-     */
-    public void clearParam()
-    {
-        _paramList.clear();
-    } //-- void clearParam() 
-
-    /**
-     * Method enumerateParam
-     * 
-     * 
-     * 
-     * @return Enumeration
-     */
-    public java.util.Enumeration enumerateParam()
-    {
-        return new org.exolab.castor.util.IteratorEnumeration(_paramList.iterator());
-    } //-- java.util.Enumeration enumerateParam() 
-
-    /**
-     * Returns the value of field 'name'.
-     * 
-     * @return String
-     * @return the value of field 'name'.
-     */
-    public java.lang.String getName()
-    {
-        return this._name;
-    } //-- java.lang.String getName() 
-
-    /**
-     * Method getParam
-     * 
-     * 
-     * 
-     * @param index
-     * @return Param
-     */
-    public org.castor.jdo.conf.Param getParam(int index)
-        throws java.lang.IndexOutOfBoundsException
-    {
-        //-- check bounds for index
-        if ((index < 0) || (index >= _paramList.size())) {
-            throw new IndexOutOfBoundsException();
-        }
-        
-        return (org.castor.jdo.conf.Param) _paramList.get(index);
-    } //-- org.castor.jdo.conf.Param getParam(int) 
-
-    /**
-     * Method getParam
-     * 
-     * 
-     * 
-     * @return Param
-     */
-    public org.castor.jdo.conf.Param[] getParam()
-    {
-        int size = _paramList.size();
-        org.castor.jdo.conf.Param[] mArray = new org.castor.jdo.conf.Param[size];
-        for (int index = 0; index < size; index++) {
-            mArray[index] = (org.castor.jdo.conf.Param) _paramList.get(index);
-        }
-        return mArray;
-    } //-- org.castor.jdo.conf.Param[] getParam() 
-
-    /**
-     * Method getParamCount
-     * 
-     * 
-     * 
-     * @return int
-     */
-    public int getParamCount()
-    {
-        return _paramList.size();
-    } //-- int getParamCount() 
-
-    /**
-     * Method isValid
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean isValid()
-    {
-        try {
-            validate();
-        }
-        catch (org.exolab.castor.xml.ValidationException vex) {
-            return false;
-        }
-        return true;
-    } //-- boolean isValid() 
-
-    /**
-     * Method marshal
-     * 
-     * 
-     * 
-     * @param out
-     */
-    public void marshal(java.io.Writer out)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
-        Marshaller.marshal(this, out);
-    } //-- void marshal(java.io.Writer) 
-
-    /**
-     * Method marshal
-     * 
-     * 
-     * 
-     * @param handler
-     */
-    public void marshal(org.xml.sax.ContentHandler handler)
-        throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
-        Marshaller.marshal(this, handler);
-    } //-- void marshal(org.xml.sax.ContentHandler) 
-
-    /**
-     * Method removeParam
-     * 
-     * 
-     * 
-     * @param vParam
-     * @return boolean
-     */
-    public boolean removeParam(org.castor.jdo.conf.Param vParam)
-    {
-        boolean removed = _paramList.remove(vParam);
-        return removed;
-    } //-- boolean removeParam(org.castor.jdo.conf.Param) 
-
-    /**
-     * Sets the value of field 'name'.
-     * 
-     * @param name the value of field 'name'.
-     */
-    public void setName(java.lang.String name)
-    {
-        this._name = name;
-    } //-- void setName(java.lang.String) 
-
-    /**
-     * Method setParam
-     * 
-     * 
-     * 
-     * @param index
-     * @param vParam
-     */
-    public void setParam(int index, org.castor.jdo.conf.Param vParam)
-        throws java.lang.IndexOutOfBoundsException
-    {
-        //-- check bounds for index
-        if ((index < 0) || (index >= _paramList.size())) {
-            throw new IndexOutOfBoundsException();
-        }
-        _paramList.set(index, vParam);
-    } //-- void setParam(int, org.castor.jdo.conf.Param) 
-
-    /**
-     * Method setParam
-     * 
-     * 
-     * 
-     * @param paramArray
-     */
-    public void setParam(org.castor.jdo.conf.Param[] paramArray)
-    {
-        //-- copy array
-        _paramList.clear();
-        for (int i = 0; i < paramArray.length; i++) {
-            _paramList.add(paramArray[i]);
-        }
-    } //-- void setParam(org.castor.jdo.conf.Param) 
-
-    /**
-     * Method unmarshal
-     * 
-     * 
-     * 
-     * @param reader
-     * @return TransactionManager
-     */
-    public static org.castor.jdo.conf.TransactionManager unmarshal(java.io.Reader reader)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        return (org.castor.jdo.conf.TransactionManager) Unmarshaller.unmarshal(org.castor.jdo.conf.TransactionManager.class, reader);
-    } //-- org.castor.jdo.conf.TransactionManager unmarshal(java.io.Reader) 
-
-    /**
-     * Method validate
-     * 
-     */
-    public void validate()
-        throws org.exolab.castor.xml.ValidationException
-    {
-        org.exolab.castor.xml.Validator validator = new org.exolab.castor.xml.Validator();
-        validator.validate(this);
-    } //-- void validate() 
-
-}
Index: cpa/src/main/java/org/castor/jdo/conf/JdoConfDescriptor.java
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/JdoConfDescriptor.java	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/JdoConfDescriptor.java	(working copy)
@@ -1,290 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 1.0.1</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package org.castor.jdo.conf;
-
-/**
- * Class JdoConfDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class JdoConfDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field elementDefinition
-     */
-    private boolean elementDefinition;
-
-    /**
-     * Field nsPrefix
-     */
-    private java.lang.String nsPrefix;
-
-    /**
-     * Field nsURI
-     */
-    private java.lang.String nsURI;
-
-    /**
-     * Field xmlName
-     */
-    private java.lang.String xmlName;
-
-    /**
-     * Field identity
-     */
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public JdoConfDescriptor() 
-     {
-        super();
-        nsURI = "http://castor.org/JDO";
-        xmlName = "jdo-conf";
-        elementDefinition = true;
-        
-        //-- set grouping compositor
-        setCompositorAsSequence();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _name
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                JdoConf target = (JdoConf) object;
-                return target.getName();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    JdoConf target = (JdoConf) object;
-                    target.setName( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return null;
-            }
-        };
-        desc.setHandler(handler);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _name
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-            org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-        //-- _databaseList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.castor.jdo.conf.Database.class, "_databaseList", "database", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                JdoConf target = (JdoConf) object;
-                return target.getDatabase();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    JdoConf target = (JdoConf) object;
-                    target.addDatabase( (org.castor.jdo.conf.Database) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new org.castor.jdo.conf.Database();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://castor.org/JDO");
-        desc.setRequired(true);
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _databaseList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _transactionDemarcation
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.castor.jdo.conf.TransactionDemarcation.class, "_transactionDemarcation", "transaction-demarcation", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                JdoConf target = (JdoConf) object;
-                return target.getTransactionDemarcation();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    JdoConf target = (JdoConf) object;
-                    target.setTransactionDemarcation( (org.castor.jdo.conf.TransactionDemarcation) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new org.castor.jdo.conf.TransactionDemarcation();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://castor.org/JDO");
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _transactionDemarcation
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-    } //-- org.castor.jdo.conf.JdoConfDescriptor()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Method getAccessMode
-     * 
-     * 
-     * 
-     * @return AccessMode
-     */
-    public org.exolab.castor.mapping.AccessMode getAccessMode()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() 
-
-    /**
-     * Method getExtends
-     * 
-     * 
-     * 
-     * @return ClassDescriptor
-     */
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() 
-
-    /**
-     * Method getIdentity
-     * 
-     * 
-     * 
-     * @return FieldDescriptor
-     */
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()
-    {
-        return identity;
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() 
-
-    /**
-     * Method getJavaClass
-     * 
-     * 
-     * 
-     * @return Class
-     */
-    public java.lang.Class getJavaClass()
-    {
-        return org.castor.jdo.conf.JdoConf.class;
-    } //-- java.lang.Class getJavaClass() 
-
-    /**
-     * Method getNameSpacePrefix
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpacePrefix()
-    {
-        return nsPrefix;
-    } //-- java.lang.String getNameSpacePrefix() 
-
-    /**
-     * Method getNameSpaceURI
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpaceURI()
-    {
-        return nsURI;
-    } //-- java.lang.String getNameSpaceURI() 
-
-    /**
-     * Method getValidator
-     * 
-     * 
-     * 
-     * @return TypeValidator
-     */
-    public org.exolab.castor.xml.TypeValidator getValidator()
-    {
-        return this;
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() 
-
-    /**
-     * Method getXMLName
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getXMLName()
-    {
-        return xmlName;
-    } //-- java.lang.String getXMLName() 
-
-    /**
-     * Method isElementDefinition
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean isElementDefinition()
-    {
-        return elementDefinition;
-    } //-- boolean isElementDefinition() 
-
-}
Index: cpa/src/main/java/org/castor/jdo/conf/TransactionDemarcation.java
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/TransactionDemarcation.java	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/TransactionDemarcation.java	(working copy)
@@ -1,168 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 1.0.1</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package org.castor.jdo.conf;
-
-  //---------------------------------/
- //- Imported classes and packages -/
-//---------------------------------/
-
-import org.exolab.castor.xml.Marshaller;
-import org.exolab.castor.xml.Unmarshaller;
-
-/**
- * Class TransactionDemarcation.
- * 
- * @version $Revision$ $Date$
- */
-public class TransactionDemarcation implements java.io.Serializable {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field _mode
-     */
-    private java.lang.String _mode;
-
-    /**
-     * Field _transactionManager
-     */
-    private org.castor.jdo.conf.TransactionManager _transactionManager;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public TransactionDemarcation() 
-     {
-        super();
-    } //-- org.castor.jdo.conf.TransactionDemarcation()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Returns the value of field 'mode'.
-     * 
-     * @return String
-     * @return the value of field 'mode'.
-     */
-    public java.lang.String getMode()
-    {
-        return this._mode;
-    } //-- java.lang.String getMode() 
-
-    /**
-     * Returns the value of field 'transactionManager'.
-     * 
-     * @return TransactionManager
-     * @return the value of field 'transactionManager'.
-     */
-    public org.castor.jdo.conf.TransactionManager getTransactionManager()
-    {
-        return this._transactionManager;
-    } //-- org.castor.jdo.conf.TransactionManager getTransactionManager() 
-
-    /**
-     * Method isValid
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean isValid()
-    {
-        try {
-            validate();
-        }
-        catch (org.exolab.castor.xml.ValidationException vex) {
-            return false;
-        }
-        return true;
-    } //-- boolean isValid() 
-
-    /**
-     * Method marshal
-     * 
-     * 
-     * 
-     * @param out
-     */
-    public void marshal(java.io.Writer out)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
-        Marshaller.marshal(this, out);
-    } //-- void marshal(java.io.Writer) 
-
-    /**
-     * Method marshal
-     * 
-     * 
-     * 
-     * @param handler
-     */
-    public void marshal(org.xml.sax.ContentHandler handler)
-        throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
-        Marshaller.marshal(this, handler);
-    } //-- void marshal(org.xml.sax.ContentHandler) 
-
-    /**
-     * Sets the value of field 'mode'.
-     * 
-     * @param mode the value of field 'mode'.
-     */
-    public void setMode(java.lang.String mode)
-    {
-        this._mode = mode;
-    } //-- void setMode(java.lang.String) 
-
-    /**
-     * Sets the value of field 'transactionManager'.
-     * 
-     * @param transactionManager the value of field
-     * 'transactionManager'.
-     */
-    public void setTransactionManager(org.castor.jdo.conf.TransactionManager transactionManager)
-    {
-        this._transactionManager = transactionManager;
-    } //-- void setTransactionManager(org.castor.jdo.conf.TransactionManager) 
-
-    /**
-     * Method unmarshal
-     * 
-     * 
-     * 
-     * @param reader
-     * @return TransactionDemarcation
-     */
-    public static org.castor.jdo.conf.TransactionDemarcation unmarshal(java.io.Reader reader)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        return (org.castor.jdo.conf.TransactionDemarcation) Unmarshaller.unmarshal(org.castor.jdo.conf.TransactionDemarcation.class, reader);
-    } //-- org.castor.jdo.conf.TransactionDemarcation unmarshal(java.io.Reader) 
-
-    /**
-     * Method validate
-     * 
-     */
-    public void validate()
-        throws org.exolab.castor.xml.ValidationException
-    {
-        org.exolab.castor.xml.Validator validator = new org.exolab.castor.xml.Validator();
-        validator.validate(this);
-    } //-- void validate() 
-
-}
Index: cpa/src/main/java/org/castor/jdo/conf/DriverDescriptor.java
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/DriverDescriptor.java	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/DriverDescriptor.java	(working copy)
@@ -1,296 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 1.0.1</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package org.castor.jdo.conf;
-
-/**
- * Class DriverDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class DriverDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field elementDefinition
-     */
-    private boolean elementDefinition;
-
-    /**
-     * Field nsPrefix
-     */
-    private java.lang.String nsPrefix;
-
-    /**
-     * Field nsURI
-     */
-    private java.lang.String nsURI;
-
-    /**
-     * Field xmlName
-     */
-    private java.lang.String xmlName;
-
-    /**
-     * Field identity
-     */
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public DriverDescriptor() 
-     {
-        super();
-        nsURI = "http://castor.org/JDO";
-        xmlName = "driver";
-        elementDefinition = true;
-        
-        //-- set grouping compositor
-        setCompositorAsSequence();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _url
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_url", "url", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Driver target = (Driver) object;
-                return target.getUrl();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Driver target = (Driver) object;
-                    target.setUrl( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return null;
-            }
-        };
-        desc.setHandler(handler);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _url
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _className
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_className", "class-name", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Driver target = (Driver) object;
-                return target.getClassName();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Driver target = (Driver) object;
-                    target.setClassName( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return null;
-            }
-        };
-        desc.setHandler(handler);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _className
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-        //-- _paramList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.castor.jdo.conf.Param.class, "_paramList", "param", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Driver target = (Driver) object;
-                return target.getParam();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Driver target = (Driver) object;
-                    target.addParam( (org.castor.jdo.conf.Param) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new org.castor.jdo.conf.Param();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://castor.org/JDO");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _paramList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-    } //-- org.castor.jdo.conf.DriverDescriptor()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Method getAccessMode
-     * 
-     * 
-     * 
-     * @return AccessMode
-     */
-    public org.exolab.castor.mapping.AccessMode getAccessMode()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() 
-
-    /**
-     * Method getExtends
-     * 
-     * 
-     * 
-     * @return ClassDescriptor
-     */
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() 
-
-    /**
-     * Method getIdentity
-     * 
-     * 
-     * 
-     * @return FieldDescriptor
-     */
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()
-    {
-        return identity;
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() 
-
-    /**
-     * Method getJavaClass
-     * 
-     * 
-     * 
-     * @return Class
-     */
-    public java.lang.Class getJavaClass()
-    {
-        return org.castor.jdo.conf.Driver.class;
-    } //-- java.lang.Class getJavaClass() 
-
-    /**
-     * Method getNameSpacePrefix
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpacePrefix()
-    {
-        return nsPrefix;
-    } //-- java.lang.String getNameSpacePrefix() 
-
-    /**
-     * Method getNameSpaceURI
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpaceURI()
-    {
-        return nsURI;
-    } //-- java.lang.String getNameSpaceURI() 
-
-    /**
-     * Method getValidator
-     * 
-     * 
-     * 
-     * @return TypeValidator
-     */
-    public org.exolab.castor.xml.TypeValidator getValidator()
-    {
-        return this;
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() 
-
-    /**
-     * Method getXMLName
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getXMLName()
-    {
-        return xmlName;
-    } //-- java.lang.String getXMLName() 
-
-    /**
-     * Method isElementDefinition
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean isElementDefinition()
-    {
-        return elementDefinition;
-    } //-- boolean isElementDefinition() 
-
-}
Index: cpa/src/main/java/org/castor/jdo/conf/Driver.java
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/Driver.java	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/Driver.java	(working copy)
@@ -1,317 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 1.0.1</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package org.castor.jdo.conf;
-
-  //---------------------------------/
- //- Imported classes and packages -/
-//---------------------------------/
-
-import org.exolab.castor.xml.Marshaller;
-import org.exolab.castor.xml.Unmarshaller;
-
-/**
- * Class Driver.
- * 
- * @version $Revision$ $Date$
- */
-public class Driver implements java.io.Serializable {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field _url
-     */
-    private java.lang.String _url;
-
-    /**
-     * Field _className
-     */
-    private java.lang.String _className;
-
-    /**
-     * Field _paramList
-     */
-    private java.util.ArrayList _paramList;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public Driver() 
-     {
-        super();
-        _paramList = new java.util.ArrayList();
-    } //-- org.castor.jdo.conf.Driver()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Method addParam
-     * 
-     * 
-     * 
-     * @param vParam
-     */
-    public void addParam(org.castor.jdo.conf.Param vParam)
-        throws java.lang.IndexOutOfBoundsException
-    {
-        _paramList.add(vParam);
-    } //-- void addParam(org.castor.jdo.conf.Param) 
-
-    /**
-     * Method addParam
-     * 
-     * 
-     * 
-     * @param index
-     * @param vParam
-     */
-    public void addParam(int index, org.castor.jdo.conf.Param vParam)
-        throws java.lang.IndexOutOfBoundsException
-    {
-        _paramList.add(index, vParam);
-    } //-- void addParam(int, org.castor.jdo.conf.Param) 
-
-    /**
-     * Method clearParam
-     * 
-     */
-    public void clearParam()
-    {
-        _paramList.clear();
-    } //-- void clearParam() 
-
-    /**
-     * Method enumerateParam
-     * 
-     * 
-     * 
-     * @return Enumeration
-     */
-    public java.util.Enumeration enumerateParam()
-    {
-        return new org.exolab.castor.util.IteratorEnumeration(_paramList.iterator());
-    } //-- java.util.Enumeration enumerateParam() 
-
-    /**
-     * Returns the value of field 'className'.
-     * 
-     * @return String
-     * @return the value of field 'className'.
-     */
-    public java.lang.String getClassName()
-    {
-        return this._className;
-    } //-- java.lang.String getClassName() 
-
-    /**
-     * Method getParam
-     * 
-     * 
-     * 
-     * @param index
-     * @return Param
-     */
-    public org.castor.jdo.conf.Param getParam(int index)
-        throws java.lang.IndexOutOfBoundsException
-    {
-        //-- check bounds for index
-        if ((index < 0) || (index >= _paramList.size())) {
-            throw new IndexOutOfBoundsException();
-        }
-        
-        return (org.castor.jdo.conf.Param) _paramList.get(index);
-    } //-- org.castor.jdo.conf.Param getParam(int) 
-
-    /**
-     * Method getParam
-     * 
-     * 
-     * 
-     * @return Param
-     */
-    public org.castor.jdo.conf.Param[] getParam()
-    {
-        int size = _paramList.size();
-        org.castor.jdo.conf.Param[] mArray = new org.castor.jdo.conf.Param[size];
-        for (int index = 0; index < size; index++) {
-            mArray[index] = (org.castor.jdo.conf.Param) _paramList.get(index);
-        }
-        return mArray;
-    } //-- org.castor.jdo.conf.Param[] getParam() 
-
-    /**
-     * Method getParamCount
-     * 
-     * 
-     * 
-     * @return int
-     */
-    public int getParamCount()
-    {
-        return _paramList.size();
-    } //-- int getParamCount() 
-
-    /**
-     * Returns the value of field 'url'.
-     * 
-     * @return String
-     * @return the value of field 'url'.
-     */
-    public java.lang.String getUrl()
-    {
-        return this._url;
-    } //-- java.lang.String getUrl() 
-
-    /**
-     * Method isValid
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean isValid()
-    {
-        try {
-            validate();
-        }
-        catch (org.exolab.castor.xml.ValidationException vex) {
-            return false;
-        }
-        return true;
-    } //-- boolean isValid() 
-
-    /**
-     * Method marshal
-     * 
-     * 
-     * 
-     * @param out
-     */
-    public void marshal(java.io.Writer out)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
-        Marshaller.marshal(this, out);
-    } //-- void marshal(java.io.Writer) 
-
-    /**
-     * Method marshal
-     * 
-     * 
-     * 
-     * @param handler
-     */
-    public void marshal(org.xml.sax.ContentHandler handler)
-        throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
-        Marshaller.marshal(this, handler);
-    } //-- void marshal(org.xml.sax.ContentHandler) 
-
-    /**
-     * Method removeParam
-     * 
-     * 
-     * 
-     * @param vParam
-     * @return boolean
-     */
-    public boolean removeParam(org.castor.jdo.conf.Param vParam)
-    {
-        boolean removed = _paramList.remove(vParam);
-        return removed;
-    } //-- boolean removeParam(org.castor.jdo.conf.Param) 
-
-    /**
-     * Sets the value of field 'className'.
-     * 
-     * @param className the value of field 'className'.
-     */
-    public void setClassName(java.lang.String className)
-    {
-        this._className = className;
-    } //-- void setClassName(java.lang.String) 
-
-    /**
-     * Method setParam
-     * 
-     * 
-     * 
-     * @param index
-     * @param vParam
-     */
-    public void setParam(int index, org.castor.jdo.conf.Param vParam)
-        throws java.lang.IndexOutOfBoundsException
-    {
-        //-- check bounds for index
-        if ((index < 0) || (index >= _paramList.size())) {
-            throw new IndexOutOfBoundsException();
-        }
-        _paramList.set(index, vParam);
-    } //-- void setParam(int, org.castor.jdo.conf.Param) 
-
-    /**
-     * Method setParam
-     * 
-     * 
-     * 
-     * @param paramArray
-     */
-    public void setParam(org.castor.jdo.conf.Param[] paramArray)
-    {
-        //-- copy array
-        _paramList.clear();
-        for (int i = 0; i < paramArray.length; i++) {
-            _paramList.add(paramArray[i]);
-        }
-    } //-- void setParam(org.castor.jdo.conf.Param) 
-
-    /**
-     * Sets the value of field 'url'.
-     * 
-     * @param url the value of field 'url'.
-     */
-    public void setUrl(java.lang.String url)
-    {
-        this._url = url;
-    } //-- void setUrl(java.lang.String) 
-
-    /**
-     * Method unmarshal
-     * 
-     * 
-     * 
-     * @param reader
-     * @return Driver
-     */
-    public static org.castor.jdo.conf.Driver unmarshal(java.io.Reader reader)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        return (org.castor.jdo.conf.Driver) Unmarshaller.unmarshal(org.castor.jdo.conf.Driver.class, reader);
-    } //-- org.castor.jdo.conf.Driver unmarshal(java.io.Reader) 
-
-    /**
-     * Method validate
-     * 
-     */
-    public void validate()
-        throws org.exolab.castor.xml.ValidationException
-    {
-        org.exolab.castor.xml.Validator validator = new org.exolab.castor.xml.Validator();
-        validator.validate(this);
-    } //-- void validate() 
-
-}
Index: cpa/src/main/java/org/castor/jdo/conf/Jndi.java
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/Jndi.java	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/Jndi.java	(working copy)
@@ -1,141 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 1.0.1</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package org.castor.jdo.conf;
-
-  //---------------------------------/
- //- Imported classes and packages -/
-//---------------------------------/
-
-import org.exolab.castor.xml.Marshaller;
-import org.exolab.castor.xml.Unmarshaller;
-
-/**
- * Class Jndi.
- * 
- * @version $Revision$ $Date$
- */
-public class Jndi implements java.io.Serializable {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field _name
-     */
-    private java.lang.String _name;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public Jndi() 
-     {
-        super();
-    } //-- org.castor.jdo.conf.Jndi()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Returns the value of field 'name'.
-     * 
-     * @return String
-     * @return the value of field 'name'.
-     */
-    public java.lang.String getName()
-    {
-        return this._name;
-    } //-- java.lang.String getName() 
-
-    /**
-     * Method isValid
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean isValid()
-    {
-        try {
-            validate();
-        }
-        catch (org.exolab.castor.xml.ValidationException vex) {
-            return false;
-        }
-        return true;
-    } //-- boolean isValid() 
-
-    /**
-     * Method marshal
-     * 
-     * 
-     * 
-     * @param out
-     */
-    public void marshal(java.io.Writer out)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
-        Marshaller.marshal(this, out);
-    } //-- void marshal(java.io.Writer) 
-
-    /**
-     * Method marshal
-     * 
-     * 
-     * 
-     * @param handler
-     */
-    public void marshal(org.xml.sax.ContentHandler handler)
-        throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
-        Marshaller.marshal(this, handler);
-    } //-- void marshal(org.xml.sax.ContentHandler) 
-
-    /**
-     * Sets the value of field 'name'.
-     * 
-     * @param name the value of field 'name'.
-     */
-    public void setName(java.lang.String name)
-    {
-        this._name = name;
-    } //-- void setName(java.lang.String) 
-
-    /**
-     * Method unmarshal
-     * 
-     * 
-     * 
-     * @param reader
-     * @return Jndi
-     */
-    public static org.castor.jdo.conf.Jndi unmarshal(java.io.Reader reader)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        return (org.castor.jdo.conf.Jndi) Unmarshaller.unmarshal(org.castor.jdo.conf.Jndi.class, reader);
-    } //-- org.castor.jdo.conf.Jndi unmarshal(java.io.Reader) 
-
-    /**
-     * Method validate
-     * 
-     */
-    public void validate()
-        throws org.exolab.castor.xml.ValidationException
-    {
-        org.exolab.castor.xml.Validator validator = new org.exolab.castor.xml.Validator();
-        validator.validate(this);
-    } //-- void validate() 
-
-}
Index: src/doc/release-notes.xml
===================================================================
--- src/doc/release-notes.xml	(revision 8028)
+++ src/doc/release-notes.xml	(working copy)
@@ -73,9 +73,29 @@
             
             </summary>
             <bugs>
+                <bug id="2629" tool="jira">
+                    <description>
+                        Added generation of files for jdo-conf.xsd with maven. 
+                    </description>
+                    <contributor>
+                        <name>Ralf Joachim</name>
+                        <email>ralf.joachim@syscon.eu</email>
+                    </contributor>
+                    <submitter>
+                        <name>Ralf Joachim</name>
+                        <email>ralf.joachim@syscon.eu</email>
+                    </submitter>
+                    <reporter>
+                        <name>Ralf Joachim</name>
+                        <email>ralf.joachim@syscon.eu</email>
+                    </reporter>
+                    <type>Enh.</type>
+                    <module>JDO</module>
+                    <date>20090125</date>
+                </bug>
                 <bug id="2628" tool="jira">
                     <description>
-                        Added generationof files for cpactf-conf.xsd with maven. 
+                        Added generation of files for cpactf-conf.xsd with maven. 
                     </description>
                     <contributor>
                         <name>Ralf Joachim</name>
Index: cpa/src/main/java/org/castor/jdo/conf/DataSource.java
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/DataSource.java	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/DataSource.java	(working copy)
@@ -1,291 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 1.0.1</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package org.castor.jdo.conf;
-
-  //---------------------------------/
- //- Imported classes and packages -/
-//---------------------------------/
-
-import org.exolab.castor.xml.Marshaller;
-import org.exolab.castor.xml.Unmarshaller;
-
-/**
- * Class DataSource.
- * 
- * @version $Revision$ $Date$
- */
-public class DataSource implements java.io.Serializable {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field _className
-     */
-    private java.lang.String _className;
-
-    /**
-     * Field _paramList
-     */
-    private java.util.ArrayList _paramList;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public DataSource() 
-     {
-        super();
-        _paramList = new java.util.ArrayList();
-    } //-- org.castor.jdo.conf.DataSource()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Method addParam
-     * 
-     * 
-     * 
-     * @param vParam
-     */
-    public void addParam(org.castor.jdo.conf.Param vParam)
-        throws java.lang.IndexOutOfBoundsException
-    {
-        _paramList.add(vParam);
-    } //-- void addParam(org.castor.jdo.conf.Param) 
-
-    /**
-     * Method addParam
-     * 
-     * 
-     * 
-     * @param index
-     * @param vParam
-     */
-    public void addParam(int index, org.castor.jdo.conf.Param vParam)
-        throws java.lang.IndexOutOfBoundsException
-    {
-        _paramList.add(index, vParam);
-    } //-- void addParam(int, org.castor.jdo.conf.Param) 
-
-    /**
-     * Method clearParam
-     * 
-     */
-    public void clearParam()
-    {
-        _paramList.clear();
-    } //-- void clearParam() 
-
-    /**
-     * Method enumerateParam
-     * 
-     * 
-     * 
-     * @return Enumeration
-     */
-    public java.util.Enumeration enumerateParam()
-    {
-        return new org.exolab.castor.util.IteratorEnumeration(_paramList.iterator());
-    } //-- java.util.Enumeration enumerateParam() 
-
-    /**
-     * Returns the value of field 'className'.
-     * 
-     * @return String
-     * @return the value of field 'className'.
-     */
-    public java.lang.String getClassName()
-    {
-        return this._className;
-    } //-- java.lang.String getClassName() 
-
-    /**
-     * Method getParam
-     * 
-     * 
-     * 
-     * @param index
-     * @return Param
-     */
-    public org.castor.jdo.conf.Param getParam(int index)
-        throws java.lang.IndexOutOfBoundsException
-    {
-        //-- check bounds for index
-        if ((index < 0) || (index >= _paramList.size())) {
-            throw new IndexOutOfBoundsException();
-        }
-        
-        return (org.castor.jdo.conf.Param) _paramList.get(index);
-    } //-- org.castor.jdo.conf.Param getParam(int) 
-
-    /**
-     * Method getParam
-     * 
-     * 
-     * 
-     * @return Param
-     */
-    public org.castor.jdo.conf.Param[] getParam()
-    {
-        int size = _paramList.size();
-        org.castor.jdo.conf.Param[] mArray = new org.castor.jdo.conf.Param[size];
-        for (int index = 0; index < size; index++) {
-            mArray[index] = (org.castor.jdo.conf.Param) _paramList.get(index);
-        }
-        return mArray;
-    } //-- org.castor.jdo.conf.Param[] getParam() 
-
-    /**
-     * Method getParamCount
-     * 
-     * 
-     * 
-     * @return int
-     */
-    public int getParamCount()
-    {
-        return _paramList.size();
-    } //-- int getParamCount() 
-
-    /**
-     * Method isValid
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean isValid()
-    {
-        try {
-            validate();
-        }
-        catch (org.exolab.castor.xml.ValidationException vex) {
-            return false;
-        }
-        return true;
-    } //-- boolean isValid() 
-
-    /**
-     * Method marshal
-     * 
-     * 
-     * 
-     * @param out
-     */
-    public void marshal(java.io.Writer out)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
-        Marshaller.marshal(this, out);
-    } //-- void marshal(java.io.Writer) 
-
-    /**
-     * Method marshal
-     * 
-     * 
-     * 
-     * @param handler
-     */
-    public void marshal(org.xml.sax.ContentHandler handler)
-        throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
-        Marshaller.marshal(this, handler);
-    } //-- void marshal(org.xml.sax.ContentHandler) 
-
-    /**
-     * Method removeParam
-     * 
-     * 
-     * 
-     * @param vParam
-     * @return boolean
-     */
-    public boolean removeParam(org.castor.jdo.conf.Param vParam)
-    {
-        boolean removed = _paramList.remove(vParam);
-        return removed;
-    } //-- boolean removeParam(org.castor.jdo.conf.Param) 
-
-    /**
-     * Sets the value of field 'className'.
-     * 
-     * @param className the value of field 'className'.
-     */
-    public void setClassName(java.lang.String className)
-    {
-        this._className = className;
-    } //-- void setClassName(java.lang.String) 
-
-    /**
-     * Method setParam
-     * 
-     * 
-     * 
-     * @param index
-     * @param vParam
-     */
-    public void setParam(int index, org.castor.jdo.conf.Param vParam)
-        throws java.lang.IndexOutOfBoundsException
-    {
-        //-- check bounds for index
-        if ((index < 0) || (index >= _paramList.size())) {
-            throw new IndexOutOfBoundsException();
-        }
-        _paramList.set(index, vParam);
-    } //-- void setParam(int, org.castor.jdo.conf.Param) 
-
-    /**
-     * Method setParam
-     * 
-     * 
-     * 
-     * @param paramArray
-     */
-    public void setParam(org.castor.jdo.conf.Param[] paramArray)
-    {
-        //-- copy array
-        _paramList.clear();
-        for (int i = 0; i < paramArray.length; i++) {
-            _paramList.add(paramArray[i]);
-        }
-    } //-- void setParam(org.castor.jdo.conf.Param) 
-
-    /**
-     * Method unmarshal
-     * 
-     * 
-     * 
-     * @param reader
-     * @return DataSource
-     */
-    public static org.castor.jdo.conf.DataSource unmarshal(java.io.Reader reader)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        return (org.castor.jdo.conf.DataSource) Unmarshaller.unmarshal(org.castor.jdo.conf.DataSource.class, reader);
-    } //-- org.castor.jdo.conf.DataSource unmarshal(java.io.Reader) 
-
-    /**
-     * Method validate
-     * 
-     */
-    public void validate()
-        throws org.exolab.castor.xml.ValidationException
-    {
-        org.exolab.castor.xml.Validator validator = new org.exolab.castor.xml.Validator();
-        validator.validate(this);
-    } //-- void validate() 
-
-}
Index: cpa/src/main/java/org/castor/jdo/conf/Database.java
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/Database.java	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/Database.java	(working copy)
@@ -1,344 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 1.0.1</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package org.castor.jdo.conf;
-
-  //---------------------------------/
- //- Imported classes and packages -/
-//---------------------------------/
-
-import org.exolab.castor.xml.Marshaller;
-import org.exolab.castor.xml.Unmarshaller;
-
-/**
- * Class Database.
- * 
- * @version $Revision$ $Date$
- */
-public class Database implements java.io.Serializable {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field _name
-     */
-    private java.lang.String _name;
-
-    /**
-     * Field _engine
-     */
-    private java.lang.String _engine = "generic";
-
-    /**
-     * Field _databaseChoice
-     */
-    private org.castor.jdo.conf.DatabaseChoice _databaseChoice;
-
-    /**
-     * Field _mappingList
-     */
-    private java.util.ArrayList _mappingList;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public Database() 
-     {
-        super();
-        setEngine("generic");
-        _mappingList = new java.util.ArrayList();
-    } //-- org.castor.jdo.conf.Database()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Method addMapping
-     * 
-     * 
-     * 
-     * @param vMapping
-     */
-    public void addMapping(org.castor.jdo.conf.Mapping vMapping)
-        throws java.lang.IndexOutOfBoundsException
-    {
-        _mappingList.add(vMapping);
-    } //-- void addMapping(org.castor.jdo.conf.Mapping) 
-
-    /**
-     * Method addMapping
-     * 
-     * 
-     * 
-     * @param index
-     * @param vMapping
-     */
-    public void addMapping(int index, org.castor.jdo.conf.Mapping vMapping)
-        throws java.lang.IndexOutOfBoundsException
-    {
-        _mappingList.add(index, vMapping);
-    } //-- void addMapping(int, org.castor.jdo.conf.Mapping) 
-
-    /**
-     * Method clearMapping
-     * 
-     */
-    public void clearMapping()
-    {
-        _mappingList.clear();
-    } //-- void clearMapping() 
-
-    /**
-     * Method enumerateMapping
-     * 
-     * 
-     * 
-     * @return Enumeration
-     */
-    public java.util.Enumeration enumerateMapping()
-    {
-        return new org.exolab.castor.util.IteratorEnumeration(_mappingList.iterator());
-    } //-- java.util.Enumeration enumerateMapping() 
-
-    /**
-     * Returns the value of field 'databaseChoice'.
-     * 
-     * @return DatabaseChoice
-     * @return the value of field 'databaseChoice'.
-     */
-    public org.castor.jdo.conf.DatabaseChoice getDatabaseChoice()
-    {
-        return this._databaseChoice;
-    } //-- org.castor.jdo.conf.DatabaseChoice getDatabaseChoice() 
-
-    /**
-     * Returns the value of field 'engine'.
-     * 
-     * @return String
-     * @return the value of field 'engine'.
-     */
-    public java.lang.String getEngine()
-    {
-        return this._engine;
-    } //-- java.lang.String getEngine() 
-
-    /**
-     * Method getMapping
-     * 
-     * 
-     * 
-     * @param index
-     * @return Mapping
-     */
-    public org.castor.jdo.conf.Mapping getMapping(int index)
-        throws java.lang.IndexOutOfBoundsException
-    {
-        //-- check bounds for index
-        if ((index < 0) || (index >= _mappingList.size())) {
-            throw new IndexOutOfBoundsException();
-        }
-        
-        return (org.castor.jdo.conf.Mapping) _mappingList.get(index);
-    } //-- org.castor.jdo.conf.Mapping getMapping(int) 
-
-    /**
-     * Method getMapping
-     * 
-     * 
-     * 
-     * @return Mapping
-     */
-    public org.castor.jdo.conf.Mapping[] getMapping()
-    {
-        int size = _mappingList.size();
-        org.castor.jdo.conf.Mapping[] mArray = new org.castor.jdo.conf.Mapping[size];
-        for (int index = 0; index < size; index++) {
-            mArray[index] = (org.castor.jdo.conf.Mapping) _mappingList.get(index);
-        }
-        return mArray;
-    } //-- org.castor.jdo.conf.Mapping[] getMapping() 
-
-    /**
-     * Method getMappingCount
-     * 
-     * 
-     * 
-     * @return int
-     */
-    public int getMappingCount()
-    {
-        return _mappingList.size();
-    } //-- int getMappingCount() 
-
-    /**
-     * Returns the value of field 'name'.
-     * 
-     * @return String
-     * @return the value of field 'name'.
-     */
-    public java.lang.String getName()
-    {
-        return this._name;
-    } //-- java.lang.String getName() 
-
-    /**
-     * Method isValid
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean isValid()
-    {
-        try {
-            validate();
-        }
-        catch (org.exolab.castor.xml.ValidationException vex) {
-            return false;
-        }
-        return true;
-    } //-- boolean isValid() 
-
-    /**
-     * Method marshal
-     * 
-     * 
-     * 
-     * @param out
-     */
-    public void marshal(java.io.Writer out)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
-        Marshaller.marshal(this, out);
-    } //-- void marshal(java.io.Writer) 
-
-    /**
-     * Method marshal
-     * 
-     * 
-     * 
-     * @param handler
-     */
-    public void marshal(org.xml.sax.ContentHandler handler)
-        throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
-        Marshaller.marshal(this, handler);
-    } //-- void marshal(org.xml.sax.ContentHandler) 
-
-    /**
-     * Method removeMapping
-     * 
-     * 
-     * 
-     * @param vMapping
-     * @return boolean
-     */
-    public boolean removeMapping(org.castor.jdo.conf.Mapping vMapping)
-    {
-        boolean removed = _mappingList.remove(vMapping);
-        return removed;
-    } //-- boolean removeMapping(org.castor.jdo.conf.Mapping) 
-
-    /**
-     * Sets the value of field 'databaseChoice'.
-     * 
-     * @param databaseChoice the value of field 'databaseChoice'.
-     */
-    public void setDatabaseChoice(org.castor.jdo.conf.DatabaseChoice databaseChoice)
-    {
-        this._databaseChoice = databaseChoice;
-    } //-- void setDatabaseChoice(org.castor.jdo.conf.DatabaseChoice) 
-
-    /**
-     * Sets the value of field 'engine'.
-     * 
-     * @param engine the value of field 'engine'.
-     */
-    public void setEngine(java.lang.String engine)
-    {
-        this._engine = engine;
-    } //-- void setEngine(java.lang.String) 
-
-    /**
-     * Method setMapping
-     * 
-     * 
-     * 
-     * @param index
-     * @param vMapping
-     */
-    public void setMapping(int index, org.castor.jdo.conf.Mapping vMapping)
-        throws java.lang.IndexOutOfBoundsException
-    {
-        //-- check bounds for index
-        if ((index < 0) || (index >= _mappingList.size())) {
-            throw new IndexOutOfBoundsException();
-        }
-        _mappingList.set(index, vMapping);
-    } //-- void setMapping(int, org.castor.jdo.conf.Mapping) 
-
-    /**
-     * Method setMapping
-     * 
-     * 
-     * 
-     * @param mappingArray
-     */
-    public void setMapping(org.castor.jdo.conf.Mapping[] mappingArray)
-    {
-        //-- copy array
-        _mappingList.clear();
-        for (int i = 0; i < mappingArray.length; i++) {
-            _mappingList.add(mappingArray[i]);
-        }
-    } //-- void setMapping(org.castor.jdo.conf.Mapping) 
-
-    /**
-     * Sets the value of field 'name'.
-     * 
-     * @param name the value of field 'name'.
-     */
-    public void setName(java.lang.String name)
-    {
-        this._name = name;
-    } //-- void setName(java.lang.String) 
-
-    /**
-     * Method unmarshal
-     * 
-     * 
-     * 
-     * @param reader
-     * @return Database
-     */
-    public static org.castor.jdo.conf.Database unmarshal(java.io.Reader reader)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        return (org.castor.jdo.conf.Database) Unmarshaller.unmarshal(org.castor.jdo.conf.Database.class, reader);
-    } //-- org.castor.jdo.conf.Database unmarshal(java.io.Reader) 
-
-    /**
-     * Method validate
-     * 
-     */
-    public void validate()
-        throws org.exolab.castor.xml.ValidationException
-    {
-        org.exolab.castor.xml.Validator validator = new org.exolab.castor.xml.Validator();
-        validator.validate(this);
-    } //-- void validate() 
-
-}
Index: cpa/src/main/java/org/castor/jdo/conf/JdoConf.java
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/JdoConf.java	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/JdoConf.java	(working copy)
@@ -1,319 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 1.0.1</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package org.castor.jdo.conf;
-
-  //---------------------------------/
- //- Imported classes and packages -/
-//---------------------------------/
-
-import org.exolab.castor.xml.Marshaller;
-import org.exolab.castor.xml.Unmarshaller;
-
-/**
- * Class JdoConf.
- * 
- * @version $Revision$ $Date$
- */
-public class JdoConf implements java.io.Serializable {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field _name
-     */
-    private java.lang.String _name = "jdo-conf";
-
-    /**
-     * Field _databaseList
-     */
-    private java.util.ArrayList _databaseList;
-
-    /**
-     * Field _transactionDemarcation
-     */
-    private org.castor.jdo.conf.TransactionDemarcation _transactionDemarcation;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public JdoConf() 
-     {
-        super();
-        setName("jdo-conf");
-        _databaseList = new java.util.ArrayList();
-    } //-- org.castor.jdo.conf.JdoConf()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Method addDatabase
-     * 
-     * 
-     * 
-     * @param vDatabase
-     */
-    public void addDatabase(org.castor.jdo.conf.Database vDatabase)
-        throws java.lang.IndexOutOfBoundsException
-    {
-        _databaseList.add(vDatabase);
-    } //-- void addDatabase(org.castor.jdo.conf.Database) 
-
-    /**
-     * Method addDatabase
-     * 
-     * 
-     * 
-     * @param index
-     * @param vDatabase
-     */
-    public void addDatabase(int index, org.castor.jdo.conf.Database vDatabase)
-        throws java.lang.IndexOutOfBoundsException
-    {
-        _databaseList.add(index, vDatabase);
-    } //-- void addDatabase(int, org.castor.jdo.conf.Database) 
-
-    /**
-     * Method clearDatabase
-     * 
-     */
-    public void clearDatabase()
-    {
-        _databaseList.clear();
-    } //-- void clearDatabase() 
-
-    /**
-     * Method enumerateDatabase
-     * 
-     * 
-     * 
-     * @return Enumeration
-     */
-    public java.util.Enumeration enumerateDatabase()
-    {
-        return new org.exolab.castor.util.IteratorEnumeration(_databaseList.iterator());
-    } //-- java.util.Enumeration enumerateDatabase() 
-
-    /**
-     * Method getDatabase
-     * 
-     * 
-     * 
-     * @param index
-     * @return Database
-     */
-    public org.castor.jdo.conf.Database getDatabase(int index)
-        throws java.lang.IndexOutOfBoundsException
-    {
-        //-- check bounds for index
-        if ((index < 0) || (index >= _databaseList.size())) {
-            throw new IndexOutOfBoundsException();
-        }
-        
-        return (org.castor.jdo.conf.Database) _databaseList.get(index);
-    } //-- org.castor.jdo.conf.Database getDatabase(int) 
-
-    /**
-     * Method getDatabase
-     * 
-     * 
-     * 
-     * @return Database
-     */
-    public org.castor.jdo.conf.Database[] getDatabase()
-    {
-        int size = _databaseList.size();
-        org.castor.jdo.conf.Database[] mArray = new org.castor.jdo.conf.Database[size];
-        for (int index = 0; index < size; index++) {
-            mArray[index] = (org.castor.jdo.conf.Database) _databaseList.get(index);
-        }
-        return mArray;
-    } //-- org.castor.jdo.conf.Database[] getDatabase() 
-
-    /**
-     * Method getDatabaseCount
-     * 
-     * 
-     * 
-     * @return int
-     */
-    public int getDatabaseCount()
-    {
-        return _databaseList.size();
-    } //-- int getDatabaseCount() 
-
-    /**
-     * Returns the value of field 'name'.
-     * 
-     * @return String
-     * @return the value of field 'name'.
-     */
-    public java.lang.String getName()
-    {
-        return this._name;
-    } //-- java.lang.String getName() 
-
-    /**
-     * Returns the value of field 'transactionDemarcation'.
-     * 
-     * @return TransactionDemarcation
-     * @return the value of field 'transactionDemarcation'.
-     */
-    public org.castor.jdo.conf.TransactionDemarcation getTransactionDemarcation()
-    {
-        return this._transactionDemarcation;
-    } //-- org.castor.jdo.conf.TransactionDemarcation getTransactionDemarcation() 
-
-    /**
-     * Method isValid
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean isValid()
-    {
-        try {
-            validate();
-        }
-        catch (org.exolab.castor.xml.ValidationException vex) {
-            return false;
-        }
-        return true;
-    } //-- boolean isValid() 
-
-    /**
-     * Method marshal
-     * 
-     * 
-     * 
-     * @param out
-     */
-    public void marshal(java.io.Writer out)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
-        Marshaller.marshal(this, out);
-    } //-- void marshal(java.io.Writer) 
-
-    /**
-     * Method marshal
-     * 
-     * 
-     * 
-     * @param handler
-     */
-    public void marshal(org.xml.sax.ContentHandler handler)
-        throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
-        Marshaller.marshal(this, handler);
-    } //-- void marshal(org.xml.sax.ContentHandler) 
-
-    /**
-     * Method removeDatabase
-     * 
-     * 
-     * 
-     * @param vDatabase
-     * @return boolean
-     */
-    public boolean removeDatabase(org.castor.jdo.conf.Database vDatabase)
-    {
-        boolean removed = _databaseList.remove(vDatabase);
-        return removed;
-    } //-- boolean removeDatabase(org.castor.jdo.conf.Database) 
-
-    /**
-     * Method setDatabase
-     * 
-     * 
-     * 
-     * @param index
-     * @param vDatabase
-     */
-    public void setDatabase(int index, org.castor.jdo.conf.Database vDatabase)
-        throws java.lang.IndexOutOfBoundsException
-    {
-        //-- check bounds for index
-        if ((index < 0) || (index >= _databaseList.size())) {
-            throw new IndexOutOfBoundsException();
-        }
-        _databaseList.set(index, vDatabase);
-    } //-- void setDatabase(int, org.castor.jdo.conf.Database) 
-
-    /**
-     * Method setDatabase
-     * 
-     * 
-     * 
-     * @param databaseArray
-     */
-    public void setDatabase(org.castor.jdo.conf.Database[] databaseArray)
-    {
-        //-- copy array
-        _databaseList.clear();
-        for (int i = 0; i < databaseArray.length; i++) {
-            _databaseList.add(databaseArray[i]);
-        }
-    } //-- void setDatabase(org.castor.jdo.conf.Database) 
-
-    /**
-     * Sets the value of field 'name'.
-     * 
-     * @param name the value of field 'name'.
-     */
-    public void setName(java.lang.String name)
-    {
-        this._name = name;
-    } //-- void setName(java.lang.String) 
-
-    /**
-     * Sets the value of field 'transactionDemarcation'.
-     * 
-     * @param transactionDemarcation the value of field
-     * 'transactionDemarcation'.
-     */
-    public void setTransactionDemarcation(org.castor.jdo.conf.TransactionDemarcation transactionDemarcation)
-    {
-        this._transactionDemarcation = transactionDemarcation;
-    } //-- void setTransactionDemarcation(org.castor.jdo.conf.TransactionDemarcation) 
-
-    /**
-     * Method unmarshal
-     * 
-     * 
-     * 
-     * @param reader
-     * @return JdoConf
-     */
-    public static org.castor.jdo.conf.JdoConf unmarshal(java.io.Reader reader)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        return (org.castor.jdo.conf.JdoConf) Unmarshaller.unmarshal(org.castor.jdo.conf.JdoConf.class, reader);
-    } //-- org.castor.jdo.conf.JdoConf unmarshal(java.io.Reader) 
-
-    /**
-     * Method validate
-     * 
-     */
-    public void validate()
-        throws org.exolab.castor.xml.ValidationException
-    {
-        org.exolab.castor.xml.Validator validator = new org.exolab.castor.xml.Validator();
-        validator.validate(this);
-    } //-- void validate() 
-
-}
Index: cpa/src/main/java/org/castor/jdo/conf/JndiDescriptor.java
===================================================================
--- cpa/src/main/java/org/castor/jdo/conf/JndiDescriptor.java	(revision 8022)
+++ cpa/src/main/java/org/castor/jdo/conf/JndiDescriptor.java	(working copy)
@@ -1,219 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 1.0.1</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package org.castor.jdo.conf;
-
-/**
- * Class JndiDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class JndiDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field elementDefinition
-     */
-    private boolean elementDefinition;
-
-    /**
-     * Field nsPrefix
-     */
-    private java.lang.String nsPrefix;
-
-    /**
-     * Field nsURI
-     */
-    private java.lang.String nsURI;
-
-    /**
-     * Field xmlName
-     */
-    private java.lang.String xmlName;
-
-    /**
-     * Field identity
-     */
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public JndiDescriptor() 
-     {
-        super();
-        nsURI = "http://castor.org/JDO";
-        xmlName = "jndi";
-        elementDefinition = true;
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _name
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Jndi target = (Jndi) object;
-                return target.getName();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Jndi target = (Jndi) object;
-                    target.setName( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return null;
-            }
-        };
-        desc.setHandler(handler);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _name
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-    } //-- org.castor.jdo.conf.JndiDescriptor()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Method getAccessMode
-     * 
-     * 
-     * 
-     * @return AccessMode
-     */
-    public org.exolab.castor.mapping.AccessMode getAccessMode()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() 
-
-    /**
-     * Method getExtends
-     * 
-     * 
-     * 
-     * @return ClassDescriptor
-     */
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() 
-
-    /**
-     * Method getIdentity
-     * 
-     * 
-     * 
-     * @return FieldDescriptor
-     */
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()
-    {
-        return identity;
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() 
-
-    /**
-     * Method getJavaClass
-     * 
-     * 
-     * 
-     * @return Class
-     */
-    public java.lang.Class getJavaClass()
-    {
-        return org.castor.jdo.conf.Jndi.class;
-    } //-- java.lang.Class getJavaClass() 
-
-    /**
-     * Method getNameSpacePrefix
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpacePrefix()
-    {
-        return nsPrefix;
-    } //-- java.lang.String getNameSpacePrefix() 
-
-    /**
-     * Method getNameSpaceURI
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpaceURI()
-    {
-        return nsURI;
-    } //-- java.lang.String getNameSpaceURI() 
-
-    /**
-     * Method getValidator
-     * 
-     * 
-     * 
-     * @return TypeValidator
-     */
-    public org.exolab.castor.xml.TypeValidator getValidator()
-    {
-        return this;
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() 
-
-    /**
-     * Method getXMLName
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getXMLName()
-    {
-        return xmlName;
-    } //-- java.lang.String getXMLName() 
-
-    /**
-     * Method isElementDefinition
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean isElementDefinition()
-    {
-        return elementDefinition;
-    } //-- boolean isElementDefinition() 
-
-}