Index: /home/ekuns/workspace/castor-1/src/doc/conf-lib.xml
===================================================================
--- /home/ekuns/workspace/castor-1/src/doc/conf-lib.xml	(revision 6550)
+++ /home/ekuns/workspace/castor-1/src/doc/conf-lib.xml	(working copy)
@@ -3,169 +3,283 @@
   <body>
     <title>Configuration, Libraries and Building Castor</title>
 
-	<section title="News">
-		<ul>
-			<li><b>Release 0.9.7:</b> Added new org.exolab.castor.persist.useProxies property to allow
-				configuration of JDBC proxy classes. If enabled, JDBC proxy classes will be used to wrap
-				<tt>java.sql.Connection</tt> and <tt>java.sql.PreparedStatement</tt>
-				instances, to allow for more detailed and complete JDBC statements to be output
-				during logging. When turned off, no logging statements will be generated at all.</li>
-		</ul>	
-	</section>
+    <section title="News">
+      <ul>
+        <li>
+          <b>Release 0.9.7:</b> Added new org.exolab.castor.persist.useProxies property to allow
+          configuration of JDBC proxy classes. If enabled, JDBC proxy classes will be used to wrap
+          <tt>java.sql.Connection</tt> and <tt>java.sql.PreparedStatement</tt>
+          instances, to allow for more detailed and complete JDBC statements to be output
+          during logging. When turned off, no logging statements will be generated at all.
+        </li>
+      </ul>
+    </section>
 
     <section title="The Castor configuration file">
 
-      <p>Castor uses a configuration file for environmental properties that are
-         shared across all the Castor sub systems. The configuration file is
-         specified as a Java properties file with the name <tt>castor.properties</tt>.</p>
+      <p>
+        Castor uses a configuration file for environmental properties that are
+        shared across all the Castor sub systems. The configuration file is
+        specified as a Java properties file with the name <tt>castor.properties</tt>.
+      </p>
 
-      <p>The Castor JAR includes a default configuration file. A configuration
-         file in the Java library directory (e.g. <tt>/jdk1.2/lib</tt>) can be used to
-         override the default configuration file with system wide properties.
-         In addition, a configuration file can be placed in the classpath and
-         will override both the system wide properties and default
-         configuration.</p>
+      <p>
+        The Castor JAR includes a default configuration file. A configuration
+        file in the Java library directory (e.g. <tt>/jdk1.2/lib</tt>) can be
+        used to override the default configuration file with system-wide
+        properties.  In addition, a configuration file can be placed in the
+        classpath and will override both the system wide properties and
+        Castor-default configuration.
+      </p>
 
-      <p>When running the provided examples, Castor will use the configuration
-         file located in the examples directory which specifies additional
-         debugging information and pretty printing of all produced XML
-         documents.</p>
+      <p>
+        When running the provided examples, Castor will use the configuration
+        file located in the examples directory which specifies additional
+        debugging information as well as pretty printing of all produced XML
+        documents.
+      </p>
 
-      <p>The following properties are currently supported in the configuration
-         file:</p>
+      <p>
+        The following properties are currently supported in the configuration
+        file:
+      </p>
+
 <pre>
-  # Defines the default XML parser to be used by castor
-  # The parser must implement org.xml.sax.Parser
-  #
-  org.exolab.castor.parser=org.apache.xerces.parsers.SAXParser
+# THE CASTOR PROPERTIES FILE
+# This file specifies values for Castor run-time which may be configured
+# by the user.
+# $Id$
 
-  # Defines the (default) XML serializer factory to use by Castor, 
-  # which must implement org.exolab.castor.xml.SerializerFactory;
-  # default is org.exolab.castor.xml.XercesXMLSerializerFactory  
-  org.exolab.castor.xml.serializer.factory=org.exolab.castor.xml.XercesXMLSerializerFactory
+# This section defines Backwards compatibility switches.
+#
+# Hashtable/Map default mapping.
+# For backward compatibility with 0.9.5.2 and earlier.
+#
+#org.exolab.castor.xml.saveMapKeys=false
 
-  # True if all documents should be indented on output by default
-  #
-  org.exolab.castor.indent=false
+# Defines the default XML parser to be used by Castor.
+# The parser must implement org.xml.sax.Parser.
+#
+org.exolab.castor.parser=org.apache.xerces.parsers.SAXParser
 
-  # True if all documents should be validated on input by default
-  #
-  org.exolab.castor.validation=true
+# Defines the (default) XML serializer factory to use by Castor, which must
+# implement org.exolab.castor.xml.SerializerFactory;
+# Default is org.exolab.castor.xml.XercesXMLSerializerFactory
+org.exolab.castor.xml.serializer.factory=org.exolab.castor.xml.XercesXMLSerializerFactory
 
-  # Comma separated list of SAX 2 features that should be enabled
-  # for the default parser
-  #
-  org.exolab.castor.sax.features=
+# Defines the NodeType for use with Java primitive types (int, long, boolean,
+# etc). This value is only used by the Introspector.  Valid values are either
+# "attribute" or "element". By default, all primitives are marshaled as
+# attributes. Uncomment the following line to change the NodeType to element.
+#
+#org.exolab.castor.xml.introspector.primitive.nodetype=element
 
-  # Comma separated list of SAX 2 features that should be disabled
-  # for the default parser
-  #
-  org.exolab.castor.sax.features-to-disable=
+# Defines the Naming "style" or conventions to use when creating XML names
+# from Java class or field names.
+# Valid values are as follows:
+# -----------------------------------------------------------------
+# lower (default)  |  All names are lowercase with hyphens
+#                  |  separating words.
+#                  |
+#                  |  Example: personInfo = person-info
+# -----------------------------------------------------------------
+# mixed            |  All names are mixed case, with Uppercase
+#                  |  character as the first letter of a new word.
+#                  |
+#                  |  Example: personInfo = personInfo
+#                  |  Example: FooBar     = fooBar
+# -----------------------------------------------------------------
+# {Any ClassName}  |  Any Class which implements
+#                  |  org.exolab.castor.xml.XMLNaming
+# -----------------------------------------------------------------
+#
+# By default, all names are treated as the "lower" option.  To preserve the
+# Java mixed-case conventions, uncomment the following line.
+#
+#org.exolab.castor.xml.naming=mixed
 
-  # True if should produce verbose messages
-  #
-  org.exolab.castor.debug=false
+###############################
+# REGULAR EXPRESSION EVALUATORS
+#
+# Defines the Regular Expression Evaluator to be used by Castor.
+# The evaluator must implement org.exolab.castor.util.RegExpEvaluator.
+#
+# Uncomment the following to basically suppress Regular expressions evaluation:
+#org.exolab.castor.regexp=org.exolab.castor.xml.util.AlwaysTrueRegExpEvaluator
+#
+# An implementation which uses the Jakarta RegExp library:
+#org.exolab.castor.regexp=org.exolab.castor.util.JakartaRegExpEvaluator
+#
+# An implementation which uses the Jakarta ORO library:
+org.exolab.castor.regexp=org.exolab.castor.util.JakartaOroEvaluator
 
-  # List of collection handlers for Java 1.1 and Java 1.2 run-times
-  #
-  org.exolab.castor.mapping.collections=\
-    org.exolab.castor.mapping.loader.J1CollectionHandlers,\
-    org.exolab.castor.mapping.loader.J2CollectionHandlers
+# True if all documents should be indented on output by default.
+# Defaults to false.
+#
+#org.exolab.castor.indent=true
 
-  # List of persistence factories for the supported database servers
-  #
-  org.exolab.castor.jdo.engines=\
-    org.exolab.castor.jdo.drivers.OracleFactory,\
-    org.exolab.castor.jdo.drivers.PostgreSQLFactory,\
-    org.exolab.castor.jdo.drivers.SybaseFactory,\
-    org.exolab.castor.jdo.drivers.SQLServerFactory,\
-    org.exolab.castor.jdo.drivers.DB2Factory,\
-    org.exolab.castor.jdo.drivers.GenericFactory
+# True if xml documents should be validated by the SAX Parser
+# Defaults to false.
+#
+org.exolab.castor.parser.validation=false
 
-  # List of key generator factories 
-  #
-  org.exolab.castor.jdo.keyGeneratorFactories=\
-    org.exolab.castor.jdo.keygen.MaxKeyGeneratorFactory,\
-    org.exolab.castor.jdo.keygen.HighLowKeyGeneratorFactory,\
-    org.exolab.castor.jdo.keygen.IdentityKeyGeneratorFactory,\
-    org.exolab.castor.jdo.keygen.SequenceKeyGeneratorFactory,\
-	org.exolab.castor.jdo.keygen.UUIDKeyGeneratorFactory
+# True for parser to support Namespaces.
+# Defaults to false.
+#
+org.exolab.castor.parser.namespaces=false
 
-  # Collection handlers for the source code generator
-  #
-  org.exolab.castor.builder.type.j2=\
-    org.exolab.castor.builder.FieldInfoFactoryJ2
-  org.exolab.castor.builder.type.j1=\
-    org.exolab.castor.builder.FieldInfoFactory
-  org.exolab.castor.builder.type.odmg=\
-    org.exolab.castor.builder.FieldInfoFactoryODMG30
+# True if all documents should be validated by the marshaling framework
+# Defaults to true.
+#
+org.exolab.castor.marshalling.validation=true
 
-  # Default time zone to apply to dates/times fetched from database fields, if not
-  # already part of the data.  Specify same format as in java.util.TimeZone.getTimeZone, or
-  # an empty string to use the computer's local time zone. Please see
-  # http://de.wikipedia.org/wiki/Zeitzone for detailed information about time zones.
-  #
-  org.exolab.castor.jdo.defaultTimeZone=
-  #org.exolab.castor.jdo.defaultTimeZone=GMT-8:00
+# Comma separated list of SAX 2 features that should be enabled for the
+# default parser.
+#
+#org.exolab.castor.sax.features=
 
-  #
-  # List of TxSynchronizeable implementations
-  #
-  #org.exolab.castor.persist.TxSynchronizable=
+# Comma separated list of SAX 2 features that should be disabled for the
+# default parser.
+#
+#org.exolab.castor.sax.features-to-disable
 
-  #
-  # True if JDBC proxy classes should be used to enable more detailed logging output of SQL
-  # statements; false otherwise (logging will be turned off completely).
-  #
-  org.exolab.castor.perists.useProxies=true
+# True if debugging output should be generated.
+# Defaults to false.
+#
+org.exolab.castor.debug=false
 
-  #
-  # List of available cache implementations; please expand this list to add
-  # any custom performance caches.
-  #
-  org.castor.cache.Factories=\
-    org.castor.cache.simple.NoCacheFactory,\
-    org.castor.cache.simple.TimeLimitedFactory,\
-    org.castor.cache.simple.CountLimitedFactory,\
-    org.castor.cache.simple.UnlimitedFactory,\
-    org.castor.cache.distributed.FKCacheFactory,\
-    org.castor.cache.distributed.JcsCacheFactory,\
-    org.castor.cache.distributed.JCacheFactory,\
-    org.castor.cache.distributed.CoherenceCacheFactory,\
-    org.castor.cache.distributed.OsCacheFactory,\
-    org.castor.cache.hashbelt.FIFOHashbeltFactory,\
-    org.castor.cache.hashbelt.LRUHashbeltFactory,\
-    org.castor.cache.distributed.EHCacheFactory
+# List of collection handlers for Java 1.1 and Java 1.2 run-times:
+#
+org.exolab.castor.mapping.collections=\
+  org.exolab.castor.mapping.loader.J1CollectionHandlers,\
+  org.exolab.castor.mapping.loader.J2CollectionHandlers
 
-  #
-  # List of supported TransactionManagerFactory implementations; please expand
-  # this list to add any custom transaction manager fatories.
-  #
-  org.castor.transactionmanager.Factories=\
-    org.castor.transactionmanager.LocalTransactionManagerFactory,\
-    org.castor.transactionmanager.JNDIENCTransactionManagerFactory,\
-    org.castor.transactionmanager.JOTMTransactionManagerFactory,\
-    org.castor.transactionmanager.WebSphereTransactionManagerFactory,\
-    org.castor.transactionmanager.WebSphere5TransactionManagerFactory,\
-    org.castor.transactionmanager.WebSphere51TransactionManagerFactory
-    
-  #
-  # Shell the TransactionManager be initialized at registration or lazily when
-  # requested for the first time? Defaults to false.
-  #
-  org.castor.transactionmanager.InitializeAtRegistration=false
-  
-</pre>
-    </section>
+# List of persistence factories for the supported database servers:
+#
+org.exolab.castor.jdo.engines=\
+  org.exolab.castor.jdo.drivers.OracleFactory,\
+  org.exolab.castor.jdo.drivers.PostgreSQLFactory,\
+  org.exolab.castor.jdo.drivers.SybaseFactory,\
+  org.exolab.castor.jdo.drivers.SQLServerFactory,\
+  org.exolab.castor.jdo.drivers.DB2Factory,\
+  org.exolab.castor.jdo.drivers.InformixFactory,\
+  org.exolab.castor.jdo.drivers.HsqlFactory,\
+  org.exolab.castor.jdo.drivers.InstantDBFactory,\
+  org.exolab.castor.jdo.drivers.InterbaseFactory,\
+  org.exolab.castor.jdo.drivers.MySQLFactory,\
+  org.exolab.castor.jdo.drivers.SapDbFactory,\
+  org.exolab.castor.jdo.drivers.GenericFactory,\
+  org.exolab.castor.jdo.drivers.DerbyFactory,\
+  org.castor.jdo.drivers.PointbaseFactory,\
+  org.castor.jdo.drivers.ProgressFactory
+
+# List of key generator factories:
+#
+org.exolab.castor.jdo.keyGeneratorFactories=\
+  org.exolab.castor.jdo.keygen.MaxKeyGeneratorFactory,\
+  org.exolab.castor.jdo.keygen.HighLowKeyGeneratorFactory,\
+  org.exolab.castor.jdo.keygen.IdentityKeyGeneratorFactory,\
+  org.exolab.castor.jdo.keygen.SequenceKeyGeneratorFactory,\
+  org.exolab.castor.jdo.keygen.UUIDKeyGeneratorFactory
+
+# Collection handlers for the source code generator:
+#
+org.exolab.castor.builder.type.j2=\
+  org.exolab.castor.builder.FieldInfoFactoryJ2
+org.exolab.castor.builder.type.j1=\
+  org.exolab.castor.builder.FieldInfoFactory
+org.exolab.castor.builder.type.odmg=\
+  org.exolab.castor.builder.FieldInfoFactoryODMG30
+
+# Configures the default time zone to apply to dates/times fetched from
+# database fields (if not already part of the data).  Specify same format as
+# in java.util.TimeZone.getTimeZone, or the empty string to use the computer's
+# local time zone. Please see http://de.wikipedia.org/wiki/Zeitzone for
+# detailed information about time zones.
+#
+org.exolab.castor.jdo.defaultTimeZone=
+#org.exolab.castor.jdo.defaultTimeZone=GMT-8:00
+
+# List of TxSynchronizeable implementations:
+#
+#org.exolab.castor.persist.TxSynchronizable=
+
+# Sets the buffer size in bytes for fetching LOBs (this is dependent upon
+# the JDBC driver implementation).  The value below == 5k.
+#
+org.exolab.castor.jdo.lobBufferSize=5120
+
+# True if database configuration should be initalization
+# when loading it (default: true).
+#
+#org.exolab.castor.jdo.DatabaseInitializeAtLoad=true
+
+# True if proxy classes should be used for JDBC connections and
+# prepared statements.
+# Defaults to true.
+#
+org.exolab.castor.persist.useProxies=false
 
-  </body>
-</document>
+# MappingLoader implementations:
+#
+org.castor.mapping.loaderFactories=\
+  org.castor.mapping.JDOMappingLoaderFactory,\
+  org.castor.mapping.XMLMappingLoaderFactory
 
+# Cache implementations:
+#
+org.castor.cache.Factories=\
+  org.castor.cache.simple.NoCacheFactory,\
+  org.castor.cache.simple.TimeLimitedFactory,\
+  org.castor.cache.simple.CountLimitedFactory,\
+  org.castor.cache.simple.UnlimitedFactory,\
+  org.castor.cache.distributed.FKCacheFactory,\
+  org.castor.cache.distributed.JcsCacheFactory,\
+  org.castor.cache.distributed.JCacheFactory,\
+  org.castor.cache.distributed.CoherenceCacheFactory,\
+  org.castor.cache.distributed.OsCacheFactory,\
+  org.castor.cache.hashbelt.FIFOHashbeltFactory,\
+  org.castor.cache.hashbelt.LRUHashbeltFactory,\
+  org.castor.cache.distributed.EHCacheFactory,\
+  org.castor.cache.distributed.GigaspacesCacheFactory
 
+# TransactionManagerFactory implementations:
+#
+org.castor.transactionmanager.Factories=\
+  org.castor.transactionmanager.WebSphereTransactionManagerFactory,\
+  org.castor.transactionmanager.WebSphere5TransactionManagerFactory,\
+  org.castor.transactionmanager.WebSphere51TransactionManagerFactory,\
+  org.castor.transactionmanager.LocalTransactionManagerFactory,\
+  org.castor.transactionmanager.JNDIENCTransactionManagerFactory,\
+  org.castor.transactionmanager.JOTMTransactionManagerFactory
 
+# Selects whether the TransactionManager should be initialized at registration,
+# or lazily when requested for the first time.
+# Defaults to false.
+#
+org.castor.transactionmanager.InitializeAtRegistration=false
 
+# Instructs Castor JDO to use the JDBC 3.0-specific features to obtain
+# the generated value of an identity column.
+# Defaults to false.
+#
+org.castor.jdo.use.jdbc30=false
 
+# Specifies whether to use ANSI-compliant SQL for MS SQL Server.
+# Defaults to false.
+#
+org.exolab.castor.jdo.sqlserver.ansi-compliant=false
 
+# Specifyies whether the ClassDescriptorResolver should (automatically) search
+# for and consult with package mapping files (.castor.xml) to retrieve class
+# descriptor information; on by default.
+# Defaults to true.
+#
+#org.exolab.castor.xml.loadPackageMappings=false
+</pre>
 
+    </section>
 
+  </body>
 
+</document>
Index: /home/ekuns/workspace/castor-1/src/main/resources/org/exolab/castor/castor.properties
===================================================================
--- /home/ekuns/workspace/castor-1/src/main/resources/org/exolab/castor/castor.properties	(revision 6550)
+++ /home/ekuns/workspace/castor-1/src/main/resources/org/exolab/castor/castor.properties	(working copy)
@@ -1,39 +1,34 @@
 # THE CASTOR PROPERTIES FILE
-# This file specifies values for Castor run-time 
-# which may be configured by the user.
+# This file specifies values for Castor run-time which may be configured
+# by the user.
 # $Id$
 
-
-# This section defines Backward compatibility switches
+# This section defines Backwards compatibility switches.
+#
+# Hashtable/Map default mapping.
+# For backward compatibility with 0.9.5.2 and earlier.
 #
-# Hashtable/Map default mapping
-#  - For backward compatibility with 0.9.5.2 and earlier
-# 
 #org.exolab.castor.xml.saveMapKeys=false
 
-
-# Defines the default XML parser to be used by castor
-# The parser must implement org.xml.sax.Parser
+# Defines the default XML parser to be used by Castor.
+# The parser must implement org.xml.sax.Parser.
 #
 org.exolab.castor.parser=org.apache.xerces.parsers.SAXParser
 
-
-# Defines the (default) XML serializer factory to use by Castor, 
-# which must implement org.exolab.castor.xml.SerializerFactory;
-# default is org.exolab.castor.xml.XercesXMLSerializerFactory  
+# Defines the (default) XML serializer factory to use by Castor, which must
+# implement org.exolab.castor.xml.SerializerFactory;
+# Default is org.exolab.castor.xml.XercesXMLSerializerFactory
 org.exolab.castor.xml.serializer.factory=org.exolab.castor.xml.XercesXMLSerializerFactory
 
-# Defines the NodeType for use with Java primitive types (int, long,
-# boolean, etc). This value is only used by the Introspector.
-# valid values are either "attribute" or "element". By default
-# all primitives are marshalled as attributes. Simply uncomment
-# the following line to change the NodeType to element.
+# Defines the NodeType for use with Java primitive types (int, long, boolean,
+# etc). This value is only used by the Introspector.  Valid values are either
+# "attribute" or "element". By default, all primitives are marshaled as
+# attributes. Uncomment the following line to change the NodeType to element.
 #
 #org.exolab.castor.xml.introspector.primitive.nodetype=element
 
-
-# Defines the Naming "style" or conventions to use when
-# creating XML names from Java class or field names. 
+# Defines the Naming "style" or conventions to use when creating XML names
+# from Java class or field names.
 # Valid values are as follows:
 # -----------------------------------------------------------------
 # lower (default)  |  All names are lowercase with hyphens
@@ -47,67 +42,66 @@
 #                  |  Example: personInfo = personInfo
 #                  |  Example: FooBar     = fooBar
 # -----------------------------------------------------------------
-# {Any ClassName}  |  Any Class which implements 
+# {Any ClassName}  |  Any Class which implements
 #                  |  org.exolab.castor.xml.XMLNaming
 # -----------------------------------------------------------------
 #
-# By default all names are treated as the "lower" option.
-# To preserve the Java mixed-case conventions simply
-# uncomment the following line. 
+# By default, all names are treated as the "lower" option.  To preserve the
+# Java mixed-case conventions, uncomment the following line.
 #
 #org.exolab.castor.xml.naming=mixed
 
-
 ###############################
 # REGULAR EXPRESSION EVALUATORS
 #
-# Defines the Regular Expression Evaluator to be used by Castor
-# The evaluator must implement org.exolab.castor.util.RegExpEvaluator
+# Defines the Regular Expression Evaluator to be used by Castor.
+# The evaluator must implement org.exolab.castor.util.RegExpEvaluator.
 #
-# Uncomment the following to basically supress evaluation of Regular expressions
+# Uncomment the following to basically suppress Regular expressions evaluation:
 #org.exolab.castor.regexp=org.exolab.castor.xml.util.AlwaysTrueRegExpEvaluator
 #
-# An implementation which uses the Jakarta RegExp library
+# An implementation which uses the Jakarta RegExp library:
 #org.exolab.castor.regexp=org.exolab.castor.util.JakartaRegExpEvaluator
 #
-# An implementation which uses the Jakarta ORO library
+# An implementation which uses the Jakarta ORO library:
 org.exolab.castor.regexp=org.exolab.castor.util.JakartaOroEvaluator
 
-
-
-
-# True if all documents should be indented on output by default
+# True if all documents should be indented on output by default.
+# Defaults to false.
 #
 #org.exolab.castor.indent=true
 
-
 # True if xml documents should be validated by the SAX Parser
+# Defaults to false.
 #
 org.exolab.castor.parser.validation=false
+
+# True for parser to support Namespaces.
+# Defaults to false.
+#
 org.exolab.castor.parser.namespaces=false
 
-# True if all documents should be validated by the marshalling framework
+# True if all documents should be validated by the marshaling framework
+# Defaults to true.
 #
 org.exolab.castor.marshalling.validation=true
 
-
-
-# Comma separated list of SAX 2 features that should be enabled
-# for the default parser.
+# Comma separated list of SAX 2 features that should be enabled for the
+# default parser.
 #
 #org.exolab.castor.sax.features=
 
-# Comma separated list of SAX 2 features that should be disabled
-# for the default parser.
+# Comma separated list of SAX 2 features that should be disabled for the
+# default parser.
 #
 #org.exolab.castor.sax.features-to-disable
 
-# True if should produce verbose messages
+# True if debugging output should be generated.
+# Defaults to false.
 #
 org.exolab.castor.debug=false
 
-
-# List of collection handlers for Java 1.1 and Java 1.2 run-times
+# List of collection handlers for Java 1.1 and Java 1.2 run-times:
 #
 org.exolab.castor.mapping.collections=\
   org.exolab.castor.mapping.loader.J1CollectionHandlers,\
@@ -113,8 +107,7 @@
   org.exolab.castor.mapping.loader.J1CollectionHandlers,\
   org.exolab.castor.mapping.loader.J2CollectionHandlers
 
-
-# List of persistence factories for the supported database servers
+# List of persistence factories for the supported database servers:
 #
 org.exolab.castor.jdo.engines=\
   org.exolab.castor.jdo.drivers.OracleFactory,\
@@ -133,8 +126,7 @@
   org.castor.jdo.drivers.PointbaseFactory,\
   org.castor.jdo.drivers.ProgressFactory
 
-
-# List of key generator factories 
+# List of key generator factories:
 #
 org.exolab.castor.jdo.keyGeneratorFactories=\
   org.exolab.castor.jdo.keygen.MaxKeyGeneratorFactory,\
@@ -143,8 +135,7 @@
   org.exolab.castor.jdo.keygen.SequenceKeyGeneratorFactory,\
   org.exolab.castor.jdo.keygen.UUIDKeyGeneratorFactory
 
-
-# Collection handlers for the source code generator
+# Collection handlers for the source code generator:
 #
 org.exolab.castor.builder.type.j2=\
   org.exolab.castor.builder.FieldInfoFactoryJ2
@@ -152,26 +143,25 @@
   org.exolab.castor.builder.FieldInfoFactory
 org.exolab.castor.builder.type.odmg=\
   org.exolab.castor.builder.FieldInfoFactoryODMG30
-  
-# Default time zone to apply to dates/times fetched from database fields, if not
-# already part of the data.  Specify same format as in java.util.TimeZone.getTimeZone, or
-# the empty string to use the computer's local time zone. Please see
-# http://de.wikipedia.org/wiki/Zeitzone for detailed information about time zones.
-org.exolab.castor.jdo.defaultTimeZone=  
+
+# Configures the default time zone to apply to dates/times fetched from
+# database fields (if not already part of the data).  Specify same format as
+# in java.util.TimeZone.getTimeZone, or the empty string to use the computer's
+# local time zone. Please see http://de.wikipedia.org/wiki/Zeitzone for
+# detailed information about time zones.
+#
+org.exolab.castor.jdo.defaultTimeZone=
 #org.exolab.castor.jdo.defaultTimeZone=GMT-8:00
 
-#
-# List of TxSynchronizeable implementations
+# List of TxSynchronizeable implementations:
 #
 #org.exolab.castor.persist.TxSynchronizable=
 
-# 
-# The buffer size in bytes for fetching LOBs (this is dependent upon
-# the JDBC driver implementation) - value below is 5k 
-# 
+# Sets the buffer size in bytes for fetching LOBs (this is dependent upon
+# the JDBC driver implementation).  The value below == 5k.
+#
 org.exolab.castor.jdo.lobBufferSize=5120
 
-#
 # True if database configuration should be initalization
 # when loading it (default: true).
 #
@@ -177,14 +167,13 @@
 #
 #org.exolab.castor.jdo.DatabaseInitializeAtLoad=true
 
-#
-# True if proxy classes should be used for JDBC connections and 
-# prepared statements (default: true).
+# True if proxy classes should be used for JDBC connections and
+# prepared statements.
+# Defaults to true.
 #
 org.exolab.castor.persist.useProxies=false
 
-#
-# MappingLoader implementations
+# MappingLoader implementations:
 #
 org.castor.mapping.loaderFactories=\
   org.castor.mapping.JDOMappingLoaderFactory,\
@@ -189,10 +178,9 @@
 org.castor.mapping.loaderFactories=\
   org.castor.mapping.JDOMappingLoaderFactory,\
   org.castor.mapping.XMLMappingLoaderFactory
-  
-# 
-# Cache implementations
-# 
+
+# Cache implementations:
+#
 org.castor.cache.Factories=\
   org.castor.cache.simple.NoCacheFactory,\
   org.castor.cache.simple.TimeLimitedFactory,\
@@ -208,9 +196,8 @@
   org.castor.cache.distributed.EHCacheFactory,\
   org.castor.cache.distributed.GigaspacesCacheFactory
 
-# 
-# TransactionManagerFactory implementations
-# 
+# TransactionManagerFactory implementations:
+#
 org.castor.transactionmanager.Factories=\
   org.castor.transactionmanager.WebSphereTransactionManagerFactory,\
   org.castor.transactionmanager.WebSphere5TransactionManagerFactory,\
@@ -219,28 +206,26 @@
   org.castor.transactionmanager.JNDIENCTransactionManagerFactory,\
   org.castor.transactionmanager.JOTMTransactionManagerFactory
 
-#
-# Shell the TransactionManager be initialized at registration or lazily when
-# requested for the first time? Defaults to false.
+# Selects whether the TransactionManager should be initialized at registration,
+# or lazily when requested for the first time.
+# Defaults to false.
 #
 org.castor.transactionmanager.InitializeAtRegistration=false
 
-#
 # Instructs Castor JDO to use the JDBC 3.0-specific features to obtain
-# the generated value of an identity column; default to false
+# the generated value of an identity column.
+# Defaults to false.
 #
 org.castor.jdo.use.jdbc30=false
 
-#
-# Property specifying whether to use ANSI-compliant SQL for MS SQL Server.
-# defaults to false
+# Specifies whether to use ANSI-compliant SQL for MS SQL Server.
+# Defaults to false.
 #
 org.exolab.castor.jdo.sqlserver.ansi-compliant=false
 
-#
-# Property specifying whether the ClassDescriptorResolver should (automatically) search for and 
-# consult with package mapping files (.castor.xml) to retrieve class descriptor information; 
-# on by default. defaults to true
+# Specifyies whether the ClassDescriptorResolver should (automatically) search
+# for and consult with package mapping files (.castor.xml) to retrieve class
+# descriptor information; on by default.
+# Defaults to true.
 #
 #org.exolab.castor.xml.loadPackageMappings=false
-
