You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/01/23 14:38:27 UTC

[01/24] cayenne git commit: Move RELEASE-NOTES, UPGRADE and KEYS files to top level

Repository: cayenne
Updated Branches:
  refs/heads/master c4b110043 -> fcb490c2a


http://git-wip-us.apache.org/repos/asf/cayenne/blob/334d9cc4/docs/doc/src/main/resources/UPGRADE.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/UPGRADE.txt b/docs/doc/src/main/resources/UPGRADE.txt
deleted file mode 100644
index 0c9fc00..0000000
--- a/docs/doc/src/main/resources/UPGRADE.txt
+++ /dev/null
@@ -1,582 +0,0 @@
-Apache Cayenne Upgrade Information
-==================================
-
-IMPORTANT: be sure to read all notes for the intermediate releases between your
-           current release and the release you are upgrading to.
--------------------------------------------------------------------------------
-UPGRADING TO 4.1.M2
-
-* Per CAY-2377 All code deprecated in Cayenne 4.0 was removed, please review your code before upgrading.
-
-* Per CAY-2372 three new modules extracted from Cayenne core. No changes to the packages or api have been made,
-    so you should only include additional module to your project (if it where used).
-
-    - cayenne-web module contains all logic related to bootstrapping Cayenne inside servlet container.
-      WebModule is autoloaded, so you shouldn't add it to runtime explicitly anymore.
-    - cayenne-osgi module contains OSGi related functionality.
-    - cayenne-rop-server ROP server part.
-
-UPGRADING TO 4.1.M1
-
-* Per CAY-2351 Minimum supported Java version is now Java 8. There is no options to use Cayenne 4.1 with earlier
-      versions, you should use 4.0 version if Java 7 is required by your project.
-
-* Per CAY-2345 Velocity replaced with Cayenne own template engine by default in cayenne-server,
-      this should be transparent in almost all cases, however if you relied on advanced Velocity
-      features in SQLTemplate you can include auto-loaded cayenne-velocity module and keep using Velocity,
-      no other actions required.
-
-* Per CAY-2335 ServerRuntime by default will fail to load projects in case of version mismatch.
-      You have two options:
-      - update project files via opening them in Cayenne Modeler
-      - if you are unable to do so you can use new cayenne-project-compatibility module,
-      to enable it simply add it as a dependency in Maven (or any other build system you use), however
-      this module can support only versions created by Cayenne 3.1 or later.
-
-* Per CAY-2330 Field-based data objects are introduced and enabled by default.
-      Your existing code will continue to work, but in order to get benefits from this feature you should
-      regenerate code via Modeler ("Tools" -> "Generate Classes") or cgen tools in Maven/Ant/Gradle plugins.
-      Also note that serialization format of old data objects have changed, make sure you don't use serialization
-      form to store your objects.
-
-UPGRADING TO 4.0.B1
-
-* Per CAY-2302 postcommit module and all it's internals renamed to commitlog.
-      Most important change is the new @CommitLog annotation which should be used instead of @Auditable,
-      this change is backward incompatible and most likely for you to miss as IDE won't give you a hint.
-      Please keep in mind that new @CommitLog annotation is used only by commitlog module.
-      Deprecated functionality in lifecycle module still depends on @Auditable annotation.
-
-      Here is list of steps you should do in order to update your code:
-      - include cayenne-commitlog module into your project (i.e. add dependency to your pom.xml)
-      - remove cayenne-lifecycle (and cayenne-postcommit if you have it) module from your project
-      - switch usages of @Auditable to @CommitLog
-      - change usages of renamed classes, here is two classes most likely used by your code:
-             PostCommitListener      -> CommitLogListener
-             PostCommitModuleBuilder -> CommitLogModuleExtender
-      - fix all imports for renamed packages:
-             org.apache.cayenne.lifecycle.postcommit -> org.apache.cayenne.commitlog
-             org.apache.cayenne.lifecycle.changemap  -> org.apache.cayenne.commitlog.model
-      - change CommitLogModuleExtender methods:
-             auditableEntitiesOnly() -> commitLogAnnotationEntitiesOnly()
-             build()                 -> module()
-
-* Per CAY-2280 Cayenne migrated from commons-logging to SLF4J.
-      Here is options you have to upgrade your project accordingly:
-      1) Migrate your logging to SLF4J. Please see https://www.slf4j.org for documentation about
-      inclusion into your project logging backend of you choice.
-
-      2) Other option is to use commons-logging over SLF4J and keep all logging compatible with previous Cayenne versions.
-      In order to do so you need:
-      - remove commons-logging dependency if you have it
-      - add to your project slf4j-jcl dependency
-
-      As a part of this change classes CommonsJdbcEventLogger and FormattedCommonsJdbcEventLogger
-      were renamed to Slf4jJdbcEventLogger and FormattedSlf4jJdbcEventLogger respectively.
-      Internally they are using now org.apache.cayenne.log.JdbcEventLogger interface as a logger name.
-
-* Per CAY-2278 Packages org.apache.cayenne.lifecycle.audit and org.apache.cayenne.lifecycle.changeset where deprecated.
-       Please use instead cayenne-commitlog module and its new @CommitLog annotation.
-
-       Weighted graph sorter moved to cayenne-server into org.apache.cayenne.ashwood package.
-
-       Packages org.apache.cayenne.lifecycle.changemap and org.apache.cayenne.lifecycle.postcommit
-       where moved to the new cayenne-commitlog module.
-
-       Please change your code accordingly (see also notes above for CAY-2302).
-
-* Per CAY-2277 ClientRuntime created with ClientRuntimeBuilder, direct instantiation of
-       ClientRuntime is deprecated. Also whole ClientLocalRuntime class is deprecated, use instead
-       ClientRuntimeBuilder.local() method.
-
-* Per CAY-2262 Client modules are now auto-loaded by default to turn off auto-loading use
-       ClientRuntimeBuilder.disableModulesAutoLoading() method.
-
-       List of client modules:
-       - cayenne-client
-       - cayenne-client-jetty
-       - cayenne-protostuff (it also supports auto-loading by ServerRuntimeBuilder)
-
-       Also new modules are extracted from the existing one and should be added to your pom.xml if the corresponding
-       functionality is used by your project:
-       - cayenne-cache-invalidation (was part of cayenne-lifecycle)
-       - cayenne-commitlog (was part of cayenne-lifecycle)
-
-* Per CAY-2259 Cache invalidation module refactored to provide new functionality and better align with
-       new module autoloading functionality. Here is list of changes:
-       - Package org.apache.cayenne.lifecycle.cache renamed to org.apache.cayenne.cache.invalidation.
-       - CacheInvalidationModuleBuilder renamed to CacheInvalidationModuleExtender and its method build()
-       renamed to module().
-       - InvalidationFunction returns CacheGroupDescriptor instead of simple String with cache group name,
-       so you need to change your custom functions accordingly.
-
-* Per CAY-2268 DI methods for binding ordered lists, introduced in 4.0.M3 where changed:
-       - method after() replaced by explicit addAfter(), addAllAfter()
-       - method before() replaced by insertBefore(), insertAllBefore()
-
-* Per CAY-2258 Injection of List and Map are made type-safe, as a result small incompatibilities are introduced.
-  If you are using following methods:
-        - bindMap(String bindingName)
-        - bindList(String bindingName)
-  you should change them to corresponding type-safe versions:
-        - bindMap(Class<T> valueType, String bindingName)
-        - bindList(Class<T> valueType, String bindingName)
-  Also if you are using DI Keys like Key.get(Map.class, "bindingName") or Key.get(List.class, "bindingName")
-  you should use new corresponding factory methods Key.mapOf(MapValues.class, "bindingName")
-  and Key.listOf(ListValues.class, "bindingName").
-  Additionally new API allows you to bind Lists and Maps without using names:
-        - binder.bindList(SomeUniqueType.class).add(...);
-        - @Inject List<SomeUniqueType> list;
-
-* Per CAY-1873 and CAY-2266 Cache and remote notification configuration was moved from Modeler into
-  runtime DI settings. To set custom cache size, you should use custom module like this:
-        Module module = binder -> {
-            ServerModule.setSnapshotCacheSize(binder, 20000);
-        };
-  Or you can use cmd line arg: -Dcayenne.DataRowStore.snapshot.size=20000
-
-  If you have used remote notifications, you should include one of the following modules into your project:
-        - cayenne-jgroups
-        - cayenne-jms
-        - cayenne-xmpp
-  For maven users this can be easily done by adding dependency to pom.xml:
-        <dependency>
-            <groupId>org.apache.cayenne</groupId>
-            <artifactId>cayenne-jgroups</artifactId>
-            <version>4.0.M6</version>
-        </dependency>
-
-  Module will be autoloaded and remote notifications enabled, so only thing you need is to provide configuration.
-  Custom DI module should be used for that, e.g. for JGroups:
-        Module module = binder -> {
-            JGroupsModule.contributeMulticastAddress(binder, MCAST_ADDRESS);
-            JGroupsModule.contributeMulticastPort(binder, MCAST_PORT));
-        };
-
-
-* Per CAY-2256 Fix for CAY-2146 was reverted, as it appears that we can't reliably deduce whether
-  relationship is optional or not. So in case of mandatory relationships in vertical inheritance
-  you should perform manual validation before insert by using "prePersist" callback in your
-  object (you can create it in the Cayenne Modeler) or by overriding "validateForSave" method.
-
-
-UPGRADING TO 4.0.M5
-
-* Per CAY-2186 DerbyPkGenerator switched from AUTO_PK_TABLE to sequence-based PK generator
-  If you relied in anyway on AUTO_PK_TABLE usage in derby, you should change your code.
-
-* Per CAY-2228 Support for multiple cache groups has been removed from caching and query API
-  as none of the modern providers supports it. If you relied on this feature you should
-  implement it by yourself or change caching provider
-
-* Per CAY-1980 "maven-cayenne-modeler-plugin" renamed to "cayenne-modeler-maven-plugin"
-
-* Per CAY-2225 CacheInvalidationFilter has been changed to support custom invalidation rules,
-  in addition to the rule based on @CacheGroups annotation.
-  If you have used it previously, you should change its binding to runtime from direct binding in
-  a custom module to a module built by CacheInvalidationModuleBuilder.
-
-* Per CAY-2212 cdbimport tool revisited once again, so configuration of Maven plugin should be changed.
-  - "maven-cayenne-plugin" is deprecated, please switch to "cayenne-maven-plugin"
-  - <reverseEngineering> tag replaced with <dbimport> tag
-  - new <dataSource> tag introduced that should enclose all connection properties:
-    1. <driver>
-    2. <url>
-    3. <user>
-    4. <password>
-
-  - top level properties moved to <dbimport>:
-    1. <defaultPackage>
-    2. <forceDataMapCatalog>
-    3. <forceDataMapSchema>
-    4. <meaningfulPkTables>
-    5. <namingStrategy>
-    6. <stripFromTableNames>
-    7. <usePrimitives>
-
-  - Java 8 java.time.* types are now used by default in cdbimport (and in "Reengineer Database Schema" tool in Modeler)
-  This can be controlled by <useJava7Types> property in <dbimport> (or checkbox in Modeler).
-
-  - For Ant users: cayenne-tools.jar split into two parts:
-    1. cayenne-ant.jar for Ant tasks
-    2. cayenne-cgen.jar for class generation functionality (required only for cgen task)
-
-
-* Per CAY-2166, Cayenne supports auto-loading of DI modules. There are a few changes worth mentioning:
-  - Service override policies. In the previous 4.0 milestones custom modules would override "builder" modules
-  (i.e. implicit modules that wrap around various customizations made in response to the builder method calls). It
-  seemed logical to reverse this order, and let builder modules override custom modules. As the builder is
-  invoked explicitly when the stack assembly is performed, while modules can be written without any knowledge of the
-  final stack.
-  - Module Renaming and Explicit Loading of Modules. If you see compile errors (class not found for CayenneJodaModule,
-   CayenneJava8Module), just remove explicit loading of those modules. They will be auto-loaded if they are on classpath.
-   If you explicitly turn off auto-loading, use the new names for these modules: JodaModule and Java8Module.
-
-* Per CAY-2164, creating a ServerRuntimeBuilder is done via a static method on ServerRuntime ("ServerRuntime.builder()").
-  The previous style (ServerRuntimeBuilder.builder()) is deprecated and will soon be removed, so you should replace it
-  with the new API.
-
-UPGRADING TO 4.0.M4
-
-* Per CAY-2133, LegacyObjectNameGenerator is no longer provided, as it wasn't possible to maintain it in a fully backwards-
-  compatible manner. Embrace the new naming scheme, or provide your own ObjectNameGenerator if you absolutely need the
-  old names.
-
-* Per CAY-2125 we no longer inject SchemaUpdateStrategy directly. Instead SchemaUpgradeStrategyFactory is injected.
-  If you have your own modules with SchemaUpdateStrategy injection, it will be ignored. So please review your
-  DI code and update it to use SchemaUpgradeStrategyFactory (or likely its subclass).
-
-* Per CAY-2060 4.0.M4 changes the way queries are stored in the mapping files, so all existing *.map.xml files should be upgraded.
-  To do that open each of your existing projects in the new CayenneModeler. Agree to perform an upgrade when asked. 
-
-  Also EntityResolver.getQuery(String) method is removed. If you relied on it, consider switching to MappedSelect or MappedExec query, or if you absolutely need to get a hold of specific query, use EntityResolver.getQueryDescriptor(String).buildQuery().
-
-* Per CAY-2065 ROPHessianServlet has been discarded in favor of new implementation called ROPServlet,
-  so if you were using org.apache.cayenne.configuration.rop.server.ROPHessianServlet in your web.xml configuration,
-  you must change it to org.apache.cayenne.rop.ROPServlet
-
-* Per CAY-2118 we stopped a bunch of deprecated keys in cdbimport configuration, and also removed the ability to set
-  properties of "reverseEngineering" config object at the top level of configuration. So you will always need
-  <reverseEngineering></reverseEngineering> tag in Maven (but not Ant) to setup any DB filtering. Removed top-level
-  configuration keys:
-
-  1. catalog
-  2. schema (also schemaName)
-  3. excludeTables
-  4. includeTables
-  5. procedurePattern
-  6. tablePattern
-  7. importProcedures
-  8. meaningfulPk
-  9. overwrite
-
-UPGRADING TO 4.0.M3
-
-* Per CAY-2026 minimal Java version is now 1.7. If you are still need Java 1.6, you can use Cayenne 3.1 or 4.0.M2 until your
-  application is able to upgrade. 
-
-* We no longer add @Deprecated annotation to generated String property names in entity superclasses.
-  Instead String property names inclusion
-  became optional, controlled with "createPropertyNames" flag in cgen ("false" by default). Also a similar option
-  was added to Advanced Type of CayenneModeler class generation dialog.
-  Note if you have references to @Deprecated String properties and you run cgen without "createPropertyNames" flag,
-  there will be errors. Reference Jira: CAY-1991
-
-* Per CAY-2008, CAY-2009 we got rid of org.apache.cayenne.conn.PoolManager and associated classes that made up a 
-  pooling DataSource. A replacement is non-blocking DataSource under org.apache.cayenne.datasource (PoolingDataSource, ManagedPoolingDataSource),
-  best assembled using org.apache.cayenne.datasource.DataSourceBuilder.
-
-* Per CAY-2012 API for ObjectSelect and SelectById queries were changed to remove "reset" functionality. Methods like 'where', 'prefetch',
-  'orderBy' that would previously reset the corresponding option state now work as "append". Methods that would previously append to the
-  option state were removed as redundant. Please revisit your code if you previously relied on the reset behavior.
-
-* If you are using DBCPDataSourceFactory, you will need to take a few steps to upgrade:
-
-  - Per CAY-2025 and CAY-2026, DBCPDataSourceFactory is now based on DBCP2 (which is required under Java 1.7 and newer).
-  - Check your DBCP properties file to ensure it uses property names supported by DBCP. 
-    (In the past Cayenne would require prefixing those properties with 'cayenne.dbcp.'. If you still have that prefix, remove it).
-  - To use DBCPDataSourceFactory, you will now have to explicitly include an extra Cayenne module, as it is no longer in cayenne-server. 
-    E.g. if you are using Maven:
-
-    <parent>
-      <groupId>org.apache.cayenne</groupId>
-      <artifactId>cayenne-dbcp2</artifactId>
-      <version>4.0.M3</version>
-    </parent>
- 
-
-UPGRADING TO 4.0.M2
-
-* Note that 3.2 line of development was renamed to 4.0. So 4.0.M2 is a straight descendant of
-  3.2M1.
-
-* org.apache.cayenne.map.naming.SmartNamingStrategy was replaced with org.apache.cayenne.map.naming.DefaultNameGenerator. If you
-  mentioned SmartNamingStrategy explicitly in your Maven or Ant configs, make sure you rename it. Since this was/is the default,
-  chances are that you didn't.
-
-* Minimal required JDK version is now 1.6 (both for modeler and runtime). This is a pretty conservative 
-  requirement, considering that Java 1.6 has been EOL'd by Oracle on Feb 2013.
-
-* Managing listeners in the Modeler is counterproductive and confusing,
-  so support for them was removed from the Modeler per CAY-1842. If you have
-  any listeners in the model, delete them from XML, and start using annotations,
-  and register them in runtime:
-
-  runtime.getDataDomain().addListener(myListener);
-
-* Cayenne.objectForSelect(Select) that was present in 3.2M1 was replaced with ObjectContext.selectOne(Select). 
-
-* In-memory expression eval (Expression.match/Expression.evaluate) will now return true when matching Persistent
-  with ObjectId or Number or String (if those correspond to a given object's ObjectId). Also 2 objects in 2 different
-  ObjectContexts will match even if they have differing local changes. Only their ObjectIds are compared. 
-  See CAY-1860 for details.
-
-* ResultIterator was moved to org.apache.cayenne to make it available on both server and client. When you upgrade
-  related iterator code, make sure to check ResultIterator improvements (e.g. it implements Iterable, it is no 
-  longer limited to DataRows and can fetch objects just as easy, it no longer requires catching checked exceptions). 
-  Also check ObjectContext.iterate(..) method.
-
-* Transaction management was refactored significantly:
-
-  * External transactions are no longer configured in the Modeler. Instead they are provided as a DI property
-    defined in Constants.SERVER_EXTERNAL_TX_PROPERTY.
-
-  * TransactionDelegate is no longer present. Similar functionality can be achieved by writing a decorator for 
-    Transaction interface and using a custom TransactionFactory to decorate standard transactions.
-
-  * If your code relied on static methods Transaction.externalTransaction() or Transaction.internalTransaction() for
-    manual tx management, use constructors of ExternalTransaction and CayenneTransaction classes instead.
-
-* When switching to ServerRuntimeBuilder, users of multi-config projects may erroneously assume it has the same 
-  behavior as 3.1 ServerRuntime in assigning domain name to the resulting merged project. Which is to use the 
-  name of the last project config. We are trying to move away from this behavior, so ServerRuntimeBuilder 
-  will only use config name if there's only one config and no override. Otherwise it will use the override, 
-   or if not set - "cayenne" as the default name. Reference Jira: CAY-1972
-
-
-
-UPGRADING TO 3.1B1
-
-* In an attempt to better organize DI configuration and ultimately make it easier to understand, 
-  all properties and DI collection keys were placed in a single Constants interface. The property and key String 
-  values were changed to follow a single convention. Please refer to https://issues.apache.org/jira/browse/CAY-1665
-  for mapping between the old and the new names.
-
-  If you are upgrading from the earlier 3.1 releases, please change your code and runtime parameters accordingly.
-  3.0 users may still review the new property names as some of them existed prior to DI.
-
-UPGRADING TO 3.1M3
-
-* DataMap listeners are no longer supported. Global listeners registered through
-  annotations API can be used instead. E.g.:
-
-	public class SomeListener {
-		@PrePersist
-		public void onPrePersist(Object object) {
-			// callback method
-		}
-	}
-
-  To register listener class use following API:
-
-	runtime.getChannel().getEntityResolver().getCallbackRegistry().addListener(listenerInstance);
-
-  Note that DataMap listeners entries from old *.map.xml files will be ignored.
-
-
-UPGRADING TO 3.1M1
-
-The most essential change in Cayenne 3.1 is a new Dependency-Injection (DI) based
-bootstrap and configuration mechanism, which is not backwards compatible with 3.0.
-Read on to learn about specific areas that require attention when upgrading your
-application.
-
-* Upgrading 3.0.x mapping files: Open each of your existing projects in the new 
-  CayenneModeler. Agree to perform an upgrade when asked. Note that Cayenne
-  3.1 only supports one DataDomain per project, so if multiple domains existed in 
-  the project, you'll end up with multiple project files  after the upgrade. Each 
-  will require instantiation of a separate ServerRuntime in the code. 
-
-* Upgrading 2.0.x and earlier mappings files: Note that CayenneModeler
-  3.1 won't be able to upgrade projects created with a Modeler older than 3.0. To 
-  upgrade older projects do it in two steps - download Cayenne 3.0, and perform an
-  upgrade with 3.0 CayenneModeler. After that perform a second upgrade from 3.0 to
-  3.1.
-
-* Cayenne runtime bootstrap: In 3.1 all classes under "org.apache.cayenne.conf"
-  package were removed, superseded by dependency injection (DI) based configuration,
-  with main classes located under "org.apache.cayenne.configuration" and its 
-  subpackages. E.g. to instantiate the Cayenne stack in 3.1 you would do 
-  something like that:
-
-  ServerRuntime cayenneRuntime = new ServerRuntime("cayenne-UntitledDomain.xml");
-  
-  To obtain a new ObjectContext, the following API is used:
-		
-  ObjectContext context = cayenneRuntime.getContext();
-
-* No static configuration singleton: Cayenne 3.1 completely gets rid of a (previously 
-  optional, but widely used) "Configuration.sharedConfiguration" singleton. This 
-  change was done to acknowledge the fact that single configuration per application 
-  is just a special case, and generally user can instantiate as many configurations 
-  (or ServerRuntime's in 3.1 terms) as appropriate. This however means that the 
-  users must now decide themselves where in their application it is appropriate to 
-  store ServerRuntime instance (or instances). E.g. it can be stored as an attribute 
-  of ServletContext (check out "org.apache.cayenne.configuration.web.CayenneFilter" and 
-  "org.apache.cayenne.configuration.web.WebUtil"), reside in a user's favorite dependency
-  injection container (e.g. Spring), or even be saved in a user's own static singleton 
-  variable.
-
-* No static DataContext creation methods: Methods like DataContext.createDataContext()
-  were relying on static configuration singleton, which was removed (see above). Use
-  ServerRuntime instance methods to create context instances.
-
-* Webapp configuration changes: "org.apache.cayenne.conf.WebApplicationContextFilter"
-  was replaced by "org.apache.cayenne.configuration.web.CayenneFilter". See CayenneFilter
-  javadocs for details on of the init parameters.
-
-* ROP Server configuration changes: "org.apache.cayenne.remote.hessian.service.HessianServlet"
-  was replaced by "org.apache.cayenne.configuration.rop.server.ROPHessianServlet". See
-  ROPHessianServlet javadocs for details on its init parameters. 
-
-* ROP Client configuration changes: There is now a special DI "runtime" object -
-  "org.apache.cayenne.configuration.rop.client.ClientRuntime", so client connection
-  and channel can be (optionally) managed via DI, with connection parameters 
-  specified as properties. E.g.:
-  
-	Map<String, String> properties = new HashMap<String, String>();
-	properties.put(ClientModule.ROP_SERVICE_URL, "http://localhost:8080/tutorial/cayenne-service");
-	properties.put(ClientModule.ROP_SERVICE_USER_NAME, "cayenne-user");
-	properties.put(ClientModule.ROP_SERVICE_PASSWORD, "secret");
-
-	ClientRuntime runtime = new ClientRuntime(properties);
-	ObjectContext context = runtime.getContext();
-	
-  The advantage of this approach in that all the client stack objects are managed
-  by the DI container and a user can customize/override various pieces.
-
-* Deprecated API removal: All API deprecated as of 3.0 is removed. This may require 
-  some code cleanup. Since 3.0 javadocs for suggested replacements. Also if custom 
-  class generation templates are used, doublecheck that they do not reference removed 
-  EntityUtil methods, which were replaced by variables placed directly into Velocity context.
-
-* Custom DbAdapter / DbAdapterFactory: The interface used by Cayenne to allow custom 
-  DbAdapters to be auto-detected with AutoAdapter has changed from 
-  org.apache.cayenne.dba.DbAdapterFactory to org.apache.cayenne.configuration.DbAdapterDetector. 
-  Note that now a custom implementation can rely on Cayenne DI to obtain Cayenne 
-  dependencies via @Inject annotation. To register a custom implementation with 
-  Cayenne DI container, one might do this in the custom DI module:
-
-  ... 
-  public void configure(Binder binder) {
-  ...
-     binder.bindList(DbAdapterFactory.class).add(new MyDbAdapterDetector());
-  }
-
-* Custom DataSourceFactory: The interface used by Cayenne to load custom DataSource 
-  factories has changed from "org.apache.cayenne.conf.DataSourceFactory" to 
-  "org.apache.cayenne.configuration.DataSourceFactory". This new interface must be 
-  implemented by the custom factories. Note that now a custom implementation can 
-  rely on Cayenne DI to obtain Cayenne dependencies via @Inject annotation.
-
-* Replaced JNDI preferences hack with runtime properties: "JNDI hack", as it was 
-  known prior to 3.1, allowed to define a named database connection using CayenneModeler, 
-  and then Cayenne would read this connection information from Modeler preferences 
-  and use it as a failover for JNDI DataNodes. The problem with this is that it 
-  required CayenneModeler and HSQLDB jars on the application classpath, and also that the 
-  preferences database was prone to data corruption. In 3.1, preferences hack is no
-  longer available. Instead JNDI (or really any other type of DataSourceFactory) 
-  can be overridden via runtime properties (or by redefining DataSourceFactoryLoader
-  via DI). See org.apache.cayenne.configuration.server.PropertyDataSourceFactory javadocs for
-  details. Here are some simple examples:
-
-  -Dcayenne.jdbc.url=jdbc://urloverride 
-  -Dcayenne.jdbc.driver=com.example.MyDriver 
-  -Dcayenne.jdbc.username=foo
-  -Dcayenne.jdbc.password=bar
-
-
-UPGRADING TO 3.0B1
-
-* Per CAY-1281 pre-persist callback was renamed to post-add (while pre-persist now has a different meaning).
-  To upgrade your project, open it in the Modeler and agree to perform an automated upgrade.
-
-UPGRADING TO 3.0M6
-
-* Per CAY-1154, org.apache.cayenne.access.reveng package was renamed to org.apache.cayenne.map.naming. So, if you
-  use your own naming strategies, you should update as well.
-
-* Per CAY-1161, custom columns feature in SelectQuery was deprecated. Consider switching to EJBQL as an alternative.
-  Custom columns support will likely go away completely after 3.0M6.
-
-* Per CAY-1175, 'columnNameCapitalization' property of SQLTemplate now takes an enum, not a String. 
-  Calling code should be fixed.
-
-UPGRADING TO 3.0M5
-
-* Per CAY-1127, query "name" property is no longer used as an internal cache key. This change should be transparent
-  to most users, as Cayenne generates a correct cache key internally when needed, however if a user code explicitly
-  depended on the value of the cache key, it should be updated to use something like this:
-    
-  String cacheKey = query.getQueryMetadata(entityResolver).getCacheKey();
-
-UPGRADING TO 3.0M4
-
-* Per CAY-1049 API of the internal classes that participate in SelectQuery translation has changed in a way that
-  is not backwards compatible. This should not affect regular users, however if you implemented a custom DbAdapter,
-  check for classes that directly or indirectly inherit from QueryAssembler and QueryAssemblerHelper and fix them
-  if needed.
-
-UPGRADING TO 3.0M3
-
-* Java 5 is now required as a minimum for Cayenne Modeler and the Cayenne libraries.
-
-* After the move to Java 5, generics have been implemented in many of the Cayenne APIs. If you don't use generics
-in your project this should not affect you, but if you do you will need to review any new compiler errors or warnings.
-The effect of generics is at compile time only, so their introduction will not change the runtime behaviour of
-your application once compiled.
-
-UPGRADING TO 3.0M2
-
-* Lifecycle Callbacks require no setup:
-  Per CAY-843, lifecycle callback functionality is now built into DataContext and DataDomain, 
-  so all the custom code to set them up is no longer needed. Also as a result of this change
-  'org.apache.cayenne.intercept' package is removed from Cayenne.
-  Further information can be found here: http://cayenne.apache.org/doc/lifecycle-callbacks.html
-
-UPGRADING TO 3.0M1
-
-* Jar files:
-  - all jar files now include version numbers in their names.
-  - "cayenne-nodeps.jar" is renamed to "cayenne-server-x.x.x.jar" 
-  - "fat" cayenne.jar file that included dependencies is no longer distributed. 
-    All dependencies that it contained are included as separate jars under 
-    "cayenne-x.x.x/lib/third-party/". The new "cayenne-server-x.x.x.jar" plus 
-    dependencies should be used in place of cayenne.jar.
-  - A new "cayenne-agent-x.x.x.jar" is included. It is used for class enhancement 
-    with POJO's and JPA. "Classic" Cayenne users can ignore this file.
-    
-* Ant class generator is using what was called "version 1.2" by default. This means that if you were
-  using custom Velocity templates in 1.1 mode, you should either change the templates or specify 'version="1.1"'
-  in the buildfile explicitly.
-
-* Cross-platform Modeler Startup is now done without a batch file or a shell script. 
-  A "fat" CayenneModeler.jar is included in the "cayenne-x.x.x/bin" directory
-  and can be run either by double-clicking the jar (on platforms that support that)
-  or by running "java -jar CayenneModeler.jar".
-  
-* Note that FireBird adapter is no longer distributed with Cayenne. The one we had was half-working
-  and we could not support it anymore.
-  
-* DataContextTransactionEventListener, DataObjectTransactionEventListener, DataContextEvent all were deprecated
-  favor of callbacks. NOTE THAT THIS API WILL BE REMOVED IN THE FOLLOWING 3.0 MILESTONES.
-  
-* Long PK: Cayenne now supports "long" primary key generation (previously it only supported "int"). You may
-  have to change the existing PK lookup tables on some databases to take advantage of that (this is optional,
-  and is needed if you expect your PK to exceed maximum value of an "int" allowed in your database). E.g. on 
-  MySQL you may run the following SQL:
-  
-  ALTER TABLE AUTO_PK_SUPPORT CHANGE COLUMN NEXT_ID NEXT_ID BIGINT NOT NULL;
-  
-
-UPGRADING TO 2.0.x
-
-Since 2.0, Cayenne is an Apache project, so all "org.objectstyle.*" java packages 
-where renamed to "org.apache.*" analogues. Since 1.2.x and 2.0.x release lines maintain
-full compatibility with each other, differing only in package names, upgrading to 2.0.x
-can be a first step in a safe upgrade to the latest version of Cayenne.
-
-* Upgrading mapping files:
-
-To upgrade the mapping files, open them in the new Modeler. You should see an upgrade 
-dialog. Once you confirm the upgrade 
-
-* Upgrading the code:
-
-Replace "org.objectstyle." with "org.apache." everywhere in imports and do a clean 
-recompile.
-
-* Upgrading logging configuration
-
-If you are using custom logging configuration file, make sure that all the 
-Cayenne loggers are changed from "org.objectstyle" to "org.apache".

http://git-wip-us.apache.org/repos/asf/cayenne/blob/334d9cc4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 90ea4d6..91639b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -766,6 +766,10 @@
 					<version>3.1.0</version>
 				</plugin>
 				<plugin>
+					<artifactId>maven-antrun-plugin</artifactId>
+					<version>1.7</version>
+				</plugin>
+				<plugin>
 					<artifactId>maven-surefire-plugin</artifactId>
 					<version>2.20.1</version>
 				</plugin>


[11/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap23.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap23.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap23.html
deleted file mode 100644
index 92fbb5a..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap23.html
+++ /dev/null
@@ -1,1353 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:obj-relationship</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id88', 
-				'properties_id89', 
-				'properties_id90', 
-				'properties_id91', 
-				'properties_id92', 
-				'properties_id93', 
-				'properties_id94', 
-				'properties_id95', 
-				'properties_id96');
-
-        
-        var usedByBoxes= new Array('usedBy_id88', 
-				'usedBy_id89', 
-				'usedBy_id90', 
-				'usedBy_id91', 
-				'usedBy_id92', 
-				'usedBy_id93', 
-				'usedBy_id94', 
-				'usedBy_id95', 
-				'usedBy_id96');
-
-        var sourceBoxes= new Array('source_id88', 
-				'source_id89', 
-				'source_id90', 
-				'source_id91', 
-				'source_id92', 
-				'source_id93', 
-				'source_id94', 
-				'source_id95', 
-				'source_id96');
-
-        
-        var diagramBoxes= new Array('diagram_id88');
-
-        
-        var attributesBoxes= new Array('attributes_id88');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id88"></a><div class="componentTitle">Element <span class="qname">cay:obj-relationship</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id88" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id88');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id88" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html24.jpeg"
-                                   usemap="#modelMap_46_html24" /><map name="modelMap_46_html24" id="modelMap_46_html24">
-                                 <area alt="modelMap23.tmp#id89" href="modelMap23.html#id89" coords="160,43,322,85" />
-                                 <area alt="modelMap23.tmp#id90" href="modelMap23.html#id90" coords="160,95,273,137" />
-                                 <area alt="modelMap23.tmp#id91" href="modelMap23.html#id91" coords="160,147,284,189" />
-                                 <area alt="modelMap23.tmp#id92" href="modelMap23.html#id92" coords="160,199,273,241" />
-                                 <area alt="modelMap23.tmp#id93" href="modelMap23.html#id93" coords="160,251,273,293" />
-                                 <area alt="modelMap23.tmp#id94" href="modelMap23.html#id94" coords="160,303,273,345" />
-                                 <area alt="modelMap23.tmp#id95" href="modelMap23.html#id95" coords="160,355,289,397" />
-                                 <area alt="modelMap23.tmp#id96" href="modelMap23.html#id96" coords="160,407,273,449" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id88" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id88');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id88" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id88" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id88');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id88" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap27.html#id1" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:data-map')">cay:data-map</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id88" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id88');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id88" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap23.html#id95" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component collection-type')">collection-type</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap23.html#id89" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component db-relationship-path')">db-relationship-path</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap23.html#id90" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component deleteRule')">deleteRule</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap23.html#id91" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component lock')">lock</a></b></td>
-                                    <td><b>xs:boolean</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap23.html#id96" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component map-key')">map-key</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap23.html#id92" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component name')">name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap23.html#id93" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component source')">source</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap23.html#id94" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component target')">target</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id88" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id88');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id88" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"obj-relationship"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-relationship-path"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"deleteRule"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"lock"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"source"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"target"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"collection-type"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"map-key"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id89"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap23.html#id88" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:obj-relationship')">cay:obj-relationship</a></b>/@db-relationship-path</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id89" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id89');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id89" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id89" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id89');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id89" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap23.html#id88" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-relationship')">cay:obj-relationship</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id89" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id89');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id89" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-relationship-path"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id90"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap23.html#id88" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:obj-relationship')">cay:obj-relationship</a></b>/@deleteRule</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id90" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id90');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id90" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>simple</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id90" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id90');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id90" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap23.html#id88" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-relationship')">cay:obj-relationship</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id90" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id90');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id90" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"deleteRule"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id91"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap23.html#id88" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:obj-relationship')">cay:obj-relationship</a></b>/@lock</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:boolean</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id91" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id91');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id91" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>simple</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id91" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id91');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id91" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap23.html#id88" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-relationship')">cay:obj-relationship</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id91" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id91');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id91" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"lock"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id92"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap23.html#id88" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:obj-relationship')">cay:obj-relationship</a></b>/@name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id92" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id92');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id92" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id92" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id92');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id92" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap23.html#id88" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-relationship')">cay:obj-relationship</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id92" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id92');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id92" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id93"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap23.html#id88" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:obj-relationship')">cay:obj-relationship</a></b>/@source</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id93" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id93');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id93" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id93" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id93');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id93" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap23.html#id88" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-relationship')">cay:obj-relationship</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id93" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id93');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id93" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"source"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id94"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap23.html#id88" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:obj-relationship')">cay:obj-relationship</a></b>/@target</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id94" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id94');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id94" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id94" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id94');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id94" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap23.html#id88" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-relationship')">cay:obj-relationship</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id94" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id94');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id94" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"target"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id95"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap23.html#id88" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:obj-relationship')">cay:obj-relationship</a></b>/@collection-type</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id95" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id95');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id95" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>optional</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id95" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id95');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id95" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap23.html#id88" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-relationship')">cay:obj-relationship</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id95" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id95');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id95" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"collection-type"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id96"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap23.html#id88" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:obj-relationship')">cay:obj-relationship</a></b>/@map-key</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id96" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id96');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id96" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>optional</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id96" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id96');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id96" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap23.html#id88" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-relationship')">cay:obj-relationship</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id96" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id96');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id96" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"map-key"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file


[15/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap19.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap19.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap19.html
deleted file mode 100644
index c4d6a5a..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap19.html
+++ /dev/null
@@ -1,736 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:db-entity</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id18', 
-				'properties_id31', 
-				'properties_id32');
-
-        
-        var usedByBoxes= new Array('usedBy_id18', 
-				'usedBy_id31', 
-				'usedBy_id32');
-
-        var sourceBoxes= new Array('source_id18', 
-				'source_id31', 
-				'source_id32');
-
-        var instanceBoxes= new Array('instance_id18');
-
-        var diagramBoxes= new Array('diagram_id18');
-
-        
-        var attributesBoxes= new Array('attributes_id18');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, instanceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Instances</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id18"></a><div class="componentTitle">Element <span class="qname">cay:db-entity</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id18" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id18');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id18" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html10.jpeg"
-                                   usemap="#modelMap_46_html10" /><map name="modelMap_46_html10" id="modelMap_46_html10">
-                                 <area alt="modelMap19.tmp#id31" href="modelMap19.html#id31" coords="123,43,236,85" />
-                                 <area alt="modelMap19.tmp#id32" href="modelMap19.html#id32" coords="123,95,236,137" />
-                                 <area alt="modelMap20.tmp#id19" href="modelMap20.html#id19" coords="201,157,319,181" />
-                                 <area alt="modelMap18.tmp#id27" href="modelMap18.html#id27" coords="201,191,350,215" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id18" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id18');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id18" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id18" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id18');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id18" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap27.html#id1" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:data-map')">cay:data-map</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="modelMap20.html#id19" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:db-attribute+')">cay:db-attribute+</a></b> , <b><a href="modelMap18.html#id27" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:db-key-generator{0,1}')">cay:db-key-generator{0,1}</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="modelMap20.html#id19" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:db-attribute')">cay:db-attribute</a></b>, <b><a href="modelMap18.html#id27" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:db-key-generator')">cay:db-key-generator</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id18" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id18');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="instance_id18" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;cay:db-entity</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">schema=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:db-attribute</span><span class="tokenText"> </span><span class="tokenAttrName">isGenerated=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">isMandatory=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">isPrimaryKey=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">length=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">scale=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">type=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{1,unbounded}</span><span class="tokenElement">&lt
 ;/cay:db-attribute&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:db-key-generator</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,1}</span><span class="tokenElement">&lt;/cay:db-key-generator&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/cay:db-entity&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id18" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id18');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id18" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap19.html#id31" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component name')">name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap19.html#id32" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component schema')">schema</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id18" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id18');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id18" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-entity"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:sequence</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:db-attribute"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:db-key-generator"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;/xs:sequence&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"schema"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id31"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap19.html#id18" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:db-entity')">cay:db-entity</a></b>/@name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id31" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id31');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id31" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id31" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id31');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id31" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap19.html#id18" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-entity')">cay:db-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id31" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id31');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id31" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id32"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap19.html#id18" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:db-entity')">cay:db-entity</a></b>/@schema</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id32" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id32');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id32" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>simple</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id32" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id32');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id32" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap19.html#id18" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-entity')">cay:db-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id32" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id32');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id32" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"schema"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap2.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap2.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap2.html
deleted file mode 100644
index ddff3e8..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap2.html
+++ /dev/null
@@ -1,434 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:qualifier</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id34');
-
-        
-        var usedByBoxes= new Array('usedBy_id34');
-
-        var sourceBoxes= new Array('source_id34');
-
-        
-        var diagramBoxes= new Array('diagram_id34');
-
-        
-        
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id34"></a><div class="componentTitle">Element <span class="qname">cay:qualifier</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id34" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id34');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id34" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html20.jpeg" /></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id34" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id34');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id34" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>simple</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id34" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id34');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id34" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap1.html#id33" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id34" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id34');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id34" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"qualifier"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file


[21/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap10.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap10.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap10.html
deleted file mode 100644
index 811d289..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap10.html
+++ /dev/null
@@ -1,578 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:post-update</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id58', 
-				'properties_id59');
-
-        
-        var usedByBoxes= new Array('usedBy_id58', 
-				'usedBy_id59');
-
-        var sourceBoxes= new Array('source_id58', 
-				'source_id59');
-
-        
-        var diagramBoxes= new Array('diagram_id58');
-
-        
-        var attributesBoxes= new Array('attributes_id58');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id58"></a><div class="componentTitle">Element <span class="qname">cay:post-update</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id58" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id58');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id58" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html19.jpeg"
-                                   usemap="#modelMap_46_html19" /><map name="modelMap_46_html19" id="modelMap_46_html19">
-                                 <area alt="modelMap10.tmp#id59" href="modelMap10.html#id59" coords="140,43,264,85" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id58" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id58');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id58" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id58" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id58');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id58" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Elements </td>
-                                    <td><b><a href="modelMap6.html#id51" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:entity-listener')">cay:entity-listener</a></b>, <b><a href="modelMap1.html#id33" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id58" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id58');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id58" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap10.html#id59" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component method-name')">method-name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id58" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id58');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id58" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"post-update"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"method-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id59"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap10.html#id58" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:post-update')">cay:post-update</a></b>/@method-name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id59" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id59');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id59" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id59" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id59');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id59" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap10.html#id58" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:post-update')">cay:post-update</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id59" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id59');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id59" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"method-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap11.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap11.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap11.html
deleted file mode 100644
index 23aae5c..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap11.html
+++ /dev/null
@@ -1,578 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:pre-remove</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id60', 
-				'properties_id61');
-
-        
-        var usedByBoxes= new Array('usedBy_id60', 
-				'usedBy_id61');
-
-        var sourceBoxes= new Array('source_id60', 
-				'source_id61');
-
-        
-        var diagramBoxes= new Array('diagram_id60');
-
-        
-        var attributesBoxes= new Array('attributes_id60');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id60"></a><div class="componentTitle">Element <span class="qname">cay:pre-remove</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id60" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id60');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id60" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html21.jpeg"
-                                   usemap="#modelMap_46_html21" /><map name="modelMap_46_html21" id="modelMap_46_html21">
-                                 <area alt="modelMap11.tmp#id61" href="modelMap11.html#id61" coords="137,43,261,85" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id60" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id60');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id60" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id60" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id60');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id60" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Elements </td>
-                                    <td><b><a href="modelMap6.html#id51" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:entity-listener')">cay:entity-listener</a></b>, <b><a href="modelMap1.html#id33" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id60" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id60');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id60" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap11.html#id61" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component method-name')">method-name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id60" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id60');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id60" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"pre-remove"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"method-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id61"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap11.html#id60" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:pre-remove')">cay:pre-remove</a></b>/@method-name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id61" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id61');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id61" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id61" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id61');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id61" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap11.html#id60" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:pre-remove')">cay:pre-remove</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id61" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id61');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id61" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"method-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap12.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap12.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap12.html
deleted file mode 100644
index 77a2754..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap12.html
+++ /dev/null
@@ -1,578 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:post-remove</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id62', 
-				'properties_id63');
-
-        
-        var usedByBoxes= new Array('usedBy_id62', 
-				'usedBy_id63');
-
-        var sourceBoxes= new Array('source_id62', 
-				'source_id63');
-
-        
-        var diagramBoxes= new Array('diagram_id62');
-
-        
-        var attributesBoxes= new Array('attributes_id62');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id62"></a><div class="componentTitle">Element <span class="qname">cay:post-remove</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id62" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id62');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id62" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html32.jpeg"
-                                   usemap="#modelMap_46_html32" /><map name="modelMap_46_html32" id="modelMap_46_html32">
-                                 <area alt="modelMap12.tmp#id63" href="modelMap12.html#id63" coords="143,43,267,85" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id62" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id62');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id62" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id62" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id62');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id62" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Elements </td>
-                                    <td><b><a href="modelMap6.html#id51" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:entity-listener')">cay:entity-listener</a></b>, <b><a href="modelMap1.html#id33" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id62" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id62');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id62" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap12.html#id63" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component method-name')">method-name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id62" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id62');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id62" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"post-remove"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"method-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id63"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap12.html#id62" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:post-remove')">cay:post-remove</a></b>/@method-name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id63" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id63');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id63" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id63" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id63');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id63" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap12.html#id62" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:post-remove')">cay:post-remove</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id63" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id63');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id63" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"method-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file


[23/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/indexList.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/indexList.html b/docs/doc/src/main/resources/doc/schema/3.0/indexList.html
deleted file mode 100644
index 8fbc2a4..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/indexList.html
+++ /dev/null
@@ -1,648 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component </title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <h2><a id="INDEX">Table of Contents</a></h2>
-      <div class="toc">
-         <form action="none">
-            <div><span> Group by: 
-                  <select id="selectTOC"
-                          onchange="selectTOCGroupBy(this.options[this.selectedIndex].value);">
-                     <option value="toc_group_by_namespace" selected="selected">Namespace</option>
-                     <option value="toc_group_by_location">Location</option>
-                     <option value="toc_group_by_component_type">Component Type</option></select></span></div>
-         </form>
-         <div class="level1" id="toc_group_by_namespace" style="display:none">
-            <div>
-               <div class="level2">
-                  <p><input id="button_boxIdNamespace1" type="image" value="-"
-                            src="images/button_minus.gif"
-                            onclick="switchState('boxIdNamespace1');"
-                            class="control" /><span class="indexGroupTitle">http://cayenne.apache.org/schema/3.0/modelMap</span></p>
-                  <div id="boxIdNamespace1" style="display:block">
-                     <div class="horizontalLayout">
-                        <table class="rt">
-                           <tr>
-                              <td class="rt_cornerTopLeft"></td>
-                              <td class="rt_lineTop"></td>
-                              <td class="rt_cornerTopRight"></td>
-                           </tr>
-                           <tr>
-                              <td class="rt_lineLeft"></td>
-                              <td class="rt_content">
-                                 <div class="componentGroupTitle">Elements
-                                    
-                                 </div>
-                                 <div id="boxIdNamespace1Element" style="display:block">
-                                    <div><b><a href="modelMap5.html#id46" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:attribute-override')">cay:attribute-override</a></b></div>
-                                    <div><b><a href="modelMap27.html#id1" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:data-map')">cay:data-map</a></b></div>
-                                    <div><b><a href="modelMap20.html#id19" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-attribute')">cay:db-attribute</a></b></div>
-                                    <div><b><a href="modelMap15.html#id80" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-attribute-pair')">cay:db-attribute-pair</a></b></div>
-                                    <div><b><a href="modelMap19.html#id18" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-entity')">cay:db-entity</a></b></div>
-                                    <div><b><a href="modelMap18.html#id27" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-key-generator')">cay:db-key-generator</a></b></div>
-                                    <div><b><a href="modelMap14.html#id79" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-relationship')">cay:db-relationship</a></b></div>
-                                    <div><b><a href="modelMap25.html#id100" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:ejbql')">cay:ejbql</a></b></div>
-                                    <div><b><a href="modelMap21.html#id5" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:embeddable')">cay:embeddable</a></b></div>
-                                    <div><b><a href="modelMap16.html#id36" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:embeddable-attribute-override')">cay:embeddable-attribute-override</a></b></div>
-                                    <div><b><a href="modelMap3.html#id35" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:embedded-attribute')">cay:embedded-attribute</a></b></div>
-                                    <div><b><a href="modelMap6.html#id51" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:entity-listener')">cay:entity-listener</a></b></div>
-                                    <div><b><a href="modelMap4.html#id41" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-attribute')">cay:obj-attribute</a></b></div>
-                                    <div><b><a href="modelMap1.html#id33" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></div>
-                                    <div><b><a href="modelMap23.html#id88" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-relationship')">cay:obj-relationship</a></b></div>
-                                    <div><b><a href="modelMap26.html#id102" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:ordering')">cay:ordering</a></b></div>
-                                    <div><b><a href="modelMap13.html#id64" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:post-load')">cay:post-load</a></b></div>
-                                    <div><b><a href="modelMap8.html#id54" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:post-persist')">cay:post-persist</a></b></div>
-                                    <div><b><a href="modelMap12.html#id62" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:post-remove')">cay:post-remove</a></b></div>
-                                    <div><b><a href="modelMap10.html#id58" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:post-update')">cay:post-update</a></b></div>
-                                    <div><b><a href="modelMap7.html#id52" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:pre-persist')">cay:pre-persist</a></b></div>
-                                    <div><b><a href="modelMap11.html#id60" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:pre-remove')">cay:pre-remove</a></b></div>
-                                    <div><b><a href="modelMap9.html#id56" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:pre-update')">cay:pre-update</a></b></div>
-                                    <div><b><a href="modelMap17.html#id11" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:procedure')">cay:procedure</a></b></div>
-                                    <div><b><a href="modelMap22.html#id2" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:property')">cay:property</a></b></div>
-                                    <div><b><a href="modelMap2.html#id34" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:qualifier')">cay:qualifier</a></b></div>
-                                    <div><b><a href="modelMap24.html#id97" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b></div>
-                                    <div><b><a href="modelMap0.html#id98" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:sql')">cay:sql</a></b></div>
-                                 </div>
-                              </td>
-                              <td class="rt_lineRight"></td>
-                           </tr>
-                           <tr>
-                              <td class="rt_cornerBottomLeft"></td>
-                              <td class="rt_lineBottom"></td>
-                              <td class="rt_cornerBottomRight"></td>
-                           </tr>
-                        </table>
-                     </div>
-                     <div style="clear:left"></div>
-                  </div>
-               </div>
-            </div>
-         </div>
-         <div class="level1" id="toc_group_by_component_type" style="display:block">
-            <div>
-               <div class="horizontalLayout">
-                  <table class="rt">
-                     <tr>
-                        <td class="rt_cornerTopLeft"></td>
-                        <td class="rt_lineTop"></td>
-                        <td class="rt_cornerTopRight"></td>
-                     </tr>
-                     <tr>
-                        <td class="rt_lineLeft"></td>
-                        <td class="rt_content">
-                           <div class="componentGroupTitle">Elements
-                              
-                           </div>
-                           <div id="Element" style="display:block">
-                              <div><b><a href="modelMap5.html#id46" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:attribute-override')">cay:attribute-override</a></b></div>
-                              <div><b><a href="modelMap27.html#id1" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:data-map')">cay:data-map</a></b></div>
-                              <div><b><a href="modelMap20.html#id19" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:db-attribute')">cay:db-attribute</a></b></div>
-                              <div><b><a href="modelMap15.html#id80" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:db-attribute-pair')">cay:db-attribute-pair</a></b></div>
-                              <div><b><a href="modelMap19.html#id18" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:db-entity')">cay:db-entity</a></b></div>
-                              <div><b><a href="modelMap18.html#id27" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:db-key-generator')">cay:db-key-generator</a></b></div>
-                              <div><b><a href="modelMap14.html#id79" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:db-relationship')">cay:db-relationship</a></b></div>
-                              <div><b><a href="modelMap25.html#id100" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:ejbql')">cay:ejbql</a></b></div>
-                              <div><b><a href="modelMap21.html#id5" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:embeddable')">cay:embeddable</a></b></div>
-                              <div><b><a href="modelMap16.html#id36" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:embeddable-attribute-override')">cay:embeddable-attribute-override</a></b></div>
-                              <div><b><a href="modelMap3.html#id35" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:embedded-attribute')">cay:embedded-attribute</a></b></div>
-                              <div><b><a href="modelMap6.html#id51" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:entity-listener')">cay:entity-listener</a></b></div>
-                              <div><b><a href="modelMap4.html#id41" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:obj-attribute')">cay:obj-attribute</a></b></div>
-                              <div><b><a href="modelMap1.html#id33" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></div>
-                              <div><b><a href="modelMap23.html#id88" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:obj-relationship')">cay:obj-relationship</a></b></div>
-                              <div><b><a href="modelMap26.html#id102" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:ordering')">cay:ordering</a></b></div>
-                              <div><b><a href="modelMap13.html#id64" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:post-load')">cay:post-load</a></b></div>
-                              <div><b><a href="modelMap8.html#id54" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:post-persist')">cay:post-persist</a></b></div>
-                              <div><b><a href="modelMap12.html#id62" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:post-remove')">cay:post-remove</a></b></div>
-                              <div><b><a href="modelMap10.html#id58" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:post-update')">cay:post-update</a></b></div>
-                              <div><b><a href="modelMap7.html#id52" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:pre-persist')">cay:pre-persist</a></b></div>
-                              <div><b><a href="modelMap11.html#id60" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:pre-remove')">cay:pre-remove</a></b></div>
-                              <div><b><a href="modelMap9.html#id56" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:pre-update')">cay:pre-update</a></b></div>
-                              <div><b><a href="modelMap17.html#id11" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:procedure')">cay:procedure</a></b></div>
-                              <div><b><a href="modelMap22.html#id2" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:property')">cay:property</a></b></div>
-                              <div><b><a href="modelMap2.html#id34" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:qualifier')">cay:qualifier</a></b></div>
-                              <div><b><a href="modelMap24.html#id97" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b></div>
-                              <div><b><a href="modelMap0.html#id98" target="mainFrame"
-                                       title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                       onclick="updatePageTitle('Schema documentation for component cay:sql')">cay:sql</a></b></div>
-                           </div>
-                        </td>
-                        <td class="rt_lineRight"></td>
-                     </tr>
-                     <tr>
-                        <td class="rt_cornerBottomLeft"></td>
-                        <td class="rt_lineBottom"></td>
-                        <td class="rt_cornerBottomRight"></td>
-                     </tr>
-                  </table>
-               </div>
-               <div style="clear:left"></div>
-            </div>
-         </div>
-         <div class="level1" id="toc_group_by_location" style="display:none">
-            <div>
-               <div class="level2">
-                  <p><input id="button_modelMap.xsd" type="image" value="-" src="images/button_minus.gif"
-                            onclick="switchState('modelMap.xsd');"
-                            class="control" /><span class="indexGroupTitle">modelMap.xsd</span></p>
-                  <div id="modelMap.xsd" style="display:block">
-                     <div class="horizontalLayout">
-                        <table class="rt">
-                           <tr>
-                              <td class="rt_cornerTopLeft"></td>
-                              <td class="rt_lineTop"></td>
-                              <td class="rt_cornerTopRight"></td>
-                           </tr>
-                           <tr>
-                              <td class="rt_lineLeft"></td>
-                              <td class="rt_content">
-                                 <div class="componentGroupTitle">Elements
-                                    
-                                 </div>
-                                 <div id="modelMap.xsdElement" style="display:block">
-                                    <div><b><a href="modelMap5.html#id46" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:attribute-override')">cay:attribute-override</a></b></div>
-                                    <div><b><a href="modelMap27.html#id1" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:data-map')">cay:data-map</a></b></div>
-                                    <div><b><a href="modelMap20.html#id19" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-attribute')">cay:db-attribute</a></b></div>
-                                    <div><b><a href="modelMap15.html#id80" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-attribute-pair')">cay:db-attribute-pair</a></b></div>
-                                    <div><b><a href="modelMap19.html#id18" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-entity')">cay:db-entity</a></b></div>
-                                    <div><b><a href="modelMap18.html#id27" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-key-generator')">cay:db-key-generator</a></b></div>
-                                    <div><b><a href="modelMap14.html#id79" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-relationship')">cay:db-relationship</a></b></div>
-                                    <div><b><a href="modelMap25.html#id100" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:ejbql')">cay:ejbql</a></b></div>
-                                    <div><b><a href="modelMap21.html#id5" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:embeddable')">cay:embeddable</a></b></div>
-                                    <div><b><a href="modelMap16.html#id36" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:embeddable-attribute-override')">cay:embeddable-attribute-override</a></b></div>
-                                    <div><b><a href="modelMap3.html#id35" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:embedded-attribute')">cay:embedded-attribute</a></b></div>
-                                    <div><b><a href="modelMap6.html#id51" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:entity-listener')">cay:entity-listener</a></b></div>
-                                    <div><b><a href="modelMap4.html#id41" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-attribute')">cay:obj-attribute</a></b></div>
-                                    <div><b><a href="modelMap1.html#id33" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></div>
-                                    <div><b><a href="modelMap23.html#id88" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-relationship')">cay:obj-relationship</a></b></div>
-                                    <div><b><a href="modelMap26.html#id102" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:ordering')">cay:ordering</a></b></div>
-                                    <div><b><a href="modelMap13.html#id64" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:post-load')">cay:post-load</a></b></div>
-                                    <div><b><a href="modelMap8.html#id54" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:post-persist')">cay:post-persist</a></b></div>
-                                    <div><b><a href="modelMap12.html#id62" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:post-remove')">cay:post-remove</a></b></div>
-                                    <div><b><a href="modelMap10.html#id58" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:post-update')">cay:post-update</a></b></div>
-                                    <div><b><a href="modelMap7.html#id52" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:pre-persist')">cay:pre-persist</a></b></div>
-                                    <div><b><a href="modelMap11.html#id60" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:pre-remove')">cay:pre-remove</a></b></div>
-                                    <div><b><a href="modelMap9.html#id56" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:pre-update')">cay:pre-update</a></b></div>
-                                    <div><b><a href="modelMap17.html#id11" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:procedure')">cay:procedure</a></b></div>
-                                    <div><b><a href="modelMap22.html#id2" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:property')">cay:property</a></b></div>
-                                    <div><b><a href="modelMap2.html#id34" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:qualifier')">cay:qualifier</a></b></div>
-                                    <div><b><a href="modelMap24.html#id97" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b></div>
-                                    <div><b><a href="modelMap0.html#id98" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:sql')">cay:sql</a></b></div>
-                                 </div>
-                              </td>
-                              <td class="rt_lineRight"></td>
-                           </tr>
-                           <tr>
-                              <td class="rt_cornerBottomLeft"></td>
-                              <td class="rt_lineBottom"></td>
-                              <td class="rt_cornerBottomRight"></td>
-                           </tr>
-                        </table>
-                     </div>
-                     <div style="clear:left"></div>
-                  </div>
-               </div>
-            </div>
-         </div>
-      </div>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap.html
deleted file mode 100644
index 317c8eb..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Schema documentation for component modelMap.xsd</title><link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /></head><frameset cols="20%, 80%"><frame name="indexFrame" src="indexList.html" /><frame name="mainFrame" src="modelMap28.html" /></frameset></html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap0.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap0.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap0.html
deleted file mode 100644
index 51fd666..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap0.html
+++ /dev/null
@@ -1,614 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:sql</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id98', 
-				'properties_id99');
-
-        
-        var usedByBoxes= new Array('usedBy_id98', 
-				'usedBy_id99');
-
-        var sourceBoxes= new Array('source_id98', 
-				'source_id99');
-
-        
-        var diagramBoxes= new Array('diagram_id98');
-
-        var annotationBoxes= new Array('annotations_id98');
-
-        var attributesBoxes= new Array('attributes_id98');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, annotationBoxes);"
-                                     class="control" /></span><span class="globalControlName">Annotations</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id98"></a><div class="componentTitle">Element <span class="qname">cay:sql</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id98" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('annotations_id98');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="annotations_id98" style="display:block">
-                              <div class="annotation">
-                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                        class="preWrapContainer">
-                                    <tr>
-                                       <td width="100%"><pre><span class="tokenText">Defines arbitrary SQL statement. Note that SQL statement can be customized for different SQL dialects per DbAdapter class. If no adapter-specific statement is found, the one with no adapter label is used by default.</span></pre></td>
-                                    </tr>
-                                 </table>
-                              </div>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id98" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id98');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id98" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html1.jpeg"
-                                   usemap="#modelMap_46_html1" /><map name="modelMap_46_html1" id="modelMap_46_html1">
-                                 <area alt="modelMap0.tmp#id99" href="modelMap0.html#id99" coords="231,88,353,130" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td>extension of <b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id98" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id98');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id98" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id98" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id98');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id98" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap24.html#id97" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id98" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id98');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id98" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap0.html#id99" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component adapter-class')">adapter-class</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id98" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id98');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id98" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"sql"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:annotation</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:documentation</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">Defines arbitrary SQL statement. Note that SQL statement can be customized for different SQL dialects per DbAdapter class. If no adapter-specific statement is found, the one with no adapter label is used by default.</span><span class="tokenElement">&lt;/xs:documentation&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:annotation&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:simpleContent</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:extension</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"adapter-class"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;/xs:extension&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;/xs:simpleContent&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id99"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap0.html#id98" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:sql')">cay:sql</a></b>/@adapter-class</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id99" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id99');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id99" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>simple</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id99" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id99');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id99" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap0.html#id98" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:sql')">cay:sql</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id99" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id99');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id99" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"adapter-class"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file


[04/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap8.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap8.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap8.html
deleted file mode 100644
index 9ccaf43..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap8.html
+++ /dev/null
@@ -1,578 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:post-persist</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id54', 
-				'properties_id55');
-
-        
-        var usedByBoxes= new Array('usedBy_id54', 
-				'usedBy_id55');
-
-        var sourceBoxes= new Array('source_id54', 
-				'source_id55');
-
-        
-        var diagramBoxes= new Array('diagram_id54');
-
-        
-        var attributesBoxes= new Array('attributes_id54');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id54"></a><div class="componentTitle">Element <span class="qname">cay:post-persist</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id54" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id54');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id54" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html13.jpeg"
-                                   usemap="#modelMap_46_html13" /><map name="modelMap_46_html13" id="modelMap_46_html13">
-                                 <area alt="modelMap8.tmp#id55" href="modelMap8.html#id55" coords="140,43,264,85" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id54" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id54');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id54" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id54" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id54');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id54" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Elements </td>
-                                    <td><b><a href="modelMap6.html#id51" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:entity-listener')">cay:entity-listener</a></b>, <b><a href="modelMap1.html#id33" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id54" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id54');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id54" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap8.html#id55" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component method-name')">method-name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id54" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id54');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id54" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"post-persist"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"method-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id55"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap8.html#id54" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:post-persist')">cay:post-persist</a></b>/@method-name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id55" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id55');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id55" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id55" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id55');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id55" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap8.html#id54" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:post-persist')">cay:post-persist</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id55" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id55');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id55" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"method-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap9.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap9.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap9.html
deleted file mode 100644
index c597586..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap9.html
+++ /dev/null
@@ -1,578 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:pre-update</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id56', 
-				'properties_id57');
-
-        
-        var usedByBoxes= new Array('usedBy_id56', 
-				'usedBy_id57');
-
-        var sourceBoxes= new Array('source_id56', 
-				'source_id57');
-
-        
-        var diagramBoxes= new Array('diagram_id56');
-
-        
-        var attributesBoxes= new Array('attributes_id56');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id56"></a><div class="componentTitle">Element <span class="qname">cay:pre-update</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id56" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id56');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id56" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html26.jpeg"
-                                   usemap="#modelMap_46_html26" /><map name="modelMap_46_html26" id="modelMap_46_html26">
-                                 <area alt="modelMap9.tmp#id57" href="modelMap9.html#id57" coords="134,43,258,85" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id56" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id56');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id56" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id56" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id56');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id56" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Elements </td>
-                                    <td><b><a href="modelMap6.html#id51" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:entity-listener')">cay:entity-listener</a></b>, <b><a href="modelMap1.html#id33" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id56" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id56');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id56" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap9.html#id57" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component method-name')">method-name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id56" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id56');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id56" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"pre-update"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"method-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id57"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap9.html#id56" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:pre-update')">cay:pre-update</a></b>/@method-name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id57" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id57');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id57" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id57" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id57');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id57" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap9.html#id56" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:pre-update')">cay:pre-update</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id57" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id57');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id57" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"method-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/xsdDocHtml.css
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/xsdDocHtml.css b/docs/doc/src/main/resources/doc/schema/3.0/xsdDocHtml.css
deleted file mode 100644
index 17a1575..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/xsdDocHtml.css
+++ /dev/null
@@ -1,554 +0,0 @@
-/*----------------------------------------
-    Global 
------------------------------------------*/
-
-body{
-}
-body, table {
-    font-family:arial, helvetica, sans-serif;
-    font-size:12px;
-}
-
-@media print{
-    body, table {
-        font-size:10px;
-    }
-}
-
-/*--------------------------------------------
-    Source code in the instance, source or 
-    annotations.
---------------------------------------------*/
-span.tokenElement {
-    color: #000096;
-    background-color:inherit;
-}
-span.tokenAttrName {
-    color: #F5844C;
-    background-color:inherit;
-}
-span.tokenAttrValue {
-    color: #993300;
-    background-color:inherit;
-}
-span.tokenIndent {
-    color: #000000;
-    background-color:inherit;
-}
-span.tokenText {
-    color: #000000;
-    background-color:inherit;
-}
-span.tokenComment {
-    color: #006400;
-    background-color:inherit;
-}
-span.tokenCDATA {
-    color: #008C00;
-    background-color:inherit;
-}
-span.tokenPI {
-    color: #8B26C9;
-    background-color:inherit;
-}
-span.tokenEntity {
-    color: #969600;
-    background-color:inherit;
-}
-span.qname{
-    color:#000096;
-    background-color:inherit;
-}
-
-/*-----------------------------------------
-    Documentation sections.
-------------------------------------------*/
-
-div.componentTitle {
-    font-size:1.4em;
-    font-weight:bold;
-    text-align:left;
-    margin-top:1.4em;
-    margin-bottom:0.7em;
-}
-div.componentTitle{
-/*    color:rgb(255, 160, 100);*/
-    color:#333333;
-    background-color:inherit;
-}
-
-
-/* Tables. */
-
-td, th {
-    padding:2px 2px 2px 5px;
-    text-align:left;
-    vertical-align:top;
-}
-
-tr > th {
-    background-color:#C4DAF4;
-    color:inherit;
-}
-
-/* Contrast for the titles*/
-table.component {
-    width:100%;
-    border-spacing:1px;
-}
-
-@media print{
-    table.component{
-        border:1px solid gray;
-        border-collapse:collapse;
-    }
-    
-    table.component td{
-        border:1px solid gray;
-    }
-}
-
-
-
-table.component td.firstColumn{
-/* pink */
-    /*background-color:#FFC0C0;*/
-/*green */
-    /* background-color:#C0F0A0;*/
-/*bleu*/
-    /*background-color:#89C6E2;*/
-/*orange*/
-    /*background-color:#FFD697;*/
-/*brown*/
-    /*background-color:#D5BC8E;*/
-/*lilla*/    
-    /*background-color:#DDDDFF;*/
-/*gray-bleu*/
-    /*background-color:#CAD0DD;*/
-/*brown-light*/
-    /*background-color:#DECFB8;*/
-/*gray-green*/
-    /*background-color:#C6D0CD;*/
-/*bleu-2*/
-    /*background-color:#B5D5FF;*/
-/*gray*/
-    /*background-color:#CCCCCC;*/
-
-
-/*bleu */
-background-color:#C4DAF4;
-    
-     
-
-    color:black;
-    width:12%;
-}
-
-table.component table td.firstColumn{
-    border:none;
-    background-color:#EAF1FB;
-    color: inherit;
-}
-
-td.firstColumn b{
-    font-weight:normal;
-}
-
-
-/* The Name and Expand/Collapse control are on the same line
- but at different ends.*/
-td.firstColumn div.floatLeft{
-    float:left;
-}
-td.firstColumn div.floatRight{
-    float:right;
-}
-
-/* Subtables */
-table.component table{
-    width:100%;
-}
-table.component table,
-table.component table td,
-table.component table th{
-    border:0;
-}
-
-
-/* Properties table */
-table.propertiesTable {
-    border-spacing:1px;
-}
-table.propertiesTable td.firstColumn{
-    width:140px;
-    text-transform:capitalize;        
-}
-/* Used by table */
-table.usedByTable {
-    border-spacing:1px;
-}
-table.usedByTable td.firstColumn{
-    width:140px;
-    text-transform:capitalize;        
-}
-
-/* Facets table*/
-table.facetsTable {
-    border-spacing:1px;
-}
-table.facetsTable td.firstColumn{
-    width:140px;
-    text-transform:capitalize;        
-}
-
-/* Attributes table */
-table.attributesTable {
-    border-spacing:1px;
-}
-table.attributesTable th{
-    font-weight:normal;
-}
-table.attributesTable tr:hover{
-    color:inherit;
-    background-color:#EAF1FB;
-}
-
-
-/* Identity constraints table */
-table.identityConstraintsTable {
-    border-spacing:1px;
-}
-table.identityConstraintsTable th{
-    font-weight:normal;
-}
-table.identityConstraintsTable tr:hover{
-    color:inherit;
-    background-color:#EAF1FB;
-}
-
-
-
-/*---------------------------------------
-    The diagram.    
-----------------------------------------*/
-
-table.component td.diagram {
-    background-color:white;
-    color:inherit;
-}
-
-
-/* This table is a workaround for an IE bug regarding pre-wrap */
-table.preWrapContainer,
-table.preWrapContainer td{
-    border:0;
-    margin:0;
-    padding:0;
-}
-
-
-/* Annotations. */
-div.annotation{    
-}
-div.annotation pre{
-    font-family:arial, helvetica, sans-serif;
-    margin:0;
-}
-div.annotation,
-div.annotation table,
-div.annotation table td{
-    margin:0;
-    padding:0;
-}
-
-/*  Hierarchy */
-ul > li{
-    list-style:none;
-}
-
-ul {
-    margin:2px;
-    padding:0;
-}
-
-ul ul li {
-    padding-left:10px;
-    
-    list-style-image:url('images/hierarchy_arrow.gif');
-    list-style-position:inside;
-}
-
-/*-------------------------------------
-    Rounded tables.
----------------------------------------*/
-
-table.rt,
-table.rt_with_bg{
-    border-collapse:collapse;
-    border-spacing:0;
-    width:100%;
-} 
-table.rt_with_bg{
-    /*background-color:#C0F0A0;*/
-    background-color:white;
-    color:inherit;
-}
-
-
-.rt_cornerTopLeft{
-    background-color:transparent;
-    background-repeat:no-repeat;
-    background-position:right;    
-    width:8px;
-    height:8px;
-    margin:0;
-    padding:0;
-}
-.rt_cornerTopLeft{
-    background-image:url('images/corner_top_left.gif');
-}
-
-
-.rt_cornerBottomLeft{
-    background-color:transparent;
-    background-repeat:no-repeat;
-    background-position:right;    
-    width:8px;
-    height:8px;
-    margin:0;
-    padding:0;
-}
-.rt_cornerBottomLeft{
-    background-image:url('images/corner_bottom_left.gif');
-}
-
-
-.rt_cornerTopRight{
-    background-color:transparent;
-    background-repeat:no-repeat;
-    width:8px;
-    height:8px;
-    margin:0;
-    padding:0;
-
-}
-.rt_cornerTopRight{
-    background-image:url('images/corner_top_right.gif');
-}
-
-
-.rt_cornerBottomRight{
-    background-color:transparent;
-    background-repeat:no-repeat;
-    width:8px;
-    height:8px;
-    margin:0;
-    padding:0;
-
-}
-.rt_cornerBottomRight{
-    background-image:url('images/corner_bottom_right.gif');    
-}
-
-
-.rt_content{
-    background-color:white;
-    color:inherit;
-    width:auto;
-    margin:0;
-    padding:0;
-}
-
-
-.rt_lineLeft{
-    background-color:transparent;
-    background-repeat:repeat-y;
-    background-position:right;    
-    width:8px;
-    margin:0;
-    padding:0;
-
-}
-.rt_lineLeft{
-    background-image:url('images/line_left.gif');
-}
-
-
-.rt_lineRight{
-    background-repeat:repeat-y;
-    width:8px;
-    margin:0;
-    padding:0;
-}
-.rt_lineRight{
-    background-image:url('images/line_right.gif');
-}
-
-
-.rt_lineTop{
-    background-color:transparent;
-    background-repeat:repeat-x;
-    height:8px;
-    width:auto;
-    margin:0;
-    padding:0;
-}
-.rt_lineTop{
-    background-image:url('images/line_top.gif');        
-}
-
-.rt_lineBottom{
-    background-color:transparent;
-    background-repeat:repeat-x;
-    height:8px;
-    width:auto;
-    margin:0;
-    padding:0;
-}
-.rt_lineBottom{
-    background-image:url('images/line_bottom.gif');
-}
-
-
-/* -------------------------------------- 
-    Controls for bulk showing/hidding sections 
-    from the documentation.
-----------------------------------------*/
-
-.globalControls h3{
-    margin:0.1em;
-    font-size:1.2em;
-}
-
-.globalControls table td{
-    padding:0;
-    margin:0;
-}
-
-.globalControls{
-    position:fixed;
-    right:0;
-    background-color:transparent;
-    padding-left:0.5em;
-    padding-right:0.5em;
-    padding-bottom:0.5em;
-    width:190px;
-}
-
-@media print{
-    .globalControls{
-        display:none;
-    }
-}
-
-/* Expand/collapse of a single section. */
-input.control {
-    text-align:center;
-    vertical-align:middle;
-    padding:0;
-    padding-right:3px;
-    padding-bottom:2px;
-    
-}
-
-
-/* close button */
-td.rt_content div span input{
-    font-size:0.8em;
-}
-
-@media print{
-    input.control{
-        display:none;
-    }
-}
-
-
-
-
-/*-----------------------------------------
-    Navigation.
-------------------------------------------*/
-a, a:visited {
-    color:rgb(0, 0, 150);
-    background-color:inherit;
-}
-
-a:link, a:visited {
-    text-decoration:none; 
-}
-a:hover {
-    text-decoration:underline;
-}
-
-div.toTop{
-    text-align:right;
-}
-div.toTop a{
-    font-weight:normal;
-}
-
-
-
-
-/*------------------------------------------
-  The second level of index. Floating DIVs
--------------------------------------------*/
-.toc {
-}
-.toc div.verticalLayout, div.horizontalLayout{
-    float:left;
-    display:block;
-
-    background-color:white;
-    color:inherit;
-
-    min-width:130px;
-    min-height:50px;
-    
-    padding:0.5em;
-}
-/* This is not used. */
-.toc div.verticalLayout {
-    clear:left;
-}
-
-/* Hack for the IE - acts like a minimum height.*/
-* html .toc div.horizontalLayout, 
-* html .toc div.verticalLayout {
-    width:120px;
-    height:60px;
-}
-
-.toc div.componentGroupTitle{
-    font-weight:bold;
-    margin-bottom:0.5em;
-    color:black;
-    background-color:inherit;
-}
-
-/* Namespacces or system ids in the TOC. */
-.toc .indexGroupTitle {
-    font-weight:bold;
-    margin-bottom:0.5em;
-}
-
-/*----------------
-    The footer. 
------------------*/
-.footer{
-    margin-top:3em;
-}
-.redX{
-    color:red;
-    background-color:inherit;
-    font-size:1.2em;
-}
-.oXygenLogo{
-    color:#1166DD;
-    background-color:inherit;
-    font-weight:bold;
-    font-size:1.2em;
-}
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/style.css
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/style.css b/docs/doc/src/main/resources/doc/style.css
deleted file mode 100644
index 84adfb8..0000000
--- a/docs/doc/src/main/resources/doc/style.css
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
- 
-     http://www.apache.org/licenses/LICENSE-2.0
- 
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.
-*/
-body, p, td, table, tr {
-	font-family: Verdana, arial, sans-serif;
-	font-size: 11px;
-	line-height: 16px;
-	color: #000000;
-	font-weight: normal;
-}
-
-body {
-	margin: 0;
-	padding: 0;
-}
-
-#ConfluenceContent {
-	text-align: left;
-	padding: 0 0 5px 10px;
-}
-
-#cayenne_toc {
-	float: right;
-	width: 200px;
-	margin-top: 5px;
-	text-align: left;
-	padding: 5px;
-	background-color: #fff;
-}
-
-#cayenne_toc ul {
-	border: 1px #778899 solid;
-}
-
-#cayenne_toc ul ul {
-	border: 0;
-}
-
-.pagetitle {
-	font-size: 22px;
-	font-weight: bold;
-	font-family: Arial, sans-serif;
-	color: #000000;
-}
-.header {
-	padding: 10px 0 10px 0px;
-	width: 100%;
-	border-bottom: 1px solid #778899;
-}
-.logoSpaceLink {color: #cc0000; text-decoration: none}
-.logoSpaceLink a:link {color: #cc0000; text-decoration: none}
-.logoSpaceLink a:visited {color: #cc0000; text-decoration: none}
-.logoSpaceLink a:active {color: #cc0000; text-decoration: none}
-.logoSpaceLink a:hover {color: #000000; text-decoration: none}
-
-
-ul, ol {
-    margin-top: 2px;
-    margin-bottom: 2px;
-    padding-top: 0px;
-    padding-bottom: 0px;
-}
-
-pre {
-    padding: 0px;
-    margin-top: 5px;
-    margin-left: 15px;
-    margin-bottom: 5px;
-    margin-right: 5px;
-    text-align: left;
-}
-
-.code {
- 	border: 1px dashed #666666;
-    font-size: 11px;
-	font-family: Courier;
-    margin: 10px;
-	line-height: 13px;
-}
-
-.panel {
- 	border: 1px dashed #666666;
-    margin: 10px;
-    margin-top: 0px;
-}
-
-.panelHeader {
-    background-color: #f0f0f0;
- 	border-bottom: 1px dashed #666666;
-    padding: 3px;
-	text-align: center;
-}
-
-.panelContent {
-    background-color: #f0f0f0;
-    padding: 5px;
-}
-
-.infopanel-heading {
-    font-weight: bold;
-	padding: 4px 0px 2px 0px;
-}
-
-HR {
-	color: 3c78b5;
-	height: 1;
-}
-
-
-h1 {
-	font-size: 24px;
-	line-height: normal;
-	font-weight: bold;
-	background-color: #f0f0f0;
-	color: #000000;
- 	border-bottom: 1px solid #666666;
-	padding: 2px;
-	margin: 36px 0px 4px 0px;
-}
-
-h2 {
-	font-size: 18px;
-	line-height: normal;
-	font-weight: bold;
-	background-color: #f0f0f0;
- 	border-bottom: 1px solid #666666;
-	padding: 2px;
-	margin: 27px 0px 4px 0px;
-}
-
-h3 {
-	font-size: 14px;
-	line-height: normal;
-	font-weight: bold;
-	background-color: #f0f0f0;
-	padding: 2px;
-	margin: 21px 0px 4px 0px;
-}
-
-h4 {
-	font-size: 12px;
-	line-height: normal;
-	font-weight: bold;
-	background-color: #f0f0f0;
-	padding: 2px;
-	margin: 18px 0px 4px 0px;
-}
-
-h4.search {
-	font-size: 12px;
-	line-height: normal;
-	font-weight: normal;
-	background-color: #f0f0f0;
-	padding: 4px;
-	margin: 18px 0px 4px 0px;
-}
-
-h5 {
-	font-size: 10px;
-	line-height: normal;
-	font-weight: bold;
-	background-color: #f0f0f0;
-	padding: 2px;
-	margin: 14px 0px 4px 0px;
-}
-
-h6 {
-	font-size: 8px;
-	line-height: normal;
-	font-weight: bold;
-	background-color: #f0f0f0;
-	padding: 2px;
-	margin: 14px 0px 4px 0px;
-}
-
-.smallfont {
-    font-size: 10px;
-}
-.descfont {
-    font-size: 10px;
-    color: #666666;
-}
-.smallerfont {
-    font-size: 9px;
-}
-.smalltext {
-    color: #666666;
-    font-size: 10px;
-}
-.smalltext a {
-    color: #666666;
-}
-.smalltext-blue {
-    color: #666666;
-    font-size: 10px;
-}
-.surtitle {
-    margin-left: 1px;
-    margin-bottom: 5px;
-    font-size: 14px;
-    color: #666666;
-}
-
-.bottomshadow {
-    height: 12px;
-    background-image: url("../../../images/border/border_bottom.gif");
-    background-repeat: repeat-x;
-}
-
-.noteMacro { border-style: solid; border-width: 1px; border-color: #F0C000; background-color: #FFFFCE; text-align:left; margin-top: 5px; margin-bottom: 5px}
-.warningMacro { border-style: solid; border-width: 1px; border-color: #c00; background-color: #fcc; text-align:left; margin-top: 5px; margin-bottom: 5px}
-.infoMacro { border-style: solid; border-width: 1px; border-color: #3c78b5; background-color: #D8E4F1; text-align:left; margin-top: 5px; margin-bottom: 5px}
-.tipMacro { border-style: solid; border-width: 1px; border-color: #090; background-color: #dfd; text-align:left; margin-top: 5px; margin-bottom: 5px}
-.informationMacroPadding { padding: 5px 0 0 5px; }
-
-table.infoMacro td, table.warningMacro td, table.tipMacro td, table.noteMacro td, table.sectionMacro td {
-    border: none;
-}
-
-
-table.confluenceTable
-{
-    margin: 5px;
-    border-collapse: collapse;
-}
-
-/* Added as a temporary fix for CONF-4223. The table elements appear to be inheriting the border: none attribute from the sectionMacro class */
-table.confluenceTable td.confluenceTd
-{
-    border-width: 1px;
-    border-style: solid;
-    border-color: #ccc;
-    padding: 3px 4px 3px 4px;
-}
-
-/* Added as a temporary fix for CONF-4223. The table elements appear to be inheriting the border: none attribute from the sectionMacro class */
-table.confluenceTable th.confluenceTh
-{
-    border-width: 1px;
-    border-style: solid;
-    border-color: #ccc;
-    padding: 3px 4px 3px 4px;
-    background-color: #f0f0f0;
-    text-align: center;
-}
-
-td.confluenceTd
-{
-    border-width: 1px;
-    border-style: solid;
-    border-color: #ccc;
-    padding: 3px 4px 3px 4px;
-}
-
-th.confluenceTh
-{
-    border-width: 1px;
-    border-style: solid;
-    border-color: #ccc;
-    padding: 3px 4px 3px 4px;
-    background-color: #f0f0f0;
-    text-align: center;
-}
-
-
-.clearer {
-	clear: both;
-	display: block;
-	height: 1px;
-	margin-bottom: -1px;
-	font-size: 1px;
-	line-height: 1px;
-}
-
-.copyright {
-	text-align: center;
-}


[24/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
Update docs included into assembly


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/fcb490c2
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/fcb490c2
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/fcb490c2

Branch: refs/heads/master
Commit: fcb490c2af20ea45e331ef693b3be9c6cf42d08b
Parents: 334d9cc
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue Jan 23 17:35:57 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Jan 23 17:35:57 2018 +0300

----------------------------------------------------------------------
 assembly/pom.xml                                |    4 +-
 docs/doc/src/main/resources/doc/images/logo.gif |  Bin 864 -> 0 bytes
 docs/doc/src/main/resources/doc/index.html      |   84 +-
 .../doc/schema/3.0/images/button_minus.gif      |  Bin 136 -> 0 bytes
 .../doc/schema/3.0/images/button_plus.gif       |  Bin 142 -> 0 bytes
 .../schema/3.0/images/corner_bottom_left.gif    |  Bin 80 -> 0 bytes
 .../schema/3.0/images/corner_bottom_right.gif   |  Bin 111 -> 0 bytes
 .../doc/schema/3.0/images/corner_top_left.gif   |  Bin 63 -> 0 bytes
 .../doc/schema/3.0/images/corner_top_right.gif  |  Bin 79 -> 0 bytes
 .../doc/schema/3.0/images/hierarchy_arrow.gif   |  Bin 68 -> 0 bytes
 .../doc/schema/3.0/images/line_bottom.gif       |  Bin 64 -> 0 bytes
 .../doc/schema/3.0/images/line_left.gif         |  Bin 50 -> 0 bytes
 .../doc/schema/3.0/images/line_right.gif        |  Bin 64 -> 0 bytes
 .../doc/schema/3.0/images/line_top.gif          |  Bin 51 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html0.jpeg   |  Bin 10459 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html1.jpeg   |  Bin 23201 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html10.jpeg  |  Bin 35231 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html11.jpeg  |  Bin 35601 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html12.jpeg  |  Bin 16798 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html13.jpeg  |  Bin 16658 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html14.jpeg  |  Bin 25460 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html15.jpeg  |  Bin 20591 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html16.jpeg  |  Bin 16415 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html17.jpeg  |  Bin 10153 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html18.jpeg  |  Bin 54392 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html19.jpeg  |  Bin 16614 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html2.jpeg   |  Bin 173180 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html20.jpeg  |  Bin 9290 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html21.jpeg  |  Bin 16573 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html22.jpeg  |  Bin 35617 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html23.jpeg  |  Bin 9016 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html24.jpeg  |  Bin 63326 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html25.jpeg  |  Bin 79391 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html26.jpeg  |  Bin 16783 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html27.jpeg  |  Bin 24446 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html28.jpeg  |  Bin 31137 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html29.jpeg  |  Bin 9150 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html3.jpeg   |  Bin 54716 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html30.jpeg  |  Bin 31893 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html31.jpeg  |  Bin 8951 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html32.jpeg  |  Bin 16446 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html33.jpeg  |  Bin 64784 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html34.jpeg  |  Bin 55639 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html4.jpeg   |  Bin 10313 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html5.jpeg   |  Bin 23172 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html6.jpeg   |  Bin 34308 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html7.jpeg   |  Bin 35686 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html8.jpeg   |  Bin 28700 -> 0 bytes
 .../doc/schema/3.0/images/modelMap.html9.jpeg   |  Bin 27255 -> 0 bytes
 .../resources/doc/schema/3.0/indexList.html     |  648 ------
 .../main/resources/doc/schema/3.0/modelMap.html |    4 -
 .../resources/doc/schema/3.0/modelMap0.html     |  614 ------
 .../resources/doc/schema/3.0/modelMap1.html     | 1943 ------------------
 .../resources/doc/schema/3.0/modelMap10.html    |  578 ------
 .../resources/doc/schema/3.0/modelMap11.html    |  578 ------
 .../resources/doc/schema/3.0/modelMap12.html    |  578 ------
 .../resources/doc/schema/3.0/modelMap13.html    |  578 ------
 .../resources/doc/schema/3.0/modelMap14.html    | 1062 ----------
 .../resources/doc/schema/3.0/modelMap15.html    |  687 -------
 .../resources/doc/schema/3.0/modelMap16.html    |  687 -------
 .../resources/doc/schema/3.0/modelMap17.html    | 1204 -----------
 .../resources/doc/schema/3.0/modelMap18.html    |  893 --------
 .../resources/doc/schema/3.0/modelMap19.html    |  736 -------
 .../resources/doc/schema/3.0/modelMap2.html     |  434 ----
 .../resources/doc/schema/3.0/modelMap20.html    | 1309 ------------
 .../resources/doc/schema/3.0/modelMap21.html    | 1083 ----------
 .../resources/doc/schema/3.0/modelMap22.html    |  715 -------
 .../resources/doc/schema/3.0/modelMap23.html    | 1353 ------------
 .../resources/doc/schema/3.0/modelMap24.html    | 1302 ------------
 .../resources/doc/schema/3.0/modelMap25.html    |  434 ----
 .../resources/doc/schema/3.0/modelMap26.html    |  696 -------
 .../resources/doc/schema/3.0/modelMap27.html    |  651 ------
 .../resources/doc/schema/3.0/modelMap28.html    |  374 ----
 .../resources/doc/schema/3.0/modelMap3.html     |  729 -------
 .../resources/doc/schema/3.0/modelMap4.html     |  909 --------
 .../resources/doc/schema/3.0/modelMap5.html     |  909 --------
 .../resources/doc/schema/3.0/modelMap6.html     |  662 ------
 .../resources/doc/schema/3.0/modelMap7.html     |  578 ------
 .../resources/doc/schema/3.0/modelMap8.html     |  578 ------
 .../resources/doc/schema/3.0/modelMap9.html     |  578 ------
 .../resources/doc/schema/3.0/xsdDocHtml.css     |  554 -----
 docs/doc/src/main/resources/doc/style.css       |  292 ---
 82 files changed, 75 insertions(+), 24943 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 8e93916..60fe820 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -245,8 +245,8 @@
 									<tasks>
 										<copy todir="${project.build.directory}/doc-staging">
 											<fileset dir="${basedir}/../docs/asciidoc">
-												<include name="**/target/**/*.pdf"/>
-												<include name="**/target/**/*.html"/>
+												<include name="**/target/generated-docs/*.pdf"/>
+												<include name="**/target/generated-docs/*.html"/>
 											</fileset>
 											<flattenmapper/>
 										</copy>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/images/logo.gif
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/images/logo.gif b/docs/doc/src/main/resources/doc/images/logo.gif
deleted file mode 100644
index 9f34a0d..0000000
Binary files a/docs/doc/src/main/resources/doc/images/logo.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/index.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/index.html b/docs/doc/src/main/resources/doc/index.html
index 8db4db8..734c147 100644
--- a/docs/doc/src/main/resources/doc/index.html
+++ b/docs/doc/src/main/resources/doc/index.html
@@ -16,31 +16,93 @@
    specific language governing permissions and limitations
    under the License.
 -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!doctype html>
 <html>
 <head>
-        <title>Cayenne ${project.version}</title>
+	<title>Cayenne ${project.version}</title>
+	<style>
+		body {
+			font-family: sans-serif;
+		}
+
+		h1, h2 {
+			font-weight: 300;
+			line-height: 1.2;
+			color: #444;
+		}
+
+		h1 {
+			text-align: left;
+		}
+
+		h1 > span {
+			vertical-align: middle;
+		}
+
+		ul {
+			display: block;
+			list-style-type: disc;
+			margin-top: 0;
+			margin-bottom: 1rem;
+			padding: 0 0 0 2.5em;
+		}
+
+		li {
+			position: relative;
+			margin-bottom: .5em;
+			font-weight: 400;
+			color: #666;
+		}
+
+		a {
+			color: #dc5656;
+			text-decoration: none;
+			outline: 0 !important;
+			-webkit-transition: all .1s linear;
+			transition: all .1s linear;
+			-ms-touch-action: manipulation;
+			touch-action: manipulation;
+		}
+
+		a:hover {
+			color: #be2727;
+			text-decoration: none;
+		}
+
+		.small {
+			font-size: 87.5%;
+			font-weight: 400;
+			color: #777;
+		}
+
+		.icon {
+			alignment: center;
+			vertical-align: middle;
+			border: 0;
+		}
+	</style>
 </head>
-
 <body>
-<h1><img src="images/logo.gif" align="absmiddle" border="0"> Cayenne ${project.version}</h1>
-<i>Built on ${project.build.datetime} by ${user.name}</i>
+<h1><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHkAAABGCAYAAADo1jsxAAAEDWlDQ1BJQ0MgUHJvZmlsZQAAOI2NVV1oHFUUPrtzZyMkzlNsNIV0qD8NJQ2TVjShtLp/3d02bpZJNtoi6GT27s6Yyc44M7v9oU9FUHwx6psUxL+3gCAo9Q/bPrQvlQol2tQgKD60+INQ6Ium65k7M5lpurHeZe58853vnnvuuWfvBei5qliWkRQBFpquLRcy4nOHj4g9K5CEh6AXBqFXUR0rXalMAjZPC3e1W99Dwntf2dXd/p+tt0YdFSBxH2Kz5qgLiI8B8KdVy3YBevqRHz/qWh72Yui3MUDEL3q44WPXw3M+fo1pZuQs4tOIBVVTaoiXEI/MxfhGDPsxsNZfoE1q66ro5aJim3XdoLFw72H+n23BaIXzbcOnz5mfPoTvYVz7KzUl5+FRxEuqkp9G/Ajia219thzg25abkRE/BpDc3pqvphHvRFys2weqvp+krbWKIX7nhDbzLOItiM8358pTwdirqpPFnMF2xLc1WvLyOwTAibpbmvHHcvttU57y5+XqNZrLe3lE/Pq8eUj2fXKfOe3pfOjzhJYtB/yll5SDFcSDiH+hRkH25+L+sdxKEAMZahrlSX8ukqMOWy/jXW2m6M9LDBc31B9LFuv6gVKg/0Szi3KAr1kGq1GMjU/aLbnq6/lRxc4XfJ98hTargX++DbMJBSiYMIe9Ck1YAxFkKEAG3xbYaKmDDgYyFK0UGYpfoWYXG+fAPPI6tJnNwb7ClP7IyF+D+bjOtCpkhz6CFrIa/I6sFtNl8auFXGMTP34sNwI/JhkgEtmDz14ySfaRcTIBInmKPE32kxyyE2Tv+thKbEVePDfW/byMM1Kmm0XdObS7oGD/MypMXFPXrCwOtoYjyyn7BV29/MZfsVzpLDdRtuIZnbpXzvlf+ev8MvYr/Gqk4H/kV/G3c
 sdazLuyTMPsbFhzd1UabQbjFvDRmcWJxR3zcfHkVw9GfpbJmeev9F08WW8uDkaslwX6avlWGU6NRKz0g/SHtCy9J30o/ca9zX3Kfc19zn3BXQKRO8ud477hLnAfc1/G9mrzGlrfexZ5GLdn6ZZrrEohI2wVHhZywjbhUWEy8icMCGNCUdiBlq3r+xafL549HQ5jH+an+1y+LlYBifuxAvRN/lVVVOlwlCkdVm9NOL5BE4wkQ2SMlDZU97hX86EilU/lUmkQUztTE6mx1EEPh7OmdqBtAvv8HdWpbrJS6tJj3n0CWdM6busNzRV3S9KTYhqvNiqWmuroiKgYhshMjmhTh9ptWhsF7970j/SbMrsPE1suR5z7DMC+P/Hs+y7ijrQAlhyAgccjbhjPygfeBTjzhNqy28EdkUh8C+DU9+z2v/oyeH791OncxHOs5y2AtTc7nb/f73TWPkD/qwBnjX8BoJ98VVBg/m8AAAAJcEhZcwAACxMAAAsTAQCanBgAAAILaVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJYTVAgQ29yZSA1LjQuMCI+CiAgIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICAgICAgICAgIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIj4KICAgICAgICAgPHRpZmY6UmVzb2x1dGlvblVuaXQ+MjwvdGlmZjpSZXNvbHV0aW9uVW5pdD4KICAgICAgICAgPHRpZmY6Q29tcHJlc3Npb24+MTwvdGlmZjpDb21wcmVzc2lvbj4KICAgICAgICAgPH
 RpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICAgICAgICAgPHRpZmY6UGhvdG9tZXRyaWNJbnRlcnByZXRhdGlvbj4yPC90aWZmOlBob3RvbWV0cmljSW50ZXJwcmV0YXRpb24+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgoPRSqTAAAWf0lEQVR4Ae1dCXRURbr+ek26k85GQkISAkFAdoFBxhEVFcR930AZjvpGdHAbR2dcZnwKLk+f6zz1+dSDoKKjuKADiCKIIIOoyKIoIHv2hHT27nR6fd9f3bfphGASkpAAXeckfW933bp1/6/+tar+qwuwIFqODApoUOl0beqvvk21o5W7jgICsIDLv7byZRTkroOt1XdWoBJcX1U1Al4vcW4bJxtbfadoxS6hgAAsoPodDhS+/Ar8dQ5k33ErjKmpIEsHubuFnkVBboFAXfmzBrC3ohLFc+aiYvY86IxG+OwVyLzzNlgGDGgV0FGQuxLFX7m3BrCnpAT5z/4Paj5cBGNuDvy1tWj4ZQf8LvevXN34p6hObkyPrj+jCA74/UpEK4Cf+QdqFn5KgHvDX10DU3IScp54BHHDh7aKi+WBopzc9bDu70FIx4oOdu3chYKnn4Xj39/CmJkBv9Ol6qXfcQvifzN6/zWtOIqC3AoiHY4qmniWezm3bkPhk8/A8c33MGSkKYs6UFeHrJl/Q8rZk4LdaaXRJZWjIAdJ1vH/ReyGWg27PAcBJgww3aPK5StQ8vxLcBeXwJCeBvj88Nsr0fO2m5B6/nnBFg/SzsEeIgrywShziN+LPpWAhQB7gDfL71SJBInHUtezrxylb85D5bsfIqDXQZ+UALAtATh58uXImDaVLGkM6mt920ypKMiHCGbTy8LghgAIuN3wkzP9DQ2o37IVPorbuBNOgDm9ZzBqJcaV1CXAdRs2ofTV2aj
 7cjV0qSl0kwwEmJKg3gXzgH7IuG4adLGxhwSw9DMKclO02nouXMmiAOOnt6oKju3bUffvr+Hath31O3cj4HKpv9iB/ZHxx+lIGHdyuL5EsOrWr6eBtRa6pEToY2IQ4MBQXLvPjvSH7oc5K1NZ0to91A3b8E9HfaCpjjZcFq2qok1ChpAIbtizB7U//oTqpctQu2gpdAnxgNkUBNNkhM5gUNEqY7wVPa77PdIuuxSGRIpkKYSgauUqFD7xNDz5RTD2zoR3dz6Sp16FnL/eBZ3Z3Gp3Kdhg4/9RkBvTo1VnYUOJtX2VlShf9AkqF38K15p1FLdJ0CcnKnEbbkzjI4rngMeDQFkFbOdNQNrUa2AbPSo8UDSruu6zLxEzdCByX3wOlv7HHbKY1u4fBVmjRGs+CZaIPWUtU6dWrVhJY+ltuNZtAGJjaCwJuDS8fL6DtyacL1xdug8GDobUG6ah5+SroLdY1DUNe/OQ/8h/IfH8c5B2ycVqxilsnR+81V/9JQryr5Jn/4+R3Ovasxdlb7+D6vc/pn0UCFrCAt6vgbu/qeARRbgYVqh1IOnSC9Dr5ukw9cpQv4nRJoacnsZWaychmjYfeR4FOZIaBzmOBFh0Zyn92PrNWxmo4EyQnpZwW8CNvEfIuvZRD9vOnYCc++4JA62qiZgP6fzIy9p6HAW5JYqFCO0pL0fZ/Pdhf2UOAiYT9Ik2mtIUy/J7ewsNNH9hCeLPPA29778H5sxe7dbDkV2KghxJjchjgqfp34a8PBT+4wXULFgMPS1fsZQPmXsj7xF5zIHjLyxG/MTxyPn7/TDRn1YTFSG/O7JqW4+jIDdHsQgxWfvNtyh+9nkGNH6BnoEK+Mm9DFR0SmFES4BOue5aZP/5jna7TlofoyBrlAh9hvUvY8aif4sefxKe8gq6RUkUz94mtTv4VPQv/wIMZabdfjMyfj8Vupj2+cjSw7YFQTv4mbpbc0o8hqzksgULkH/XvfA66oN+b2cD
 LMQISZAA3bGapcs5SVGsSCQDrz0lGtYMUU/Tf37GmEveehv7Xp4LndUa5CQxsA5XUUCT++Li6E8HebC9fnIUZIKnAezl2qmiF/4XlfMXQNcjWa2n6nADq6XBIpLE7YGeYVGJY3dEOeZB1gBuKCpG/qxH4Fi1FnpO1BP5jregW4MYMQ54vNDHE2SJWXdAOaZ1sgaw+MD5sx5F3ecrYchi1EmCG51lQbcEmo7x7Uqu5crK4gQGjT0pwt3tKMcsyBrA7rIy5M18FI4138LQLwcSUuzSQglisMYitncWwQ2qkvb255gEWQPYyxmkgkefQO2yldCn9VC6sL0Ebdf1DHz4HU6Yhg2CNTc32FQ7uVgaOeZA3g9wFQq5nrl25WoYenG1xqHGn9uFapOLJbpVVYPYYUNgGXS8+rF9gjrY/jEFsgawj6s3Cp95DlUfLoQ+hXpPpgfb6Ys2gavtp+RYtc/JFg/bqJFByz7kN7e9scZXHDMgq0iWiEP6wcWz56DyvY+h78lZJDGwuhpgwUS42FkPU042Ek8Z1xildp4dEy6UFqr0cYtJMRfM2V97KyiiuwMHawByoAVcDUi59CKYetKF68By1HOyBrDEnUvemIfyl14jB9PIEu7tDhwsYJKLxao352QheeIEBa+olva6Tto4OapBDtAdkZBggBGk4nlvo/yVuTBkpgefvbsALL3hElx/YSlSr58Gc0awfzr6yx1VOq6ljupRB7WjjCwhFDm47N35KH38meBEv+g+4ZLuUDjQdDKPXFKG+LPPQPIZ41WvglzccR08KnVy2IqmDi577wPYZ78e9INlsr+7ACwYyvwx/WJDWip63TYDxh49wnH0joP4aFtcT86gplVrnT1l+1D0fy+jYs4/YcjOCLok3QlgCXJIf7kdteedtyJu2FCekrNF0nRwOXo4mQQSQ0WCB86ffkbxS6+g5qMliBkxCHqujHRXVHUKAQ8ZD1mWywV8SddeidQLz1fNdETgo
 7n+dPywae4unfxdpCVaw+U6eX97ENUvvobEqy5Cn0dnImHCmfDX1AZ90U7uS6uaFzFdVIKkyZepZT6y5lq4uKOs6aZ9OOI5WdO/Aa8H5QsXo/ixp+DbUYAes+5B5k030ufsCR8JuO/pFwC1RqspCQ7juYhoLgRQAF95KbL/+mcYOKWoPUNn9eTIBVlGPovoMNlkVjJ7Ll2kObSgE5D5/GNIu+Ky4OJ01onNzIT1rNPg/OFnrriwdo3xJQCzr+IqJV1NDhaAufqjswEWGh2R4josnkk4167d2PvQwyi7+0FYRgxFn6ceQzr3GMnuA1WPDym+Z/xppyoCq22h8uSHsygOpg4uKkXylMsPK8DymEcUJyu9xU4L90oI0P7ZUtgZ5HC+vxy26VORfdefYBnItEcsmqWqcYpt+DBUDOgLH+PDapfg4bK0xVomyL69BUiZNhlZ7OPh4mBFCP47MpbkUjQr10g4gqVu4ybY/7UI1e8uQCDOgpTLL0bGDdfBRH9TgSuVQnXlUIrsJiyixW2f/YZav3VYphZpQct9UV1LgKegF/cmH26A5dm7PcgaJ0pnPfv2wb54Cexz58FTVg69LQ6Jk7iH6IH7FXcGOCesdjdI5YiigCfo7rx87LjlDni4gF3tQOzMOWTZ0MbNbNQZSL/tj+h59ZXBPlKCdIYvHPG4Bxx2W50swGgiV3pdt34D9v7nLBTfMxNe7sCXjdrgQjfHxh9RtWp18MFENDZTVPyaxDXn9Eb6jOncJsrdgrKOugm3N3PpoX0locrScph7pSPn8UeQfu2ULgNYHqD76eQmormhoBAVn5B7572Dhq/WIv7aK5h7Yzhqv/wKAbojnp+YDunBhxHDeVjrwIEHWqtNBou1f38YU5LhYTJSHROw0L86NCCbu0oGGf8kFm0ZMxLZ99wN6+BBqmbkgG3u0s78rnuI6ybAygN7mQ2nau1a2N/8JxyfrIKpfxaSpl6NtCsvh4EcvPPGGTD1zU
 Hq5Zeg9P0FMNIdyZ31IBOoMOeGGFXk0shF6ZIyqZqBksoPP0L9hh8VGJLyQXJVtjueLRKB4AYamAyGaiTpsguRyb1MkgRGgSsP1FlSQ9puoXQtJ0dwWdCkIrhc4F616itUfroUdW98DF2vRCRNn4zUyVcjYfTIYFCfEw8xw4fAQLGYeMbpiOGit11Tb0Dl6tVI4XxspM7zltth/3wZqpd9gbrXXoE+d6hK5WAZ0B9Vn6+gbi+jbmd+j0PdJSHcy+fwV1bByP1S6Q/dp8KUhoSEA6VKC2B01s9dA7KAKwYIrc/gfK8broICVH/xJaqZBad+yQpGhnSw/eEKpJx3DhLp44pVKiVAMPQ2G2wnn4Sq+R8ydZIDsX37IO3u21H23AtIYEpCYzLFMSVBJYGtWPIp6t/6DLpMGxJuuR3J50xC4vjTYGSkyTJkMIoefhzemjoYEmxqjVWbCM15YJmrDjBkapswHhmMsFmPHxjspzyfDIBuUA4PyARVinKD5EBEqbgXTGXk3L4D9gUfoeaLVfCs3wqdywvbjClIPmtCEFyCISUs9kL7g6z9+qGcANfv3In4E0Yg7cIL4Nz0I4pefFnp7LI5bzCXxw/QVdTBdttkrrg4E0kyWMhhWkk+a6ICoohbUz3Fpfst7lB/tXoHfAp41Od+LoI3cNdhGmeRUi+7ZH/bvL67ACx971yQhWN5E003aiLZw916jt17UL3yK9S+t4CGrg9GZqDrcf+tsI09EbaRJyhu1IirANZ0GjlEBoksWY0dPhh1a79RIIuBJhPwlW++g4rX34aOHGa7YCLXTF0c5O4U7i0OFWlPRKwAkcTJCxHXRUyv5N65ByBHq6gYt64eUDgw5TrJ9RHg0lnruLHoecN1SKRUkT6FB6LW1wMa6JovOt7wEiIIAeVBIx5WjJK6DRtQQ1fI8f0GOF9biIDNCOOYIYorAgwY5Dw+SxFdSKHEudZGqE1pTxswUqf8gwWwz/8AceNOQu3
 ylWgQzu2RSH09GOl/uL7RYGnUnlwshe1qfZSsO/vemY+Kt+YjwPuotIfBWlQdBJecG6BYD9Q5YWb6pfTp/9Fo8ISfWbumG312HMgauBF6SFY9uPLz4SCwNQTWQZHs27gWxlMnIpZx5hSKZGNGBvL+ch/8eUWwTjgVuc8+CWPIaFEAyICJbJPhTE+FHTX0jStonLk2b1EZdPRcIB//u7Eq6lW/+Wf0efhBZrLLggqQyPURA64R/aXf/ELZBgyOODb/hDIu+HOsXceZDTPvbWCuripuDK+CedQw9LjofKqSicEsebyuu3Jv5DO2T1wLJ2glxGUiytzcQFbPDHVVi5agZsUqeL/bzpkQD+JunoJ47qBPYIIy65AhFK+czGddY3wcku+9EzVfr0XN6jXK2AoDK+BQ9LoKC9BQWoaaz5ejlikNGzYzvYOHYn74QOiZDzqTy2cSOWi8NIJ2XnkNHDt2KZAVuE0Bjuw3+x+WDlQFZr7bIf63Y+Fct56zWzXA3mJYzj2dA+gk9Dj3bMTm9tWeuNtYz+EOHeTg0EAWIgnhIognrkrt5s2o++57OFd/DecXa4EYEywnj0LKi9cgfuRIxB3XjwlPmqyWZFsxJGwSrV7ZHlJBP1Ysaokt12/7BfVFRXD+vJVJWRai4bvNCFjMTHKWgMQplyKZRBcrWXJ6eEOZAPTMpGMa2B/OPbuRPP7U/VKA99GGZBjUEFE89KEdTCJeTRfMsXQFGrbthMFmpcV8GhJmnYOEYcMQ0ycnTEJNNIcHYviX7nnQNpBDhAoTiSPfSSAkrFi37nu4Vq6Bj+LUOKAvkm66BkkES1wKMyfuxSiSonRjhPg00h0yMmjgLi2FbcQI2N96BwVPPQufxw0Hs8a6ly6CHz1hPGUYbFMvIZeNQfzo0bDQbTIkMgMei/fmG1HywEyVsj82OxtxFNtVH3wM96RJDC1mBEW2uGuqdvCfn/10bWff16xl39ejfsFnfIEHdzCcPgI9
 pk9Tg85KX9oYMtgixXL4+SPa686HrdbJYXD4ND4uPqvbtEn5obVfrYHny6UwjTuD8eQsuL/diJQ7bkLvGTerwEWzD89N1r56JwNNfrhpFZfNfVOBLOkbXD9tQYD6GfVutjkaVrpHsdStCeRK8Yf1YgQZg2MzPCHBdvYyVaFwZPa9f4F90WKUP/DfGLDuC1j75aouyOJ1H20EGUwOZqUVG8H5w2Z4li2BYRDVx5mnKBfLRlEtA0Pb5S/PLeVI4VrV2Sb/WgY5knvp6tT+sAnl777Ht5ssRmBHHmIvmYR46sIUgiAWav2WLTDRmEq54PxwFlhfdTU8NF4EWDdzSrq2b4eLGWXF7Wmg7uQtSEQdDLGxXFnJPFlWC1IvvhDx3PgVSxHftIQJT3WhBh+Br/9lO/bc8id4GDEzZfVCw5YdyJ33Kjm+L0XxToYyN6KOXFu/jW9ioZ6FfQ/M489C/LkMjowdA9uJY9RSHO1ewrlSjjSu1fof+dkyyKHarh07uYZqESrm0gflEhrb+HFIpB61DRqkxK1Uq176OdMh2ZW74SXXxDBg4dy1C25e27CJXEM/1PNLPkCOhUkPU58MWE/9Hdcbp6Du62+RcfsMxGRnoWTO68h96AHq3mQxX1UPGhE9whYIdU991Kz5Gnl/nwk/JYX4urEDj4M3rxD1n34CpGRzJsgIy29HIe60k2EdPgyWXr1glS2iIckQulGwyYPcI/J+R8rxwXWyYi8d5MVT5f9aiEpayg3fbYLllBMRN3QIX13D0GFhEUrocshmbpnV8e7YrSbJddwp7/lxK/zbNtLY4STA0ONh5i7+uHMmwHx9BmKo6ySkKJwrlrUx1oI8JmRx8x1IQnRvHi1pil6rgBwidiOOYt+Eg+VtZw20uoU73XSrXAyyBAiuZKAV/evklKQ+PRWJM2YgntxqHTMaMVzAbmKaBp1MN4aKkgZyH+1P++Eo+Wyek4V5hEosEnAouGI6AsdlwDQgV4kvY
 xKJJKOflqxwmhApIDQy0CXatQegUWMZO5qDYShiuL7KQuNLVk1K/FnpNpnia1Lqye159z5AI4ttVTEwwncfxf9mlNL/Ks2/j3qc7pGH1ras6xLL28WB4OXSVu92Dq49P7PLyTCNPxHG4/oihvrbNmK4EvmyYkRvjlErJbXbSp+lHMm6VnuWlj6bB1muCnGy3+lExTIG+j9aSLdI3pHAiFLvbM789IVl5AiVb0ogM0pafV5j57JYP3cvpN14Pff2nE49zGRn/E0W1vnYlmy0luw2fn4vRd7RIGOK4QoUvPwqapm/MmbwQCScxXAjl/a4KR0E2Ia9+fAyKiYDKFBLo61kBwxIRcx542AeNBAWShdxxUTCWCklRAU0LWFgj1KObfq82vnBQdZqhD7dTIFUsWw5nPSD5d0KDVu2k+CcgbG7oM9KgCHJBgM3dYvFK9a3mZP4RhpAMs8qi8dFv3rt5VzDQ5Bl3pV1RDz6qMPlXEKHPle90qcyv+tndvdArYtp/pnsm6PIkMLBldtXbdI2MfgRM3gQpUQGzHSjzORUQ0RsulHXZbBqRcA9BkvLIJNIykcU35bHoqN9dEckXOktK6MIrVFvBHUXFMNbWxMUr3yxhpv5KEFuFQBlZaXEpnXkTKX3OHMjFrS0J7kj1epJtm9KTlQi3ZjAT04UmPiCDTMNMQlPyrnByBTESipQMojxFlGUYSaAEkgF5TEKaARJwoctgxyqqoBujnBCWNHJ5GBFaDkmmUXMi0j21VSrOV8ZDCrIz9kdg3C2BDJ4jQRJjDwWi104nh1S3C+GltL7MriaK6ynxK/Uk34117fmrjsGv2s1yGHaCHH5dzgJG+ZSdiJsZUdBDUPS0kHbQW7aonBek6J900gDNgKFNbRKoWu100bXyG+Nrmtyo+hpqyjQfpBbdZtopa6kwP8DZE+p5boeHNkAAAAASUVORK5CYII=" class="icon" alt="Apache Cayenne Ico
 n"/>
+	<span>Cayenne ${project.version}</span></h1>
+<i class="small">Built on ${project.build.datetime} by ${user.name}</i>
 
-<h2>Included HTML Documentation:</h2>
+<h2>Offline Documentation:</h2>
 <ul>
+	<li>Cayenne Tutorial: <a href="getting-started-guide.pdf">PDF</a>, <a href="getting-started-guide.html">HTML</a></li>
+	<li>Cayenne Guide: <a href="cayenne-guide.pdf">PDF</a>, <a href="cayenne-guide.html">HTML</a> </li>
+	<li>Upgrade Guide: <a href="upgrade-guide.pdf">PDF</a>, <a href="upgrade-guide.html">HTML</a></li>
+	<li>Cayenne Tutorial - Db-First Flow: <a href="getting-started-db-first.pdf">PDF</a>, <a href="getting-started-db-first.html">HTML</a></li>
+	<li>Cayenne Tutorial - Remote Object Persistence: <a href="getting-started-rop.pdf">PDF</a>, <a href="getting-started-rop.html">HTML</a></li>
 	<li><a href="api/index.html">JavaDocs</a></li>
-	<li><a href="cayenne-guide.pdf">Cayenne Guide (PDF)</a></li>
-	<li><a href="getting-started.pdf">Cayenne Tutorial (PDF)</a></li>
-	<li><a href="getting-started-rop.pdf">Cayenne Tutorial - Remote Object Persistence (PDF)</a></li>
-	<li><a href="upgrade-guide.pdf">Upgrade Guide (PDF)</a></li>
 </ul>
 
 <h2>Online Resources:</h2>
 <ul>
 	<li><a href="http://cayenne.apache.org">Cayenne Home</a></li>
 	<li><a href="http://cayenne.apache.org/download.html">Downloads</a></li>
+	<li><a href="http://cayenne.apache.org/support.html">Support</a></li>
 	<li><a href="http://issues.apache.org/jira/browse/CAY">Report Bugs</a></li>
-	<li><a href="http://cayenne.apache.org/commercial-support.html">Commercial Support</a></li>
 </ul>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/button_minus.gif
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/button_minus.gif b/docs/doc/src/main/resources/doc/schema/3.0/images/button_minus.gif
deleted file mode 100644
index 78d309a..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/button_minus.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/button_plus.gif
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/button_plus.gif b/docs/doc/src/main/resources/doc/schema/3.0/images/button_plus.gif
deleted file mode 100644
index 63e2535..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/button_plus.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/corner_bottom_left.gif
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/corner_bottom_left.gif b/docs/doc/src/main/resources/doc/schema/3.0/images/corner_bottom_left.gif
deleted file mode 100644
index aacb1da..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/corner_bottom_left.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/corner_bottom_right.gif
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/corner_bottom_right.gif b/docs/doc/src/main/resources/doc/schema/3.0/images/corner_bottom_right.gif
deleted file mode 100644
index 48879ca..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/corner_bottom_right.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/corner_top_left.gif
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/corner_top_left.gif b/docs/doc/src/main/resources/doc/schema/3.0/images/corner_top_left.gif
deleted file mode 100644
index b52ae54..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/corner_top_left.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/corner_top_right.gif
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/corner_top_right.gif b/docs/doc/src/main/resources/doc/schema/3.0/images/corner_top_right.gif
deleted file mode 100644
index 136df09..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/corner_top_right.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/hierarchy_arrow.gif
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/hierarchy_arrow.gif b/docs/doc/src/main/resources/doc/schema/3.0/images/hierarchy_arrow.gif
deleted file mode 100644
index 739bb65..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/hierarchy_arrow.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/line_bottom.gif
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/line_bottom.gif b/docs/doc/src/main/resources/doc/schema/3.0/images/line_bottom.gif
deleted file mode 100644
index c0b44c6..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/line_bottom.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/line_left.gif
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/line_left.gif b/docs/doc/src/main/resources/doc/schema/3.0/images/line_left.gif
deleted file mode 100644
index bfbef22..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/line_left.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/line_right.gif
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/line_right.gif b/docs/doc/src/main/resources/doc/schema/3.0/images/line_right.gif
deleted file mode 100644
index cd75fdc..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/line_right.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/line_top.gif
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/line_top.gif b/docs/doc/src/main/resources/doc/schema/3.0/images/line_top.gif
deleted file mode 100644
index c67c576..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/line_top.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html0.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html0.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html0.jpeg
deleted file mode 100644
index 0f09e70..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html0.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html1.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html1.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html1.jpeg
deleted file mode 100644
index d7643aa..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html1.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html10.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html10.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html10.jpeg
deleted file mode 100644
index e3c5b89..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html10.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html11.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html11.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html11.jpeg
deleted file mode 100644
index fc9532c..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html11.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html12.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html12.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html12.jpeg
deleted file mode 100644
index c9930e9..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html12.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html13.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html13.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html13.jpeg
deleted file mode 100644
index 65f445d..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html13.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html14.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html14.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html14.jpeg
deleted file mode 100644
index 84a0bc5..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html14.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html15.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html15.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html15.jpeg
deleted file mode 100644
index e58f534..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html15.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html16.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html16.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html16.jpeg
deleted file mode 100644
index fcbf95f..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html16.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html17.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html17.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html17.jpeg
deleted file mode 100644
index 161f215..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html17.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html18.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html18.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html18.jpeg
deleted file mode 100644
index 6e5c944..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html18.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html19.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html19.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html19.jpeg
deleted file mode 100644
index dc20912..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html19.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html2.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html2.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html2.jpeg
deleted file mode 100644
index 7da3b4e..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html2.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html20.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html20.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html20.jpeg
deleted file mode 100644
index 4f9ee44..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html20.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html21.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html21.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html21.jpeg
deleted file mode 100644
index b7b7af7..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html21.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html22.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html22.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html22.jpeg
deleted file mode 100644
index cf9a52d..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html22.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html23.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html23.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html23.jpeg
deleted file mode 100644
index 576a345..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html23.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html24.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html24.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html24.jpeg
deleted file mode 100644
index dd756df..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html24.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html25.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html25.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html25.jpeg
deleted file mode 100644
index 7e2a483..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html25.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html26.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html26.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html26.jpeg
deleted file mode 100644
index bbe7901..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html26.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html27.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html27.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html27.jpeg
deleted file mode 100644
index f745b39..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html27.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html28.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html28.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html28.jpeg
deleted file mode 100644
index 63c083d..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html28.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html29.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html29.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html29.jpeg
deleted file mode 100644
index c3043e0..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html29.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html3.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html3.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html3.jpeg
deleted file mode 100644
index b49fdad..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html3.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html30.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html30.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html30.jpeg
deleted file mode 100644
index 710c364..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html30.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html31.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html31.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html31.jpeg
deleted file mode 100644
index 3f44288..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html31.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html32.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html32.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html32.jpeg
deleted file mode 100644
index 9bcaba1..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html32.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html33.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html33.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html33.jpeg
deleted file mode 100644
index e94e4f1..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html33.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html34.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html34.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html34.jpeg
deleted file mode 100644
index 37696dd..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html34.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html4.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html4.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html4.jpeg
deleted file mode 100644
index 8e03899..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html4.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html5.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html5.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html5.jpeg
deleted file mode 100644
index c29c0fa..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html5.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html6.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html6.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html6.jpeg
deleted file mode 100644
index c4efaad..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html6.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html7.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html7.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html7.jpeg
deleted file mode 100644
index 2d09be2..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html7.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html8.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html8.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html8.jpeg
deleted file mode 100644
index ed01f78..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html8.jpeg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html9.jpeg
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html9.jpeg b/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html9.jpeg
deleted file mode 100644
index 6a25c5e..0000000
Binary files a/docs/doc/src/main/resources/doc/schema/3.0/images/modelMap.html9.jpeg and /dev/null differ


[08/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap27.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap27.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap27.html
deleted file mode 100644
index 52d010e..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap27.html
+++ /dev/null
@@ -1,651 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:data-map</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id1', 
-				'properties_id111');
-
-        
-        var usedByBoxes= new Array('usedBy_id111');
-
-        var sourceBoxes= new Array('source_id1', 
-				'source_id111');
-
-        var instanceBoxes= new Array('instance_id1');
-
-        var diagramBoxes= new Array('diagram_id1');
-
-        
-        var attributesBoxes= new Array('attributes_id1');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, instanceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Instances</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id1"></a><div class="componentTitle">Element <span class="qname">cay:data-map</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id1" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id1');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id1" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html33.jpeg"
-                                   usemap="#modelMap_46_html33" /><map name="modelMap_46_html33" id="modelMap_46_html33">
-                                 <area alt="modelMap27.tmp#id111" href="modelMap27.html#id111" coords="125,43,257,85" />
-                                 <area alt="modelMap22.tmp#id2" href="modelMap22.html#id2" coords="203,105,302,129" />
-                                 <area alt="modelMap21.tmp#id5" href="modelMap21.html#id5" coords="203,139,320,163" />
-                                 <area alt="modelMap17.tmp#id11" href="modelMap17.html#id11" coords="203,173,311,197" />
-                                 <area alt="modelMap19.tmp#id18" href="modelMap19.html#id18" coords="203,207,305,231" />
-                                 <area alt="modelMap1.tmp#id33" href="modelMap1.html#id33" coords="203,241,308,265" />
-                                 <area alt="modelMap14.tmp#id79" href="modelMap14.html#id79" coords="203,275,339,299" />
-                                 <area alt="modelMap23.tmp#id88" href="modelMap23.html#id88" coords="203,309,342,333" />
-                                 <area alt="modelMap24.tmp#id97" href="modelMap24.html#id97" coords="203,343,286,367" />
-                                 <area alt="modelMap6.tmp#id51" href="modelMap6.html#id51" coords="203,377,331,401" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id1" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('properties_id1');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id1" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="modelMap22.html#id2" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:property*')">cay:property*</a></b> , <b><a href="modelMap21.html#id5" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:embeddable*')">cay:embeddable*</a></b> , <b><a href="modelMap17.html#id11" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:procedure*')">cay:procedure*</a></b> , <b><a href="modelMap19.html#id18" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:db-entity*')">cay:db-entity*</a></b> , <b><a href="modelMap1.html#id33" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:obj-entity*')">cay:obj-entity*</a></b> , <b><a href="modelMap14.html#id79" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:db-relationship*')">cay:db-relationship*</a></b> , <b><a href="modelMap23.html#id88" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:obj-relationship*')">cay:obj-relationship*</a></b> , <b><a href="modelMap24.html#id97" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:query*')">cay:query*</a></b> , <b><a href="modelMap6.html#id51" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:entity-listener*')">cay:entity-listener*</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="modelMap19.html#id18" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:db-entity')">cay:db-entity</a></b>, <b><a href="modelMap14.html#id79" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:db-relationship')">cay:db-relationship</a></b>, <b><a href="modelMap21.html#id5" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:embeddable')">cay:embeddable</a></b>, <b><a href="modelMap6.html#id51" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:entity-listener')">cay:entity-listener</a></b>, <b><a href="modelMap1.html#id33" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b>, <b><a href="modelMap23.html#id88" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:obj-relationship')">cay:obj-relationship</a></b>, <b><a href="modelMap17.html#id11" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:procedure')">cay:procedure</a></b>, <b><a href="modelMap22.html#id2" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:property')">cay:property</a></b>, <b><a href="modelMap24.html#id97" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id1" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id1');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="instance_id1" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;cay:data-map</span><span class="tokenText"> </span><span class="tokenAttrName">project-version=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:property</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">value=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:property&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:embeddable</span><span class="tokenText"> </span><span class="tokenAttrName">className=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:embeddable&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:procedure</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:procedure&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:db-entity</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">schema=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:db-entity&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:obj-entity</span><span class="tokenText"> </span><span class="tokenAttrName">abstract=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">className=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">clientClassName=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">clientSuperClassName=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">dbEntityName=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">exclude-default-listeners=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">exclude-superclass-listeners=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">lock-type=</span>
 <span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">readOnly=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">superClassName=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">superEntityName=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:obj-entity&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:db-relationship</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">source=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">target=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">toDependentPK=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">toMany=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:db-relationship&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:obj-relationship</span><span class="tokenText"> </span><span class="tokenAttrName">collection-type=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">db-relationship-path=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">deleteRule=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">lock=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">map-key=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">source=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">target=</span><span class="tokenAttrValue">""</span><span clas
 s="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:obj-relationship&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:query</span><span class="tokenText"> </span><span class="tokenAttrName">factory=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">result-entity=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">root=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">root-name=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:query&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:entity-listener</span><span class="tokenText"> </span><span class="tokenAttrName">class=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:entity-listener&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/cay:data-map&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id1" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('attributes_id1');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id1" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap27.html#id111" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component project-version')">project-version</a></b></td>
-                                    <td><b>xs:decimal</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id1" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id1');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id1" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"data-map"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:sequence</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:property"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:embeddable"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:procedure"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:db-entity"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:obj-entity"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:db-relationship"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:obj-relationship"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:query"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:entity-listener"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;/xs:sequence&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"project-version"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:decimal"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id111"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap27.html#id1" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:data-map')">cay:data-map</a></b>/@project-version</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:decimal</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id111" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id111');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id111" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id111" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id111');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id111" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap27.html#id1" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:data-map')">cay:data-map</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id111" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id111');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id111" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"project-version"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:decimal"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap28.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap28.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap28.html
deleted file mode 100644
index c993fbb..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap28.html
+++ /dev/null
@@ -1,374 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component modelMap.xsd</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id0');
-
-        
-        
-        
-        
-        
-        
-        
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id0"></a><div class="componentTitle">Main schema <span class="qname">modelMap.xsd</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id0" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('properties_id0');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id0" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">attribute form default:
-                                       
-                                    </td>
-                                    <td><b>unqualified</b></td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">element form default:
-                                       
-                                    </td>
-                                    <td><b>qualified</b></td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">version:
-                                       
-                                    </td>
-                                    <td><b>2</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file


[06/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap5.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap5.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap5.html
deleted file mode 100644
index 3bd59f8..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap5.html
+++ /dev/null
@@ -1,909 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:attribute-override</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id46', 
-				'properties_id47', 
-				'properties_id48', 
-				'properties_id49', 
-				'properties_id50');
-
-        
-        var usedByBoxes= new Array('usedBy_id46', 
-				'usedBy_id47', 
-				'usedBy_id48', 
-				'usedBy_id49', 
-				'usedBy_id50');
-
-        var sourceBoxes= new Array('source_id46', 
-				'source_id47', 
-				'source_id48', 
-				'source_id49', 
-				'source_id50');
-
-        
-        var diagramBoxes= new Array('diagram_id46');
-
-        
-        var attributesBoxes= new Array('attributes_id46');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id46"></a><div class="componentTitle">Element <span class="qname">cay:attribute-override</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id46" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id46');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id46" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html11.jpeg"
-                                   usemap="#modelMap_46_html11" /><map name="modelMap_46_html11" id="modelMap_46_html11">
-                                 <area alt="modelMap5.tmp#id47" href="modelMap5.html#id47" coords="170,43,314,85" />
-                                 <area alt="modelMap5.tmp#id48" href="modelMap5.html#id48" coords="170,95,294,137" />
-                                 <area alt="modelMap5.tmp#id49" href="modelMap5.html#id49" coords="170,147,283,189" />
-                                 <area alt="modelMap5.tmp#id50" href="modelMap5.html#id50" coords="170,199,283,241" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id46" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id46');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id46" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id46" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id46');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id46" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap1.html#id33" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id46" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id46');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id46" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap5.html#id47" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component db-attribute-path')">db-attribute-path</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap5.html#id48" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component lock')">lock</a></b></td>
-                                    <td><b>xs:boolean</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap5.html#id49" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component name')">name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap5.html#id50" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component type')">type</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id46" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id46');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id46" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"attribute-override"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-attribute-path"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"lock"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"type"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id47"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap5.html#id46" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:attribute-override')">cay:attribute-override</a></b>/@db-attribute-path</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id47" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id47');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id47" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>optional</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id47" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id47');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id47" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap5.html#id46" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:attribute-override')">cay:attribute-override</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id47" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id47');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id47" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-attribute-path"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id48"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap5.html#id46" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:attribute-override')">cay:attribute-override</a></b>/@lock</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:boolean</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id48" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id48');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id48" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>optional</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id48" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id48');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id48" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap5.html#id46" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:attribute-override')">cay:attribute-override</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id48" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id48');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id48" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"lock"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id49"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap5.html#id46" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:attribute-override')">cay:attribute-override</a></b>/@name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id49" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id49');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id49" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>optional</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id49" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id49');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id49" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap5.html#id46" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:attribute-override')">cay:attribute-override</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id49" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id49');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id49" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id50"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap5.html#id46" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:attribute-override')">cay:attribute-override</a></b>/@type</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id50" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id50');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id50" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>optional</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id50" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id50');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id50" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap5.html#id46" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:attribute-override')">cay:attribute-override</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id50" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id50');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id50" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"type"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file


[10/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap24.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap24.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap24.html
deleted file mode 100644
index e1d3f18..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap24.html
+++ /dev/null
@@ -1,1302 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:query</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id97', 
-				'properties_id101', 
-				'properties_id105', 
-				'properties_id106', 
-				'properties_id107', 
-				'properties_id108', 
-				'properties_id109', 
-				'properties_id110');
-
-        
-        var usedByBoxes= new Array('usedBy_id97', 
-				'usedBy_id106', 
-				'usedBy_id107', 
-				'usedBy_id108', 
-				'usedBy_id109', 
-				'usedBy_id110');
-
-        var sourceBoxes= new Array('source_id97', 
-				'source_id101', 
-				'source_id105', 
-				'source_id106', 
-				'source_id107', 
-				'source_id108', 
-				'source_id109', 
-				'source_id110');
-
-        var instanceBoxes= new Array('instance_id97');
-
-        var diagramBoxes= new Array('diagram_id97', 
-				'diagram_id101', 
-				'diagram_id105');
-
-        
-        var attributesBoxes= new Array('attributes_id97');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, instanceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Instances</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id97"></a><div class="componentTitle">Element <span class="qname">cay:query</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id97" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id97');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id97" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html25.jpeg"
-                                   usemap="#modelMap_46_html25" /><map name="modelMap_46_html25" id="modelMap_46_html25">
-                                 <area alt="modelMap24.tmp#id106" href="modelMap24.html#id106" coords="104,43,179,67" />
-                                 <area alt="modelMap24.tmp#id107" href="modelMap24.html#id107" coords="104,77,217,119" />
-                                 <area alt="modelMap24.tmp#id108" href="modelMap24.html#id108"
-                                       coords="104,129,217,171" />
-                                 <area alt="modelMap24.tmp#id109" href="modelMap24.html#id109"
-                                       coords="104,181,217,223" />
-                                 <area alt="modelMap24.tmp#id110" href="modelMap24.html#id110"
-                                       coords="104,233,219,275" />
-                                 <area alt="modelMap22.tmp#id2" href="modelMap22.html#id2" coords="182,295,281,319" />
-                                 <area alt="modelMap0.tmp#id98" href="modelMap0.html#id98" coords="182,329,371,371" />
-                                 <area alt="modelMap25.tmp#id100" href="modelMap25.html#id100"
-                                       coords="182,381,295,423" />
-                                 <area alt="modelMap24.tmp#id101" href="modelMap24.html#id101"
-                                       coords="182,433,295,475" />
-                                 <area alt="modelMap26.tmp#id102" href="modelMap26.html#id102"
-                                       coords="182,485,371,527" />
-                                 <area alt="modelMap24.tmp#id105" href="modelMap24.html#id105"
-                                       coords="182,537,295,579" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id97" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id97');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id97" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id97" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id97');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id97" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap27.html#id1" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:data-map')">cay:data-map</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="modelMap22.html#id2" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:property*')">cay:property*</a></b> , <b><a href="modelMap0.html#id98" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:sql*')">cay:sql*</a></b> , <b><a href="modelMap25.html#id100" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:ejbql*')">cay:ejbql*</a></b> , <b><a href="modelMap24.html#id101" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:qualifier*')">cay:qualifier*</a></b> , <b><a href="modelMap26.html#id102" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:ordering*')">cay:ordering*</a></b> , <b><a href="modelMap24.html#id105" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:prefetch*')">cay:prefetch*</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="modelMap25.html#id100" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:ejbql')">cay:ejbql</a></b>, <b><a href="modelMap26.html#id102" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:ordering')">cay:ordering</a></b>, <b><a href="modelMap24.html#id105" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:prefetch')">cay:prefetch</a></b>, <b><a href="modelMap22.html#id2" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:property')">cay:property</a></b>, <b><a href="modelMap24.html#id101" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:qualifier')">cay:qualifier</a></b>, <b><a href="modelMap0.html#id98" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:sql')">cay:sql</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id97" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id97');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="instance_id97" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;cay:query</span><span class="tokenText"> </span><span class="tokenAttrName">factory=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">result-entity=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">root=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">root-name=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:property</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">value=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:property&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:sql</span><span class="tokenText"> </span><span class="tokenAttrName">adapter-class=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:sql&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:ejbql</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:ejbql&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:qualifier</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:qualifier&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:ordering</span><span class="tokenText"> </span><span class="tokenAttrName">descending=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">ignore-case=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:ordering&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:prefetch</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:prefetch&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/cay:query&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id97" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id97');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id97" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap24.html#id106" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component factory')">factory</a></b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap24.html#id107" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component name')">name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap24.html#id110" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component result-entity')">result-entity</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap24.html#id108" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component root')">root</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap24.html#id109" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component root-name')">root-name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id97" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id97');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id97" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"query"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:sequence</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:property"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:sql"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:ejbql"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"qualifier"</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:ordering"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"prefetch"</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;/xs:sequence&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"factory"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"root"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"root-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"result-entity"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id101"></a><div class="componentTitle">Element <span class="qname"><b><a href="modelMap24.html#id97" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b>/cay:qualifier</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id101" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id101');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id101" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html31.jpeg" /></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id101" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id101');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id101" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>simple</b></td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">minOccurs:
-                                       
-                                    </td>
-                                    <td><b>0</b></td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">maxOccurs:
-                                       
-                                    </td>
-                                    <td><b>unbounded</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id101" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id101');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id101" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"qualifier"</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id105"></a><div class="componentTitle">Element <span class="qname"><b><a href="modelMap24.html#id97" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b>/cay:prefetch</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id105" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id105');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id105" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html23.jpeg" /></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id105" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id105');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id105" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>simple</b></td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">minOccurs:
-                                       
-                                    </td>
-                                    <td><b>0</b></td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">maxOccurs:
-                                       
-                                    </td>
-                                    <td><b>unbounded</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id105" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id105');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id105" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"prefetch"</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id106"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap24.html#id97" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b>/@factory</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id106" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id106');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id106" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id106" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id106');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id106" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap24.html#id97" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id106" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id106');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id106" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"factory"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id107"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap24.html#id97" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b>/@name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id107" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id107');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id107" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id107" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id107');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id107" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap24.html#id97" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id107" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id107');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id107" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id108"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap24.html#id97" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b>/@root</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id108" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id108');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id108" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>optional</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id108" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id108');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id108" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap24.html#id97" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id108" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id108');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id108" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"root"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id109"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap24.html#id97" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b>/@root-name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id109" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id109');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id109" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>optional</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id109" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id109');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id109" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap24.html#id97" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id109" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id109');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id109" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"root-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id110"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap24.html#id97" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b>/@result-entity</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id110" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id110');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id110" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>optional</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id110" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id110');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id110" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap24.html#id97" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id110" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id110');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id110" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"result-entity"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file


[19/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap14.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap14.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap14.html
deleted file mode 100644
index 76b964d..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap14.html
+++ /dev/null
@@ -1,1062 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:db-relationship</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id79', 
-				'properties_id83', 
-				'properties_id84', 
-				'properties_id85', 
-				'properties_id86', 
-				'properties_id87');
-
-        
-        var usedByBoxes= new Array('usedBy_id79', 
-				'usedBy_id83', 
-				'usedBy_id84', 
-				'usedBy_id85', 
-				'usedBy_id86', 
-				'usedBy_id87');
-
-        var sourceBoxes= new Array('source_id79', 
-				'source_id83', 
-				'source_id84', 
-				'source_id85', 
-				'source_id86', 
-				'source_id87');
-
-        var instanceBoxes= new Array('instance_id79');
-
-        var diagramBoxes= new Array('diagram_id79');
-
-        
-        var attributesBoxes= new Array('attributes_id79');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, instanceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Instances</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id79"></a><div class="componentTitle">Element <span class="qname">cay:db-relationship</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id79" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id79');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id79" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html3.jpeg"
-                                   usemap="#modelMap_46_html3" /><map name="modelMap_46_html3" id="modelMap_46_html3">
-                                 <area alt="modelMap14.tmp#id83" href="modelMap14.html#id83" coords="157,43,270,85" />
-                                 <area alt="modelMap14.tmp#id84" href="modelMap14.html#id84" coords="157,95,270,137" />
-                                 <area alt="modelMap14.tmp#id85" href="modelMap14.html#id85" coords="157,147,270,189" />
-                                 <area alt="modelMap14.tmp#id86" href="modelMap14.html#id86" coords="157,199,287,241" />
-                                 <area alt="modelMap14.tmp#id87" href="modelMap14.html#id87" coords="157,251,281,293" />
-                                 <area alt="modelMap15.tmp#id80" href="modelMap15.html#id80" coords="223,317,368,341" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id79" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id79');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id79" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id79" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id79');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id79" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap27.html#id1" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:data-map')">cay:data-map</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="modelMap15.html#id80" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:db-attribute-pair+')">cay:db-attribute-pair+</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="modelMap15.html#id80" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:db-attribute-pair')">cay:db-attribute-pair</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id79" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id79');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="instance_id79" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;cay:db-relationship</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">source=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">target=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">toDependentPK=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">toMany=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:db-attribute-pair</span><span class="tokenText"> </span><span class="tokenAttrName">source=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">target=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{1,unbounded}</span><span class="tokenElement">&lt;/cay:db-attribute-pair&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/cay:db-relationship&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id79" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id79');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id79" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap14.html#id83" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component name')">name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap14.html#id84" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component source')">source</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap14.html#id85" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component target')">target</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap14.html#id86" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component toDependentPK')">toDependentPK</a></b></td>
-                                    <td><b>xs:boolean</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap14.html#id87" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component toMany')">toMany</a></b></td>
-                                    <td><b>xs:boolean</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id79" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id79');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id79" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-relationship"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:sequence</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"1"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:db-attribute-pair"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;/xs:sequence&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"source"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"target"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"toDependentPK"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"toMany"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id83"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap14.html#id79" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:db-relationship')">cay:db-relationship</a></b>/@name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id83" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id83');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id83" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id83" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id83');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id83" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap14.html#id79" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-relationship')">cay:db-relationship</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id83" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id83');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id83" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id84"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap14.html#id79" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:db-relationship')">cay:db-relationship</a></b>/@source</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id84" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id84');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id84" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id84" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id84');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id84" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap14.html#id79" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-relationship')">cay:db-relationship</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id84" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id84');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id84" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"source"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id85"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap14.html#id79" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:db-relationship')">cay:db-relationship</a></b>/@target</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id85" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id85');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id85" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id85" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id85');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id85" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap14.html#id79" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-relationship')">cay:db-relationship</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id85" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id85');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id85" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"target"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id86"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap14.html#id79" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:db-relationship')">cay:db-relationship</a></b>/@toDependentPK</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:boolean</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id86" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id86');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id86" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>simple</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id86" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id86');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id86" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap14.html#id79" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-relationship')">cay:db-relationship</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id86" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id86');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id86" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"toDependentPK"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id87"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap14.html#id79" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:db-relationship')">cay:db-relationship</a></b>/@toMany</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:boolean</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id87" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id87');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id87" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id87" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id87');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id87" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap14.html#id79" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-relationship')">cay:db-relationship</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id87" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id87');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id87" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"toMany"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file


[09/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap25.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap25.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap25.html
deleted file mode 100644
index cc2c5e7..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap25.html
+++ /dev/null
@@ -1,434 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:ejbql</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id100');
-
-        
-        var usedByBoxes= new Array('usedBy_id100');
-
-        var sourceBoxes= new Array('source_id100');
-
-        
-        var diagramBoxes= new Array('diagram_id100');
-
-        
-        
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id100"></a><div class="componentTitle">Element <span class="qname">cay:ejbql</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id100" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id100');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id100" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html29.jpeg" /></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id100" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id100');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id100" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>simple</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id100" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id100');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id100" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap24.html#id97" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id100" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id100');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id100" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"ejbql"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap26.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap26.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap26.html
deleted file mode 100644
index a8a6ef1..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap26.html
+++ /dev/null
@@ -1,696 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:ordering</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id102', 
-				'properties_id103', 
-				'properties_id104');
-
-        
-        var usedByBoxes= new Array('usedBy_id102', 
-				'usedBy_id103', 
-				'usedBy_id104');
-
-        var sourceBoxes= new Array('source_id102', 
-				'source_id103', 
-				'source_id104');
-
-        
-        var diagramBoxes= new Array('diagram_id102');
-
-        
-        var attributesBoxes= new Array('attributes_id102');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id102"></a><div class="componentTitle">Element <span class="qname">cay:ordering</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id102" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id102');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id102" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html30.jpeg"
-                                   usemap="#modelMap_46_html30" /><map name="modelMap_46_html30" id="modelMap_46_html30">
-                                 <area alt="modelMap26.tmp#id103" href="modelMap26.html#id103" coords="231,88,355,130" />
-                                 <area alt="modelMap26.tmp#id104" href="modelMap26.html#id104"
-                                       coords="231,140,355,182" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td>extension of <b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id102" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id102');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id102" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id102" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id102');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id102" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap24.html#id97" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id102" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id102');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id102" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap26.html#id103" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component descending')">descending</a></b></td>
-                                    <td><b>xs:boolean</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap26.html#id104" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component ignore-case')">ignore-case</a></b></td>
-                                    <td><b>xs:boolean</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id102" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id102');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id102" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"ordering"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:simpleContent</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:extension</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"descending"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"ignore-case"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;/xs:extension&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;/xs:simpleContent&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id103"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap26.html#id102" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:ordering')">cay:ordering</a></b>/@descending</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:boolean</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id103" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id103');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id103" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>simple</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id103" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id103');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id103" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap26.html#id102" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:ordering')">cay:ordering</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id103" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id103');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id103" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"descending"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id104"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap26.html#id102" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:ordering')">cay:ordering</a></b>/@ignore-case</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:boolean</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id104" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id104');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id104" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>simple</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id104" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id104');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id104" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap26.html#id102" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:ordering')">cay:ordering</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id104" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id104');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id104" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"ignore-case"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file


[14/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap20.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap20.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap20.html
deleted file mode 100644
index 88a688a..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap20.html
+++ /dev/null
@@ -1,1309 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:db-attribute</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id19', 
-				'properties_id20', 
-				'properties_id21', 
-				'properties_id22', 
-				'properties_id23', 
-				'properties_id24', 
-				'properties_id25', 
-				'properties_id26');
-
-        
-        var usedByBoxes= new Array('usedBy_id19', 
-				'usedBy_id20', 
-				'usedBy_id21', 
-				'usedBy_id22', 
-				'usedBy_id23', 
-				'usedBy_id24', 
-				'usedBy_id25', 
-				'usedBy_id26');
-
-        var sourceBoxes= new Array('source_id19', 
-				'source_id20', 
-				'source_id21', 
-				'source_id22', 
-				'source_id23', 
-				'source_id24', 
-				'source_id25', 
-				'source_id26');
-
-        
-        var diagramBoxes= new Array('diagram_id19');
-
-        var annotationBoxes= new Array('annotations_id19', 
-				'annotations_id21');
-
-        var attributesBoxes= new Array('attributes_id19');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, annotationBoxes);"
-                                     class="control" /></span><span class="globalControlName">Annotations</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id19"></a><div class="componentTitle">Element <span class="qname">cay:db-attribute</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id19" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('annotations_id19');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="annotations_id19" style="display:block">
-                              <div class="annotation">
-                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                        class="preWrapContainer">
-                                    <tr>
-                                       <td width="100%"><pre><span class="tokenText">A database column.</span></pre></td>
-                                    </tr>
-                                 </table>
-                              </div>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id19" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id19');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id19" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html34.jpeg"
-                                   usemap="#modelMap_46_html34" /><map name="modelMap_46_html34" id="modelMap_46_html34">
-                                 <area alt="modelMap20.tmp#id20" href="modelMap20.html#id20" coords="139,43,263,85" />
-                                 <area alt="modelMap20.tmp#id21" href="modelMap20.html#id21" coords="139,95,263,137" />
-                                 <area alt="modelMap20.tmp#id22" href="modelMap20.html#id22" coords="139,147,263,189" />
-                                 <area alt="modelMap20.tmp#id23" href="modelMap20.html#id23" coords="139,199,258,241" />
-                                 <area alt="modelMap20.tmp#id24" href="modelMap20.html#id24" coords="139,251,252,293" />
-                                 <area alt="modelMap20.tmp#id25" href="modelMap20.html#id25" coords="139,303,258,345" />
-                                 <area alt="modelMap20.tmp#id26" href="modelMap20.html#id26" coords="139,355,252,397" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id19" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id19');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id19" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id19" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id19');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id19" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap19.html#id18" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-entity')">cay:db-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id19" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id19');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id19" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap20.html#id22" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component isGenerated')">isGenerated</a></b></td>
-                                    <td><b>xs:boolean</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap20.html#id20" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component isMandatory')">isMandatory</a></b></td>
-                                    <td><b>xs:boolean</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap20.html#id21" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component isPrimaryKey')">isPrimaryKey</a></b></td>
-                                    <td><b>xs:boolean</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation">
-                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                                 class="preWrapContainer">
-                                             <tr>
-                                                <td width="100%"><pre><span class="tokenText">If true, the value of attribute is unique and used as a primary key identifier.</span></pre></td>
-                                             </tr>
-                                          </table>
-                                       </div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap20.html#id23" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component length')">length</a></b></td>
-                                    <td><b>xs:integer</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap20.html#id24" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component name')">name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap20.html#id25" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component scale')">scale</a></b></td>
-                                    <td><b>xs:integer</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap20.html#id26" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component type')">type</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id19" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id19');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id19" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-attribute"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:annotation</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:documentation</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">A database column.</span><span class="tokenElement">&lt;/xs:documentation&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:annotation&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"isMandatory"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"isPrimaryKey"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:annotation</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;xs:documentation</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">If true, the value of attribute is unique and used as a primary key identifier.</span><span class="tokenElement">&lt;/xs:documentation&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;/xs:annotation&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;/xs:attribute&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"isGenerated"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"length"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:integer"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"scale"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:integer"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"type"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id20"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap20.html#id19" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:db-attribute')">cay:db-attribute</a></b>/@isMandatory</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:boolean</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id20" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id20');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id20" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>simple</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id20" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id20');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id20" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap20.html#id19" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-attribute')">cay:db-attribute</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id20" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id20');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id20" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"isMandatory"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id21"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap20.html#id19" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:db-attribute')">cay:db-attribute</a></b>/@isPrimaryKey</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id21" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('annotations_id21');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="annotations_id21" style="display:block">
-                              <div class="annotation">
-                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                        class="preWrapContainer">
-                                    <tr>
-                                       <td width="100%"><pre><span class="tokenText">If true, the value of attribute is unique and used as a primary key identifier.</span></pre></td>
-                                    </tr>
-                                 </table>
-                              </div>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:boolean</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id21" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id21');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id21" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>simple</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id21" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id21');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id21" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap20.html#id19" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-attribute')">cay:db-attribute</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id21" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id21');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id21" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"isPrimaryKey"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:annotation</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:documentation</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">If true, the value of attribute is unique and used as a primary key identifier.</span><span class="tokenElement">&lt;/xs:documentation&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:annotation&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:attribute&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id22"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap20.html#id19" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:db-attribute')">cay:db-attribute</a></b>/@isGenerated</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:boolean</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id22" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id22');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id22" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>optional</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id22" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id22');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id22" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap20.html#id19" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-attribute')">cay:db-attribute</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id22" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id22');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id22" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"isGenerated"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id23"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap20.html#id19" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:db-attribute')">cay:db-attribute</a></b>/@length</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:integer</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id23" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id23');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id23" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>simple</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id23" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id23');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id23" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap20.html#id19" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-attribute')">cay:db-attribute</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id23" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id23');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id23" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"length"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:integer"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id24"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap20.html#id19" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:db-attribute')">cay:db-attribute</a></b>/@name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id24" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id24');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id24" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id24" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id24');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id24" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap20.html#id19" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-attribute')">cay:db-attribute</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id24" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id24');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id24" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id25"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap20.html#id19" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:db-attribute')">cay:db-attribute</a></b>/@scale</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:integer</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id25" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id25');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id25" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>simple</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id25" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id25');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id25" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap20.html#id19" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-attribute')">cay:db-attribute</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id25" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id25');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id25" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"scale"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:integer"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id26"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap20.html#id19" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:db-attribute')">cay:db-attribute</a></b>/@type</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id26" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id26');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id26" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id26" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id26');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id26" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap20.html#id19" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-attribute')">cay:db-attribute</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id26" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id26');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id26" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"type"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file


[22/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap1.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap1.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap1.html
deleted file mode 100644
index 72ed109..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap1.html
+++ /dev/null
@@ -1,1943 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:obj-entity</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id33', 
-				'properties_id67', 
-				'properties_id68', 
-				'properties_id69', 
-				'properties_id70', 
-				'properties_id71', 
-				'properties_id72', 
-				'properties_id73', 
-				'properties_id74', 
-				'properties_id75', 
-				'properties_id76', 
-				'properties_id77', 
-				'properties_id78');
-
-        
-        var usedByBoxes= new Array('usedBy_id33', 
-				'usedBy_id67', 
-				'usedBy_id68', 
-				'usedBy_id69', 
-				'usedBy_id70', 
-				'usedBy_id71', 
-				'usedBy_id72', 
-				'usedBy_id73', 
-				'usedBy_id74', 
-				'usedBy_id75', 
-				'usedBy_id76', 
-				'usedBy_id77', 
-				'usedBy_id78');
-
-        var sourceBoxes= new Array('source_id33', 
-				'source_id67', 
-				'source_id68', 
-				'source_id69', 
-				'source_id70', 
-				'source_id71', 
-				'source_id72', 
-				'source_id73', 
-				'source_id74', 
-				'source_id75', 
-				'source_id76', 
-				'source_id77', 
-				'source_id78');
-
-        var instanceBoxes= new Array('instance_id33');
-
-        var diagramBoxes= new Array('diagram_id33');
-
-        var annotationBoxes= new Array('annotations_id33');
-
-        var attributesBoxes= new Array('attributes_id33');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, annotationBoxes);"
-                                     class="control" /></span><span class="globalControlName">Annotations</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, instanceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Instances</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id33"></a><div class="componentTitle">Element <span class="qname">cay:obj-entity</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id33" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('annotations_id33');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="annotations_id33" style="display:block">
-                              <div class="annotation">
-                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                        class="preWrapContainer">
-                                    <tr>
-                                       <td width="100%"><pre><span class="tokenText">A persistent Java class managed by Cayenne.</span></pre></td>
-                                    </tr>
-                                 </table>
-                              </div>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id33" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id33');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id33" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html2.jpeg"
-                                   usemap="#modelMap_46_html2" /><map name="modelMap_46_html2" id="modelMap_46_html2">
-                                 <area alt="modelMap1.tmp#id67" href="modelMap1.html#id67" coords="126,43,239,85" />
-                                 <area alt="modelMap1.tmp#id68" href="modelMap1.html#id68" coords="126,95,239,137" />
-                                 <area alt="modelMap1.tmp#id69" href="modelMap1.html#id69" coords="126,147,250,189" />
-                                 <area alt="modelMap1.tmp#id70" href="modelMap1.html#id70" coords="126,199,262,241" />
-                                 <area alt="modelMap1.tmp#id71" href="modelMap1.html#id71" coords="126,251,293,293" />
-                                 <area alt="modelMap1.tmp#id72" href="modelMap1.html#id72" coords="126,303,248,345" />
-                                 <area alt="modelMap1.tmp#id73" href="modelMap1.html#id73" coords="126,355,239,397" />
-                                 <area alt="modelMap1.tmp#id74" href="modelMap1.html#id74" coords="126,407,239,449" />
-                                 <area alt="modelMap1.tmp#id75" href="modelMap1.html#id75" coords="126,459,264,501" />
-                                 <area alt="modelMap1.tmp#id76" href="modelMap1.html#id76" coords="126,511,265,553" />
-                                 <area alt="modelMap1.tmp#id77" href="modelMap1.html#id77" coords="126,563,332,605" />
-                                 <area alt="modelMap1.tmp#id78" href="modelMap1.html#id78" coords="126,615,311,657" />
-                                 <area alt="modelMap2.tmp#id34" href="modelMap2.html#id34" coords="204,677,317,719" />
-                                 <area alt="modelMap3.tmp#id35" href="modelMap3.html#id35" coords="204,729,364,753" />
-                                 <area alt="modelMap4.tmp#id41" href="modelMap4.html#id41" coords="204,763,325,787" />
-                                 <area alt="modelMap5.tmp#id46" href="modelMap5.html#id46" coords="204,797,353,821" />
-                                 <area alt="modelMap6.tmp#id51" href="modelMap6.html#id51" coords="275,831,403,855" />
-                                 <area alt="modelMap7.tmp#id52" href="modelMap7.html#id52" coords="275,865,388,889" />
-                                 <area alt="modelMap8.tmp#id54" href="modelMap8.html#id54" coords="275,899,394,923" />
-                                 <area alt="modelMap9.tmp#id56" href="modelMap9.html#id56" coords="275,933,388,957" />
-                                 <area alt="modelMap10.tmp#id58" href="modelMap10.html#id58" coords="275,967,394,991" />
-                                 <area alt="modelMap11.tmp#id60" href="modelMap11.html#id60"
-                                       coords="275,1001,391,1025" />
-                                 <area alt="modelMap12.tmp#id62" href="modelMap12.html#id62"
-                                       coords="275,1035,397,1059" />
-                                 <area alt="modelMap13.tmp#id64" href="modelMap13.html#id64"
-                                       coords="275,1069,380,1093" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id33" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id33');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id33" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id33" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id33');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id33" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap27.html#id1" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:data-map')">cay:data-map</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="modelMap2.html#id34" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:qualifier{0,1}')">cay:qualifier{0,1}</a></b> , <b><a href="modelMap3.html#id35" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:embedded-attribute*')">cay:embedded-attribute*</a></b> , <b><a href="modelMap4.html#id41" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:obj-attribute*')">cay:obj-attribute*</a></b> , <b><a href="modelMap5.html#id46" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:attribute-override*')">cay:attribute-override*</a></b> , <b><a href="modelMap6.html#id51" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:entity-listener')">cay:entity-listener</a></b> , <b><a href="modelMap7.html#id52" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:pre-persist')">cay:pre-persist</a></b> , <b><a href="modelMap8.html#id54" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:post-persist')">cay:post-persist</a></b> , <b><a href="modelMap9.html#id56" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:pre-update')">cay:pre-update</a></b> , <b><a href="modelMap10.html#id58" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:post-update')">cay:post-update</a></b> , <b><a href="modelMap11.html#id60" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:pre-remove')">cay:pre-remove</a></b> , <b><a href="modelMap12.html#id62" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:post-remove')">cay:post-remove</a></b> , <b><a href="modelMap13.html#id64" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:post-load')">cay:post-load</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="modelMap5.html#id46" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:attribute-override')">cay:attribute-override</a></b>, <b><a href="modelMap3.html#id35" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:embedded-attribute')">cay:embedded-attribute</a></b>, <b><a href="modelMap6.html#id51" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:entity-listener')">cay:entity-listener</a></b>, <b><a href="modelMap4.html#id41" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:obj-attribute')">cay:obj-attribute</a></b>, <b><a href="modelMap13.html#id64" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:post-load')">cay:post-load</a></b>, <b><a href="modelMap8.html#id54" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:post-persist')">cay:post-persist</a></b>, <b><a href="modelMap12.html#id62" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:post-remove')">cay:post-remove</a></b>, <b><a href="modelMap10.html#id58" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:post-update')">cay:post-update</a></b>, <b><a href="modelMap7.html#id52" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:pre-persist')">cay:pre-persist</a></b>, <b><a href="modelMap11.html#id60" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:pre-remove')">cay:pre-remove</a></b>, <b><a href="modelMap9.html#id56" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:pre-update')">cay:pre-update</a></b>, <b><a href="modelMap2.html#id34" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:qualifier')">cay:qualifier</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id33" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id33');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="instance_id33" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;cay:obj-entity</span><span class="tokenText"> </span><span class="tokenAttrName">abstract=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">className=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">clientClassName=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">clientSuperClassName=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">dbEntityName=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">exclude-default-listeners=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">exclude-superclass-listeners=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </s
 pan><span class="tokenAttrName">lock-type=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">readOnly=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">superClassName=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">superEntityName=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:qualifier</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,1}</span><span class="tokenElement">&lt;/cay:qualifier&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:embedded-attribute</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">type=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:embedded-attribute&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:obj-attribute</span><span class="tokenText"> </span><span class="tokenAttrName">db-attribute-path=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">lock=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">type=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:obj-attribute&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:attribute-override</span><span class="tokenText"> </span><span class="tokenAttrName">db-attribute-path=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">lock=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">type=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:attribute-override&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/cay:obj-entity&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id33" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id33');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id33" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap1.html#id68" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component abstract')">abstract</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap1.html#id67" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component className')">className</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap1.html#id70" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component clientClassName')">clientClassName</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap1.html#id71" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component clientSuperClassName')">clientSuperClassName</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap1.html#id72" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component dbEntityName')">dbEntityName</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap1.html#id78" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component exclude-default-listeners')">exclude-default-listeners</a></b></td>
-                                    <td><b>xs:boolean</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap1.html#id77" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component exclude-superclass-listeners')">exclude-superclass-listeners</a></b></td>
-                                    <td><b>xs:boolean</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap1.html#id73" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component lock-type')">lock-type</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap1.html#id74" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component name')">name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap1.html#id69" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component readOnly')">readOnly</a></b></td>
-                                    <td><b>xs:boolean</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap1.html#id75" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component superClassName')">superClassName</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap1.html#id76" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component superEntityName')">superEntityName</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id33" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id33');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id33" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"obj-entity"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:annotation</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:documentation</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">A persistent Java class managed by Cayenne.</span><span class="tokenElement">&lt;/xs:documentation&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:annotation&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:sequence</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:qualifier"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:embedded-attribute"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:obj-attribute"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:attribute-override"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:sequence</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:entity-listener"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:pre-persist"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:post-persist"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:pre-update"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:post-update"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:pre-remove"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:post-remove"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:post-load"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;/xs:sequence&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;/xs:sequence&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"className"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"abstract"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"readOnly"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"clientClassName"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"clientSuperClassName"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"dbEntityName"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"lock-type"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"superClassName"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"superEntityName"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"exclude-superclass-listeners"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"exclude-default-listeners"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id67"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap1.html#id33" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b>/@className</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id67" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id67');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id67" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>optional</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id67" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id67');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id67" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap1.html#id33" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id67" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id67');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id67" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"className"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id68"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap1.html#id33" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b>/@abstract</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id68" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id68');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id68" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>optional</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id68" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id68');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id68" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap1.html#id33" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id68" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id68');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id68" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"abstract"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id69"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap1.html#id33" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b>/@readOnly</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:boolean</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id69" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id69');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id69" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>optional</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id69" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id69');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id69" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap1.html#id33" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id69" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id69');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id69" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"readOnly"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id70"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap1.html#id33" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b>/@clientClassName</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id70" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id70');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id70" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>optional</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id70" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id70');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id70" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap1.html#id33" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id70" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id70');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id70" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"clientClassName"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id71"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap1.html#id33" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b>/@clientSuperClassName</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id71" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id71');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id71" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>optional</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id71" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id71');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id71" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap1.html#id33" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id71" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id71');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id71" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"clientSuperClassName"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id72"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap1.html#id33" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b>/@dbEntityName</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id72" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id72');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id72" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>optional</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id72" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id72');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id72" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap1.html#id33" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id72" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id72');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id72" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"dbEntityName"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id73"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap1.html#id33" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b>/@lock-type</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class

<TRUNCATED>

[16/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap18.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap18.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap18.html
deleted file mode 100644
index ee4a448..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap18.html
+++ /dev/null
@@ -1,893 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:db-key-generator</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id27', 
-				'properties_id28', 
-				'properties_id29', 
-				'properties_id30');
-
-        
-        var usedByBoxes= new Array('usedBy_id27');
-
-        var sourceBoxes= new Array('source_id27', 
-				'source_id28', 
-				'source_id29', 
-				'source_id30');
-
-        var instanceBoxes= new Array('instance_id27');
-
-        var diagramBoxes= new Array('diagram_id27', 
-				'diagram_id28', 
-				'diagram_id29', 
-				'diagram_id30');
-
-        var annotationBoxes= new Array('annotations_id27', 
-				'annotations_id28', 
-				'annotations_id29', 
-				'annotations_id30');
-
-        
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, annotationBoxes);"
-                                     class="control" /></span><span class="globalControlName">Annotations</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, instanceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Instances</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id27"></a><div class="componentTitle">Element <span class="qname">cay:db-key-generator</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id27" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('annotations_id27');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="annotations_id27" style="display:block">
-                              <div class="annotation">
-                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                        class="preWrapContainer">
-                                    <tr>
-                                       <td width="100%"><pre><span class="tokenText">Used to install the Automatic Sequence/Key Generation facility for db-entity. This feature is intended for use with simple (non-compound) integral primary keys.</span></pre></td>
-                                    </tr>
-                                 </table>
-                              </div>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id27" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id27');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id27" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html8.jpeg"
-                                   usemap="#modelMap_46_html8" /><map name="modelMap_46_html8" id="modelMap_46_html8">
-                                 <area alt="modelMap18.tmp#id28" href="modelMap18.html#id28" coords="227,10,360,52" />
-                                 <area alt="modelMap18.tmp#id29" href="modelMap18.html#id29" coords="227,62,366,104" />
-                                 <area alt="modelMap18.tmp#id30" href="modelMap18.html#id30" coords="227,114,360,156" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id27" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id27');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id27" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id27" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id27');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id27" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap19.html#id18" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-entity')">cay:db-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="modelMap18.html#id28" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:db-generator-type')">cay:db-generator-type</a></b> , <b><a href="modelMap18.html#id29" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:db-generator-name{0,1}')">cay:db-generator-name{0,1}</a></b> , <b><a href="modelMap18.html#id30" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:db-key-cache-size{0,1}')">cay:db-key-cache-size{0,1}</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="modelMap18.html#id29" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:db-generator-name')">cay:db-generator-name</a></b>, <b><a href="modelMap18.html#id28" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:db-generator-type')">cay:db-generator-type</a></b>, <b><a href="modelMap18.html#id30" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:db-key-cache-size')">cay:db-key-cache-size</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id27" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id27');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="instance_id27" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;cay:db-key-generator</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:db-generator-type</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement">&lt;/cay:db-generator-type&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:db-generator-name</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,1}</span><span class="tokenElement">&lt;/cay:db-generator-name&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:db-key-cache-size</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,1}</span><span class="tokenElement">&lt;/cay:db-key-cache-size&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/cay:db-key-generator&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id27" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id27');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id27" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-key-generator"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:annotation</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:documentation</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">Used to install the Automatic Sequence/Key Generation facility for db-entity. This feature is intended for use with simple (non-compound) integral primary keys.</span><span class="tokenElement">&lt;/xs:documentation&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:annotation&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:sequence</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-generator-type"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;xs:annotation</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-          </span><span class="tokenElement">&lt;xs:documentation</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">Specifies the Key Generation Method that will be employed 'ORACLE' - use Oracle's SEQUENCE 'NAMED_SEQUENCE_TABLE' - use USER designated SEQUENCE TABLE. User specifies the name of a DBMS Table with the schema (sequence INT) which will be used to hold sequence values (not supported yet)</span><span class="tokenElement">&lt;/xs:documentation&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;/xs:annotation&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;/xs:element&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-generator-name"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;xs:annotation</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-          </span><span class="tokenElement">&lt;xs:documentation</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">For db-generator-type ORACLE this is the name of the ORACLE SEQUENCE to use. The SEQUENCE is assumed to already exist in the Database. If this is db-generator-type NAMED_SEQUENCE_TABLE Key Generation, this specifies the name of the SEQUENCE TABLE to use. The NAMED_SEQUENCE_TABLE is assumed to already exist in the database.</span><span class="tokenElement">&lt;/xs:documentation&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;/xs:annotation&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;/xs:element&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-key-cache-size"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:integer"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;xs:annotation</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-          </span><span class="tokenElement">&lt;xs:documentation</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">Size of key cache. For db-generator-type ORACLE , this value MUST match the Oracle SEQUENCE INCREMENT value. If there is a mismatch between this value and the Oracle SEQUENCE INCREMENT value, then there will likely be duplicate key problems. For db-generator-type NAMED_SEQUENCE_TABLE , this tells how many keys the Container will fetch in a single DBMS call.</span><span class="tokenElement">&lt;/xs:documentation&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;/xs:annotation&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;/xs:element&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;/xs:sequence&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id28"></a><div class="componentTitle">Element <span class="qname"><b><a href="modelMap18.html#id27" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:db-key-generator')">cay:db-key-generator</a></b>/cay:db-generator-type</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id28" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('annotations_id28');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="annotations_id28" style="display:block">
-                              <div class="annotation">
-                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                        class="preWrapContainer">
-                                    <tr>
-                                       <td width="100%"><pre><span class="tokenText">Specifies the Key Generation Method that will be employed</span><span class="tokenIndent">
-</span><span class="tokenText">      'ORACLE'               - use Oracle's SEQUENCE</span><span class="tokenIndent">
-</span><span class="tokenText">      'NAMED_SEQUENCE_TABLE' - use USER designated SEQUENCE TABLE. User specifies the name of a DBMS Table with the schema (sequence INT) which will be used to hold sequence values (not supported yet)</span></pre></td>
-                                    </tr>
-                                 </table>
-                              </div>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id28" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id28');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id28" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html0.jpeg" /></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id28" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id28');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id28" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>simple</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id28" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id28');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id28" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-generator-type"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:annotation</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:documentation</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">Specifies the Key Generation Method that will be employed 'ORACLE' - use Oracle's SEQUENCE 'NAMED_SEQUENCE_TABLE' - use USER designated SEQUENCE TABLE. User specifies the name of a DBMS Table with the schema (sequence INT) which will be used to hold sequence values (not supported yet)</span><span class="tokenElement">&lt;/xs:documentation&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:annotation&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id29"></a><div class="componentTitle">Element <span class="qname"><b><a href="modelMap18.html#id27" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:db-key-generator')">cay:db-key-generator</a></b>/cay:db-generator-name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id29" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('annotations_id29');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="annotations_id29" style="display:block">
-                              <div class="annotation">
-                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                        class="preWrapContainer">
-                                    <tr>
-                                       <td width="100%"><pre><span class="tokenText">For db-generator-type ORACLE this is the name of the ORACLE SEQUENCE to use. The SEQUENCE is assumed to already exist in the Database.</span><span class="tokenIndent">
-</span><span class="tokenText">If this is db-generator-type NAMED_SEQUENCE_TABLE Key Generation, this specifies the name of the SEQUENCE TABLE to use. The NAMED_SEQUENCE_TABLE is assumed to already exist in the database.</span></pre></td>
-                                    </tr>
-                                 </table>
-                              </div>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id29" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id29');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id29" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html17.jpeg" /></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id29" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id29');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id29" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>simple</b></td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">minOccurs:
-                                       
-                                    </td>
-                                    <td><b>0</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id29" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id29');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id29" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-generator-name"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:annotation</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:documentation</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">For db-generator-type ORACLE this is the name of the ORACLE SEQUENCE to use. The SEQUENCE is assumed to already exist in the Database. If this is db-generator-type NAMED_SEQUENCE_TABLE Key Generation, this specifies the name of the SEQUENCE TABLE to use. The NAMED_SEQUENCE_TABLE is assumed to already exist in the database.</span><span class="tokenElement">&lt;/xs:documentation&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:annotation&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id30"></a><div class="componentTitle">Element <span class="qname"><b><a href="modelMap18.html#id27" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:db-key-generator')">cay:db-key-generator</a></b>/cay:db-key-cache-size</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id30" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('annotations_id30');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="annotations_id30" style="display:block">
-                              <div class="annotation">
-                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                        class="preWrapContainer">
-                                    <tr>
-                                       <td width="100%"><pre><span class="tokenText">Size of key cache. For db-generator-type ORACLE , this value MUST match the Oracle SEQUENCE  INCREMENT value.  If there is a mismatch between this value and the Oracle SEQUENCE INCREMENT value, then there will likely be duplicate key problems.</span><span class="tokenIndent">
-</span><span class="tokenText">For db-generator-type NAMED_SEQUENCE_TABLE , this tells how many keys the Container will fetch in a single DBMS call.</span></pre></td>
-                                    </tr>
-                                 </table>
-                              </div>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id30" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id30');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id30" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html4.jpeg" /></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:integer</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id30" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id30');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id30" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>simple</b></td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">minOccurs:
-                                       
-                                    </td>
-                                    <td><b>0</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id30" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id30');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id30" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-key-cache-size"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:integer"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:annotation</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:documentation</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">Size of key cache. For db-generator-type ORACLE , this value MUST match the Oracle SEQUENCE INCREMENT value. If there is a mismatch between this value and the Oracle SEQUENCE INCREMENT value, then there will likely be duplicate key problems. For db-generator-type NAMED_SEQUENCE_TABLE , this tells how many keys the Container will fetch in a single DBMS call.</span><span class="tokenElement">&lt;/xs:documentation&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:annotation&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file


[13/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap21.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap21.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap21.html
deleted file mode 100644
index 301e450..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap21.html
+++ /dev/null
@@ -1,1083 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:embeddable</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id5', 
-				'properties_id6', 
-				'properties_id7', 
-				'properties_id8', 
-				'properties_id9', 
-				'properties_id10');
-
-        
-        var usedByBoxes= new Array('usedBy_id5', 
-				'usedBy_id7', 
-				'usedBy_id8', 
-				'usedBy_id9', 
-				'usedBy_id10');
-
-        var sourceBoxes= new Array('source_id5', 
-				'source_id6', 
-				'source_id7', 
-				'source_id8', 
-				'source_id9', 
-				'source_id10');
-
-        var instanceBoxes= new Array('instance_id5');
-
-        var diagramBoxes= new Array('diagram_id5', 
-				'diagram_id6');
-
-        
-        var attributesBoxes= new Array('attributes_id5', 
-				'attributes_id6');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, instanceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Instances</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id5"></a><div class="componentTitle">Element <span class="qname">cay:embeddable</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id5" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id5');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id5" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html14.jpeg"
-                                   usemap="#modelMap_46_html14" /><map name="modelMap_46_html14" id="modelMap_46_html14">
-                                 <area alt="modelMap21.tmp#id10" href="modelMap21.html#id10" coords="138,43,251,85" />
-                                 <area alt="modelMap21.tmp#id6" href="modelMap21.html#id6" coords="204,109,352,133" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id5" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('properties_id5');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id5" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id5" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id5');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id5" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap27.html#id1" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:data-map')">cay:data-map</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="modelMap21.html#id6" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:embeddable-attribute*')">cay:embeddable-attribute*</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="modelMap21.html#id6" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:embeddable-attribute')">cay:embeddable-attribute</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id5" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id5');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="instance_id5" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;cay:embeddable</span><span class="tokenText"> </span><span class="tokenAttrName">className=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:embeddable-attribute</span><span class="tokenText"> </span><span class="tokenAttrName">db-attribute-name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">type=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:embeddable-attribute&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/cay:embeddable&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id5" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('attributes_id5');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id5" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap21.html#id10" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component className')">className</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id5" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id5');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id5" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"embeddable"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:sequence</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"embeddable-attribute"</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-          </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-          </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"type"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-          </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-attribute-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;/xs:element&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;/xs:sequence&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"className"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id6"></a><div class="componentTitle">Element <span class="qname"><b><a href="modelMap21.html#id5" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:embeddable')">cay:embeddable</a></b>/cay:embeddable-attribute</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id6" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id6');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id6" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html28.jpeg"
-                                   usemap="#modelMap_46_html28" /><map name="modelMap_46_html28" id="modelMap_46_html28">
-                                 <area alt="modelMap21.tmp#id7" href="modelMap21.html#id7" coords="190,43,303,85" />
-                                 <area alt="modelMap21.tmp#id8" href="modelMap21.html#id8" coords="190,95,303,137" />
-                                 <area alt="modelMap21.tmp#id9" href="modelMap21.html#id9" coords="190,147,339,189" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id6" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('properties_id6');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id6" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">minOccurs:
-                                       
-                                    </td>
-                                    <td><b>0</b></td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">maxOccurs:
-                                       
-                                    </td>
-                                    <td><b>unbounded</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id6" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('attributes_id6');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id6" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap21.html#id9" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component db-attribute-name')">db-attribute-name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap21.html#id7" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component name')">name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap21.html#id8" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component type')">type</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id6" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id6');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id6" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"embeddable-attribute"</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"type"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-attribute-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id7"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap21.html#id6" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:embeddable-attribute')">cay:embeddable-attribute</a></b>/<b><a href="modelMap21.html#id5" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:embeddable')">cay:embeddable</a></b>/@name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id7" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('properties_id7');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id7" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id7" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id7');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id7" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap21.html#id6" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:embeddable/cay:embeddable-attribute')">cay:embeddable/cay:embeddable-attribute</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id7" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id7');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id7" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id8"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap21.html#id6" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:embeddable-attribute')">cay:embeddable-attribute</a></b>/<b><a href="modelMap21.html#id5" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:embeddable')">cay:embeddable</a></b>/@type</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id8" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('properties_id8');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id8" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id8" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id8');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id8" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap21.html#id6" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:embeddable/cay:embeddable-attribute')">cay:embeddable/cay:embeddable-attribute</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id8" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id8');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id8" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"type"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id9"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap21.html#id6" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:embeddable-attribute')">cay:embeddable-attribute</a></b>/<b><a href="modelMap21.html#id5" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:embeddable')">cay:embeddable</a></b>/@db-attribute-name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id9" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('properties_id9');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id9" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id9" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id9');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id9" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap21.html#id6" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:embeddable/cay:embeddable-attribute')">cay:embeddable/cay:embeddable-attribute</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id9" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id9');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id9" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-attribute-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id10"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap21.html#id5" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:embeddable')">cay:embeddable</a></b>/@className</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id10" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id10');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id10" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id10" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id10');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id10" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap21.html#id5" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:embeddable')">cay:embeddable</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id10" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id10');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id10" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"className"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file


[02/24] cayenne git commit: Move RELEASE-NOTES, UPGRADE and KEYS files to top level

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/334d9cc4/assembly/src/main/resources/assemblies/assembly-mac.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-mac.xml b/assembly/src/main/resources/assemblies/assembly-mac.xml
index e2cb738..f3d1cdb 100644
--- a/assembly/src/main/resources/assemblies/assembly-mac.xml
+++ b/assembly/src/main/resources/assemblies/assembly-mac.xml
@@ -48,62 +48,49 @@
 			<directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
 			<outputDirectory>cayenne-${project.version}-macosx/templates/</outputDirectory>
 		</fileSet>
+		<fileSet>
+			<directory>target/doc-staging</directory>
+			<outputDirectory>cayenne-${project.version}-macosx/doc</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>../</directory>
+			<outputDirectory>cayenne-${project.version}-macosx/</outputDirectory>
+			<includes>
+				<include>RELEASE-NOTES.txt</include>
+				<include>UPGRADE.txt</include>
+				<include>KEYS</include>
+			</includes>
+		</fileSet>
 	</fileSets>
 
-	<files>
-		<file>
-			<source>../docs/asciidoc/getting-started-guide/target/generated-docs/getting-started-guide.pdf</source>
-			<outputDirectory>cayenne-${project.version}-macosx/doc/</outputDirectory>
-			<destName>getting-started.pdf</destName>
-		</file>
-		<file>
-			<source>../docs/asciidoc/getting-started-db-first/target/generated-docs/getting-started-db-first.pdf</source>
-			<outputDirectory>cayenne-${project.version}-macosx/doc/</outputDirectory>
-			<destName>getting-started-db-first.pdf</destName>
-		</file>
-		<file>
-			<source>../docs/asciidoc/getting-started-rop/target/generated-docs/getting-started-rop.pdf</source>
-			<outputDirectory>cayenne-${project.version}-macosx/doc/</outputDirectory>
-			<destName>getting-started-rop.pdf</destName>
-		</file>
-		<file>
-			<source>../docs/asciidoc/cayenne-guide/target/generated-docs/cayenne-guide.pdf</source>
-			<outputDirectory>cayenne-${project.version}-macosx/doc/</outputDirectory>
-			<destName>cayenne-guide.pdf</destName>
-		</file>
-		<file>
-			<source>../docs/asciidoc/upgrade-guide/target/generated-docs/upgrade-guide.pdf</source>
-			<outputDirectory>cayenne-${project.version}-macosx/doc/</outputDirectory>
-			<destName>upgrade-guide.pdf</destName>
-		</file>
-	</files>
-
 	<dependencySets>
 		<dependencySet>
 			<outputDirectory>cayenne-${project.version}-macosx/lib/</outputDirectory>
 			<includes>
+				<include>org.apache.cayenne:cayenne-ant</include>
+				<include>org.apache.cayenne:cayenne-cache-invalidation</include>
+				<include>org.apache.cayenne:cayenne-cgen</include>
 				<include>org.apache.cayenne:cayenne-client</include>
+				<include>org.apache.cayenne:cayenne-client-jetty</include>
+				<include>org.apache.cayenne:cayenne-commitlog</include>
 				<include>org.apache.cayenne:cayenne-crypto</include>
+				<include>org.apache.cayenne:cayenne-dbcp2</include>
+				<include>org.apache.cayenne:cayenne-dbsync</include>
 				<include>org.apache.cayenne:cayenne-di</include>
+				<include>org.apache.cayenne:cayenne-jcache</include>
 				<include>org.apache.cayenne:cayenne-joda</include>
 				<include>org.apache.cayenne:cayenne-lifecycle</include>
-				<include>org.apache.cayenne:cayenne-commitlog</include>
+				<include>org.apache.cayenne:cayenne-osgi</include>
 				<include>org.apache.cayenne:cayenne-project</include>
+				<include>org.apache.cayenne:cayenne-project-compatibility</include>
+				<include>org.apache.cayenne:cayenne-protostuff</include>
+				<include>org.apache.cayenne:cayenne-rop-server</include>
 				<include>org.apache.cayenne:cayenne-server</include>
-				<include>org.apache.cayenne:cayenne-dbsync</include>
-				<include>org.apache.cayenne:cayenne-cgen</include>
-				<include>org.apache.cayenne:cayenne-ant</include>
-				<include>org.apache.cayenne:cayenne-dbcp2</include>
-				<include>org.apache.cayenne:cayenne-jcache</include>
-				<include>org.apache.cayenne:cayenne-cache-invalidation</include>
+				<include>org.apache.cayenne:cayenne-velocity</include>
+				<include>org.apache.cayenne:cayenne-web</include>
 				<include>org.apache.cayenne:cayenne-jgroups</include>
 				<include>org.apache.cayenne:cayenne-jms</include>
 				<include>org.apache.cayenne:cayenne-xmpp</include>
-				<include>org.apache.cayenne:cayenne-velocity</include>
-				<include>org.apache.cayenne:cayenne-project-compatibility</include>
-				<include>org.apache.cayenne:cayenne-web</include>
-				<include>org.apache.cayenne:cayenne-osgi</include>
-				<include>org.apache.cayenne:cayenne-rop-server</include>
 			</includes>
 		</dependencySet>
 		<dependencySet>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/334d9cc4/assembly/src/main/resources/assemblies/assembly-windows.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-windows.xml b/assembly/src/main/resources/assemblies/assembly-windows.xml
index 6185af5..cacd57c 100644
--- a/assembly/src/main/resources/assemblies/assembly-windows.xml
+++ b/assembly/src/main/resources/assemblies/assembly-windows.xml
@@ -48,62 +48,49 @@
 			<directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
 			<outputDirectory>templates</outputDirectory>
 		</fileSet>
+		<fileSet>
+			<directory>target/doc-staging</directory>
+			<outputDirectory>doc</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>../</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>RELEASE-NOTES.txt</include>
+				<include>UPGRADE.txt</include>
+				<include>KEYS</include>
+			</includes>
+		</fileSet>
 	</fileSets>
-
-    <files>
-        <file>
-            <source>../docs/asciidoc/getting-started-guide/target/generated-docs/getting-started-guide.pdf</source>
-            <outputDirectory>doc</outputDirectory>
-            <destName>getting-started.pdf</destName>
-        </file>
-        <file>
-            <source>../docs/asciidoc/getting-started-db-first/target/generated-docs/getting-started-db-first.pdf</source>
-            <outputDirectory>doc</outputDirectory>
-            <destName>getting-started-db-first.pdf</destName>
-        </file>
-        <file>
-            <source>../docs/asciidoc/getting-started-rop/target/generated-docs/getting-started-rop.pdf</source>
-            <outputDirectory>doc</outputDirectory>
-            <destName>getting-started-rop.pdf</destName>
-        </file>
-        <file>
-            <source>../docs/asciidoc/cayenne-guide/target/generated-docs/cayenne-guide.pdf</source>
-            <outputDirectory>doc</outputDirectory>
-            <destName>cayenne-guide.pdf</destName>
-        </file>
-        <file>
-            <source>../docs/asciidoc/upgrade-guide/target/generated-docs/upgrade-guide.pdf</source>
-            <outputDirectory>doc</outputDirectory>
-            <destName>upgrade-guide.pdf</destName>
-        </file>
-    </files>
 	
 	<dependencySets>
 		<dependencySet>
 			<outputDirectory>lib</outputDirectory>
 			<includes>
+				<include>org.apache.cayenne:cayenne-ant</include>
+				<include>org.apache.cayenne:cayenne-cache-invalidation</include>
+				<include>org.apache.cayenne:cayenne-cgen</include>
 				<include>org.apache.cayenne:cayenne-client</include>
+				<include>org.apache.cayenne:cayenne-client-jetty</include>
+				<include>org.apache.cayenne:cayenne-commitlog</include>
 				<include>org.apache.cayenne:cayenne-crypto</include>
+				<include>org.apache.cayenne:cayenne-dbcp2</include>
+				<include>org.apache.cayenne:cayenne-dbsync</include>
 				<include>org.apache.cayenne:cayenne-di</include>
+				<include>org.apache.cayenne:cayenne-jcache</include>
 				<include>org.apache.cayenne:cayenne-joda</include>
 				<include>org.apache.cayenne:cayenne-lifecycle</include>
-				<include>org.apache.cayenne:cayenne-commitlog</include>
+				<include>org.apache.cayenne:cayenne-osgi</include>
 				<include>org.apache.cayenne:cayenne-project</include>
+				<include>org.apache.cayenne:cayenne-project-compatibility</include>
+				<include>org.apache.cayenne:cayenne-protostuff</include>
+				<include>org.apache.cayenne:cayenne-rop-server</include>
 				<include>org.apache.cayenne:cayenne-server</include>
-				<include>org.apache.cayenne:cayenne-dbsync</include>
-				<include>org.apache.cayenne:cayenne-cgen</include>
-				<include>org.apache.cayenne:cayenne-ant</include>
-				<include>org.apache.cayenne:cayenne-dbcp2</include>
-				<include>org.apache.cayenne:cayenne-jcache</include>
-				<include>org.apache.cayenne:cayenne-cache-invalidation</include>
+				<include>org.apache.cayenne:cayenne-velocity</include>
+				<include>org.apache.cayenne:cayenne-web</include>
 				<include>org.apache.cayenne:cayenne-jgroups</include>
 				<include>org.apache.cayenne:cayenne-jms</include>
 				<include>org.apache.cayenne:cayenne-xmpp</include>
-				<include>org.apache.cayenne:cayenne-velocity</include>
-				<include>org.apache.cayenne:cayenne-project-compatibility</include>
-				<include>org.apache.cayenne:cayenne-web</include>
-				<include>org.apache.cayenne:cayenne-osgi</include>
-				<include>org.apache.cayenne:cayenne-rop-server</include>
 			</includes>
 		</dependencySet>
 		<dependencySet>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/334d9cc4/docs/doc/src/main/resources/KEYS
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/KEYS b/docs/doc/src/main/resources/KEYS
deleted file mode 100644
index 60b8e71..0000000
--- a/docs/doc/src/main/resources/KEYS
+++ /dev/null
@@ -1,319 +0,0 @@
-This file contains the PGP&GPG keys of various Apache developers.
-Please don't use them for email unless you have to. Their main
-purpose is code signing.
-
-Apache users: pgp < KEYS
-Apache developers: 
-        (pgpk -ll <your name> && pgpk -xa <your name>) >> this file.
-      or
-        (gpg --fingerprint --list-sigs <your name>
-             && gpg --armor --export <your name>) >> this file.
-
-Apache developers: please ensure that your key is also available via the
-PGP keyservers (such as pgpkeys.mit.edu).
-
-pub   1024D/B8AF90BF 2006-09-23
-uid                  Andrus Adamchik (andrus) <an...@objectstyle.org>
-sig 3        B8AF90BF 2006-09-23  Andrus Adamchik (andrus) <an...@objectstyle.org>
-sub   2048g/A6C30C00 2006-09-23
-sig          B8AF90BF 2006-09-23  Andrus Adamchik (andrus) <an...@objectstyle.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.3 (Darwin)
-
-mQGiBEUVncgRBADiguZch//Lz2FZLy+NZxZQ5fAAya/5i6mPcJ/FUppY02x3HWmY
-RGAVI/ZURIqCqHxyhgguX7zcrKfyE0bu45OayhhyfaydU4yTUPZF1UwtS8ULvLjl
-szu5G7OeO7Blmaajj0pFaYnb1cXhxG7I9Wz2mFnRAtVo2VoL+s5KWNdRUwCg6Z7M
-KGHkj7LWBoKEBODs4UTvEjkEAJRDFV20q7wpho7fMvJJgUpy7AlUgzplt/hVjv7X
-zgDLb0G5huqH28zLf3ZT3XIn6llIkjRjKX0RWAaebgnAoc2vhG3vglqmyphjH5zP
-mGaP+heY6Pz26sAYyKC1VOTndUdk2j0FQ+JJ91oUNhNerBxwUEHOBt8oVXOO/N+d
-dSb0A/9kbLklVVnNP2ztmvHwhKpSwJBWvZXOjX4AN1KB/b1RiwIZUSV85NFITqKj
-VCCaG4cyRvHkvfMATBpDcPUVWZaPoiKAXTKa3ZHK4W+ZbuDN++PwTfurxfwg2o4b
-sljRJVvR0oNWXXV2w3ZrywfAq9bejgiW1zgQoin+FzD+pflW5LQxQW5kcnVzIEFk
-YW1jaGlrIChhbmRydXMpIDxhbmRydXNAb2JqZWN0c3R5bGUub3JnPohgBBMRAgAg
-BQJFFZ3IAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQKmKWXbivkL+/YwCg
-1vJJidCeMN3IYzTWsdGFB7lKjXoAoKLBkzAyTJj8mu/Rj1y+Ro+rusZguQINBEUV
-ngwQCAClmw1DRilFKQAPdagJ4j4dvxUAdYv5ZJY0Umt44Vvs6hXFzCwyKD3W3aDG
-jaqIKGYj1q1/FHCPlXTfAjm4AQwcLrgOCMcbMkqJsDLD27cD4+O2hbBrJW3hwFFf
-sCFatvW3EBEXyWI4k9uos0nUrIDqGoA+DqLRgyrCFh+874Fr6eO5oJmKw1O8LkOP
-O4K3N5AXY4AFT9VZfOVEdhkHxht0IwVuqmHGyvPLEMkyp2bUhMd/9VHBgvEMnSlA
-4JmNB6EU+GdlPvei9C9ZzzmeYvwicAO1HHo4uQxfmE6V13K3/mH+hE/NlxLZ9syQ
-Zhe77mjaOQILt3g4CRRQ5Y5S2vyvAAMFB/wJ/OgwXrJImZhG0JxYTDl/pHVU7Whn
-anSaSrn2kI+8oGxJi4mrTFKZHgfOeFhhSsyMvydnscXAHS/ehUpEjcpxRS8ZVvyA
-sAJyBBkm1MhkQK2FFlSBIYCOXl+8mRGJqiem0NP8OgnNJAjTzOVukZpoz7UiAzbX
-zu7+DbFFJzq5G0xXDsNIdIObAFrCFgBkNg5V4T7iVMA3hN6Gp5UXBT4bRif36uDm
-SwKET84KQZrIWyMZNfNLNlxUCVaI44TsOuaUj4OPO4OIwHGSFZNV8b596+EB7VCB
-wDdE2uePbWP5Lc1vEkFCkNz/BUf60oiNnU0uGZ0pNlKo+Nk+HKnJP0V9iEkEGBEC
-AAkFAkUVngwCGwwACgkQKmKWXbivkL+03wCdFt9ms0gcaF0xAYRSh37N2eVwPGwA
-n0fr1EHLyn3mbwHqwllfwX9QE1EV
-=KVMq
------END PGP PUBLIC KEY BLOCK-----
-
-
-pub   1024D/DBAC3830 2007-10-28
-      Key fingerprint = C972 6F98 0956 F70E AAEC  735C F421 EF4E DBAC 3830
-uid                  Kevin Menard (CODE SIGNING KEY) <km...@apache.org>
-sig 3        DBAC3830 2007-10-28  Kevin Menard (CODE SIGNING KEY) <km...@apache.org>
-sub   2048g/BDA83969 2007-10-28
-sig          DBAC3830 2007-10-28  Kevin Menard (CODE SIGNING KEY) <km...@apache.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (Darwin)
-
-mQGiBEckmuERBADw1lkZ1Us5eTV6p3mvc+Cot7lOQNa3rATEIouH38cL3SYc16S3
-P7Izo4C8QlZiNsLhUWrJFbBwKHPmyAjuNaJnvFvL53P4aUDdsx531D3p8pTMRx/w
-TcI3mFzOBpiZp08dJQviiIZ9HgpxHQCt+dyPPjBVajfRx1Ib/0LcG6s83wCg4wwz
-aHsw6KF+K5AQYro17FhpPm0D/1LSvydJjn3Uo8ZsDOPG8HqUOWrxk5He/G98ERT6
-uLL9WbyL+/mmw6FuWOmadZgjz0oK5r2AmluaE6L5OehiG3SH7tj7auq9SiR9l3vK
-cVGIvsUVMtdoDCzIvVSyZSLWahC6XijL6kTGh/rQ7yq1QIzHjA78ZLwzhLT6ORtL
-bELhBACqP0mH4Md0LcAbu9mVgom3Y/Jsrwb01HtkbvqOVTcH2TY6Lqubn9/2Hsff
-OVdoMmY65ZaGHnikh058jnz4JRTWcJ2gvK5Vo17G5M+nA8iIDg7DVY9tptfWv1Xn
-ZwlX2fZt0y0p56LO5Rkx6D0DNXiI/buXra6DIPkrV30RcRZtp7Q0S2V2aW4gTWVu
-YXJkIChDT0RFIFNJR05JTkcgS0VZKSA8a21lbmFyZEBhcGFjaGUub3JnPohgBBMR
-AgAgBQJHJJrhAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ9CHvTtusODAX
-6QCgsrp3HSVffN3TEP8o8gl8LBpZGKgAniFLZXM3k3IFDIbEunp5VVfCwa56uQIN
-BEckmuEQCAD88944PNdpAJWBaAZUNEUlLfeUVB1CkykN76PjDtpsrcf/wnJtuQGS
-+EXcEZetCAoRdGVTM3cUHU3BVCNnDtmu/DE4f7AH3AWOl/WFGjQK49+KyyKbc2tm
-eocu9JSsxEn+fwBJOWSoJC4hTeleQ3U0r8CVW6Q2jgawXtpmBFgVQHE4lLBnSyLW
-RXdrTaFiO6KYaL2QvB7zdleRUPl3tFz6miUBF6stXvbuIGi2r57J+ZCMfnrbbtk/
-yI1MGUnY4+q7gyHiPZnghm/6hz9kszxg84ANVK6YryS7QTX9KGWPdnAtsNYVDwaS
-KGfg/fjL9wNZaLE2IK/WcktEe0aA/6Y3AAMHB/9HCbwSB3m5/DLZ/ARZtATuUNRE
-CeDyom6IKMzuhNEVnIWLlFrlmdCG3qdpSPHDhQR+OyIvzh8h7WErQYm/WjY/ouQ5
-ShBGy2FFuQFfqKnh8QK+OudIdnnGf0E+hjpIMg8jzvxy0Jrox2mpT3etMreXH29t
-m8IpDcuQcS4V5XfZAy/xTxnXN2VKek1tbEL66Pt6UyUDdCOvX42u/thQLaaUSfHM
-O3KVDIU87zl9QEuBVSC13pi3zXNXbNBrQqVLXzHbw7/dibjXcCPEYnR0ubU5mN75
-pxzmrm8EUNqLWUhLh3fscoRqTYkaoQlYkrCGw6udnN9V3h1WmZUFPbE6e7HxiEkE
-GBECAAkFAkckmuECGwwACgkQ9CHvTtusODD0lwCgibSRJsN1DO8NrigKNplynOfc
-qXoAoN/9XbpoW58ve7O/6lh9kLXGa/fv
-=JWKS
------END PGP PUBLIC KEY BLOCK-----
-
-
-pub   rsa2048/9E3D3908 2015-02-19
-      Key fingerprint = 964D 4B2D E8B3 EED1 32A2  BC49 BB6E 1A8C 9E3D 3908
-uid       [ultimate] Alex Kolonitsky <ko...@apache.org>
-sig 3        9E3D3908 2015-02-19  Alex Kolonitsky <ko...@apache.org>
-sub   rsa2048/4E068AA6 2015-02-19
-sig          9E3D3908 2015-02-19  Alex Kolonitsky <ko...@apache.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2
-
-mQENBFTl3zUBCADkcIWf0LrHVwN8HsAntvXV7+UiYc9MXv68T3W1xc2Wpa8+4Qtj
-Z24ZgJ9oDhXpim+2IeqbhUL+hzUJA2hWkJNrZTo+UNWCo/krb8RgLHbiYh+y0Jsv
-bohJ/UfG99D3DTuf+w24pBwUvSywzprtqTZBP3r7WfAdQyw15ExeuGpQljr92+0g
-QcnL2itqkKjPnnxm2ErGUxeq90E1VLwU4ZEPcibxzgenbc+csnAlhtM1TTUCtp88
-SxPAFhD1sUY+5jCm8kUm9KdFd15+QoVr1CGtwJyMLcBXKZnpO2sx+ueyy/C7t8xe
-hURISoJY3CZSRHO/RcRXBfY7KhRDH7PejESlABEBAAG0J0FsZXggS29sb25pdHNr
-eSA8a29sb25pdHNreUBhcGFjaGUub3JnPokBNwQTAQgAIQUCVOXfNQIbAwULCQgH
-AgYVCAkKCwIEFgIDAQIeAQIXgAAKCRC7bhqMnj05CO+YB/9ayGjLmlyeF4cCwPBd
-fnxHeQ3P2PHIIfqrUJx/N5Q93J4y51U/6KhTsNEA87+AlfdmM2RyYIBZckcUrP6U
-Y2mdzTvCflUpKqnRZyV2u3L18AgXL/M8Tnz3aNaET61kX7za709Q3vCxLK1DGU3Q
-2eC9ZHhjK7pdLfolGyT4lHjI2Zpg32mhkOCpYzxI1fUQ42DO7UssoBjKsqq+9i1C
-36Ps1nt5iRqEjTRUK6IMKK6oYPNyWy9KSYdS3UbArCWUHdkGJBXY3oj5O4VGAd/u
-nHax2zeaJ58nUyotp5Ny5q/PRd/6vUr4kUqGDGn7Q1zph919NLEcFooNXqek60He
-+KrEuQENBFTl3zUBCADE7NrJc/aBJhrHpC63r7F2ldwZWYEzCjS6J6ovFuvp+i2C
-EP7mEZaGPmpnZ2fN9rJ+a1UaWLzRzDJdX7CwiH/cO1YE56Dv/bG2qK38nWVZ5TAl
-eYbJyMQPGMI/wkuZb+ikoS7Jf/0sz245TFBb1lwGBVFgCBlrbpkK13YP+TZ5iAOe
-USpeddl7imlCTiAXprtZ5hw+TC6ZSmcUq1HVWJosFCQGnaYLz/gdJNU+9TBSU3kM
-lLvNFh9i74rfiopkoyRJnLvl5O5HWtcbHSY4qFmVKpEMLnnwBQuKN78tnwiKSz5C
-0XzzMc/W7jBrBjiX7lQ1HjTa6CvDjpvbOcqMIsrTABEBAAGJAR8EGAEIAAkFAlTl
-3zUCGwwACgkQu24ajJ49OQgPyggAmxSH+VLPRwXiulHEiVNVGk/ff9Z55bwYtpVv
-bTPXb0Z+oYr5AT1Ea8hKQf8DsUA93SPFQXMGZ7My4472x+ZPRUCmg6Lr9q+4yEu5
-6Rex0XDWKlF2oEWhGgaKjQ9cg8MyKMaUG/ShmJgp6P+yWwMqoNB3CaSRWuHwJp4i
-EgtxbMXzprVZ5h6/RrKsjHNTFQEVcSxJKGNuUJ7WlaXA+qGBDiaxDEyUJABWDqkr
-UyQv2xCibMNjhgFlu0KDGPPQPb4XgwJDn9Oznof0QwV1Z+dL/TtTCGM3zHqbr97/
-Qg579xwo+gI/PHgH2XI1QI6d3ZO/KGR3lsCUZHR3piON3YtICA==
-=WJOl
------END PGP PUBLIC KEY BLOCK-----
-
-
-pub   4096R/48F4C2B5 2016-02-02
-      Key fingerprint = 4B7F DDD3 BCAA C5DC D571  D36F 8A34 C614 48F4 C2B5
-uid       [ultimate] Savva Kolbachev <sk...@apache.org>
-sig 3        48F4C2B5 2016-02-02  Savva Kolbachev <sk...@apache.org>
-sub   4096R/4335EA7E 2016-02-02
-sig          48F4C2B5 2016-02-02  Savva Kolbachev <sk...@apache.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Comment: GPGTools - https://gpgtools.org
-
-mQINBFaw0TABEADRL4nqZv3ubuy3+n75RURY0d3x88/yacLoUy0h0dfIQR6uZhKC
-D7R9B6eQ5sYP1nvIgQn9ZvHK4crM7nFWNGWEhxKOyTivak8zWZtXaRlcU+W8qTTg
-UeEaDrD1OwkW2rbEmQdpLYaAlJc1iJhu8bI82G2I1QSWnkhULr6kOKWk3NOEljLI
-C6B6VeGff4iX8ryu1u9LEu1H2xL2eLGBZ4UzfPaeAqHM4Y9S28HspCSy2Wc0iC+m
-x5ine7yCwihXHUchpseV5/zoq7tcqefJQVs/vjtSZ/OEKGD7WMR1Qsj4NED+2clb
-dqtHr9H580NkOvt846SXuiLxMC8ONQ4MTOkW2CXtarzctbky74eHYwIyHFz4WwJW
-idH78HQ1uKsVOLlDNTPh2PjgzaWv2v3/Al/Ba+DWgX+p12tNu330b2+DTAgxLeWM
-pLaiZjElksP2n44tSR5pcFI97rs86mUwO5IHHjgqWl6XpI7mVdiZzx7nxSJAIWAD
-v+bU9fgkrHuHgIpZN7FKR1ehk1IqFDkFiEsv+J4jlmhQE+o0Am7NH5+SL+4zkPUm
-T2kEdTViQV2DmgP8tdHykuJ3fUr7qMc2y4uGFgUe7HZVQi+UJf3zLdLMDEl2SN3d
-6RxJYVG4vjJaUoNLepZ+kXik+fpA763beBkevwk2khiOiBl9iC49NUOCewARAQAB
-tCdTYXZ2YSBLb2xiYWNoZXYgPHNrb2xiYWNoZXZAYXBhY2hlLm9yZz6JAjcEEwEK
-ACEFAlaw0TACGwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQijTGFEj0wrVq
-LRAAtW7XoHNiyN0Py33qrWcvMCbXoEBBcbaolE6z0ngemTnChFHN0MWouBnFa5yv
-FFfelyaizPnZHj/UJC+Gi6Af38pVQviGOlI/c/k0k8M/8N8HEtWJl371RWF1cp3l
-BajIFFX8T8Mx8hQRjmoAKBsdMU+lJmJE4lcxB5GUV1OcmpY7SxX4vL5kTgvJR7nr
-OqDDueorqJTBDA32vYHO1S/qiTswHlD5lYfrWCkssswqt4719PXD27xFfRwrqZXD
-MJCT4lenEJ2u2b0E48a9fJi/DvK9gWrny9rtJ71BLxVmoQ7twpZdTmQo/mVO5JFj
-R/mR/hJDxk8xzPGgnvvH2ly4BtspCXLVQ6z8uFyOrY8Me92lOwWpF9OTVgqnNOYa
-xa4FFOkto3LhLOCJMKZ2dCsxJHyCKy553NzDO5hFFg4/puy+yU7ftbbZt0a38+LE
-h3FgAvPp9YYVvYhd577j7BdOUOg7YYjhiPh/R0yyge5+VLSPQnGEs4EfNbwmNBk+
-wNN4eHQ/sGQJU2Typ8hv4RLiwrCvYMgrQ68IY5g2xk9qIVNuA2Y3H0qDcmE03iOk
-Xw4JSDtqyjvOpAaaaI+Y1R0YHfwRzh+tBIezuWdVx+8+PU52PhH7dNXpunoR4x9j
-/hd8uK74fGNX4Wg811kN2Wqmv4+Fmr4ltxtuWauhERF9rE+5Ag0EVrDRMAEQANqp
-2WSj9irF5Rt8OV6wM0EQMrDcGZwZumXvoc3975rfhCYhPIh3KPK38AWai7ncPEvX
-OJ+JsN3fjBaX0/vYOokLx+fBPZ6ewLp55t1A41odNiUftTKs/ePXmxBJtkC9leCw
-RFTNvZV6TpnaKktHDTOwJenn9hre6+WsOSetUhr6wTeoiruRcECxbcPx9TnZyjjq
-sFDznnExOM7kbb1Ib3z01tPf7lBCGIEu8kTySWSG6lUzWBCOWRrcUp4xuqTVB68m
-471NDzrum4QCHuQmIgaGXDpCqKlmxau3FDAsDktRGhQSFUTcecbDAvvmx75W4TnE
-VQYIaUnpG5Ab0SGSxhYUBWtxciw1vWNUj4uHtT+JLPt9eeFb3XQqp0Nl7wcVJMqe
-al7S4AMkScpa75JslLBU4FhaLTzHDlLNUe5564t5Rz+Cjnte6whBWQFZBYAnK3vM
-hpxXDwQ9PN7Rp1zrZLOSH1kROecL49aBaZW+ecgNgmLj/+CpQVnOcmuXUPQBWZ0P
-6hjnGsRQj87hBhjWv0+Mu8fJNEVkObe2bgRrs8eBd6xyaTXxMzHatmwd+HEUkuIQ
-a+JIOzFIMUU2I49amoffVs9544U4n5QHLj/pqQRWPMUwsKyCOjCuKmKeBq+CF2hx
-UWDrvMYQWGLYL45jBYrpkn/15pSyfBTgk+HThjrJABEBAAGJAh8EGAEKAAkFAlaw
-0TACGwwACgkQijTGFEj0wrXnSRAAmXZ42xljD2R2KcPBZb/zkOfsh2DeJOvo2Lno
-TIcmCJhS33uTXbCYpJ/6d1wjkAXARF3StyHgWYk5/wtWueIrI1kwEKEpwT55cwqQ
-1XJBtfqgYF+EGBWES3bjylOUWJnzWgUXVr5IdShmi75B8WWSkkSBj1Ms2z6Jy59d
-VPfPczeQHfL8Tka79IDkfs323dVwVUvoRxPFStUoNyZVkKeJNeTf4kc1muSTS4O7
-DzoRM+f1zP0RkhD8wVGB7ReX1shsDI5cq7r9my/U83bFkUsq8hnJMojPBTjW8Uqn
-XorVik64Szp8X7bzSGqC8c/eMO1+Z41aXHjoSCx7cZ/tO6TgecxzTPLXhJVQ1yKa
-RHZljS+mnEmTogeLMbkGv8Ebqnr64Itf5J55jHybtVPv3sZyYkD81FvgbBdP27Rl
-umsdnX8HYNx+Xxtbzo/evpnKIxE5jiCE4R89isOHqAl0Txzmc41mR03eqb6HWb0/
-9qoMhdHiA4FTNcejuAUlhKE6YfXMQURkh8kACv7MwHL3VNXeHR5ppMqzGm/cBTMQ
-a6O0d2o87OgG0Di67Rt3TtStVNiSQ7QFWXtnRik93LBjyGGbpfRC7GjMo31kFzZ3
-M9xRIxYLHhywfyQHf0hEX89AYNlSO9XBR61EOnjpUaw6Xp+3wWcjsjbE6+s1Sq38
-D0crmx0=
-=etVP
------END PGP PUBLIC KEY BLOCK-----
-
-pub   4096R/D1E9FD5C 2016-02-06
-uid                  Andrus Adamchik <an...@objectstyle.org>
-sig 3        D1E9FD5C 2016-02-06  Andrus Adamchik <an...@objectstyle.org>
-sub   4096R/11C6A471 2016-02-06
-sig          D1E9FD5C 2016-02-06  Andrus Adamchik <an...@objectstyle.org>
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.9 (Darwin)
-
-mQINBFa2CU4BEACsW4K4Mlecpuj1h3pnyxpra3c/qKNqnnE/Ee/FHW2h3+6R//mf
-ivMvaLLZAyB94m3qsAmQcTtQcHNh7iSpIhAFjZP005BwAIUJsgvtH4uUR4rNHz4d
-Io2Q5ZILP/HccaawUYDel69NCNmpRF302vkc/LgOByQymcxZ817mr6zqjykIK7J6
-lPPoCJkVCV+HjX60C3I/P7btg9mAsgqjKhosM9kRT6F+y3Aisv8gH1pTZevARLrZ
-LLmOzVD1POReGzojuvUkwYf9TiN4zd8aHd4tEe9HQ353qBFSpfA7Hwr2hwqyopaL
-jkx02ANUUWU1p5W30DPvIpB2wYxtA3AmQaIn25erh/UaGrD2v0Z9uU57v8jys8Ls
-9Zb5+yzEsCCcvNtT9vCgowSQPmDToCq8S1mqQhkgYh82Br8WjmQiVVi3upAI/YA5
-6WBkeG26nk1tQ5tmEc5gLIV1iAX93LvYyM6gCPC59jhm9I7ZsYR3ZhdHtadon54V
-1JmZ6GVGxkHtFv8uILImV652NSv+v5PSWiCnUpQt37EHAsT55fPX38g4ksEfoyxq
-kXT/GYdFCIm/g+iy6PzXIS/jBpNgc8jHFkVVNxzwRv4WWaIjePZHEPo+fv2B0hMy
-O0ImPMDZZN/8hP0dR014VYQcgMzAebDfNUc02GKdcmqFuPc1FWhqdS6kPwARAQAB
-tChBbmRydXMgQWRhbWNoaWsgPGFuZHJ1c0BvYmplY3RzdHlsZS5vcmc+iQI5BBMB
-CAAjBQJWtglOAhsDBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AACgkQbWqE4tHp
-/Vx6hxAApeDtcmgINtD3chTVqaVRBbuZiVGxeIGZbq9A7wBE/a7IzuJXTL6+eEKt
-rHVHGBP456s5+aHX5ZpJyitCjgNEqLoqCCIrclFsEHFkkifQKbEGFXRX98MeD3gq
-s+ZrlmDNzKXquU8LJ6yotGCOId7EWFJ8Ii2kOyHIfhFtzlVYRYOjC5PdfDJb/sat
-7+hRm0eMr+e3g2LyIMIRXFgPo27slYHwxaO37tm40dksaNlOEhBx5qLoOpT37s50
-m1kvgF71OFc4LQtNebxcal6VjFeOwd3vU4uah5Q3TBuksWwuDr2DSBDUpmipmdtc
-gouTJUQ7T5/4L17GzGQSVuMVtBZ05d0e1nuYqC+qA17Vb4gc/kaX723IxzYL090T
-mL7noFfVnc78zsOtQVk69rftVJfERlOkx1zTJkxXTG8eelQ5/FGBl+wjaN84vL5e
-77Lea8iddJKQJkW51iwPAfApGleJO7KP2I0DDCmFggKWVwxzNeqtpwUMF0NOkVop
-+vTK507xhDqOjY+MkFCsQmSlYLr0lu2jnUQu5W5QPiE+xtR+wQbKcSGTykaG0Sla
-GiGeqHLdMmc8uqA5rZD1xrh6LItfHlh2EslS2y5t0NWGB7+HR4V3vyn9yVY+qrJA
-hWu7Oo9tuj6Ntmqld2xENcQt2HAFsVhm6YFhNTjsSEDZicVxdlK5Ag0EVrYJTgEQ
-AJVmlwaIkQo1elRkswF7d2hyniHkHtvTcyY1bNs9PMopmOfiu9cqc2MxO9A/Jsfc
-xygPEcYnQSG13Nn+fCofo2NO/RgseYVJmYXx83gbdpYWyThf1reQlg1UmMvYgE5u
-dulxY3cOcR6Y2x+pMrlRYx+57aqH7J08VsHzRPflgcBunXWkDRGIrKNlgZT78R27
-5Q4f3OA5CfO0IixEH0FGUCkWkTMyjLdCWfsGHQaLm69k6bzZq8b+4Z3QG8kregQb
-gJEjg6vw/1Lb9y/ZlRd686AhpcQXnju0zKPvw3xNE5leQ1XVUyIrIz0afBwfmtGq
-UrY0nF+VDin5JheXqIXBtxin+OP7C2ZPwXAK43oqkCaLk0ZSaqGSP1nv6tpo8X30
-aDyav0tWYy+buxU6KSktJ0Po3mQnf6v2klITUtS7ZlWj5os1l54dNE2JEjaB8qQC
-cQX5CMS8c2BMwt0KNOQ3RFk4KuNcWRhyg0GSSRg4KByWwR3EnDvt/KJya1u/e1Vs
-HQ5+wsNceTMe0CZF7sVjxA6jrYJoqpRv6PV+9NXf7cvAI82TlChYuQxiJ2ZreEiL
-0787qkA8cpSb4Myrq7bFtxX/vIf/3p6MDnt7xrjZ7gBmXDGMObK4SSrvOsPTuq0c
-oJM3MZx9hiaFRR3qqCbX61OUYkhEiRzzeaOBJ9Sd3FXvABEBAAGJAh8EGAEIAAkF
-Ala2CU4CGwwACgkQbWqE4tHp/VyPVhAApcG5S4TcQ/ZbhElHzvWdMBKSGtaRw1c6
-MKShcQthXR8St0z+/NqqdeRXOF4ybkXCl4N0O1uRkffWlQJ2lcWpgds23xs/pYZt
-o6SNYYsEG849B0NiMiQVBCqlKkYlFNp69+QZjqler+G4sVlmht9xYiBNcQA6Ghwt
-kc6enjjJRWAi7pczbJUtt42HIt/34RmWrCgKpjTZkV0i1bZo0tO6q4hfouF8Mw1L
-BHld7wdK3ZHccdtHKEGZcFmkGI/PxTKN/LxgikYj//1rNeWA6Vwsg/P5AA9jsW/o
-Wjgs/ytETLmAZBf77op1U9axsKiWUUTBCXmCsJ272pLX/BMMSCLvuDIxMRrmAcVT
-WHOqwphFaYlKenJtqAW7mUE0IAc0RQU96CogQk2dooD3CIB9pvFES9FMQ2NeQtk9
-a5E8QYKivkhM8Ig+e24kaY2LZA7tESOwczzYOJIkTb9R2wpVWuUkvhPm4U23Fxo1
-2xaeELH/hT8YarDC6I3w2dhhpIYdHvXXpDc6Bo28MagcLYC4JTH6YovOby/FXWn0
-kb9ChPGl0BX/pzFnt/eaty2KESohc/OIvE9STG0SFVOOcvk/ACgU45Tiyhr3Ym4S
-LbakdIXOK1J5A/RIbEVMtMnOPmP/9NSapJBZWibcit+pIfHs7XjlohdrniCzt/ll
-52ujr6w0mW0=
-=flxx
------END PGP PUBLIC KEY BLOCK-----
-
-pub   rsa4096 2017-02-21 [SC]
-      CE7D E8E5 2FC2 1AA1 75FB  9E93 EFBE 8395 88C2 AA2E
-uid           [ultimate] Nikita Timofeev <nt...@apache.org>
-sig 3        EFBE839588C2AA2E 2017-02-21  Nikita Timofeev <nt...@apache.org>
-sig          6D6A84E2D1E9FD5C 2017-02-23  Andrus Adamchik <an...@objectstyle.org>
-sub   rsa4096 2017-02-23 [E]
-sig          EFBE839588C2AA2E 2017-02-23  Nikita Timofeev <nt...@apache.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFisQ1ABEAC18V7edFXe5Ez056/zAuWE3BZ2Ge1j3dVpkTPUAal/JKwOs227
-SkT1f10eplXRJ3nVWH/vvFQ2wiQAKXQxMCP5MT8vfoFRsMfpZxN5JaOm+biXFb30
-CcYn/wTpX7l01wpZJkh84nRnGO5AVRCZJgoU+dYetk7d7Kfy9dFv5KnWvATDwR+O
-uwVOx1my7cY7biUQVjxFYcYkL9W2e5w59DSYTELeyH4vlHDc8IyFXB6W/T5pdopw
-t9y2ey70fchTnqJvEA8ZMa47hvaN0jPVG3+E/0NKEtjqg4jZo+ezSkp4p17vvWvC
-wSLOLGbDLJ0SOgFb1twr2TdpbYHHY+q/033K2oooBDXzkCOOWASNCQkBlKh7ckOH
-pSbogz7ypU1DTh3+UeaklvOs5PdmTogNWxhvCBNchedCqa2YB1VMjnHwyfPhtRJA
-U7CueEMbTwg1PrWBIYpPjX7oNQPpdMFY6W9XyHl1Gwle08Zyh451a11fP3W03Fj7
-6OZADt8TAoMesFKVBLbur8kKq8djXMiDhhf+/mED17vJNyzmVcPqFCxkK04tM7lR
-Qezet6E/JwyaBksSoGWOyr8YU0lWcae0eQhPJhFXoDl1Ykc432dYG0Aacp9LOu0I
-ItxGKGetZ1ufOwsvfOH3Fz1z22h31Qw1dFK7dKcg42Rgy6BoywTcyMsRHQARAQAB
-tCZOaWtpdGEgVGltb2ZlZXYgPG50aW1vZmVldkBhcGFjaGUub3JnPokCTgQTAQgA
-OAIbAwULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgBYhBM596OUvwhqhdfuek+++g5WI
-wqouBQJYrERSAAoJEO++g5WIwqou8yAP/0zrbzfc4FNYV/zRiICXgioTORC9injv
-lBya0FB4DzvxRVaPOfaMYPbaZTzT0LGg52dYj77NpwGsEgxcjrTRvt8pgnzIK5IJ
-JgPzDzgSmFF/v8Oou/vQZNW9YSTBsOAk2xyqfXwdQocoAUSmhdOWkxpuvnf7kuQj
-41XP1ZTIJz4IaLJpxaFZ6rI/rxJ7KLwfKJzyudtodg5nf65COk/8XWiufl+8Lmk4
-op/UJ03mk5j8K6v5qJVZjo/AyWHLPnJbJcK0CxbcdrESOUqk0i1dhx28pwca611T
-wogr+eeZydMCnZWKOtn5Az38whb0c0EmM1ibmHsEBdFCpZ6pZ6KeZlcXQvU5AYYF
-YaSr7AlOJYb6GVbFN2YETXe5XzpQlG3RMY2gs3rqcmXZLLAXPtKqBgB6b93UYdUe
-xQmV9TIPX8fYRYVVLBpaWnGTq5jk56tvY+LpwpDPba+YsLTiJkLftsp/eiJEBKJh
-I48+goIZPQCa74RQcekmwxPSyqONhZpMICDS6IeXInXK4nrYlnMBDmcHWH0Lc9Ub
-WxGJb/5sSLQhiIpvfHDVzJCQ5zJFUfW2hbe5Vhe9fx5yYmRn2M++fGh+Hnmc9yS4
-gq7GOszC5s9LSul50eQA+xQ5+g4kr4p6cGaGptOraRK2uqApBX7eXOriDwXK8txJ
-eK9vkYdPV1OaiQIcBBABAgAGBQJYroQoAAoJEG1qhOLR6f1c++QQAJsAuD/66AIM
-dKkk68RNlGTlnz69CLShKEvX/iCRVhMJlELddKudO1OqC8rS7CbDLcPRy7zJpZky
-psEl2LAS5cOHdFAy2yPokpYnQYTM1JitGAQxtVzoz2VUfcD48pco3CZ8DkXUGw9x
-0TTFbyUy/IHo4PLYy5qZHKg/4ul3TG1QptcUN2dAB5wlS6/JT7lwbaKFUGWYY6Kk
-A4tgvtuxR4aWzUHwYtRU3X82FsUw8hsP7EtKu6vnZqyHwLqCdoNsoYrK+QcAUswI
-sdTGuXzaf+HRe6pCIBu4vmQtybNce1tTpnqiiJ+Ze60XMH2ntWNwVHHl++LcWWcf
-TNoc+WymROqaZIG/Y8OD65jfQ+uMTf9FQ5rBWLiCnWZc4/vxMnnYMAQvcV63I4n7
-0H0FVxED6o8m0jEHoiLKVoYI49HxK0JqE/AzarR7QjXixLLjK3Ti7x83QYuX/+Ls
-4SkOf6Sq98nwHXd6f+C855ay1yrnEvQtN4vWeBPZ8rs2Us60DHKLPXWA1+LzzjnS
-AlKNo1tBju6jKepW9RBMa/7T92GS4VpGK8mUU0KmaZiDpCRMSc75HI3KVtkh2cGF
-ebjTLblUdakUKqAoaP9nGCCe8Z5gj86X01YUZFWTgKS2+IsOcK5f2GrB3tFvbjCp
-3oj5rgeIvryYz/7WTeMggThVAwl+0DmCuQINBFiui3wBEACqZgMUryULZfSCDB89
-6evn6DbnjCIIgzIqKLdDOoWDaA02AHJ6n7E0bIGjbdDrhVeu9FIGqhR50DCIdqjf
-unuplm70sC9JYjHDkWErGJnd8lXb7PmW9knKwsmIityTKt8/5os3Lr8EplCuO7iJ
-mkdEz8zdGp7+h7ZSwC+Rz9q1JThjjJbIqadjTfa4Pt3yn6z9I33TO8POxGRch7W7
-qnVHvsWiZEv5osELUXOipIutdBtvz0tkpDJXeXkX/YJNVl1ig88bSTBE4u3NQ8SY
-ySqlKhjvGo278KIqnpCnCU2Dy9PgLchkMxULR4gryHrVLqK1lL6PnGvcA284I45H
-pypMCtgibN1iQ6QyG/IvU45hczzOeNyuqYikE6Ej3oYCXsRlnMK6kUwyDU4bf8R4
-05ODNbvzv5IwkmgWTtQFTp1xM/dtHL7BHqhCGuKY7kEUA5q5X0dSv+MyIYaPGW7l
-505IVkPAVlcw7Qs3hlihVf+hJepKy5BPSZYNzUfeb/MpDG1j3ps1L2OeozkyGUCU
-Im6BxL31TE7BIHbapVCykkd6qZHL1HENi7nq97pvLsE7936DCcg452oNjjQuZEzy
-qXUkIGt9DVeiige95rUlcFsq8Rg/0dZ4pwPFBkyOvMXOw3+UKiZyFXvR4NE2qRET
-qNjoKP+S8MQ3koXXsRZlcUff0wARAQABiQI2BBgBCAAgFiEEzn3o5S/CGqF1+56T
-776DlYjCqi4FAliui3wCGwwACgkQ776DlYjCqi6bQhAAtWjx3U593nZGTksyiOmn
-X7oKuseRnSmpoINH5I+DVPYSn7wpJXI892cDyE8k+Qyo/EjpNpM4vwR5rnC86jyx
-zk4IcZ06fh4MBA+4CRwgYasfPVcGVLnXG3v8XkBiUqQH8G54AdfcXHQGsjzyD/UV
-y8Q3xV2hs+KtK79rLB7T4pNs/oYfQOscpsHLIbCXG+jFmBjXlqlW8pleIHBLo1bL
-3nd/CZ63LQpo6+UcRRMilQS6vER2CbvQ96EiKwt2HUlUNZcf6R5sREeCIcRtnqZ8
-vBEFhMvH5Bli28Up6c7td8XsI4nX/X/hJnKp30nnjDHeGGpXYf3y+gCjsaj+srkU
-ZxViZsZ7NWjAJrRth9agjrsqgUBsk9t61/3JUmfNgKll4SAmsjLI5DvqjMB17UrZ
-/B+oLIMEMLd8G6X7gcV0/Gl+MYgyqcd3DBmW7mKCla/3fvkDm6F9Wi2507u3jBpW
-3bDfLf7WlSK8MAyPDJ75U5rGTX4GPP/uVRIB+OIM3zM+1h3pL1/lR0/IL9QS1KIV
-py5uerg3Q7WfqbAa0YMG2DaZ/YJRv2fXlVh2CkMFy8YXJIk5WOI+4vfDGO9Y+5yN
-hKkeIv6tGxekNrf3mThlCgIwKfWqeUfMbfib2kFIpM+efbWxTnN3vHaYwOukrgnq
-fwFW2VhoEcMt5UlivoHmpIY=
-=N0zb
------END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/334d9cc4/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt
deleted file mode 100644
index 5b61a78..0000000
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ /dev/null
@@ -1,491 +0,0 @@
-Apache Cayenne Release Notes
-============================
-
-For the latest information visit project web site: 
-http://cayenne.apache.org/
-
-To browse individual bug reports check out project issue tracker:
-https://issues.apache.org/jira/browse/CAY
-
-----------------------------------
-Release: 4.1.M2
-Date:
-----------------------------------
-Changes/New Features:
-
-CAY-2372 Extract new modules from cayenne-server
-CAY-2377 Cleanup deprecated code.
-CAY-2391 cdbimport: add option to skip user-defined relationships
-CAY-2393 Add sqlserver-docker profile to automate tests on SQLServer
-CAY-2394 Upgrade to Apache Velocity 2.0
-CAY-2395 cdbimport: add option to create project file
-CAY-2396 Upgrade maven-assembly-plugin to 3.1.0
-
-Bug Fixes:
-
-CAY-2370 ValueObjectType for byte[] fails lookup
-CAY-2380 ReferenceMap should not store or return null values
-CAY-2381 cgen: meaningful PK with boxed type ends up with primitive type in generated source
-CAY-2382 Lack of synchronization in DataContext serialization
-CAY-2387 Can't select byte[] property with ColumnSelect
-CAY-2388 Modeler: Visualization issues with undo/redo actions for attributes and relationships
-CAY-2389 DbEntity qualifier with DbPath expression translates into wrong SQL
-CAY-2392 Modeler: Unable to remove DataNode
-
-----------------------------------
-Release: 4.1.M1
-Date:
-----------------------------------
-Changes/New Features:
-
-CAY-2152 Redesign project file upgrade system
-CAY-2329 Update project dependencies
-CAY-2330 Field based data objects
-CAY-2335 New XML loading/saving mechanics with support of plugable handlers
-CAY-2336 Support for comments in Modeler
-CAY-2339 Compatibility module to support old versions of projects at runtime
-CAY-2344 Modeler: Save ER-Graph and class diagram
-CAY-2345 Own template renderer as a replacement for Velocity
-CAY-2346 Field-based data object with Map-based storage fallback
-CAY-2351 Remove commons-collections usage completely
-
-Bug Fixes:
-
-CAY-2312 Modeler: Undo does not work for checkboxes
-CAY-2318 Modeler: Query. Exception after Undo clicking
-CAY-2319 Modeler: Embeddable > Attributes. Undo does not cancel pasted objects
-CAY-2321 cdbimport: Reverse relationship is not created after adding and rev engineeering new db table
-CAY-2323 Modeler: Graph. No warning while saving the image with existing name
-CAY-2331 cgen: broken templates for data map
-CAY-2347 cdbimport: can't get all relationships on the first pass
-CAY-2349 Cache issue: 'SelectQuery' with prefetches loses relationships
-CAY-2350 Expression: NotIn with empty collection returns empty result
-CAY-2353 Broken paginated column select with only one entity in the result
-CAY-2354 DbGenerator.runGenerator must commit its connection
-CAY-2356 EJBQL: Incorrect COUNT() on outer joined table
-CAY-2357 Generic select queries silently convert result to nulls if no PK column found
-CAY-2358 NPE when callbacks invoked on null objects
-CAY-2359 EJBQL: db path in not supported in ORDER BY
-CAY-2361 PostgreSQL DbGenerator issues
-CAY-2362 ColumnSelect: unable to use Property without type
-CAY-2363 ColumnSelect: unable to use from nested context
-CAY-2364 Wrong logging in SQLTemplate
-CAY-2365 SQLExec query tries to convert (unexpected) result set into objects
-CAY-2366 Incorrect EJBQL COUNT translation
-CAY-2367 ClassCastException reading object with an attribute of type 'char'
-CAY-2368 ColumnSelect: Property.self() translates into wrong SQL code
-
-----------------------------------
-Release: 4.0.B1
-Date: June 12, 2017
-----------------------------------
-Changes/New Features:
-
-CAY-1873 Move DataDomain cache configuration from the Modeler and into DI
-CAY-1891 Modeler: Add To-Many Warning
-CAY-1892 Modeler: Add Relationship Data Type Warning
-CAY-2057 Modeler: Clean up OS X version
-CAY-2109 cayenne-crypto: add value authentication (HMAC) 
-CAY-2210 Query cache: incorrect cache key for queries with custom value objects
-CAY-2255 ObjectSelect improvement: columns as full entities
-CAY-2258 DI: type-safe binding of List and Map
-CAY-2259 QueryCache: support for referencing type-safe caches
-CAY-2261 Replace NamedQuery with MappedXYZ in *datamap.vm
-CAY-2262 Module auto-loading
-CAY-2266 Move EventBridge implementations into autoloadable modules
-CAY-2267 Contribute lifecycle events listeners via DI
-CAY-2268 DI: Refactor ListBuilder API ambiguities for before() / after() bindings
-CAY-2269 Add support for date/time components extraction in expression functions
-CAY-2270 Update function support in expression parser
-CAY-2271 ColumnSelect: support for prefetch and limit
-CAY-2272 ColumnSelect: methods to manually control DISTINCT clause
-CAY-2274 Modeler: Validate case when dependent PK is marked as “generated”
-CAY-2277 Create ClientRuntime with ClientRuntimeBuilder just like ServerRuntime
-CAY-2278 Extract cayenne-postcommit module from cayenne-lifecycle
-CAY-2280 Switch from commons-logging to slf4j
-CAY-2295 "Sync ObjEntity with DbEntity" and "View related DbEntity" buttons aren't disabled, if DbEntity doesn't have ObjEntity
-CAY-2296 cayenne-crypto: Get java type for DbAttribute bound to ObjAttributes with the same type
-CAY-2300 Modeler: New icons and design improvements
-CAY-2302 Rename postcommit module and its content to commitlog
-
-Bug Fixes:
-
-CAY-2021 cdbimport: detect when same FK constraint is defined twice
-CAY-2077 Bug in CayenneRuntimeException using wrong specified string in Formatter
-CAY-2094 SelectById query doesn't work from ROP client
-CAY-2161 'Not for Client Use' option is ignored at Class Generation
-CAY-2171 Modeler: Undo db Entity Sync throws error
-CAY-2208 SQLTemplate: LEFT JOIN to a subset of a table returns nulls for entries that don't have a match in the subset
-CAY-2230 Error using connection to postgresql with db schema in DB URL
-CAY-2240 Modeler: issue with cursor rendering for EJBQL query
-CAY-2243 ObjectContext.getGraphManager().unregisterObject() inconsistencies
-CAY-2250 Remove: Incorrect text in Confirm Remove message when cursor is set on attribute row
-CAY-2256 Cannot Save/Insert an Object With null Flattened (complex) toOne Relationship (see also CAY-2146)
-CAY-2265 ServerRuntime.builder() fails to set default runtime name when a the project file doesn't follow recognized pattern
-CAY-2273 Modeler: default suggested cgen location is rooted in subpackage
-CAY-2275 Documentation: tutorial is out of sync with 4.0.M5 version
-CAY-2276 PrePersist listener registered as PostPersist in LifecycleCallbackRegistry.addListener(Class<?>, LifecycleListener)
-CAY-2279 cdbimport: skip PK comparison for VIEWs
-CAY-2281 ObjEntity attribute overrides are never deleted
-CAY-2284 Expression likeIgnoreCase can't handle unicode chars in in-memory evaluation
-CAY-2286 Filter out inherited ObjEntities from sync with DbEntity
-CAY-2326 DI: can't override List/Map elements from another Module
-
-----------------------------------
-Release: 4.0.M5
-Date: March 6, 2017
-----------------------------------
-Changes/New Features:
-
-CAY-2139 Upgrade HSQLDB dependency to the most recent version (2.3.4)
-CAY-2150 Refactoring: ParameterBinding to contain ExtendedType property
-CAY-2163 Property.path() , ExpressionFactory.pathExp()
-CAY-2164 Relocate builder bootstrap methods from ServerRuntimeBuilder to ServerRuntime
-CAY-2165 Explicit "contribution" API for easier expansion of DI collections and maps
-CAY-2166 Auto-loading of Cayenne modules
-CAY-2168 Split DbLoader to parts and clean it up
-CAY-2169 Split DbMerger to parts and clean it up
-CAY-2170 MergeToken sorting is highly unstable
-CAY-2172 Cleanup Modeler import and migrate db actions
-CAY-2176 Java 7 diamond class generation templates
-CAY-2177 Sync auto generated state of PK between model and DB
-CAY-2187 Support for the scalar and aggregate SQL functions in ObjectSelect API
-CAY-2197 Update sqlite version and enable in-memory default config
-CAY-2212 cdbimport cleanup and configuration schema refactoring
-CAY-2223 JCacheQueryCache - a query cache provider to plug in JCache implementers
-CAY-2225 Extensible CacheInvalidationFilter logic
-CAY-2228 Deprecate multiple cache groups in caching and query API
-CAY-2231 Support for collections in new functional expressions and old math expressions
-CAY-2232 Proper conversion to String for new functional expressions
-CAY-2235 Deprecate Query.getDataMap() method
-
-Bug Fixes:
-
-CAY-2032 SelectAction: DistinctResultIterator ignores flattened relationships
-CAY-2137 When generating SQL from EJBQL, use "AND" to separate multiple join conditions
-CAY-2174 Change FK attribute name cause ObjAttribute appear after Reverse Engineering
-CAY-2175 AliasName used in EJBQLQuery is not working if it contains mixed case
-CAY-2183 Newly created DbRelationship is unexpectedly renamed by the Modeler
-CAY-2199 Modeler on Windows: The same project is displayed twice in "Recent Projects"
-CAY-2207 Modeler: "Java Type" and "DbAttribute Path" are not saved with using TAB to move forward
-CAY-2221 In-memory expression evaluation gives different result than select query
-CAY-2236 Modeler Migrate DB Schema: unable to Reverse All Operations
-CAY-2238 Modeler: Preserve manually set DbRelationship name when syncing with ObjEntity
-CAY-2242 Vertical Inheritance: Cannot Insert Record For Implementing Class with Attribute And Relationship
-
-----------------------------------
-Release: 4.0.M4
-Date: December 13, 2016
-----------------------------------
-Changes/New Features:
-
-CAY-2051 Applying new Reverse Engineering to the Modeler
-CAY-2053 SQLExec fluent query API
-CAY-2060 Replace Query objects in DataMap with query descriptors
-CAY-2062 MappedSelect and MappedExec fluent query API
-CAY-2063 ProcedureCall fluent query API
-CAY-2065 Pluggable serialization and connectivity layers for ROP
-CAY-2073 Ordering.orderedList methods
-CAY-2074 Support for catalogs in stored procedures
-CAY-2076 Implement Jetty HTTP/1.1 and HTTP/2 Client support for ROP Client
-CAY-2083 Implement Protostuff as serialization service for Cayenne ROP
-CAY-2090 Untangle HttpRemoteService from ServiceContext thread local setup
-CAY-2100 Add supporting generated keys for PostgreSQL
-CAY-2102 EJBQL: db: path not supported in select columns
-CAY-2103 cayenne-crypto: support for mapping non-String and non-binary types
-CAY-2106 cayenne-crypto: allow DI contribution of type converters inside ValueTransformerFactory
-CAY-2107 cayenne-crypto: Lazy initialization of crypto subsystem
-CAY-2111 Unbind transaction object from the current thread for iterated queries
-CAY-2112 Expose callback for "performInTransaction"
-CAY-2113 cdbimport: Reverse-engineering reinstates previously ignored columns
-CAY-2114 cdbimport: object layer settings are not respected
-CAY-2115 DbLoader - allow loading DataMap without Obj layer
-CAY-2116 Split schema synchronization code in a separate module
-CAY-2118 cdbimport: drop support for the old style of table filtering
-CAY-2129 Modeler: reengineer dialog improvements
-CAY-2130 Stripping common name prefixes on reverse engineering
-CAY-2132 Adding SybaseSelectTranslator to support TOP/DISTINCT TOP in limited queries
-CAY-2133 ObjectNameGenerator refactoring - unifying relationship name generation
-CAY-2135 cdbimport: reset DbEntity catalogs / schemas to DataMap defaults
-CAY-2136 Allow Ordering.orderedList(…) methods to accept a Collection rather than only a List
-CAY-2160 Modeler: new welcome screen
-CAY-2222 MySQLAdapter should not create indexes on FK columns
-
-Bug Fixes:
-
-CAY-2016 cdbimport: Rename table with toMany relationship causes migration error
-CAY-2064 Issue with BeanAccessor for classes with complex inheritance
-CAY-2066 Fixes for inner enums handling in ExtendedTypeMap
-CAY-2067 Cayenne 4.0 connection pool is occasionally running out of connections
-CAY-2070 Modeler sync function adds extraneous ObjRelationships inside the class hierarchy
-CAY-2078 Client code gen bug. Unnecessary DataMap class generation setting datamap gen to false.
-CAY-2080 Cayenne doesn't pick up reverse engineering file changes
-CAY-2084 ObjectIdQuery - no cache access polymorphism
-CAY-2086 SelectById.selectFirst stack overflow
-CAY-2087 PostCommitFilter is confused about changes made by Pre* listeners
-CAY-2089 HTTP connections aren't always closed in new ROP implementation
-CAY-2097 NullPointerException while updating relationships for entities with vertical inheritance
-CAY-2101 DataContext.currentSnapshot() doesn't set snapshot entity name
-CAY-2105 Add missing elements to the reverseEngineering.xsd
-CAY-2108 cayenne-di: StackOverflow for decorator that takes Provider of the delegate
-CAY-2110 Obfuscated exception when processing iterated results
-CAY-2119 ProjectUpgrader test failure (Windows)
-CAY-2122 Vertical Inheritance: Cannot Insert Record For Implementing Class with Attribute And Relationship
-CAY-2125 SchemaUpdateStrategy doesn't work with multiple DataNodes
-CAY-2126 Modeler cannot upgrade project from v7 to v9
-CAY-2128 Modeler stored procedures are not imported
-CAY-2131 Modeler NullPointerException in reverse engineering when importing different catalogs in one datamap
-CAY-2138 NVARCHAR, LONGNVARCHAR and NCLOB types are missing from Firebird types.xml
-CAY-2141 Disjoint-by-id prefetch generates repeating ID conditions
-CAY-2143 NPE in BaseSchemaUpdateStrategy
-CAY-2144 cdbimport always fails for databases which don't support catalogs
-CAY-2146 Vertical inheritance: record still inserted into parent db table when child validation fails
-CAY-2148 Failure upgrading from 3.1 to M4
-CAY-2150 UI bug: PK generation custom sequence is getting reset
-CAY-2151 Migrate Database Schema: issue when no db is specified
-CAY-2153 Modeler Exception in save action after reverse engineering some complex DB schema
-CAY-2154 Migrate db: queries order
-CAY-2226 PK generation for Frontbase: PK cache size must be ignored
-
-----------------------------------
-Release: 4.0.M3
-Date: February 12, 2016
-----------------------------------
-Changes/New Features:
-
-CAY-1626 Add JodaTime DateTime support
-CAY-1902 Implement resolving Db paths for DataObjects
-CAY-1991 More control over generated String property names
-CAY-1992 Allow to exclude DataMap java class from Modeler class generation
-CAY-1995 Add support for iterators to Select
-CAY-2001 Saving a display state of Project
-CAY-2004 EJBQL: Support for ordering on aggregate expressions
-CAY-2007 Refactoring SelectTranslator for better extensibility
-CAY-2008 Connection pool refactoring and validation query support in Cayenne DataSource
-CAY-2009 Non-blocking connection pool
-CAY-2010 DataSourceBuilder to help users create pooling and non-pooling DataSources
-CAY-2011 Support for Java 8 date and time types
-CAY-2012 ObjectSelect, SelectById: eliminating methods that reset query state
-CAY-2013 In-memory evaluation of DB expressions - non-id attributes
-CAY-2023 Decouple the use of ResourceLocator
-CAY-2025 Support for DBCP2
-CAY-2026 Java 7
-CAY-2027 Support for Expression outer join syntax in EJBQL
-CAY-2028 Wrap DataChannelFilter calls in the main transaction
-CAY-2029 Allow out-of-order insertion into DI lists
-CAY-2030 Capturing a stream of commit changes
-CAY-2035 Autobind items added to collections (Cayenne DI)
-CAY-2042 Remove an arbitrary limitation on 1000 runtime DbRelationships
-CAY-2043 ServerRuntimeBuilder: use DataDomain name for the default DataNode
-CAY-2044 Collection setter for to-many relationships
-CAY-2045 Add autosuggestion fields to choose attributes and relationships
-
-Bug Fixes:
-
-CAY-1977 Cleanup Modeler reverse engineering functionality
-CAY-1987 Widen types before performing in-memory evaluation of qualifiers using j.l.Number subclasses
-CAY-1990 Incorrect display of the raw SQL query in Modeler
-CAY-1993 Reverse Engineering does not work with PostgreSQL database
-CAY-1994 Modeler Migration Tool Shows No Changes
-CAY-1997 Difference in NULL handling inside the path between PropertyUtils and DataObject.readNestedProperty
-CAY-1998 Speeding up PropertyUtils
-CAY-1999 Unneeded Property import for superclasses with no properties
-CAY-2003 cdbimport doesn't work properly with several includeTable tags
-CAY-2015 Joint prefetches combined with DisjointById prefetches return null incorrectly
-CAY-2020 typo: correction to upper alpha range in Rot13PasswordEncoder
-CAY-2041 "cayenne.jdbc.max_connections" and "cayenne.jdbc.min_connections" command line options are ignored
-CAY-2047 Relationship mapping with target inheritance
-CAY-2049 Changing the Relationship name in ObjRelationship Inspector has no effect
-
-----------------------------------
-Release: 4.0.M2
-Date: March 18, 2015
-----------------------------------
-Changes/New Features:
-
-CAY-1267 Some changes to LogDialog
-CAY-1826 Merge Entity Attributes and Relationships tabs together with one toolbar.
-CAY-1839 Allow to link DataMaps to DataNodes from DataNode editor.
-CAY-1841 Filters for Left-hand project navigator
-CAY-1842 Remove Listeners support from the Modeler 
-CAY-1843 DataMap v7: Stop saving listeners in DataMap, add upgrade handler
-CAY-1845 Upgrade javadoc plugin to 2.9.1 
-CAY-1846 Reworking of callback mapping
-CAY-1847 Make ConverterFactory extensible
-CAY-1848 New method: ObjectContext.selectOne(Select query) 
-CAY-1851 Generate default serialVersionUID for generated java classes to avoid eclipse warnings
-CAY-1852 Straighten thread model and synchronization in the Modeler 
-CAY-1855 Iterated and paginated queries must print result counts 
-CAY-1856 Expression.expWithParameters does not work when parameters are placed in the inline collection 
-CAY-1860 In-memory matching of DataObjects against ObjectId or int
-CAY-1861 Remove runtime relationships
-CAY-1870 cgen - smarter default for 'superPkg' and 'destDir'
-CAY-1882 Porting to OSGi environment
-CAY-1883 Clean up Cayenne maven structure
-CAY-1886 cayenne-di module reorg, new exceptions
-CAY-1890 Remove Cayenne-level buffering when retrieving LOBs
-CAY-1894 Support native PK generation using sequences for H2 databases
-CAY-1899 ServerRuntimeBuilder
-CAY-1900 Allow DataNode name to be used as a root of SQLTemplate
-CAY-1901 Config-free ServerRuntime
-CAY-1904 Simple injection-friendly constructor for AuditableFilter
-CAY-1907 RowReaderFactory
-CAY-1908 Refactor all SQLActions to work with DataNode
-CAY-1911 BatchQuery refactoring - make Iterable
-CAY-1912 BatchQueryBuilder refactoring
-CAY-1913 Refactor org.apache.cayenne.access.trans into query-specific packages
-CAY-1914 Refactor EJBQL-related translators to a standalone 'org.apache.cayenne.access.translator.ejbql' package
-CAY-1915 BatchTranslator instead of performing bindings should return binding object whose values can be altered
-CAY-1916 cayenne-crypto module that enables data encryption for certain model attributes
-CAY-1918 Replace Oracle LOB hacks with JDBC 4.0 API
-CAY-1919 Split DataNode creation into a separate DataNodeFactory
-CAY-1920 DI: add support for decorators
-CAY-1921 Support for schema selection in 'Migrate Database Schema'
-CAY-1923 Optimize BatchTranslator - use fixed size array of BatchParameterBinding
-CAY-1925 cayenne-crypto: add optional compression to the encryption pipeline
-CAY-1928 Second INNER join generated for OUTER flattended relationships in disjoint prefetches
-CAY-1929 Property.outer method to build OUTER join properties
-CAY-1932 Improved Handling for Scalar Parameters Converting Expressions to EJBQL
-CAY-1933 Problems in Evaluating EJBQL Statements with Integral Literals > Integer.MAX_VALUE
-CAY-1934 A problem exists where the escape character is not conveyed in the EJBQL when toEJBQL() is invoked on the expression.
-CAY-1936 ServerRuntime.getDataSource() returning DataSource of a default DataNode
-CAY-1937 Make Transaction an interface
-CAY-1938 Create a DI factory for transactions, get rid of TransactionDelegate and modeler config for tx policies
-CAY-1939 DataDomain must use injectable TransactionManager
-CAY-1946 CDbimport improvements
-CAY-1949 Search in configuration fields (Catalog, Schema) in DbEntity
-CAY-1952 Undeprecate (actually restore) ObjectContext.deleteObject(..)
-CAY-1953 Redo ResultIteratorCallback to handle single row callback instead of iterator
-CAY-1954 Make Cayenne class constructor protected
-CAY-1958 SelectById - a new full-featured select query to get objects by id
-CAY-1959 ObjectSelect query - a fluent API alternative to SelectQuery
-CAY-1960 ExpressionFactory.exp(..) , and(..), or(..)
-CAY-1962 Implement CayenneTable column resize on double-click on the header separator
-CAY-1965 Change version from 3.2 to 4.0
-CAY-1966 SQLTemplate/SQLSelect positional parameter binding
-CAY-1967 Deprecate SQLTemplate parameter batches
-CAY-1968 SQLSelect cleanup and omissions
-CAY-1971 Variants of Property.like(..) : contains(..), startsWith(..), endsWith(..)
-CAY-1972 A property to override DataSources of multi-module projects 
-CAY-1981 Add support of JDBC 4.0 N-types (nchar, nvarchar, longnvarchar, nclob)
-CAY-1984 cdbimport doesn't flatten many to many relationships
-
-Bug Fixes:
-
-CAy-1988 ServerRuntimeBuilder: synthetic DataNode does not have domain's DataMaps linked
-CAY-1480 Implement cross-db functional expressions
-CAY-1695 Unexpected null value in bidirectional one-to-one prefetch 
-CAY-1736 IllegalArgumentException when synchronizing entities in the Modeler
-CAY-1795 "Invisible" ObjAttribute in subclass
-CAY-1796 ROP: All entity's to-many relationships getting faulted from database when using it as a parameter in qualifier expression
-CAY-1797 NPE importing DataMap
-CAY-1798 ROP: Reverse relationships of prefetched entity objects are not filled during server to client objects conversion
-CAY-1799 ROP: Server can't deserialize LIKE expression with pattern already compiled
-CAY-1818 Fix copyright year in the Modeler "about" panel
-CAY-1834 Exception: ToManyList cannot be cast to DataObject 
-CAY-1857 Problem with hotkeys 
-CAY-1859 NullPointerException when importing EOModel 
-CAY-1863 Make determining whether a particular database type supports length adapter-specific not universal
-CAY-1866 Change in General Modeler Preferences reverts old settings to default value
-CAY-1868 Select contention with multiple contexts 
-CAY-1869 ResultIterator from cayenne-client dependency is subclassed from org.apache.cayenne.access.ResultIterator which is present only in cayenne-server dependency 
-CAY-1874 DB2 Procedure action ignores the first result set
-CAY-1877 In-memory evaluation of expression may fail with UnsupportedOpeartionException depending on order of nodes
-CAY-1880 objectStore snapshots never cleared from RefreshQuery when "use shared cache" unchecked
-CAY-1881 CayenneModeler (Mac version) doesn't work with Java 7
-CAY-1885 Null value in subclass's field.
-CAY-1905 Multi-step prefetching NPE : 1..N..1 with absent N and root with no qualifier
-CAY-1943 XML file not deleted when a DataMap is deleted from the project
-CAY-1961 Fix RemoveAction for DataMaps in ProjectTree
-CAY-1964 Fix convertAdditionalDataMaps() in CayenneGeneratorMojo.java
-CAY-1973 error while generating classes
-CAY-1974 Copy/Paste DbEntiry throws exception
-CAY-1978 ESCAPE clause should be included in LIKE parenthesis
-CAY-1979 Prefetches on Many-to-Many Relationships with Longvarchar
-CAY-1980 'mvn cayenne-modeler:run' seems to be broken in 4.0
-
-----------------------------------
-Release: 3.2M1
-Date: July 19, 2013
-----------------------------------
-Changes/New Features:
-
-CAY-1294 Generify query
-CAY-1646 Synchronize tabs in Modeler between ObjEntity and DbEntity editor panes
-CAY-1647 Easily switch to/from ObjEntity and DbEntity in Modeler
-CAY-1717 [PATCH] Implement JDBC compatibility layer methods
-CAY-1718 Remove everything deprecated in 3.1
-CAY-1724 Add 'Property' class for easier and better Expression creation
-CAY-1726 Expression parser support for bit operators, support for << and >>
-CAY-1737 ObjectContexts listening to DataChannel events must be non-blocking
-CAY-1748 IdCoder/EntityIdCoder improvements to work with ObjectIds, including temp ones
-CAY-1753 remove light-superclass.vm class template
-CAY-1754 Modeler suggested URL for SQLServer should start with 'jdbc:sqlserver:' instead of 'jdbc:microsoft:sqlserver:'
-CAY-1758 cdbimport improvements
-CAY-1759 cdbimport improvements: add 'catalog', rename 'schemaName' to 'schema'
-CAY-1760 cdbimport improvements: Default adapter (if none specified) must be AutoAdapter, not JdbcAdapter 
-CAY-1761 cdbimport improvements: DbLoader must reverse engineer PK auto-increment state. 
-CAY-1762 cdbimport improvements: Support for "defaultPackage" parameter, as the new DataMaps ends up placing entities in the root package 
-CAY-1763 cdbimport improvements: specified "schema" should become the default schema of the generated DataMap 
-CAY-1764 cdbimport improvements: "overwrite" flag
-CAY-1765 cdbimport improvements: add excludeTables/includeTables parameters
-CAY-1766 Deprecating DataPort ant task
-CAY-1768 cdbimport improvements: DataMap "project-version" attribute is skipped when DM is saved
-CAY-1769 cdbimport improvements: meaningfulPk flag must be turned into a pattern
-CAY-1771 cdbimport improvements: "usePrimitives" flag
-CAY-1772 Real support for DbEntity catalogs
-CAY-1778 TransactionManager to simplify user-managed transactions 
-CAY-1779 Flatten object entities for many to many relationships on reverse engineering 
-CAY-1781 Add StatelessContextRequestHandler as an alternative to the Session-based one
-CAY-1785 SelectQuery<T> for DataRows
-CAY-1789 Lock-free EntityResolver 
-CAY-1792 [PATCH] Supply additional factory methods for generic SelectQueries 
-CAY-1803 Optimize Expression conversion to String and EJBQL 
-CAY-1809 Remove 'final' modifier from Cayenne, HessianUtil, PropertyComparator, ConversionUtil, and LinkedDeque
-CAY-1813 Missing ObjEntity Attribute Validation with Duplicate DbEntity Columns
-CAY-1814 Support Property.nin 
-CAY-1819 When adding a filter, auto-register it as a listener 
-CAY-1820 DataDomain.addListener(Object) - a shortcut for adding annotated listeners 
-CAY-1821 AuditableFilter and friends should explicitly work with Persistent instead of Object
-CAY-1822 Make DataMap editor fields wider 
-CAY-1823 remove ":sync w/DbEntity" button from ObjEntity - it is redundant and already present on the entity toolbar. 
-CAY-1825 Simplify API for setting up query caching
-CAY-1828 SQLSelect - generics friendly fluent selecting sql query
-CAY-1829 Make ResultIterator implement Iterable<T>, create ObjectContext.iterate method
-CAY-1836 Firebird Adapter 
-CAY-1838 Deprecate EntityResolver.indexedByClassProperty
-CAY-1840 Conditionally log slow / long-running queries
-CAY-1844 Configuration for maximum time to wait for an available DB connection
-CAY-1862 MySQL - allow specifying a length for TIMESTAMP and TIME columns
-
-Bug Fixes:
-
-CAY-957 Deadlock in nested contexts
-CAY-1522 EJBQL query don't support quotes
-CAY-1677 Modeler: text fields discard input unless you press enter
-CAY-1701 Modeler cannot undo pasting of obj (db) entity
-CAY-1708 Modeler error when pasting datamap with EJBQL query
-CAY-1714 ROP: Cayenne tries to build a query for non committed object when using more than 2 nested contexts 
-CAY-1721 Writing blobs fails (Oracle)
-CAY-1725 NullPointerException from call to removeToManyTarget
-CAY-1719 Modeler - Obj Attribute Java Type editor won't focus sometimes
-CAY-1727 Modeler thinks entity is using inheritance when it doesn't
-CAY-1729 PersistentDescriptor must have predictable property iteration order
-CAY-1738 Tutorial cayenne-rop-server should be packaged as a war
-CAY-1739 Cayenne ROP server resets session on every request if BASIC auth is used
-CAY-1742 ObjRelationship inspector says "ObjAttribute Inspector"
-CAY-1744 Unexpected read-only relationships in vertical inheritance mapping
-CAY-1749 NPE on simple nested context commit
-CAY-1755 FaultFailureException resolving relationships to UNIQUE non-PK columns
-CAY-1757 ROP: Faulting entity relationship resets uncommitted modifications made to its reverse relationship 
-CAY-1774 EhCacheQueryCache.get(QueryMetadata, QueryCacheEntryFactory) returns null if EhCache instance for group is not present
-CAY-1780 cdbimport do not create xml file in resource folder
-CAY-1782 Deadlock when performing many concurrent inserts
-CAY-1783 JdbcPkGenerator.longPkFromDatabase would throw an exception if the PK value exceeds a range of Java int
-CAY-1794 Duplicate attributes in discriminator columns of PersistentDescriptor
-CAY-1804 Serialisation of long[] type was not working correctly. 
-CAY-1806 Error importing eomodel 
-CAY-1817 NPE during Validate Project 
-CAY-1827 EhCache region corresponding to a cache group loses its settings after 'removeGroup'
-CAY-1832 Exception when modifying objects in postLoad callback
-


[07/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap3.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap3.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap3.html
deleted file mode 100644
index d0e44170..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap3.html
+++ /dev/null
@@ -1,729 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:embedded-attribute</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id35', 
-				'properties_id39', 
-				'properties_id40');
-
-        
-        var usedByBoxes= new Array('usedBy_id35', 
-				'usedBy_id39', 
-				'usedBy_id40');
-
-        var sourceBoxes= new Array('source_id35', 
-				'source_id39', 
-				'source_id40');
-
-        var instanceBoxes= new Array('instance_id35');
-
-        var diagramBoxes= new Array('diagram_id35');
-
-        
-        var attributesBoxes= new Array('attributes_id35');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, instanceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Instances</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id35"></a><div class="componentTitle">Element <span class="qname">cay:embedded-attribute</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id35" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id35');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id35" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html6.jpeg"
-                                   usemap="#modelMap_46_html6" /><map name="modelMap_46_html6" id="modelMap_46_html6">
-                                 <area alt="modelMap3.tmp#id39" href="modelMap3.html#id39" coords="181,43,294,85" />
-                                 <area alt="modelMap3.tmp#id40" href="modelMap3.html#id40" coords="181,95,294,137" />
-                                 <area alt="modelMap16.tmp#id36" href="modelMap16.html#id36" coords="247,161,467,185" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id35" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id35');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id35" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id35" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id35');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id35" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap1.html#id33" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="modelMap16.html#id36" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:embeddable-attribute-override*')">cay:embeddable-attribute-override*</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="modelMap16.html#id36" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:embeddable-attribute-override')">cay:embeddable-attribute-override</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id35" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id35');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="instance_id35" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;cay:embedded-attribute</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">type=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:embeddable-attribute-override</span><span class="tokenText"> </span><span class="tokenAttrName">db-attribute-path=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:embeddable-attribute-override&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/cay:embedded-attribute&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id35" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id35');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id35" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap3.html#id40" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component name')">name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap3.html#id39" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component type')">type</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id35" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id35');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id35" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"embedded-attribute"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:sequence</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:embeddable-attribute-override"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;/xs:sequence&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"type"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id39"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap3.html#id35" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:embedded-attribute')">cay:embedded-attribute</a></b>/@type</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id39" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id39');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id39" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id39" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id39');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id39" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap3.html#id35" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:embedded-attribute')">cay:embedded-attribute</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id39" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id39');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id39" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"type"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id40"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap3.html#id35" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:embedded-attribute')">cay:embedded-attribute</a></b>/@name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id40" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id40');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id40" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id40" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id40');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id40" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap3.html#id35" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:embedded-attribute')">cay:embedded-attribute</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id40" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id40');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id40" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap4.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap4.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap4.html
deleted file mode 100644
index 9d2c9a7..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap4.html
+++ /dev/null
@@ -1,909 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:obj-attribute</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id41', 
-				'properties_id42', 
-				'properties_id43', 
-				'properties_id44', 
-				'properties_id45');
-
-        
-        var usedByBoxes= new Array('usedBy_id41', 
-				'usedBy_id42', 
-				'usedBy_id43', 
-				'usedBy_id44', 
-				'usedBy_id45');
-
-        var sourceBoxes= new Array('source_id41', 
-				'source_id42', 
-				'source_id43', 
-				'source_id44', 
-				'source_id45');
-
-        
-        var diagramBoxes= new Array('diagram_id41');
-
-        
-        var attributesBoxes= new Array('attributes_id41');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id41"></a><div class="componentTitle">Element <span class="qname">cay:obj-attribute</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id41" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id41');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id41" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html22.jpeg"
-                                   usemap="#modelMap_46_html22" /><map name="modelMap_46_html22" id="modelMap_46_html22">
-                                 <area alt="modelMap4.tmp#id42" href="modelMap4.html#id42" coords="142,43,286,85" />
-                                 <area alt="modelMap4.tmp#id43" href="modelMap4.html#id43" coords="142,95,266,137" />
-                                 <area alt="modelMap4.tmp#id44" href="modelMap4.html#id44" coords="142,147,255,189" />
-                                 <area alt="modelMap4.tmp#id45" href="modelMap4.html#id45" coords="142,199,255,241" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id41" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id41');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id41" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id41" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id41');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id41" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap1.html#id33" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id41" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id41');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id41" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap4.html#id42" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component db-attribute-path')">db-attribute-path</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap4.html#id43" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component lock')">lock</a></b></td>
-                                    <td><b>xs:boolean</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap4.html#id44" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component name')">name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap4.html#id45" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component type')">type</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id41" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id41');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id41" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"obj-attribute"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-attribute-path"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"lock"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"type"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id42"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap4.html#id41" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:obj-attribute')">cay:obj-attribute</a></b>/@db-attribute-path</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id42" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id42');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id42" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>optional</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id42" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id42');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id42" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap4.html#id41" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-attribute')">cay:obj-attribute</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id42" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id42');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id42" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-attribute-path"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id43"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap4.html#id41" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:obj-attribute')">cay:obj-attribute</a></b>/@lock</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:boolean</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id43" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id43');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id43" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>optional</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id43" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id43');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id43" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap4.html#id41" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-attribute')">cay:obj-attribute</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id43" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id43');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id43" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"lock"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id44"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap4.html#id41" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:obj-attribute')">cay:obj-attribute</a></b>/@name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id44" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id44');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id44" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id44" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id44');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id44" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap4.html#id41" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-attribute')">cay:obj-attribute</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id44" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id44');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id44" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id45"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap4.html#id41" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:obj-attribute')">cay:obj-attribute</a></b>/@type</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id45" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id45');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id45" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id45" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id45');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id45" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap4.html#id41" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-attribute')">cay:obj-attribute</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id45" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id45');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id45" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"type"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file


[05/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap6.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap6.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap6.html
deleted file mode 100644
index 81dfdf0..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap6.html
+++ /dev/null
@@ -1,662 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:entity-listener</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id51', 
-				'properties_id66');
-
-        
-        var usedByBoxes= new Array('usedBy_id51', 
-				'usedBy_id66');
-
-        var sourceBoxes= new Array('source_id51', 
-				'source_id66');
-
-        var instanceBoxes= new Array('instance_id51');
-
-        var diagramBoxes= new Array('diagram_id51');
-
-        
-        var attributesBoxes= new Array('attributes_id51');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, instanceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Instances</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id51"></a><div class="componentTitle">Element <span class="qname">cay:entity-listener</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id51" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id51');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id51" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html18.jpeg"
-                                   usemap="#modelMap_46_html18" /><map name="modelMap_46_html18" id="modelMap_46_html18">
-                                 <area alt="modelMap6.tmp#id66" href="modelMap6.html#id66" coords="149,43,262,85" />
-                                 <area alt="modelMap7.tmp#id52" href="modelMap7.html#id52" coords="227,105,340,129" />
-                                 <area alt="modelMap8.tmp#id54" href="modelMap8.html#id54" coords="227,139,346,163" />
-                                 <area alt="modelMap9.tmp#id56" href="modelMap9.html#id56" coords="227,173,340,197" />
-                                 <area alt="modelMap10.tmp#id58" href="modelMap10.html#id58" coords="227,207,346,231" />
-                                 <area alt="modelMap11.tmp#id60" href="modelMap11.html#id60" coords="227,241,343,265" />
-                                 <area alt="modelMap12.tmp#id62" href="modelMap12.html#id62" coords="227,275,349,299" />
-                                 <area alt="modelMap13.tmp#id64" href="modelMap13.html#id64" coords="227,309,332,333" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id51" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id51');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id51" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id51" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id51');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id51" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Elements </td>
-                                    <td><b><a href="modelMap27.html#id1" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:data-map')">cay:data-map</a></b>, <b><a href="modelMap1.html#id33" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="modelMap7.html#id52" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:pre-persist*')">cay:pre-persist*</a></b> , <b><a href="modelMap8.html#id54" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:post-persist*')">cay:post-persist*</a></b> , <b><a href="modelMap9.html#id56" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:pre-update*')">cay:pre-update*</a></b> , <b><a href="modelMap10.html#id58" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:post-update*')">cay:post-update*</a></b> , <b><a href="modelMap11.html#id60" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:pre-remove*')">cay:pre-remove*</a></b> , <b><a href="modelMap12.html#id62" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:post-remove*')">cay:post-remove*</a></b> , <b><a href="modelMap13.html#id64" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:post-load*')">cay:post-load*</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="modelMap13.html#id64" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:post-load')">cay:post-load</a></b>, <b><a href="modelMap8.html#id54" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:post-persist')">cay:post-persist</a></b>, <b><a href="modelMap12.html#id62" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:post-remove')">cay:post-remove</a></b>, <b><a href="modelMap10.html#id58" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:post-update')">cay:post-update</a></b>, <b><a href="modelMap7.html#id52" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:pre-persist')">cay:pre-persist</a></b>, <b><a href="modelMap11.html#id60" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:pre-remove')">cay:pre-remove</a></b>, <b><a href="modelMap9.html#id56" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:pre-update')">cay:pre-update</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id51" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id51');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="instance_id51" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;cay:entity-listener</span><span class="tokenText"> </span><span class="tokenAttrName">class=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:pre-persist</span><span class="tokenText"> </span><span class="tokenAttrName">method-name=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:pre-persist&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:post-persist</span><span class="tokenText"> </span><span class="tokenAttrName">method-name=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:post-persist&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:pre-update</span><span class="tokenText"> </span><span class="tokenAttrName">method-name=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:pre-update&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:post-update</span><span class="tokenText"> </span><span class="tokenAttrName">method-name=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:post-update&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:pre-remove</span><span class="tokenText"> </span><span class="tokenAttrName">method-name=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:pre-remove&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:post-remove</span><span class="tokenText"> </span><span class="tokenAttrName">method-name=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:post-remove&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:post-load</span><span class="tokenText"> </span><span class="tokenAttrName">method-name=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:post-load&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/cay:entity-listener&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id51" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id51');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id51" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap6.html#id66" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component class')">class</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id51" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id51');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id51" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"entity-listener"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:sequence</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:pre-persist"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:post-persist"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:pre-update"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:post-update"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:pre-remove"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:post-remove"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"cay:post-load"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;/xs:sequence&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"class"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id66"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap6.html#id51" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:entity-listener')">cay:entity-listener</a></b>/@class</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id66" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id66');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id66" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id66" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id66');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id66" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap6.html#id51" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:entity-listener')">cay:entity-listener</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id66" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id66');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id66" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"class"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap7.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap7.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap7.html
deleted file mode 100644
index cbab934..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap7.html
+++ /dev/null
@@ -1,578 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:pre-persist</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id52', 
-				'properties_id53');
-
-        
-        var usedByBoxes= new Array('usedBy_id52', 
-				'usedBy_id53');
-
-        var sourceBoxes= new Array('source_id52', 
-				'source_id53');
-
-        
-        var diagramBoxes= new Array('diagram_id52');
-
-        
-        var attributesBoxes= new Array('attributes_id52');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id52"></a><div class="componentTitle">Element <span class="qname">cay:pre-persist</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id52" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id52');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id52" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html12.jpeg"
-                                   usemap="#modelMap_46_html12" /><map name="modelMap_46_html12" id="modelMap_46_html12">
-                                 <area alt="modelMap7.tmp#id53" href="modelMap7.html#id53" coords="134,43,258,85" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id52" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id52');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id52" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id52" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id52');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id52" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Elements </td>
-                                    <td><b><a href="modelMap6.html#id51" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:entity-listener')">cay:entity-listener</a></b>, <b><a href="modelMap1.html#id33" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id52" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id52');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id52" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap7.html#id53" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component method-name')">method-name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id52" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id52');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id52" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"pre-persist"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"method-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id53"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap7.html#id52" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:pre-persist')">cay:pre-persist</a></b>/@method-name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id53" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id53');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id53" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id53" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id53');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id53" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap7.html#id52" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:pre-persist')">cay:pre-persist</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id53" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id53');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id53" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"method-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file


[18/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap15.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap15.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap15.html
deleted file mode 100644
index b48b351..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap15.html
+++ /dev/null
@@ -1,687 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:db-attribute-pair</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id80', 
-				'properties_id81', 
-				'properties_id82');
-
-        
-        var usedByBoxes= new Array('usedBy_id80', 
-				'usedBy_id81', 
-				'usedBy_id82');
-
-        var sourceBoxes= new Array('source_id80', 
-				'source_id81', 
-				'source_id82');
-
-        
-        var diagramBoxes= new Array('diagram_id80');
-
-        
-        var attributesBoxes= new Array('attributes_id80');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id80"></a><div class="componentTitle">Element <span class="qname">cay:db-attribute-pair</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id80" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id80');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id80" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html5.jpeg"
-                                   usemap="#modelMap_46_html5" /><map name="modelMap_46_html5" id="modelMap_46_html5">
-                                 <area alt="modelMap15.tmp#id81" href="modelMap15.html#id81" coords="166,43,279,85" />
-                                 <area alt="modelMap15.tmp#id82" href="modelMap15.html#id82" coords="166,95,279,137" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id80" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id80');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id80" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id80" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id80');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id80" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap14.html#id79" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-relationship')">cay:db-relationship</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id80" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id80');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id80" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap15.html#id81" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component source')">source</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap15.html#id82" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component target')">target</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id80" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id80');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id80" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-attribute-pair"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"source"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"target"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id81"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap15.html#id80" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:db-attribute-pair')">cay:db-attribute-pair</a></b>/@source</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id81" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id81');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id81" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id81" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id81');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id81" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap15.html#id80" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-attribute-pair')">cay:db-attribute-pair</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id81" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id81');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id81" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"source"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id82"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap15.html#id80" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:db-attribute-pair')">cay:db-attribute-pair</a></b>/@target</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id82" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id82');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id82" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id82" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id82');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id82" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap15.html#id80" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:db-attribute-pair')">cay:db-attribute-pair</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id82" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id82');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id82" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"target"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap16.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap16.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap16.html
deleted file mode 100644
index 468cd11..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap16.html
+++ /dev/null
@@ -1,687 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:embeddable-attribute-override</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id36', 
-				'properties_id37', 
-				'properties_id38');
-
-        
-        var usedByBoxes= new Array('usedBy_id36', 
-				'usedBy_id37', 
-				'usedBy_id38');
-
-        var sourceBoxes= new Array('source_id36', 
-				'source_id37', 
-				'source_id38');
-
-        
-        var diagramBoxes= new Array('diagram_id36');
-
-        
-        var attributesBoxes= new Array('attributes_id36');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id36"></a><div class="componentTitle">Element <span class="qname">cay:embeddable-attribute-override</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id36" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id36');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id36" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html9.jpeg"
-                                   usemap="#modelMap_46_html9" /><map name="modelMap_46_html9" id="modelMap_46_html9">
-                                 <area alt="modelMap16.tmp#id37" href="modelMap16.html#id37" coords="241,43,385,85" />
-                                 <area alt="modelMap16.tmp#id38" href="modelMap16.html#id38" coords="241,95,354,137" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id36" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id36');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id36" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id36" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id36');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id36" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap3.html#id35" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:embedded-attribute')">cay:embedded-attribute</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id36" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id36');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id36" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap16.html#id37" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component db-attribute-path')">db-attribute-path</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap16.html#id38" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component name')">name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id36" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id36');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id36" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"embeddable-attribute-override"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-attribute-path"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id37"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap16.html#id36" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:embeddable-attribute-override')">cay:embeddable-attribute-override</a></b>/@db-attribute-path</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id37" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id37');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id37" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id37" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id37');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id37" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap16.html#id36" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:embeddable-attribute-override')">cay:embeddable-attribute-override</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id37" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id37');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id37" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"db-attribute-path"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id38"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap16.html#id36" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:embeddable-attribute-override')">cay:embeddable-attribute-override</a></b>/@name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id38" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id38');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id38" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id38" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id38');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id38" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap16.html#id36" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:embeddable-attribute-override')">cay:embeddable-attribute-override</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id38" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id38');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id38" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file


[03/24] cayenne git commit: Move RELEASE-NOTES, UPGRADE and KEYS files to top level

Posted by nt...@apache.org.
Move RELEASE-NOTES, UPGRADE and KEYS files to top level


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/334d9cc4
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/334d9cc4
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/334d9cc4

Branch: refs/heads/master
Commit: 334d9cc48b1fca561773dda648463f537f881d70
Parents: c4b1100
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue Jan 23 17:08:53 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Jan 23 17:08:53 2018 +0300

----------------------------------------------------------------------
 KEYS                                            | 319 ++++++++++
 RELEASE-NOTES.txt                               | 491 ++++++++++++++++
 UPGRADE.txt                                     | 582 +++++++++++++++++++
 assembly/pom.xml                                |  22 +
 .../resources/assemblies/assembly-generic.xml   |  67 +--
 .../main/resources/assemblies/assembly-mac.xml  |  67 +--
 .../resources/assemblies/assembly-windows.xml   |  67 +--
 docs/doc/src/main/resources/KEYS                | 319 ----------
 docs/doc/src/main/resources/RELEASE-NOTES.txt   | 491 ----------------
 docs/doc/src/main/resources/UPGRADE.txt         | 582 -------------------
 pom.xml                                         |   4 +
 11 files changed, 1499 insertions(+), 1512 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/334d9cc4/KEYS
----------------------------------------------------------------------
diff --git a/KEYS b/KEYS
new file mode 100644
index 0000000..60b8e71
--- /dev/null
+++ b/KEYS
@@ -0,0 +1,319 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers: 
+        (pgpk -ll <your name> && pgpk -xa <your name>) >> this file.
+      or
+        (gpg --fingerprint --list-sigs <your name>
+             && gpg --armor --export <your name>) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+pub   1024D/B8AF90BF 2006-09-23
+uid                  Andrus Adamchik (andrus) <an...@objectstyle.org>
+sig 3        B8AF90BF 2006-09-23  Andrus Adamchik (andrus) <an...@objectstyle.org>
+sub   2048g/A6C30C00 2006-09-23
+sig          B8AF90BF 2006-09-23  Andrus Adamchik (andrus) <an...@objectstyle.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.3 (Darwin)
+
+mQGiBEUVncgRBADiguZch//Lz2FZLy+NZxZQ5fAAya/5i6mPcJ/FUppY02x3HWmY
+RGAVI/ZURIqCqHxyhgguX7zcrKfyE0bu45OayhhyfaydU4yTUPZF1UwtS8ULvLjl
+szu5G7OeO7Blmaajj0pFaYnb1cXhxG7I9Wz2mFnRAtVo2VoL+s5KWNdRUwCg6Z7M
+KGHkj7LWBoKEBODs4UTvEjkEAJRDFV20q7wpho7fMvJJgUpy7AlUgzplt/hVjv7X
+zgDLb0G5huqH28zLf3ZT3XIn6llIkjRjKX0RWAaebgnAoc2vhG3vglqmyphjH5zP
+mGaP+heY6Pz26sAYyKC1VOTndUdk2j0FQ+JJ91oUNhNerBxwUEHOBt8oVXOO/N+d
+dSb0A/9kbLklVVnNP2ztmvHwhKpSwJBWvZXOjX4AN1KB/b1RiwIZUSV85NFITqKj
+VCCaG4cyRvHkvfMATBpDcPUVWZaPoiKAXTKa3ZHK4W+ZbuDN++PwTfurxfwg2o4b
+sljRJVvR0oNWXXV2w3ZrywfAq9bejgiW1zgQoin+FzD+pflW5LQxQW5kcnVzIEFk
+YW1jaGlrIChhbmRydXMpIDxhbmRydXNAb2JqZWN0c3R5bGUub3JnPohgBBMRAgAg
+BQJFFZ3IAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQKmKWXbivkL+/YwCg
+1vJJidCeMN3IYzTWsdGFB7lKjXoAoKLBkzAyTJj8mu/Rj1y+Ro+rusZguQINBEUV
+ngwQCAClmw1DRilFKQAPdagJ4j4dvxUAdYv5ZJY0Umt44Vvs6hXFzCwyKD3W3aDG
+jaqIKGYj1q1/FHCPlXTfAjm4AQwcLrgOCMcbMkqJsDLD27cD4+O2hbBrJW3hwFFf
+sCFatvW3EBEXyWI4k9uos0nUrIDqGoA+DqLRgyrCFh+874Fr6eO5oJmKw1O8LkOP
+O4K3N5AXY4AFT9VZfOVEdhkHxht0IwVuqmHGyvPLEMkyp2bUhMd/9VHBgvEMnSlA
+4JmNB6EU+GdlPvei9C9ZzzmeYvwicAO1HHo4uQxfmE6V13K3/mH+hE/NlxLZ9syQ
+Zhe77mjaOQILt3g4CRRQ5Y5S2vyvAAMFB/wJ/OgwXrJImZhG0JxYTDl/pHVU7Whn
+anSaSrn2kI+8oGxJi4mrTFKZHgfOeFhhSsyMvydnscXAHS/ehUpEjcpxRS8ZVvyA
+sAJyBBkm1MhkQK2FFlSBIYCOXl+8mRGJqiem0NP8OgnNJAjTzOVukZpoz7UiAzbX
+zu7+DbFFJzq5G0xXDsNIdIObAFrCFgBkNg5V4T7iVMA3hN6Gp5UXBT4bRif36uDm
+SwKET84KQZrIWyMZNfNLNlxUCVaI44TsOuaUj4OPO4OIwHGSFZNV8b596+EB7VCB
+wDdE2uePbWP5Lc1vEkFCkNz/BUf60oiNnU0uGZ0pNlKo+Nk+HKnJP0V9iEkEGBEC
+AAkFAkUVngwCGwwACgkQKmKWXbivkL+03wCdFt9ms0gcaF0xAYRSh37N2eVwPGwA
+n0fr1EHLyn3mbwHqwllfwX9QE1EV
+=KVMq
+-----END PGP PUBLIC KEY BLOCK-----
+
+
+pub   1024D/DBAC3830 2007-10-28
+      Key fingerprint = C972 6F98 0956 F70E AAEC  735C F421 EF4E DBAC 3830
+uid                  Kevin Menard (CODE SIGNING KEY) <km...@apache.org>
+sig 3        DBAC3830 2007-10-28  Kevin Menard (CODE SIGNING KEY) <km...@apache.org>
+sub   2048g/BDA83969 2007-10-28
+sig          DBAC3830 2007-10-28  Kevin Menard (CODE SIGNING KEY) <km...@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.7 (Darwin)
+
+mQGiBEckmuERBADw1lkZ1Us5eTV6p3mvc+Cot7lOQNa3rATEIouH38cL3SYc16S3
+P7Izo4C8QlZiNsLhUWrJFbBwKHPmyAjuNaJnvFvL53P4aUDdsx531D3p8pTMRx/w
+TcI3mFzOBpiZp08dJQviiIZ9HgpxHQCt+dyPPjBVajfRx1Ib/0LcG6s83wCg4wwz
+aHsw6KF+K5AQYro17FhpPm0D/1LSvydJjn3Uo8ZsDOPG8HqUOWrxk5He/G98ERT6
+uLL9WbyL+/mmw6FuWOmadZgjz0oK5r2AmluaE6L5OehiG3SH7tj7auq9SiR9l3vK
+cVGIvsUVMtdoDCzIvVSyZSLWahC6XijL6kTGh/rQ7yq1QIzHjA78ZLwzhLT6ORtL
+bELhBACqP0mH4Md0LcAbu9mVgom3Y/Jsrwb01HtkbvqOVTcH2TY6Lqubn9/2Hsff
+OVdoMmY65ZaGHnikh058jnz4JRTWcJ2gvK5Vo17G5M+nA8iIDg7DVY9tptfWv1Xn
+ZwlX2fZt0y0p56LO5Rkx6D0DNXiI/buXra6DIPkrV30RcRZtp7Q0S2V2aW4gTWVu
+YXJkIChDT0RFIFNJR05JTkcgS0VZKSA8a21lbmFyZEBhcGFjaGUub3JnPohgBBMR
+AgAgBQJHJJrhAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ9CHvTtusODAX
+6QCgsrp3HSVffN3TEP8o8gl8LBpZGKgAniFLZXM3k3IFDIbEunp5VVfCwa56uQIN
+BEckmuEQCAD88944PNdpAJWBaAZUNEUlLfeUVB1CkykN76PjDtpsrcf/wnJtuQGS
++EXcEZetCAoRdGVTM3cUHU3BVCNnDtmu/DE4f7AH3AWOl/WFGjQK49+KyyKbc2tm
+eocu9JSsxEn+fwBJOWSoJC4hTeleQ3U0r8CVW6Q2jgawXtpmBFgVQHE4lLBnSyLW
+RXdrTaFiO6KYaL2QvB7zdleRUPl3tFz6miUBF6stXvbuIGi2r57J+ZCMfnrbbtk/
+yI1MGUnY4+q7gyHiPZnghm/6hz9kszxg84ANVK6YryS7QTX9KGWPdnAtsNYVDwaS
+KGfg/fjL9wNZaLE2IK/WcktEe0aA/6Y3AAMHB/9HCbwSB3m5/DLZ/ARZtATuUNRE
+CeDyom6IKMzuhNEVnIWLlFrlmdCG3qdpSPHDhQR+OyIvzh8h7WErQYm/WjY/ouQ5
+ShBGy2FFuQFfqKnh8QK+OudIdnnGf0E+hjpIMg8jzvxy0Jrox2mpT3etMreXH29t
+m8IpDcuQcS4V5XfZAy/xTxnXN2VKek1tbEL66Pt6UyUDdCOvX42u/thQLaaUSfHM
+O3KVDIU87zl9QEuBVSC13pi3zXNXbNBrQqVLXzHbw7/dibjXcCPEYnR0ubU5mN75
+pxzmrm8EUNqLWUhLh3fscoRqTYkaoQlYkrCGw6udnN9V3h1WmZUFPbE6e7HxiEkE
+GBECAAkFAkckmuECGwwACgkQ9CHvTtusODD0lwCgibSRJsN1DO8NrigKNplynOfc
+qXoAoN/9XbpoW58ve7O/6lh9kLXGa/fv
+=JWKS
+-----END PGP PUBLIC KEY BLOCK-----
+
+
+pub   rsa2048/9E3D3908 2015-02-19
+      Key fingerprint = 964D 4B2D E8B3 EED1 32A2  BC49 BB6E 1A8C 9E3D 3908
+uid       [ultimate] Alex Kolonitsky <ko...@apache.org>
+sig 3        9E3D3908 2015-02-19  Alex Kolonitsky <ko...@apache.org>
+sub   rsa2048/4E068AA6 2015-02-19
+sig          9E3D3908 2015-02-19  Alex Kolonitsky <ko...@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+mQENBFTl3zUBCADkcIWf0LrHVwN8HsAntvXV7+UiYc9MXv68T3W1xc2Wpa8+4Qtj
+Z24ZgJ9oDhXpim+2IeqbhUL+hzUJA2hWkJNrZTo+UNWCo/krb8RgLHbiYh+y0Jsv
+bohJ/UfG99D3DTuf+w24pBwUvSywzprtqTZBP3r7WfAdQyw15ExeuGpQljr92+0g
+QcnL2itqkKjPnnxm2ErGUxeq90E1VLwU4ZEPcibxzgenbc+csnAlhtM1TTUCtp88
+SxPAFhD1sUY+5jCm8kUm9KdFd15+QoVr1CGtwJyMLcBXKZnpO2sx+ueyy/C7t8xe
+hURISoJY3CZSRHO/RcRXBfY7KhRDH7PejESlABEBAAG0J0FsZXggS29sb25pdHNr
+eSA8a29sb25pdHNreUBhcGFjaGUub3JnPokBNwQTAQgAIQUCVOXfNQIbAwULCQgH
+AgYVCAkKCwIEFgIDAQIeAQIXgAAKCRC7bhqMnj05CO+YB/9ayGjLmlyeF4cCwPBd
+fnxHeQ3P2PHIIfqrUJx/N5Q93J4y51U/6KhTsNEA87+AlfdmM2RyYIBZckcUrP6U
+Y2mdzTvCflUpKqnRZyV2u3L18AgXL/M8Tnz3aNaET61kX7za709Q3vCxLK1DGU3Q
+2eC9ZHhjK7pdLfolGyT4lHjI2Zpg32mhkOCpYzxI1fUQ42DO7UssoBjKsqq+9i1C
+36Ps1nt5iRqEjTRUK6IMKK6oYPNyWy9KSYdS3UbArCWUHdkGJBXY3oj5O4VGAd/u
+nHax2zeaJ58nUyotp5Ny5q/PRd/6vUr4kUqGDGn7Q1zph919NLEcFooNXqek60He
++KrEuQENBFTl3zUBCADE7NrJc/aBJhrHpC63r7F2ldwZWYEzCjS6J6ovFuvp+i2C
+EP7mEZaGPmpnZ2fN9rJ+a1UaWLzRzDJdX7CwiH/cO1YE56Dv/bG2qK38nWVZ5TAl
+eYbJyMQPGMI/wkuZb+ikoS7Jf/0sz245TFBb1lwGBVFgCBlrbpkK13YP+TZ5iAOe
+USpeddl7imlCTiAXprtZ5hw+TC6ZSmcUq1HVWJosFCQGnaYLz/gdJNU+9TBSU3kM
+lLvNFh9i74rfiopkoyRJnLvl5O5HWtcbHSY4qFmVKpEMLnnwBQuKN78tnwiKSz5C
+0XzzMc/W7jBrBjiX7lQ1HjTa6CvDjpvbOcqMIsrTABEBAAGJAR8EGAEIAAkFAlTl
+3zUCGwwACgkQu24ajJ49OQgPyggAmxSH+VLPRwXiulHEiVNVGk/ff9Z55bwYtpVv
+bTPXb0Z+oYr5AT1Ea8hKQf8DsUA93SPFQXMGZ7My4472x+ZPRUCmg6Lr9q+4yEu5
+6Rex0XDWKlF2oEWhGgaKjQ9cg8MyKMaUG/ShmJgp6P+yWwMqoNB3CaSRWuHwJp4i
+EgtxbMXzprVZ5h6/RrKsjHNTFQEVcSxJKGNuUJ7WlaXA+qGBDiaxDEyUJABWDqkr
+UyQv2xCibMNjhgFlu0KDGPPQPb4XgwJDn9Oznof0QwV1Z+dL/TtTCGM3zHqbr97/
+Qg579xwo+gI/PHgH2XI1QI6d3ZO/KGR3lsCUZHR3piON3YtICA==
+=WJOl
+-----END PGP PUBLIC KEY BLOCK-----
+
+
+pub   4096R/48F4C2B5 2016-02-02
+      Key fingerprint = 4B7F DDD3 BCAA C5DC D571  D36F 8A34 C614 48F4 C2B5
+uid       [ultimate] Savva Kolbachev <sk...@apache.org>
+sig 3        48F4C2B5 2016-02-02  Savva Kolbachev <sk...@apache.org>
+sub   4096R/4335EA7E 2016-02-02
+sig          48F4C2B5 2016-02-02  Savva Kolbachev <sk...@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: GPGTools - https://gpgtools.org
+
+mQINBFaw0TABEADRL4nqZv3ubuy3+n75RURY0d3x88/yacLoUy0h0dfIQR6uZhKC
+D7R9B6eQ5sYP1nvIgQn9ZvHK4crM7nFWNGWEhxKOyTivak8zWZtXaRlcU+W8qTTg
+UeEaDrD1OwkW2rbEmQdpLYaAlJc1iJhu8bI82G2I1QSWnkhULr6kOKWk3NOEljLI
+C6B6VeGff4iX8ryu1u9LEu1H2xL2eLGBZ4UzfPaeAqHM4Y9S28HspCSy2Wc0iC+m
+x5ine7yCwihXHUchpseV5/zoq7tcqefJQVs/vjtSZ/OEKGD7WMR1Qsj4NED+2clb
+dqtHr9H580NkOvt846SXuiLxMC8ONQ4MTOkW2CXtarzctbky74eHYwIyHFz4WwJW
+idH78HQ1uKsVOLlDNTPh2PjgzaWv2v3/Al/Ba+DWgX+p12tNu330b2+DTAgxLeWM
+pLaiZjElksP2n44tSR5pcFI97rs86mUwO5IHHjgqWl6XpI7mVdiZzx7nxSJAIWAD
+v+bU9fgkrHuHgIpZN7FKR1ehk1IqFDkFiEsv+J4jlmhQE+o0Am7NH5+SL+4zkPUm
+T2kEdTViQV2DmgP8tdHykuJ3fUr7qMc2y4uGFgUe7HZVQi+UJf3zLdLMDEl2SN3d
+6RxJYVG4vjJaUoNLepZ+kXik+fpA763beBkevwk2khiOiBl9iC49NUOCewARAQAB
+tCdTYXZ2YSBLb2xiYWNoZXYgPHNrb2xiYWNoZXZAYXBhY2hlLm9yZz6JAjcEEwEK
+ACEFAlaw0TACGwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQijTGFEj0wrVq
+LRAAtW7XoHNiyN0Py33qrWcvMCbXoEBBcbaolE6z0ngemTnChFHN0MWouBnFa5yv
+FFfelyaizPnZHj/UJC+Gi6Af38pVQviGOlI/c/k0k8M/8N8HEtWJl371RWF1cp3l
+BajIFFX8T8Mx8hQRjmoAKBsdMU+lJmJE4lcxB5GUV1OcmpY7SxX4vL5kTgvJR7nr
+OqDDueorqJTBDA32vYHO1S/qiTswHlD5lYfrWCkssswqt4719PXD27xFfRwrqZXD
+MJCT4lenEJ2u2b0E48a9fJi/DvK9gWrny9rtJ71BLxVmoQ7twpZdTmQo/mVO5JFj
+R/mR/hJDxk8xzPGgnvvH2ly4BtspCXLVQ6z8uFyOrY8Me92lOwWpF9OTVgqnNOYa
+xa4FFOkto3LhLOCJMKZ2dCsxJHyCKy553NzDO5hFFg4/puy+yU7ftbbZt0a38+LE
+h3FgAvPp9YYVvYhd577j7BdOUOg7YYjhiPh/R0yyge5+VLSPQnGEs4EfNbwmNBk+
+wNN4eHQ/sGQJU2Typ8hv4RLiwrCvYMgrQ68IY5g2xk9qIVNuA2Y3H0qDcmE03iOk
+Xw4JSDtqyjvOpAaaaI+Y1R0YHfwRzh+tBIezuWdVx+8+PU52PhH7dNXpunoR4x9j
+/hd8uK74fGNX4Wg811kN2Wqmv4+Fmr4ltxtuWauhERF9rE+5Ag0EVrDRMAEQANqp
+2WSj9irF5Rt8OV6wM0EQMrDcGZwZumXvoc3975rfhCYhPIh3KPK38AWai7ncPEvX
+OJ+JsN3fjBaX0/vYOokLx+fBPZ6ewLp55t1A41odNiUftTKs/ePXmxBJtkC9leCw
+RFTNvZV6TpnaKktHDTOwJenn9hre6+WsOSetUhr6wTeoiruRcECxbcPx9TnZyjjq
+sFDznnExOM7kbb1Ib3z01tPf7lBCGIEu8kTySWSG6lUzWBCOWRrcUp4xuqTVB68m
+471NDzrum4QCHuQmIgaGXDpCqKlmxau3FDAsDktRGhQSFUTcecbDAvvmx75W4TnE
+VQYIaUnpG5Ab0SGSxhYUBWtxciw1vWNUj4uHtT+JLPt9eeFb3XQqp0Nl7wcVJMqe
+al7S4AMkScpa75JslLBU4FhaLTzHDlLNUe5564t5Rz+Cjnte6whBWQFZBYAnK3vM
+hpxXDwQ9PN7Rp1zrZLOSH1kROecL49aBaZW+ecgNgmLj/+CpQVnOcmuXUPQBWZ0P
+6hjnGsRQj87hBhjWv0+Mu8fJNEVkObe2bgRrs8eBd6xyaTXxMzHatmwd+HEUkuIQ
+a+JIOzFIMUU2I49amoffVs9544U4n5QHLj/pqQRWPMUwsKyCOjCuKmKeBq+CF2hx
+UWDrvMYQWGLYL45jBYrpkn/15pSyfBTgk+HThjrJABEBAAGJAh8EGAEKAAkFAlaw
+0TACGwwACgkQijTGFEj0wrXnSRAAmXZ42xljD2R2KcPBZb/zkOfsh2DeJOvo2Lno
+TIcmCJhS33uTXbCYpJ/6d1wjkAXARF3StyHgWYk5/wtWueIrI1kwEKEpwT55cwqQ
+1XJBtfqgYF+EGBWES3bjylOUWJnzWgUXVr5IdShmi75B8WWSkkSBj1Ms2z6Jy59d
+VPfPczeQHfL8Tka79IDkfs323dVwVUvoRxPFStUoNyZVkKeJNeTf4kc1muSTS4O7
+DzoRM+f1zP0RkhD8wVGB7ReX1shsDI5cq7r9my/U83bFkUsq8hnJMojPBTjW8Uqn
+XorVik64Szp8X7bzSGqC8c/eMO1+Z41aXHjoSCx7cZ/tO6TgecxzTPLXhJVQ1yKa
+RHZljS+mnEmTogeLMbkGv8Ebqnr64Itf5J55jHybtVPv3sZyYkD81FvgbBdP27Rl
+umsdnX8HYNx+Xxtbzo/evpnKIxE5jiCE4R89isOHqAl0Txzmc41mR03eqb6HWb0/
+9qoMhdHiA4FTNcejuAUlhKE6YfXMQURkh8kACv7MwHL3VNXeHR5ppMqzGm/cBTMQ
+a6O0d2o87OgG0Di67Rt3TtStVNiSQ7QFWXtnRik93LBjyGGbpfRC7GjMo31kFzZ3
+M9xRIxYLHhywfyQHf0hEX89AYNlSO9XBR61EOnjpUaw6Xp+3wWcjsjbE6+s1Sq38
+D0crmx0=
+=etVP
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub   4096R/D1E9FD5C 2016-02-06
+uid                  Andrus Adamchik <an...@objectstyle.org>
+sig 3        D1E9FD5C 2016-02-06  Andrus Adamchik <an...@objectstyle.org>
+sub   4096R/11C6A471 2016-02-06
+sig          D1E9FD5C 2016-02-06  Andrus Adamchik <an...@objectstyle.org>
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (Darwin)
+
+mQINBFa2CU4BEACsW4K4Mlecpuj1h3pnyxpra3c/qKNqnnE/Ee/FHW2h3+6R//mf
+ivMvaLLZAyB94m3qsAmQcTtQcHNh7iSpIhAFjZP005BwAIUJsgvtH4uUR4rNHz4d
+Io2Q5ZILP/HccaawUYDel69NCNmpRF302vkc/LgOByQymcxZ817mr6zqjykIK7J6
+lPPoCJkVCV+HjX60C3I/P7btg9mAsgqjKhosM9kRT6F+y3Aisv8gH1pTZevARLrZ
+LLmOzVD1POReGzojuvUkwYf9TiN4zd8aHd4tEe9HQ353qBFSpfA7Hwr2hwqyopaL
+jkx02ANUUWU1p5W30DPvIpB2wYxtA3AmQaIn25erh/UaGrD2v0Z9uU57v8jys8Ls
+9Zb5+yzEsCCcvNtT9vCgowSQPmDToCq8S1mqQhkgYh82Br8WjmQiVVi3upAI/YA5
+6WBkeG26nk1tQ5tmEc5gLIV1iAX93LvYyM6gCPC59jhm9I7ZsYR3ZhdHtadon54V
+1JmZ6GVGxkHtFv8uILImV652NSv+v5PSWiCnUpQt37EHAsT55fPX38g4ksEfoyxq
+kXT/GYdFCIm/g+iy6PzXIS/jBpNgc8jHFkVVNxzwRv4WWaIjePZHEPo+fv2B0hMy
+O0ImPMDZZN/8hP0dR014VYQcgMzAebDfNUc02GKdcmqFuPc1FWhqdS6kPwARAQAB
+tChBbmRydXMgQWRhbWNoaWsgPGFuZHJ1c0BvYmplY3RzdHlsZS5vcmc+iQI5BBMB
+CAAjBQJWtglOAhsDBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AACgkQbWqE4tHp
+/Vx6hxAApeDtcmgINtD3chTVqaVRBbuZiVGxeIGZbq9A7wBE/a7IzuJXTL6+eEKt
+rHVHGBP456s5+aHX5ZpJyitCjgNEqLoqCCIrclFsEHFkkifQKbEGFXRX98MeD3gq
+s+ZrlmDNzKXquU8LJ6yotGCOId7EWFJ8Ii2kOyHIfhFtzlVYRYOjC5PdfDJb/sat
+7+hRm0eMr+e3g2LyIMIRXFgPo27slYHwxaO37tm40dksaNlOEhBx5qLoOpT37s50
+m1kvgF71OFc4LQtNebxcal6VjFeOwd3vU4uah5Q3TBuksWwuDr2DSBDUpmipmdtc
+gouTJUQ7T5/4L17GzGQSVuMVtBZ05d0e1nuYqC+qA17Vb4gc/kaX723IxzYL090T
+mL7noFfVnc78zsOtQVk69rftVJfERlOkx1zTJkxXTG8eelQ5/FGBl+wjaN84vL5e
+77Lea8iddJKQJkW51iwPAfApGleJO7KP2I0DDCmFggKWVwxzNeqtpwUMF0NOkVop
++vTK507xhDqOjY+MkFCsQmSlYLr0lu2jnUQu5W5QPiE+xtR+wQbKcSGTykaG0Sla
+GiGeqHLdMmc8uqA5rZD1xrh6LItfHlh2EslS2y5t0NWGB7+HR4V3vyn9yVY+qrJA
+hWu7Oo9tuj6Ntmqld2xENcQt2HAFsVhm6YFhNTjsSEDZicVxdlK5Ag0EVrYJTgEQ
+AJVmlwaIkQo1elRkswF7d2hyniHkHtvTcyY1bNs9PMopmOfiu9cqc2MxO9A/Jsfc
+xygPEcYnQSG13Nn+fCofo2NO/RgseYVJmYXx83gbdpYWyThf1reQlg1UmMvYgE5u
+dulxY3cOcR6Y2x+pMrlRYx+57aqH7J08VsHzRPflgcBunXWkDRGIrKNlgZT78R27
+5Q4f3OA5CfO0IixEH0FGUCkWkTMyjLdCWfsGHQaLm69k6bzZq8b+4Z3QG8kregQb
+gJEjg6vw/1Lb9y/ZlRd686AhpcQXnju0zKPvw3xNE5leQ1XVUyIrIz0afBwfmtGq
+UrY0nF+VDin5JheXqIXBtxin+OP7C2ZPwXAK43oqkCaLk0ZSaqGSP1nv6tpo8X30
+aDyav0tWYy+buxU6KSktJ0Po3mQnf6v2klITUtS7ZlWj5os1l54dNE2JEjaB8qQC
+cQX5CMS8c2BMwt0KNOQ3RFk4KuNcWRhyg0GSSRg4KByWwR3EnDvt/KJya1u/e1Vs
+HQ5+wsNceTMe0CZF7sVjxA6jrYJoqpRv6PV+9NXf7cvAI82TlChYuQxiJ2ZreEiL
+0787qkA8cpSb4Myrq7bFtxX/vIf/3p6MDnt7xrjZ7gBmXDGMObK4SSrvOsPTuq0c
+oJM3MZx9hiaFRR3qqCbX61OUYkhEiRzzeaOBJ9Sd3FXvABEBAAGJAh8EGAEIAAkF
+Ala2CU4CGwwACgkQbWqE4tHp/VyPVhAApcG5S4TcQ/ZbhElHzvWdMBKSGtaRw1c6
+MKShcQthXR8St0z+/NqqdeRXOF4ybkXCl4N0O1uRkffWlQJ2lcWpgds23xs/pYZt
+o6SNYYsEG849B0NiMiQVBCqlKkYlFNp69+QZjqler+G4sVlmht9xYiBNcQA6Ghwt
+kc6enjjJRWAi7pczbJUtt42HIt/34RmWrCgKpjTZkV0i1bZo0tO6q4hfouF8Mw1L
+BHld7wdK3ZHccdtHKEGZcFmkGI/PxTKN/LxgikYj//1rNeWA6Vwsg/P5AA9jsW/o
+Wjgs/ytETLmAZBf77op1U9axsKiWUUTBCXmCsJ272pLX/BMMSCLvuDIxMRrmAcVT
+WHOqwphFaYlKenJtqAW7mUE0IAc0RQU96CogQk2dooD3CIB9pvFES9FMQ2NeQtk9
+a5E8QYKivkhM8Ig+e24kaY2LZA7tESOwczzYOJIkTb9R2wpVWuUkvhPm4U23Fxo1
+2xaeELH/hT8YarDC6I3w2dhhpIYdHvXXpDc6Bo28MagcLYC4JTH6YovOby/FXWn0
+kb9ChPGl0BX/pzFnt/eaty2KESohc/OIvE9STG0SFVOOcvk/ACgU45Tiyhr3Ym4S
+LbakdIXOK1J5A/RIbEVMtMnOPmP/9NSapJBZWibcit+pIfHs7XjlohdrniCzt/ll
+52ujr6w0mW0=
+=flxx
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub   rsa4096 2017-02-21 [SC]
+      CE7D E8E5 2FC2 1AA1 75FB  9E93 EFBE 8395 88C2 AA2E
+uid           [ultimate] Nikita Timofeev <nt...@apache.org>
+sig 3        EFBE839588C2AA2E 2017-02-21  Nikita Timofeev <nt...@apache.org>
+sig          6D6A84E2D1E9FD5C 2017-02-23  Andrus Adamchik <an...@objectstyle.org>
+sub   rsa4096 2017-02-23 [E]
+sig          EFBE839588C2AA2E 2017-02-23  Nikita Timofeev <nt...@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFisQ1ABEAC18V7edFXe5Ez056/zAuWE3BZ2Ge1j3dVpkTPUAal/JKwOs227
+SkT1f10eplXRJ3nVWH/vvFQ2wiQAKXQxMCP5MT8vfoFRsMfpZxN5JaOm+biXFb30
+CcYn/wTpX7l01wpZJkh84nRnGO5AVRCZJgoU+dYetk7d7Kfy9dFv5KnWvATDwR+O
+uwVOx1my7cY7biUQVjxFYcYkL9W2e5w59DSYTELeyH4vlHDc8IyFXB6W/T5pdopw
+t9y2ey70fchTnqJvEA8ZMa47hvaN0jPVG3+E/0NKEtjqg4jZo+ezSkp4p17vvWvC
+wSLOLGbDLJ0SOgFb1twr2TdpbYHHY+q/033K2oooBDXzkCOOWASNCQkBlKh7ckOH
+pSbogz7ypU1DTh3+UeaklvOs5PdmTogNWxhvCBNchedCqa2YB1VMjnHwyfPhtRJA
+U7CueEMbTwg1PrWBIYpPjX7oNQPpdMFY6W9XyHl1Gwle08Zyh451a11fP3W03Fj7
+6OZADt8TAoMesFKVBLbur8kKq8djXMiDhhf+/mED17vJNyzmVcPqFCxkK04tM7lR
+Qezet6E/JwyaBksSoGWOyr8YU0lWcae0eQhPJhFXoDl1Ykc432dYG0Aacp9LOu0I
+ItxGKGetZ1ufOwsvfOH3Fz1z22h31Qw1dFK7dKcg42Rgy6BoywTcyMsRHQARAQAB
+tCZOaWtpdGEgVGltb2ZlZXYgPG50aW1vZmVldkBhcGFjaGUub3JnPokCTgQTAQgA
+OAIbAwULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgBYhBM596OUvwhqhdfuek+++g5WI
+wqouBQJYrERSAAoJEO++g5WIwqou8yAP/0zrbzfc4FNYV/zRiICXgioTORC9injv
+lBya0FB4DzvxRVaPOfaMYPbaZTzT0LGg52dYj77NpwGsEgxcjrTRvt8pgnzIK5IJ
+JgPzDzgSmFF/v8Oou/vQZNW9YSTBsOAk2xyqfXwdQocoAUSmhdOWkxpuvnf7kuQj
+41XP1ZTIJz4IaLJpxaFZ6rI/rxJ7KLwfKJzyudtodg5nf65COk/8XWiufl+8Lmk4
+op/UJ03mk5j8K6v5qJVZjo/AyWHLPnJbJcK0CxbcdrESOUqk0i1dhx28pwca611T
+wogr+eeZydMCnZWKOtn5Az38whb0c0EmM1ibmHsEBdFCpZ6pZ6KeZlcXQvU5AYYF
+YaSr7AlOJYb6GVbFN2YETXe5XzpQlG3RMY2gs3rqcmXZLLAXPtKqBgB6b93UYdUe
+xQmV9TIPX8fYRYVVLBpaWnGTq5jk56tvY+LpwpDPba+YsLTiJkLftsp/eiJEBKJh
+I48+goIZPQCa74RQcekmwxPSyqONhZpMICDS6IeXInXK4nrYlnMBDmcHWH0Lc9Ub
+WxGJb/5sSLQhiIpvfHDVzJCQ5zJFUfW2hbe5Vhe9fx5yYmRn2M++fGh+Hnmc9yS4
+gq7GOszC5s9LSul50eQA+xQ5+g4kr4p6cGaGptOraRK2uqApBX7eXOriDwXK8txJ
+eK9vkYdPV1OaiQIcBBABAgAGBQJYroQoAAoJEG1qhOLR6f1c++QQAJsAuD/66AIM
+dKkk68RNlGTlnz69CLShKEvX/iCRVhMJlELddKudO1OqC8rS7CbDLcPRy7zJpZky
+psEl2LAS5cOHdFAy2yPokpYnQYTM1JitGAQxtVzoz2VUfcD48pco3CZ8DkXUGw9x
+0TTFbyUy/IHo4PLYy5qZHKg/4ul3TG1QptcUN2dAB5wlS6/JT7lwbaKFUGWYY6Kk
+A4tgvtuxR4aWzUHwYtRU3X82FsUw8hsP7EtKu6vnZqyHwLqCdoNsoYrK+QcAUswI
+sdTGuXzaf+HRe6pCIBu4vmQtybNce1tTpnqiiJ+Ze60XMH2ntWNwVHHl++LcWWcf
+TNoc+WymROqaZIG/Y8OD65jfQ+uMTf9FQ5rBWLiCnWZc4/vxMnnYMAQvcV63I4n7
+0H0FVxED6o8m0jEHoiLKVoYI49HxK0JqE/AzarR7QjXixLLjK3Ti7x83QYuX/+Ls
+4SkOf6Sq98nwHXd6f+C855ay1yrnEvQtN4vWeBPZ8rs2Us60DHKLPXWA1+LzzjnS
+AlKNo1tBju6jKepW9RBMa/7T92GS4VpGK8mUU0KmaZiDpCRMSc75HI3KVtkh2cGF
+ebjTLblUdakUKqAoaP9nGCCe8Z5gj86X01YUZFWTgKS2+IsOcK5f2GrB3tFvbjCp
+3oj5rgeIvryYz/7WTeMggThVAwl+0DmCuQINBFiui3wBEACqZgMUryULZfSCDB89
+6evn6DbnjCIIgzIqKLdDOoWDaA02AHJ6n7E0bIGjbdDrhVeu9FIGqhR50DCIdqjf
+unuplm70sC9JYjHDkWErGJnd8lXb7PmW9knKwsmIityTKt8/5os3Lr8EplCuO7iJ
+mkdEz8zdGp7+h7ZSwC+Rz9q1JThjjJbIqadjTfa4Pt3yn6z9I33TO8POxGRch7W7
+qnVHvsWiZEv5osELUXOipIutdBtvz0tkpDJXeXkX/YJNVl1ig88bSTBE4u3NQ8SY
+ySqlKhjvGo278KIqnpCnCU2Dy9PgLchkMxULR4gryHrVLqK1lL6PnGvcA284I45H
+pypMCtgibN1iQ6QyG/IvU45hczzOeNyuqYikE6Ej3oYCXsRlnMK6kUwyDU4bf8R4
+05ODNbvzv5IwkmgWTtQFTp1xM/dtHL7BHqhCGuKY7kEUA5q5X0dSv+MyIYaPGW7l
+505IVkPAVlcw7Qs3hlihVf+hJepKy5BPSZYNzUfeb/MpDG1j3ps1L2OeozkyGUCU
+Im6BxL31TE7BIHbapVCykkd6qZHL1HENi7nq97pvLsE7936DCcg452oNjjQuZEzy
+qXUkIGt9DVeiige95rUlcFsq8Rg/0dZ4pwPFBkyOvMXOw3+UKiZyFXvR4NE2qRET
+qNjoKP+S8MQ3koXXsRZlcUff0wARAQABiQI2BBgBCAAgFiEEzn3o5S/CGqF1+56T
+776DlYjCqi4FAliui3wCGwwACgkQ776DlYjCqi6bQhAAtWjx3U593nZGTksyiOmn
+X7oKuseRnSmpoINH5I+DVPYSn7wpJXI892cDyE8k+Qyo/EjpNpM4vwR5rnC86jyx
+zk4IcZ06fh4MBA+4CRwgYasfPVcGVLnXG3v8XkBiUqQH8G54AdfcXHQGsjzyD/UV
+y8Q3xV2hs+KtK79rLB7T4pNs/oYfQOscpsHLIbCXG+jFmBjXlqlW8pleIHBLo1bL
+3nd/CZ63LQpo6+UcRRMilQS6vER2CbvQ96EiKwt2HUlUNZcf6R5sREeCIcRtnqZ8
+vBEFhMvH5Bli28Up6c7td8XsI4nX/X/hJnKp30nnjDHeGGpXYf3y+gCjsaj+srkU
+ZxViZsZ7NWjAJrRth9agjrsqgUBsk9t61/3JUmfNgKll4SAmsjLI5DvqjMB17UrZ
+/B+oLIMEMLd8G6X7gcV0/Gl+MYgyqcd3DBmW7mKCla/3fvkDm6F9Wi2507u3jBpW
+3bDfLf7WlSK8MAyPDJ75U5rGTX4GPP/uVRIB+OIM3zM+1h3pL1/lR0/IL9QS1KIV
+py5uerg3Q7WfqbAa0YMG2DaZ/YJRv2fXlVh2CkMFy8YXJIk5WOI+4vfDGO9Y+5yN
+hKkeIv6tGxekNrf3mThlCgIwKfWqeUfMbfib2kFIpM+efbWxTnN3vHaYwOukrgnq
+fwFW2VhoEcMt5UlivoHmpIY=
+=N0zb
+-----END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/334d9cc4/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
new file mode 100644
index 0000000..5b61a78
--- /dev/null
+++ b/RELEASE-NOTES.txt
@@ -0,0 +1,491 @@
+Apache Cayenne Release Notes
+============================
+
+For the latest information visit project web site: 
+http://cayenne.apache.org/
+
+To browse individual bug reports check out project issue tracker:
+https://issues.apache.org/jira/browse/CAY
+
+----------------------------------
+Release: 4.1.M2
+Date:
+----------------------------------
+Changes/New Features:
+
+CAY-2372 Extract new modules from cayenne-server
+CAY-2377 Cleanup deprecated code.
+CAY-2391 cdbimport: add option to skip user-defined relationships
+CAY-2393 Add sqlserver-docker profile to automate tests on SQLServer
+CAY-2394 Upgrade to Apache Velocity 2.0
+CAY-2395 cdbimport: add option to create project file
+CAY-2396 Upgrade maven-assembly-plugin to 3.1.0
+
+Bug Fixes:
+
+CAY-2370 ValueObjectType for byte[] fails lookup
+CAY-2380 ReferenceMap should not store or return null values
+CAY-2381 cgen: meaningful PK with boxed type ends up with primitive type in generated source
+CAY-2382 Lack of synchronization in DataContext serialization
+CAY-2387 Can't select byte[] property with ColumnSelect
+CAY-2388 Modeler: Visualization issues with undo/redo actions for attributes and relationships
+CAY-2389 DbEntity qualifier with DbPath expression translates into wrong SQL
+CAY-2392 Modeler: Unable to remove DataNode
+
+----------------------------------
+Release: 4.1.M1
+Date:
+----------------------------------
+Changes/New Features:
+
+CAY-2152 Redesign project file upgrade system
+CAY-2329 Update project dependencies
+CAY-2330 Field based data objects
+CAY-2335 New XML loading/saving mechanics with support of plugable handlers
+CAY-2336 Support for comments in Modeler
+CAY-2339 Compatibility module to support old versions of projects at runtime
+CAY-2344 Modeler: Save ER-Graph and class diagram
+CAY-2345 Own template renderer as a replacement for Velocity
+CAY-2346 Field-based data object with Map-based storage fallback
+CAY-2351 Remove commons-collections usage completely
+
+Bug Fixes:
+
+CAY-2312 Modeler: Undo does not work for checkboxes
+CAY-2318 Modeler: Query. Exception after Undo clicking
+CAY-2319 Modeler: Embeddable > Attributes. Undo does not cancel pasted objects
+CAY-2321 cdbimport: Reverse relationship is not created after adding and rev engineeering new db table
+CAY-2323 Modeler: Graph. No warning while saving the image with existing name
+CAY-2331 cgen: broken templates for data map
+CAY-2347 cdbimport: can't get all relationships on the first pass
+CAY-2349 Cache issue: 'SelectQuery' with prefetches loses relationships
+CAY-2350 Expression: NotIn with empty collection returns empty result
+CAY-2353 Broken paginated column select with only one entity in the result
+CAY-2354 DbGenerator.runGenerator must commit its connection
+CAY-2356 EJBQL: Incorrect COUNT() on outer joined table
+CAY-2357 Generic select queries silently convert result to nulls if no PK column found
+CAY-2358 NPE when callbacks invoked on null objects
+CAY-2359 EJBQL: db path in not supported in ORDER BY
+CAY-2361 PostgreSQL DbGenerator issues
+CAY-2362 ColumnSelect: unable to use Property without type
+CAY-2363 ColumnSelect: unable to use from nested context
+CAY-2364 Wrong logging in SQLTemplate
+CAY-2365 SQLExec query tries to convert (unexpected) result set into objects
+CAY-2366 Incorrect EJBQL COUNT translation
+CAY-2367 ClassCastException reading object with an attribute of type 'char'
+CAY-2368 ColumnSelect: Property.self() translates into wrong SQL code
+
+----------------------------------
+Release: 4.0.B1
+Date: June 12, 2017
+----------------------------------
+Changes/New Features:
+
+CAY-1873 Move DataDomain cache configuration from the Modeler and into DI
+CAY-1891 Modeler: Add To-Many Warning
+CAY-1892 Modeler: Add Relationship Data Type Warning
+CAY-2057 Modeler: Clean up OS X version
+CAY-2109 cayenne-crypto: add value authentication (HMAC) 
+CAY-2210 Query cache: incorrect cache key for queries with custom value objects
+CAY-2255 ObjectSelect improvement: columns as full entities
+CAY-2258 DI: type-safe binding of List and Map
+CAY-2259 QueryCache: support for referencing type-safe caches
+CAY-2261 Replace NamedQuery with MappedXYZ in *datamap.vm
+CAY-2262 Module auto-loading
+CAY-2266 Move EventBridge implementations into autoloadable modules
+CAY-2267 Contribute lifecycle events listeners via DI
+CAY-2268 DI: Refactor ListBuilder API ambiguities for before() / after() bindings
+CAY-2269 Add support for date/time components extraction in expression functions
+CAY-2270 Update function support in expression parser
+CAY-2271 ColumnSelect: support for prefetch and limit
+CAY-2272 ColumnSelect: methods to manually control DISTINCT clause
+CAY-2274 Modeler: Validate case when dependent PK is marked as “generated”
+CAY-2277 Create ClientRuntime with ClientRuntimeBuilder just like ServerRuntime
+CAY-2278 Extract cayenne-postcommit module from cayenne-lifecycle
+CAY-2280 Switch from commons-logging to slf4j
+CAY-2295 "Sync ObjEntity with DbEntity" and "View related DbEntity" buttons aren't disabled, if DbEntity doesn't have ObjEntity
+CAY-2296 cayenne-crypto: Get java type for DbAttribute bound to ObjAttributes with the same type
+CAY-2300 Modeler: New icons and design improvements
+CAY-2302 Rename postcommit module and its content to commitlog
+
+Bug Fixes:
+
+CAY-2021 cdbimport: detect when same FK constraint is defined twice
+CAY-2077 Bug in CayenneRuntimeException using wrong specified string in Formatter
+CAY-2094 SelectById query doesn't work from ROP client
+CAY-2161 'Not for Client Use' option is ignored at Class Generation
+CAY-2171 Modeler: Undo db Entity Sync throws error
+CAY-2208 SQLTemplate: LEFT JOIN to a subset of a table returns nulls for entries that don't have a match in the subset
+CAY-2230 Error using connection to postgresql with db schema in DB URL
+CAY-2240 Modeler: issue with cursor rendering for EJBQL query
+CAY-2243 ObjectContext.getGraphManager().unregisterObject() inconsistencies
+CAY-2250 Remove: Incorrect text in Confirm Remove message when cursor is set on attribute row
+CAY-2256 Cannot Save/Insert an Object With null Flattened (complex) toOne Relationship (see also CAY-2146)
+CAY-2265 ServerRuntime.builder() fails to set default runtime name when a the project file doesn't follow recognized pattern
+CAY-2273 Modeler: default suggested cgen location is rooted in subpackage
+CAY-2275 Documentation: tutorial is out of sync with 4.0.M5 version
+CAY-2276 PrePersist listener registered as PostPersist in LifecycleCallbackRegistry.addListener(Class<?>, LifecycleListener)
+CAY-2279 cdbimport: skip PK comparison for VIEWs
+CAY-2281 ObjEntity attribute overrides are never deleted
+CAY-2284 Expression likeIgnoreCase can't handle unicode chars in in-memory evaluation
+CAY-2286 Filter out inherited ObjEntities from sync with DbEntity
+CAY-2326 DI: can't override List/Map elements from another Module
+
+----------------------------------
+Release: 4.0.M5
+Date: March 6, 2017
+----------------------------------
+Changes/New Features:
+
+CAY-2139 Upgrade HSQLDB dependency to the most recent version (2.3.4)
+CAY-2150 Refactoring: ParameterBinding to contain ExtendedType property
+CAY-2163 Property.path() , ExpressionFactory.pathExp()
+CAY-2164 Relocate builder bootstrap methods from ServerRuntimeBuilder to ServerRuntime
+CAY-2165 Explicit "contribution" API for easier expansion of DI collections and maps
+CAY-2166 Auto-loading of Cayenne modules
+CAY-2168 Split DbLoader to parts and clean it up
+CAY-2169 Split DbMerger to parts and clean it up
+CAY-2170 MergeToken sorting is highly unstable
+CAY-2172 Cleanup Modeler import and migrate db actions
+CAY-2176 Java 7 diamond class generation templates
+CAY-2177 Sync auto generated state of PK between model and DB
+CAY-2187 Support for the scalar and aggregate SQL functions in ObjectSelect API
+CAY-2197 Update sqlite version and enable in-memory default config
+CAY-2212 cdbimport cleanup and configuration schema refactoring
+CAY-2223 JCacheQueryCache - a query cache provider to plug in JCache implementers
+CAY-2225 Extensible CacheInvalidationFilter logic
+CAY-2228 Deprecate multiple cache groups in caching and query API
+CAY-2231 Support for collections in new functional expressions and old math expressions
+CAY-2232 Proper conversion to String for new functional expressions
+CAY-2235 Deprecate Query.getDataMap() method
+
+Bug Fixes:
+
+CAY-2032 SelectAction: DistinctResultIterator ignores flattened relationships
+CAY-2137 When generating SQL from EJBQL, use "AND" to separate multiple join conditions
+CAY-2174 Change FK attribute name cause ObjAttribute appear after Reverse Engineering
+CAY-2175 AliasName used in EJBQLQuery is not working if it contains mixed case
+CAY-2183 Newly created DbRelationship is unexpectedly renamed by the Modeler
+CAY-2199 Modeler on Windows: The same project is displayed twice in "Recent Projects"
+CAY-2207 Modeler: "Java Type" and "DbAttribute Path" are not saved with using TAB to move forward
+CAY-2221 In-memory expression evaluation gives different result than select query
+CAY-2236 Modeler Migrate DB Schema: unable to Reverse All Operations
+CAY-2238 Modeler: Preserve manually set DbRelationship name when syncing with ObjEntity
+CAY-2242 Vertical Inheritance: Cannot Insert Record For Implementing Class with Attribute And Relationship
+
+----------------------------------
+Release: 4.0.M4
+Date: December 13, 2016
+----------------------------------
+Changes/New Features:
+
+CAY-2051 Applying new Reverse Engineering to the Modeler
+CAY-2053 SQLExec fluent query API
+CAY-2060 Replace Query objects in DataMap with query descriptors
+CAY-2062 MappedSelect and MappedExec fluent query API
+CAY-2063 ProcedureCall fluent query API
+CAY-2065 Pluggable serialization and connectivity layers for ROP
+CAY-2073 Ordering.orderedList methods
+CAY-2074 Support for catalogs in stored procedures
+CAY-2076 Implement Jetty HTTP/1.1 and HTTP/2 Client support for ROP Client
+CAY-2083 Implement Protostuff as serialization service for Cayenne ROP
+CAY-2090 Untangle HttpRemoteService from ServiceContext thread local setup
+CAY-2100 Add supporting generated keys for PostgreSQL
+CAY-2102 EJBQL: db: path not supported in select columns
+CAY-2103 cayenne-crypto: support for mapping non-String and non-binary types
+CAY-2106 cayenne-crypto: allow DI contribution of type converters inside ValueTransformerFactory
+CAY-2107 cayenne-crypto: Lazy initialization of crypto subsystem
+CAY-2111 Unbind transaction object from the current thread for iterated queries
+CAY-2112 Expose callback for "performInTransaction"
+CAY-2113 cdbimport: Reverse-engineering reinstates previously ignored columns
+CAY-2114 cdbimport: object layer settings are not respected
+CAY-2115 DbLoader - allow loading DataMap without Obj layer
+CAY-2116 Split schema synchronization code in a separate module
+CAY-2118 cdbimport: drop support for the old style of table filtering
+CAY-2129 Modeler: reengineer dialog improvements
+CAY-2130 Stripping common name prefixes on reverse engineering
+CAY-2132 Adding SybaseSelectTranslator to support TOP/DISTINCT TOP in limited queries
+CAY-2133 ObjectNameGenerator refactoring - unifying relationship name generation
+CAY-2135 cdbimport: reset DbEntity catalogs / schemas to DataMap defaults
+CAY-2136 Allow Ordering.orderedList(…) methods to accept a Collection rather than only a List
+CAY-2160 Modeler: new welcome screen
+CAY-2222 MySQLAdapter should not create indexes on FK columns
+
+Bug Fixes:
+
+CAY-2016 cdbimport: Rename table with toMany relationship causes migration error
+CAY-2064 Issue with BeanAccessor for classes with complex inheritance
+CAY-2066 Fixes for inner enums handling in ExtendedTypeMap
+CAY-2067 Cayenne 4.0 connection pool is occasionally running out of connections
+CAY-2070 Modeler sync function adds extraneous ObjRelationships inside the class hierarchy
+CAY-2078 Client code gen bug. Unnecessary DataMap class generation setting datamap gen to false.
+CAY-2080 Cayenne doesn't pick up reverse engineering file changes
+CAY-2084 ObjectIdQuery - no cache access polymorphism
+CAY-2086 SelectById.selectFirst stack overflow
+CAY-2087 PostCommitFilter is confused about changes made by Pre* listeners
+CAY-2089 HTTP connections aren't always closed in new ROP implementation
+CAY-2097 NullPointerException while updating relationships for entities with vertical inheritance
+CAY-2101 DataContext.currentSnapshot() doesn't set snapshot entity name
+CAY-2105 Add missing elements to the reverseEngineering.xsd
+CAY-2108 cayenne-di: StackOverflow for decorator that takes Provider of the delegate
+CAY-2110 Obfuscated exception when processing iterated results
+CAY-2119 ProjectUpgrader test failure (Windows)
+CAY-2122 Vertical Inheritance: Cannot Insert Record For Implementing Class with Attribute And Relationship
+CAY-2125 SchemaUpdateStrategy doesn't work with multiple DataNodes
+CAY-2126 Modeler cannot upgrade project from v7 to v9
+CAY-2128 Modeler stored procedures are not imported
+CAY-2131 Modeler NullPointerException in reverse engineering when importing different catalogs in one datamap
+CAY-2138 NVARCHAR, LONGNVARCHAR and NCLOB types are missing from Firebird types.xml
+CAY-2141 Disjoint-by-id prefetch generates repeating ID conditions
+CAY-2143 NPE in BaseSchemaUpdateStrategy
+CAY-2144 cdbimport always fails for databases which don't support catalogs
+CAY-2146 Vertical inheritance: record still inserted into parent db table when child validation fails
+CAY-2148 Failure upgrading from 3.1 to M4
+CAY-2150 UI bug: PK generation custom sequence is getting reset
+CAY-2151 Migrate Database Schema: issue when no db is specified
+CAY-2153 Modeler Exception in save action after reverse engineering some complex DB schema
+CAY-2154 Migrate db: queries order
+CAY-2226 PK generation for Frontbase: PK cache size must be ignored
+
+----------------------------------
+Release: 4.0.M3
+Date: February 12, 2016
+----------------------------------
+Changes/New Features:
+
+CAY-1626 Add JodaTime DateTime support
+CAY-1902 Implement resolving Db paths for DataObjects
+CAY-1991 More control over generated String property names
+CAY-1992 Allow to exclude DataMap java class from Modeler class generation
+CAY-1995 Add support for iterators to Select
+CAY-2001 Saving a display state of Project
+CAY-2004 EJBQL: Support for ordering on aggregate expressions
+CAY-2007 Refactoring SelectTranslator for better extensibility
+CAY-2008 Connection pool refactoring and validation query support in Cayenne DataSource
+CAY-2009 Non-blocking connection pool
+CAY-2010 DataSourceBuilder to help users create pooling and non-pooling DataSources
+CAY-2011 Support for Java 8 date and time types
+CAY-2012 ObjectSelect, SelectById: eliminating methods that reset query state
+CAY-2013 In-memory evaluation of DB expressions - non-id attributes
+CAY-2023 Decouple the use of ResourceLocator
+CAY-2025 Support for DBCP2
+CAY-2026 Java 7
+CAY-2027 Support for Expression outer join syntax in EJBQL
+CAY-2028 Wrap DataChannelFilter calls in the main transaction
+CAY-2029 Allow out-of-order insertion into DI lists
+CAY-2030 Capturing a stream of commit changes
+CAY-2035 Autobind items added to collections (Cayenne DI)
+CAY-2042 Remove an arbitrary limitation on 1000 runtime DbRelationships
+CAY-2043 ServerRuntimeBuilder: use DataDomain name for the default DataNode
+CAY-2044 Collection setter for to-many relationships
+CAY-2045 Add autosuggestion fields to choose attributes and relationships
+
+Bug Fixes:
+
+CAY-1977 Cleanup Modeler reverse engineering functionality
+CAY-1987 Widen types before performing in-memory evaluation of qualifiers using j.l.Number subclasses
+CAY-1990 Incorrect display of the raw SQL query in Modeler
+CAY-1993 Reverse Engineering does not work with PostgreSQL database
+CAY-1994 Modeler Migration Tool Shows No Changes
+CAY-1997 Difference in NULL handling inside the path between PropertyUtils and DataObject.readNestedProperty
+CAY-1998 Speeding up PropertyUtils
+CAY-1999 Unneeded Property import for superclasses with no properties
+CAY-2003 cdbimport doesn't work properly with several includeTable tags
+CAY-2015 Joint prefetches combined with DisjointById prefetches return null incorrectly
+CAY-2020 typo: correction to upper alpha range in Rot13PasswordEncoder
+CAY-2041 "cayenne.jdbc.max_connections" and "cayenne.jdbc.min_connections" command line options are ignored
+CAY-2047 Relationship mapping with target inheritance
+CAY-2049 Changing the Relationship name in ObjRelationship Inspector has no effect
+
+----------------------------------
+Release: 4.0.M2
+Date: March 18, 2015
+----------------------------------
+Changes/New Features:
+
+CAY-1267 Some changes to LogDialog
+CAY-1826 Merge Entity Attributes and Relationships tabs together with one toolbar.
+CAY-1839 Allow to link DataMaps to DataNodes from DataNode editor.
+CAY-1841 Filters for Left-hand project navigator
+CAY-1842 Remove Listeners support from the Modeler 
+CAY-1843 DataMap v7: Stop saving listeners in DataMap, add upgrade handler
+CAY-1845 Upgrade javadoc plugin to 2.9.1 
+CAY-1846 Reworking of callback mapping
+CAY-1847 Make ConverterFactory extensible
+CAY-1848 New method: ObjectContext.selectOne(Select query) 
+CAY-1851 Generate default serialVersionUID for generated java classes to avoid eclipse warnings
+CAY-1852 Straighten thread model and synchronization in the Modeler 
+CAY-1855 Iterated and paginated queries must print result counts 
+CAY-1856 Expression.expWithParameters does not work when parameters are placed in the inline collection 
+CAY-1860 In-memory matching of DataObjects against ObjectId or int
+CAY-1861 Remove runtime relationships
+CAY-1870 cgen - smarter default for 'superPkg' and 'destDir'
+CAY-1882 Porting to OSGi environment
+CAY-1883 Clean up Cayenne maven structure
+CAY-1886 cayenne-di module reorg, new exceptions
+CAY-1890 Remove Cayenne-level buffering when retrieving LOBs
+CAY-1894 Support native PK generation using sequences for H2 databases
+CAY-1899 ServerRuntimeBuilder
+CAY-1900 Allow DataNode name to be used as a root of SQLTemplate
+CAY-1901 Config-free ServerRuntime
+CAY-1904 Simple injection-friendly constructor for AuditableFilter
+CAY-1907 RowReaderFactory
+CAY-1908 Refactor all SQLActions to work with DataNode
+CAY-1911 BatchQuery refactoring - make Iterable
+CAY-1912 BatchQueryBuilder refactoring
+CAY-1913 Refactor org.apache.cayenne.access.trans into query-specific packages
+CAY-1914 Refactor EJBQL-related translators to a standalone 'org.apache.cayenne.access.translator.ejbql' package
+CAY-1915 BatchTranslator instead of performing bindings should return binding object whose values can be altered
+CAY-1916 cayenne-crypto module that enables data encryption for certain model attributes
+CAY-1918 Replace Oracle LOB hacks with JDBC 4.0 API
+CAY-1919 Split DataNode creation into a separate DataNodeFactory
+CAY-1920 DI: add support for decorators
+CAY-1921 Support for schema selection in 'Migrate Database Schema'
+CAY-1923 Optimize BatchTranslator - use fixed size array of BatchParameterBinding
+CAY-1925 cayenne-crypto: add optional compression to the encryption pipeline
+CAY-1928 Second INNER join generated for OUTER flattended relationships in disjoint prefetches
+CAY-1929 Property.outer method to build OUTER join properties
+CAY-1932 Improved Handling for Scalar Parameters Converting Expressions to EJBQL
+CAY-1933 Problems in Evaluating EJBQL Statements with Integral Literals > Integer.MAX_VALUE
+CAY-1934 A problem exists where the escape character is not conveyed in the EJBQL when toEJBQL() is invoked on the expression.
+CAY-1936 ServerRuntime.getDataSource() returning DataSource of a default DataNode
+CAY-1937 Make Transaction an interface
+CAY-1938 Create a DI factory for transactions, get rid of TransactionDelegate and modeler config for tx policies
+CAY-1939 DataDomain must use injectable TransactionManager
+CAY-1946 CDbimport improvements
+CAY-1949 Search in configuration fields (Catalog, Schema) in DbEntity
+CAY-1952 Undeprecate (actually restore) ObjectContext.deleteObject(..)
+CAY-1953 Redo ResultIteratorCallback to handle single row callback instead of iterator
+CAY-1954 Make Cayenne class constructor protected
+CAY-1958 SelectById - a new full-featured select query to get objects by id
+CAY-1959 ObjectSelect query - a fluent API alternative to SelectQuery
+CAY-1960 ExpressionFactory.exp(..) , and(..), or(..)
+CAY-1962 Implement CayenneTable column resize on double-click on the header separator
+CAY-1965 Change version from 3.2 to 4.0
+CAY-1966 SQLTemplate/SQLSelect positional parameter binding
+CAY-1967 Deprecate SQLTemplate parameter batches
+CAY-1968 SQLSelect cleanup and omissions
+CAY-1971 Variants of Property.like(..) : contains(..), startsWith(..), endsWith(..)
+CAY-1972 A property to override DataSources of multi-module projects 
+CAY-1981 Add support of JDBC 4.0 N-types (nchar, nvarchar, longnvarchar, nclob)
+CAY-1984 cdbimport doesn't flatten many to many relationships
+
+Bug Fixes:
+
+CAy-1988 ServerRuntimeBuilder: synthetic DataNode does not have domain's DataMaps linked
+CAY-1480 Implement cross-db functional expressions
+CAY-1695 Unexpected null value in bidirectional one-to-one prefetch 
+CAY-1736 IllegalArgumentException when synchronizing entities in the Modeler
+CAY-1795 "Invisible" ObjAttribute in subclass
+CAY-1796 ROP: All entity's to-many relationships getting faulted from database when using it as a parameter in qualifier expression
+CAY-1797 NPE importing DataMap
+CAY-1798 ROP: Reverse relationships of prefetched entity objects are not filled during server to client objects conversion
+CAY-1799 ROP: Server can't deserialize LIKE expression with pattern already compiled
+CAY-1818 Fix copyright year in the Modeler "about" panel
+CAY-1834 Exception: ToManyList cannot be cast to DataObject 
+CAY-1857 Problem with hotkeys 
+CAY-1859 NullPointerException when importing EOModel 
+CAY-1863 Make determining whether a particular database type supports length adapter-specific not universal
+CAY-1866 Change in General Modeler Preferences reverts old settings to default value
+CAY-1868 Select contention with multiple contexts 
+CAY-1869 ResultIterator from cayenne-client dependency is subclassed from org.apache.cayenne.access.ResultIterator which is present only in cayenne-server dependency 
+CAY-1874 DB2 Procedure action ignores the first result set
+CAY-1877 In-memory evaluation of expression may fail with UnsupportedOpeartionException depending on order of nodes
+CAY-1880 objectStore snapshots never cleared from RefreshQuery when "use shared cache" unchecked
+CAY-1881 CayenneModeler (Mac version) doesn't work with Java 7
+CAY-1885 Null value in subclass's field.
+CAY-1905 Multi-step prefetching NPE : 1..N..1 with absent N and root with no qualifier
+CAY-1943 XML file not deleted when a DataMap is deleted from the project
+CAY-1961 Fix RemoveAction for DataMaps in ProjectTree
+CAY-1964 Fix convertAdditionalDataMaps() in CayenneGeneratorMojo.java
+CAY-1973 error while generating classes
+CAY-1974 Copy/Paste DbEntiry throws exception
+CAY-1978 ESCAPE clause should be included in LIKE parenthesis
+CAY-1979 Prefetches on Many-to-Many Relationships with Longvarchar
+CAY-1980 'mvn cayenne-modeler:run' seems to be broken in 4.0
+
+----------------------------------
+Release: 3.2M1
+Date: July 19, 2013
+----------------------------------
+Changes/New Features:
+
+CAY-1294 Generify query
+CAY-1646 Synchronize tabs in Modeler between ObjEntity and DbEntity editor panes
+CAY-1647 Easily switch to/from ObjEntity and DbEntity in Modeler
+CAY-1717 [PATCH] Implement JDBC compatibility layer methods
+CAY-1718 Remove everything deprecated in 3.1
+CAY-1724 Add 'Property' class for easier and better Expression creation
+CAY-1726 Expression parser support for bit operators, support for << and >>
+CAY-1737 ObjectContexts listening to DataChannel events must be non-blocking
+CAY-1748 IdCoder/EntityIdCoder improvements to work with ObjectIds, including temp ones
+CAY-1753 remove light-superclass.vm class template
+CAY-1754 Modeler suggested URL for SQLServer should start with 'jdbc:sqlserver:' instead of 'jdbc:microsoft:sqlserver:'
+CAY-1758 cdbimport improvements
+CAY-1759 cdbimport improvements: add 'catalog', rename 'schemaName' to 'schema'
+CAY-1760 cdbimport improvements: Default adapter (if none specified) must be AutoAdapter, not JdbcAdapter 
+CAY-1761 cdbimport improvements: DbLoader must reverse engineer PK auto-increment state. 
+CAY-1762 cdbimport improvements: Support for "defaultPackage" parameter, as the new DataMaps ends up placing entities in the root package 
+CAY-1763 cdbimport improvements: specified "schema" should become the default schema of the generated DataMap 
+CAY-1764 cdbimport improvements: "overwrite" flag
+CAY-1765 cdbimport improvements: add excludeTables/includeTables parameters
+CAY-1766 Deprecating DataPort ant task
+CAY-1768 cdbimport improvements: DataMap "project-version" attribute is skipped when DM is saved
+CAY-1769 cdbimport improvements: meaningfulPk flag must be turned into a pattern
+CAY-1771 cdbimport improvements: "usePrimitives" flag
+CAY-1772 Real support for DbEntity catalogs
+CAY-1778 TransactionManager to simplify user-managed transactions 
+CAY-1779 Flatten object entities for many to many relationships on reverse engineering 
+CAY-1781 Add StatelessContextRequestHandler as an alternative to the Session-based one
+CAY-1785 SelectQuery<T> for DataRows
+CAY-1789 Lock-free EntityResolver 
+CAY-1792 [PATCH] Supply additional factory methods for generic SelectQueries 
+CAY-1803 Optimize Expression conversion to String and EJBQL 
+CAY-1809 Remove 'final' modifier from Cayenne, HessianUtil, PropertyComparator, ConversionUtil, and LinkedDeque
+CAY-1813 Missing ObjEntity Attribute Validation with Duplicate DbEntity Columns
+CAY-1814 Support Property.nin 
+CAY-1819 When adding a filter, auto-register it as a listener 
+CAY-1820 DataDomain.addListener(Object) - a shortcut for adding annotated listeners 
+CAY-1821 AuditableFilter and friends should explicitly work with Persistent instead of Object
+CAY-1822 Make DataMap editor fields wider 
+CAY-1823 remove ":sync w/DbEntity" button from ObjEntity - it is redundant and already present on the entity toolbar. 
+CAY-1825 Simplify API for setting up query caching
+CAY-1828 SQLSelect - generics friendly fluent selecting sql query
+CAY-1829 Make ResultIterator implement Iterable<T>, create ObjectContext.iterate method
+CAY-1836 Firebird Adapter 
+CAY-1838 Deprecate EntityResolver.indexedByClassProperty
+CAY-1840 Conditionally log slow / long-running queries
+CAY-1844 Configuration for maximum time to wait for an available DB connection
+CAY-1862 MySQL - allow specifying a length for TIMESTAMP and TIME columns
+
+Bug Fixes:
+
+CAY-957 Deadlock in nested contexts
+CAY-1522 EJBQL query don't support quotes
+CAY-1677 Modeler: text fields discard input unless you press enter
+CAY-1701 Modeler cannot undo pasting of obj (db) entity
+CAY-1708 Modeler error when pasting datamap with EJBQL query
+CAY-1714 ROP: Cayenne tries to build a query for non committed object when using more than 2 nested contexts 
+CAY-1721 Writing blobs fails (Oracle)
+CAY-1725 NullPointerException from call to removeToManyTarget
+CAY-1719 Modeler - Obj Attribute Java Type editor won't focus sometimes
+CAY-1727 Modeler thinks entity is using inheritance when it doesn't
+CAY-1729 PersistentDescriptor must have predictable property iteration order
+CAY-1738 Tutorial cayenne-rop-server should be packaged as a war
+CAY-1739 Cayenne ROP server resets session on every request if BASIC auth is used
+CAY-1742 ObjRelationship inspector says "ObjAttribute Inspector"
+CAY-1744 Unexpected read-only relationships in vertical inheritance mapping
+CAY-1749 NPE on simple nested context commit
+CAY-1755 FaultFailureException resolving relationships to UNIQUE non-PK columns
+CAY-1757 ROP: Faulting entity relationship resets uncommitted modifications made to its reverse relationship 
+CAY-1774 EhCacheQueryCache.get(QueryMetadata, QueryCacheEntryFactory) returns null if EhCache instance for group is not present
+CAY-1780 cdbimport do not create xml file in resource folder
+CAY-1782 Deadlock when performing many concurrent inserts
+CAY-1783 JdbcPkGenerator.longPkFromDatabase would throw an exception if the PK value exceeds a range of Java int
+CAY-1794 Duplicate attributes in discriminator columns of PersistentDescriptor
+CAY-1804 Serialisation of long[] type was not working correctly. 
+CAY-1806 Error importing eomodel 
+CAY-1817 NPE during Validate Project 
+CAY-1827 EhCache region corresponding to a cache group loses its settings after 'removeGroup'
+CAY-1832 Exception when modifying objects in postLoad callback
+

http://git-wip-us.apache.org/repos/asf/cayenne/blob/334d9cc4/UPGRADE.txt
----------------------------------------------------------------------
diff --git a/UPGRADE.txt b/UPGRADE.txt
new file mode 100644
index 0000000..0c9fc00
--- /dev/null
+++ b/UPGRADE.txt
@@ -0,0 +1,582 @@
+Apache Cayenne Upgrade Information
+==================================
+
+IMPORTANT: be sure to read all notes for the intermediate releases between your
+           current release and the release you are upgrading to.
+-------------------------------------------------------------------------------
+UPGRADING TO 4.1.M2
+
+* Per CAY-2377 All code deprecated in Cayenne 4.0 was removed, please review your code before upgrading.
+
+* Per CAY-2372 three new modules extracted from Cayenne core. No changes to the packages or api have been made,
+    so you should only include additional module to your project (if it where used).
+
+    - cayenne-web module contains all logic related to bootstrapping Cayenne inside servlet container.
+      WebModule is autoloaded, so you shouldn't add it to runtime explicitly anymore.
+    - cayenne-osgi module contains OSGi related functionality.
+    - cayenne-rop-server ROP server part.
+
+UPGRADING TO 4.1.M1
+
+* Per CAY-2351 Minimum supported Java version is now Java 8. There is no options to use Cayenne 4.1 with earlier
+      versions, you should use 4.0 version if Java 7 is required by your project.
+
+* Per CAY-2345 Velocity replaced with Cayenne own template engine by default in cayenne-server,
+      this should be transparent in almost all cases, however if you relied on advanced Velocity
+      features in SQLTemplate you can include auto-loaded cayenne-velocity module and keep using Velocity,
+      no other actions required.
+
+* Per CAY-2335 ServerRuntime by default will fail to load projects in case of version mismatch.
+      You have two options:
+      - update project files via opening them in Cayenne Modeler
+      - if you are unable to do so you can use new cayenne-project-compatibility module,
+      to enable it simply add it as a dependency in Maven (or any other build system you use), however
+      this module can support only versions created by Cayenne 3.1 or later.
+
+* Per CAY-2330 Field-based data objects are introduced and enabled by default.
+      Your existing code will continue to work, but in order to get benefits from this feature you should
+      regenerate code via Modeler ("Tools" -> "Generate Classes") or cgen tools in Maven/Ant/Gradle plugins.
+      Also note that serialization format of old data objects have changed, make sure you don't use serialization
+      form to store your objects.
+
+UPGRADING TO 4.0.B1
+
+* Per CAY-2302 postcommit module and all it's internals renamed to commitlog.
+      Most important change is the new @CommitLog annotation which should be used instead of @Auditable,
+      this change is backward incompatible and most likely for you to miss as IDE won't give you a hint.
+      Please keep in mind that new @CommitLog annotation is used only by commitlog module.
+      Deprecated functionality in lifecycle module still depends on @Auditable annotation.
+
+      Here is list of steps you should do in order to update your code:
+      - include cayenne-commitlog module into your project (i.e. add dependency to your pom.xml)
+      - remove cayenne-lifecycle (and cayenne-postcommit if you have it) module from your project
+      - switch usages of @Auditable to @CommitLog
+      - change usages of renamed classes, here is two classes most likely used by your code:
+             PostCommitListener      -> CommitLogListener
+             PostCommitModuleBuilder -> CommitLogModuleExtender
+      - fix all imports for renamed packages:
+             org.apache.cayenne.lifecycle.postcommit -> org.apache.cayenne.commitlog
+             org.apache.cayenne.lifecycle.changemap  -> org.apache.cayenne.commitlog.model
+      - change CommitLogModuleExtender methods:
+             auditableEntitiesOnly() -> commitLogAnnotationEntitiesOnly()
+             build()                 -> module()
+
+* Per CAY-2280 Cayenne migrated from commons-logging to SLF4J.
+      Here is options you have to upgrade your project accordingly:
+      1) Migrate your logging to SLF4J. Please see https://www.slf4j.org for documentation about
+      inclusion into your project logging backend of you choice.
+
+      2) Other option is to use commons-logging over SLF4J and keep all logging compatible with previous Cayenne versions.
+      In order to do so you need:
+      - remove commons-logging dependency if you have it
+      - add to your project slf4j-jcl dependency
+
+      As a part of this change classes CommonsJdbcEventLogger and FormattedCommonsJdbcEventLogger
+      were renamed to Slf4jJdbcEventLogger and FormattedSlf4jJdbcEventLogger respectively.
+      Internally they are using now org.apache.cayenne.log.JdbcEventLogger interface as a logger name.
+
+* Per CAY-2278 Packages org.apache.cayenne.lifecycle.audit and org.apache.cayenne.lifecycle.changeset where deprecated.
+       Please use instead cayenne-commitlog module and its new @CommitLog annotation.
+
+       Weighted graph sorter moved to cayenne-server into org.apache.cayenne.ashwood package.
+
+       Packages org.apache.cayenne.lifecycle.changemap and org.apache.cayenne.lifecycle.postcommit
+       where moved to the new cayenne-commitlog module.
+
+       Please change your code accordingly (see also notes above for CAY-2302).
+
+* Per CAY-2277 ClientRuntime created with ClientRuntimeBuilder, direct instantiation of
+       ClientRuntime is deprecated. Also whole ClientLocalRuntime class is deprecated, use instead
+       ClientRuntimeBuilder.local() method.
+
+* Per CAY-2262 Client modules are now auto-loaded by default to turn off auto-loading use
+       ClientRuntimeBuilder.disableModulesAutoLoading() method.
+
+       List of client modules:
+       - cayenne-client
+       - cayenne-client-jetty
+       - cayenne-protostuff (it also supports auto-loading by ServerRuntimeBuilder)
+
+       Also new modules are extracted from the existing one and should be added to your pom.xml if the corresponding
+       functionality is used by your project:
+       - cayenne-cache-invalidation (was part of cayenne-lifecycle)
+       - cayenne-commitlog (was part of cayenne-lifecycle)
+
+* Per CAY-2259 Cache invalidation module refactored to provide new functionality and better align with
+       new module autoloading functionality. Here is list of changes:
+       - Package org.apache.cayenne.lifecycle.cache renamed to org.apache.cayenne.cache.invalidation.
+       - CacheInvalidationModuleBuilder renamed to CacheInvalidationModuleExtender and its method build()
+       renamed to module().
+       - InvalidationFunction returns CacheGroupDescriptor instead of simple String with cache group name,
+       so you need to change your custom functions accordingly.
+
+* Per CAY-2268 DI methods for binding ordered lists, introduced in 4.0.M3 where changed:
+       - method after() replaced by explicit addAfter(), addAllAfter()
+       - method before() replaced by insertBefore(), insertAllBefore()
+
+* Per CAY-2258 Injection of List and Map are made type-safe, as a result small incompatibilities are introduced.
+  If you are using following methods:
+        - bindMap(String bindingName)
+        - bindList(String bindingName)
+  you should change them to corresponding type-safe versions:
+        - bindMap(Class<T> valueType, String bindingName)
+        - bindList(Class<T> valueType, String bindingName)
+  Also if you are using DI Keys like Key.get(Map.class, "bindingName") or Key.get(List.class, "bindingName")
+  you should use new corresponding factory methods Key.mapOf(MapValues.class, "bindingName")
+  and Key.listOf(ListValues.class, "bindingName").
+  Additionally new API allows you to bind Lists and Maps without using names:
+        - binder.bindList(SomeUniqueType.class).add(...);
+        - @Inject List<SomeUniqueType> list;
+
+* Per CAY-1873 and CAY-2266 Cache and remote notification configuration was moved from Modeler into
+  runtime DI settings. To set custom cache size, you should use custom module like this:
+        Module module = binder -> {
+            ServerModule.setSnapshotCacheSize(binder, 20000);
+        };
+  Or you can use cmd line arg: -Dcayenne.DataRowStore.snapshot.size=20000
+
+  If you have used remote notifications, you should include one of the following modules into your project:
+        - cayenne-jgroups
+        - cayenne-jms
+        - cayenne-xmpp
+  For maven users this can be easily done by adding dependency to pom.xml:
+        <dependency>
+            <groupId>org.apache.cayenne</groupId>
+            <artifactId>cayenne-jgroups</artifactId>
+            <version>4.0.M6</version>
+        </dependency>
+
+  Module will be autoloaded and remote notifications enabled, so only thing you need is to provide configuration.
+  Custom DI module should be used for that, e.g. for JGroups:
+        Module module = binder -> {
+            JGroupsModule.contributeMulticastAddress(binder, MCAST_ADDRESS);
+            JGroupsModule.contributeMulticastPort(binder, MCAST_PORT));
+        };
+
+
+* Per CAY-2256 Fix for CAY-2146 was reverted, as it appears that we can't reliably deduce whether
+  relationship is optional or not. So in case of mandatory relationships in vertical inheritance
+  you should perform manual validation before insert by using "prePersist" callback in your
+  object (you can create it in the Cayenne Modeler) or by overriding "validateForSave" method.
+
+
+UPGRADING TO 4.0.M5
+
+* Per CAY-2186 DerbyPkGenerator switched from AUTO_PK_TABLE to sequence-based PK generator
+  If you relied in anyway on AUTO_PK_TABLE usage in derby, you should change your code.
+
+* Per CAY-2228 Support for multiple cache groups has been removed from caching and query API
+  as none of the modern providers supports it. If you relied on this feature you should
+  implement it by yourself or change caching provider
+
+* Per CAY-1980 "maven-cayenne-modeler-plugin" renamed to "cayenne-modeler-maven-plugin"
+
+* Per CAY-2225 CacheInvalidationFilter has been changed to support custom invalidation rules,
+  in addition to the rule based on @CacheGroups annotation.
+  If you have used it previously, you should change its binding to runtime from direct binding in
+  a custom module to a module built by CacheInvalidationModuleBuilder.
+
+* Per CAY-2212 cdbimport tool revisited once again, so configuration of Maven plugin should be changed.
+  - "maven-cayenne-plugin" is deprecated, please switch to "cayenne-maven-plugin"
+  - <reverseEngineering> tag replaced with <dbimport> tag
+  - new <dataSource> tag introduced that should enclose all connection properties:
+    1. <driver>
+    2. <url>
+    3. <user>
+    4. <password>
+
+  - top level properties moved to <dbimport>:
+    1. <defaultPackage>
+    2. <forceDataMapCatalog>
+    3. <forceDataMapSchema>
+    4. <meaningfulPkTables>
+    5. <namingStrategy>
+    6. <stripFromTableNames>
+    7. <usePrimitives>
+
+  - Java 8 java.time.* types are now used by default in cdbimport (and in "Reengineer Database Schema" tool in Modeler)
+  This can be controlled by <useJava7Types> property in <dbimport> (or checkbox in Modeler).
+
+  - For Ant users: cayenne-tools.jar split into two parts:
+    1. cayenne-ant.jar for Ant tasks
+    2. cayenne-cgen.jar for class generation functionality (required only for cgen task)
+
+
+* Per CAY-2166, Cayenne supports auto-loading of DI modules. There are a few changes worth mentioning:
+  - Service override policies. In the previous 4.0 milestones custom modules would override "builder" modules
+  (i.e. implicit modules that wrap around various customizations made in response to the builder method calls). It
+  seemed logical to reverse this order, and let builder modules override custom modules. As the builder is
+  invoked explicitly when the stack assembly is performed, while modules can be written without any knowledge of the
+  final stack.
+  - Module Renaming and Explicit Loading of Modules. If you see compile errors (class not found for CayenneJodaModule,
+   CayenneJava8Module), just remove explicit loading of those modules. They will be auto-loaded if they are on classpath.
+   If you explicitly turn off auto-loading, use the new names for these modules: JodaModule and Java8Module.
+
+* Per CAY-2164, creating a ServerRuntimeBuilder is done via a static method on ServerRuntime ("ServerRuntime.builder()").
+  The previous style (ServerRuntimeBuilder.builder()) is deprecated and will soon be removed, so you should replace it
+  with the new API.
+
+UPGRADING TO 4.0.M4
+
+* Per CAY-2133, LegacyObjectNameGenerator is no longer provided, as it wasn't possible to maintain it in a fully backwards-
+  compatible manner. Embrace the new naming scheme, or provide your own ObjectNameGenerator if you absolutely need the
+  old names.
+
+* Per CAY-2125 we no longer inject SchemaUpdateStrategy directly. Instead SchemaUpgradeStrategyFactory is injected.
+  If you have your own modules with SchemaUpdateStrategy injection, it will be ignored. So please review your
+  DI code and update it to use SchemaUpgradeStrategyFactory (or likely its subclass).
+
+* Per CAY-2060 4.0.M4 changes the way queries are stored in the mapping files, so all existing *.map.xml files should be upgraded.
+  To do that open each of your existing projects in the new CayenneModeler. Agree to perform an upgrade when asked. 
+
+  Also EntityResolver.getQuery(String) method is removed. If you relied on it, consider switching to MappedSelect or MappedExec query, or if you absolutely need to get a hold of specific query, use EntityResolver.getQueryDescriptor(String).buildQuery().
+
+* Per CAY-2065 ROPHessianServlet has been discarded in favor of new implementation called ROPServlet,
+  so if you were using org.apache.cayenne.configuration.rop.server.ROPHessianServlet in your web.xml configuration,
+  you must change it to org.apache.cayenne.rop.ROPServlet
+
+* Per CAY-2118 we stopped a bunch of deprecated keys in cdbimport configuration, and also removed the ability to set
+  properties of "reverseEngineering" config object at the top level of configuration. So you will always need
+  <reverseEngineering></reverseEngineering> tag in Maven (but not Ant) to setup any DB filtering. Removed top-level
+  configuration keys:
+
+  1. catalog
+  2. schema (also schemaName)
+  3. excludeTables
+  4. includeTables
+  5. procedurePattern
+  6. tablePattern
+  7. importProcedures
+  8. meaningfulPk
+  9. overwrite
+
+UPGRADING TO 4.0.M3
+
+* Per CAY-2026 minimal Java version is now 1.7. If you are still need Java 1.6, you can use Cayenne 3.1 or 4.0.M2 until your
+  application is able to upgrade. 
+
+* We no longer add @Deprecated annotation to generated String property names in entity superclasses.
+  Instead String property names inclusion
+  became optional, controlled with "createPropertyNames" flag in cgen ("false" by default). Also a similar option
+  was added to Advanced Type of CayenneModeler class generation dialog.
+  Note if you have references to @Deprecated String properties and you run cgen without "createPropertyNames" flag,
+  there will be errors. Reference Jira: CAY-1991
+
+* Per CAY-2008, CAY-2009 we got rid of org.apache.cayenne.conn.PoolManager and associated classes that made up a 
+  pooling DataSource. A replacement is non-blocking DataSource under org.apache.cayenne.datasource (PoolingDataSource, ManagedPoolingDataSource),
+  best assembled using org.apache.cayenne.datasource.DataSourceBuilder.
+
+* Per CAY-2012 API for ObjectSelect and SelectById queries were changed to remove "reset" functionality. Methods like 'where', 'prefetch',
+  'orderBy' that would previously reset the corresponding option state now work as "append". Methods that would previously append to the
+  option state were removed as redundant. Please revisit your code if you previously relied on the reset behavior.
+
+* If you are using DBCPDataSourceFactory, you will need to take a few steps to upgrade:
+
+  - Per CAY-2025 and CAY-2026, DBCPDataSourceFactory is now based on DBCP2 (which is required under Java 1.7 and newer).
+  - Check your DBCP properties file to ensure it uses property names supported by DBCP. 
+    (In the past Cayenne would require prefixing those properties with 'cayenne.dbcp.'. If you still have that prefix, remove it).
+  - To use DBCPDataSourceFactory, you will now have to explicitly include an extra Cayenne module, as it is no longer in cayenne-server. 
+    E.g. if you are using Maven:
+
+    <parent>
+      <groupId>org.apache.cayenne</groupId>
+      <artifactId>cayenne-dbcp2</artifactId>
+      <version>4.0.M3</version>
+    </parent>
+ 
+
+UPGRADING TO 4.0.M2
+
+* Note that 3.2 line of development was renamed to 4.0. So 4.0.M2 is a straight descendant of
+  3.2M1.
+
+* org.apache.cayenne.map.naming.SmartNamingStrategy was replaced with org.apache.cayenne.map.naming.DefaultNameGenerator. If you
+  mentioned SmartNamingStrategy explicitly in your Maven or Ant configs, make sure you rename it. Since this was/is the default,
+  chances are that you didn't.
+
+* Minimal required JDK version is now 1.6 (both for modeler and runtime). This is a pretty conservative 
+  requirement, considering that Java 1.6 has been EOL'd by Oracle on Feb 2013.
+
+* Managing listeners in the Modeler is counterproductive and confusing,
+  so support for them was removed from the Modeler per CAY-1842. If you have
+  any listeners in the model, delete them from XML, and start using annotations,
+  and register them in runtime:
+
+  runtime.getDataDomain().addListener(myListener);
+
+* Cayenne.objectForSelect(Select) that was present in 3.2M1 was replaced with ObjectContext.selectOne(Select). 
+
+* In-memory expression eval (Expression.match/Expression.evaluate) will now return true when matching Persistent
+  with ObjectId or Number or String (if those correspond to a given object's ObjectId). Also 2 objects in 2 different
+  ObjectContexts will match even if they have differing local changes. Only their ObjectIds are compared. 
+  See CAY-1860 for details.
+
+* ResultIterator was moved to org.apache.cayenne to make it available on both server and client. When you upgrade
+  related iterator code, make sure to check ResultIterator improvements (e.g. it implements Iterable, it is no 
+  longer limited to DataRows and can fetch objects just as easy, it no longer requires catching checked exceptions). 
+  Also check ObjectContext.iterate(..) method.
+
+* Transaction management was refactored significantly:
+
+  * External transactions are no longer configured in the Modeler. Instead they are provided as a DI property
+    defined in Constants.SERVER_EXTERNAL_TX_PROPERTY.
+
+  * TransactionDelegate is no longer present. Similar functionality can be achieved by writing a decorator for 
+    Transaction interface and using a custom TransactionFactory to decorate standard transactions.
+
+  * If your code relied on static methods Transaction.externalTransaction() or Transaction.internalTransaction() for
+    manual tx management, use constructors of ExternalTransaction and CayenneTransaction classes instead.
+
+* When switching to ServerRuntimeBuilder, users of multi-config projects may erroneously assume it has the same 
+  behavior as 3.1 ServerRuntime in assigning domain name to the resulting merged project. Which is to use the 
+  name of the last project config. We are trying to move away from this behavior, so ServerRuntimeBuilder 
+  will only use config name if there's only one config and no override. Otherwise it will use the override, 
+   or if not set - "cayenne" as the default name. Reference Jira: CAY-1972
+
+
+
+UPGRADING TO 3.1B1
+
+* In an attempt to better organize DI configuration and ultimately make it easier to understand, 
+  all properties and DI collection keys were placed in a single Constants interface. The property and key String 
+  values were changed to follow a single convention. Please refer to https://issues.apache.org/jira/browse/CAY-1665
+  for mapping between the old and the new names.
+
+  If you are upgrading from the earlier 3.1 releases, please change your code and runtime parameters accordingly.
+  3.0 users may still review the new property names as some of them existed prior to DI.
+
+UPGRADING TO 3.1M3
+
+* DataMap listeners are no longer supported. Global listeners registered through
+  annotations API can be used instead. E.g.:
+
+	public class SomeListener {
+		@PrePersist
+		public void onPrePersist(Object object) {
+			// callback method
+		}
+	}
+
+  To register listener class use following API:
+
+	runtime.getChannel().getEntityResolver().getCallbackRegistry().addListener(listenerInstance);
+
+  Note that DataMap listeners entries from old *.map.xml files will be ignored.
+
+
+UPGRADING TO 3.1M1
+
+The most essential change in Cayenne 3.1 is a new Dependency-Injection (DI) based
+bootstrap and configuration mechanism, which is not backwards compatible with 3.0.
+Read on to learn about specific areas that require attention when upgrading your
+application.
+
+* Upgrading 3.0.x mapping files: Open each of your existing projects in the new 
+  CayenneModeler. Agree to perform an upgrade when asked. Note that Cayenne
+  3.1 only supports one DataDomain per project, so if multiple domains existed in 
+  the project, you'll end up with multiple project files  after the upgrade. Each 
+  will require instantiation of a separate ServerRuntime in the code. 
+
+* Upgrading 2.0.x and earlier mappings files: Note that CayenneModeler
+  3.1 won't be able to upgrade projects created with a Modeler older than 3.0. To 
+  upgrade older projects do it in two steps - download Cayenne 3.0, and perform an
+  upgrade with 3.0 CayenneModeler. After that perform a second upgrade from 3.0 to
+  3.1.
+
+* Cayenne runtime bootstrap: In 3.1 all classes under "org.apache.cayenne.conf"
+  package were removed, superseded by dependency injection (DI) based configuration,
+  with main classes located under "org.apache.cayenne.configuration" and its 
+  subpackages. E.g. to instantiate the Cayenne stack in 3.1 you would do 
+  something like that:
+
+  ServerRuntime cayenneRuntime = new ServerRuntime("cayenne-UntitledDomain.xml");
+  
+  To obtain a new ObjectContext, the following API is used:
+		
+  ObjectContext context = cayenneRuntime.getContext();
+
+* No static configuration singleton: Cayenne 3.1 completely gets rid of a (previously 
+  optional, but widely used) "Configuration.sharedConfiguration" singleton. This 
+  change was done to acknowledge the fact that single configuration per application 
+  is just a special case, and generally user can instantiate as many configurations 
+  (or ServerRuntime's in 3.1 terms) as appropriate. This however means that the 
+  users must now decide themselves where in their application it is appropriate to 
+  store ServerRuntime instance (or instances). E.g. it can be stored as an attribute 
+  of ServletContext (check out "org.apache.cayenne.configuration.web.CayenneFilter" and 
+  "org.apache.cayenne.configuration.web.WebUtil"), reside in a user's favorite dependency
+  injection container (e.g. Spring), or even be saved in a user's own static singleton 
+  variable.
+
+* No static DataContext creation methods: Methods like DataContext.createDataContext()
+  were relying on static configuration singleton, which was removed (see above). Use
+  ServerRuntime instance methods to create context instances.
+
+* Webapp configuration changes: "org.apache.cayenne.conf.WebApplicationContextFilter"
+  was replaced by "org.apache.cayenne.configuration.web.CayenneFilter". See CayenneFilter
+  javadocs for details on of the init parameters.
+
+* ROP Server configuration changes: "org.apache.cayenne.remote.hessian.service.HessianServlet"
+  was replaced by "org.apache.cayenne.configuration.rop.server.ROPHessianServlet". See
+  ROPHessianServlet javadocs for details on its init parameters. 
+
+* ROP Client configuration changes: There is now a special DI "runtime" object -
+  "org.apache.cayenne.configuration.rop.client.ClientRuntime", so client connection
+  and channel can be (optionally) managed via DI, with connection parameters 
+  specified as properties. E.g.:
+  
+	Map<String, String> properties = new HashMap<String, String>();
+	properties.put(ClientModule.ROP_SERVICE_URL, "http://localhost:8080/tutorial/cayenne-service");
+	properties.put(ClientModule.ROP_SERVICE_USER_NAME, "cayenne-user");
+	properties.put(ClientModule.ROP_SERVICE_PASSWORD, "secret");
+
+	ClientRuntime runtime = new ClientRuntime(properties);
+	ObjectContext context = runtime.getContext();
+	
+  The advantage of this approach in that all the client stack objects are managed
+  by the DI container and a user can customize/override various pieces.
+
+* Deprecated API removal: All API deprecated as of 3.0 is removed. This may require 
+  some code cleanup. Since 3.0 javadocs for suggested replacements. Also if custom 
+  class generation templates are used, doublecheck that they do not reference removed 
+  EntityUtil methods, which were replaced by variables placed directly into Velocity context.
+
+* Custom DbAdapter / DbAdapterFactory: The interface used by Cayenne to allow custom 
+  DbAdapters to be auto-detected with AutoAdapter has changed from 
+  org.apache.cayenne.dba.DbAdapterFactory to org.apache.cayenne.configuration.DbAdapterDetector. 
+  Note that now a custom implementation can rely on Cayenne DI to obtain Cayenne 
+  dependencies via @Inject annotation. To register a custom implementation with 
+  Cayenne DI container, one might do this in the custom DI module:
+
+  ... 
+  public void configure(Binder binder) {
+  ...
+     binder.bindList(DbAdapterFactory.class).add(new MyDbAdapterDetector());
+  }
+
+* Custom DataSourceFactory: The interface used by Cayenne to load custom DataSource 
+  factories has changed from "org.apache.cayenne.conf.DataSourceFactory" to 
+  "org.apache.cayenne.configuration.DataSourceFactory". This new interface must be 
+  implemented by the custom factories. Note that now a custom implementation can 
+  rely on Cayenne DI to obtain Cayenne dependencies via @Inject annotation.
+
+* Replaced JNDI preferences hack with runtime properties: "JNDI hack", as it was 
+  known prior to 3.1, allowed to define a named database connection using CayenneModeler, 
+  and then Cayenne would read this connection information from Modeler preferences 
+  and use it as a failover for JNDI DataNodes. The problem with this is that it 
+  required CayenneModeler and HSQLDB jars on the application classpath, and also that the 
+  preferences database was prone to data corruption. In 3.1, preferences hack is no
+  longer available. Instead JNDI (or really any other type of DataSourceFactory) 
+  can be overridden via runtime properties (or by redefining DataSourceFactoryLoader
+  via DI). See org.apache.cayenne.configuration.server.PropertyDataSourceFactory javadocs for
+  details. Here are some simple examples:
+
+  -Dcayenne.jdbc.url=jdbc://urloverride 
+  -Dcayenne.jdbc.driver=com.example.MyDriver 
+  -Dcayenne.jdbc.username=foo
+  -Dcayenne.jdbc.password=bar
+
+
+UPGRADING TO 3.0B1
+
+* Per CAY-1281 pre-persist callback was renamed to post-add (while pre-persist now has a different meaning).
+  To upgrade your project, open it in the Modeler and agree to perform an automated upgrade.
+
+UPGRADING TO 3.0M6
+
+* Per CAY-1154, org.apache.cayenne.access.reveng package was renamed to org.apache.cayenne.map.naming. So, if you
+  use your own naming strategies, you should update as well.
+
+* Per CAY-1161, custom columns feature in SelectQuery was deprecated. Consider switching to EJBQL as an alternative.
+  Custom columns support will likely go away completely after 3.0M6.
+
+* Per CAY-1175, 'columnNameCapitalization' property of SQLTemplate now takes an enum, not a String. 
+  Calling code should be fixed.
+
+UPGRADING TO 3.0M5
+
+* Per CAY-1127, query "name" property is no longer used as an internal cache key. This change should be transparent
+  to most users, as Cayenne generates a correct cache key internally when needed, however if a user code explicitly
+  depended on the value of the cache key, it should be updated to use something like this:
+    
+  String cacheKey = query.getQueryMetadata(entityResolver).getCacheKey();
+
+UPGRADING TO 3.0M4
+
+* Per CAY-1049 API of the internal classes that participate in SelectQuery translation has changed in a way that
+  is not backwards compatible. This should not affect regular users, however if you implemented a custom DbAdapter,
+  check for classes that directly or indirectly inherit from QueryAssembler and QueryAssemblerHelper and fix them
+  if needed.
+
+UPGRADING TO 3.0M3
+
+* Java 5 is now required as a minimum for Cayenne Modeler and the Cayenne libraries.
+
+* After the move to Java 5, generics have been implemented in many of the Cayenne APIs. If you don't use generics
+in your project this should not affect you, but if you do you will need to review any new compiler errors or warnings.
+The effect of generics is at compile time only, so their introduction will not change the runtime behaviour of
+your application once compiled.
+
+UPGRADING TO 3.0M2
+
+* Lifecycle Callbacks require no setup:
+  Per CAY-843, lifecycle callback functionality is now built into DataContext and DataDomain, 
+  so all the custom code to set them up is no longer needed. Also as a result of this change
+  'org.apache.cayenne.intercept' package is removed from Cayenne.
+  Further information can be found here: http://cayenne.apache.org/doc/lifecycle-callbacks.html
+
+UPGRADING TO 3.0M1
+
+* Jar files:
+  - all jar files now include version numbers in their names.
+  - "cayenne-nodeps.jar" is renamed to "cayenne-server-x.x.x.jar" 
+  - "fat" cayenne.jar file that included dependencies is no longer distributed. 
+    All dependencies that it contained are included as separate jars under 
+    "cayenne-x.x.x/lib/third-party/". The new "cayenne-server-x.x.x.jar" plus 
+    dependencies should be used in place of cayenne.jar.
+  - A new "cayenne-agent-x.x.x.jar" is included. It is used for class enhancement 
+    with POJO's and JPA. "Classic" Cayenne users can ignore this file.
+    
+* Ant class generator is using what was called "version 1.2" by default. This means that if you were
+  using custom Velocity templates in 1.1 mode, you should either change the templates or specify 'version="1.1"'
+  in the buildfile explicitly.
+
+* Cross-platform Modeler Startup is now done without a batch file or a shell script. 
+  A "fat" CayenneModeler.jar is included in the "cayenne-x.x.x/bin" directory
+  and can be run either by double-clicking the jar (on platforms that support that)
+  or by running "java -jar CayenneModeler.jar".
+  
+* Note that FireBird adapter is no longer distributed with Cayenne. The one we had was half-working
+  and we could not support it anymore.
+  
+* DataContextTransactionEventListener, DataObjectTransactionEventListener, DataContextEvent all were deprecated
+  favor of callbacks. NOTE THAT THIS API WILL BE REMOVED IN THE FOLLOWING 3.0 MILESTONES.
+  
+* Long PK: Cayenne now supports "long" primary key generation (previously it only supported "int"). You may
+  have to change the existing PK lookup tables on some databases to take advantage of that (this is optional,
+  and is needed if you expect your PK to exceed maximum value of an "int" allowed in your database). E.g. on 
+  MySQL you may run the following SQL:
+  
+  ALTER TABLE AUTO_PK_SUPPORT CHANGE COLUMN NEXT_ID NEXT_ID BIGINT NOT NULL;
+  
+
+UPGRADING TO 2.0.x
+
+Since 2.0, Cayenne is an Apache project, so all "org.objectstyle.*" java packages 
+where renamed to "org.apache.*" analogues. Since 1.2.x and 2.0.x release lines maintain
+full compatibility with each other, differing only in package names, upgrading to 2.0.x
+can be a first step in a safe upgrade to the latest version of Cayenne.
+
+* Upgrading mapping files:
+
+To upgrade the mapping files, open them in the new Modeler. You should see an upgrade 
+dialog. Once you confirm the upgrade 
+
+* Upgrading the code:
+
+Replace "org.objectstyle." with "org.apache." everywhere in imports and do a clean 
+recompile.
+
+* Upgrading logging configuration
+
+If you are using custom logging configuration file, make sure that all the 
+Cayenne loggers are changed from "org.objectstyle" to "org.apache".

http://git-wip-us.apache.org/repos/asf/cayenne/blob/334d9cc4/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index fecdbd5..8e93916 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -236,6 +236,28 @@
 							<tarLongFileMode>gnu</tarLongFileMode>
 						</configuration>
 					</plugin>
+					<plugin>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>process-resources</phase>
+								<configuration>
+									<tasks>
+										<copy todir="${project.build.directory}/doc-staging">
+											<fileset dir="${basedir}/../docs/asciidoc">
+												<include name="**/target/**/*.pdf"/>
+												<include name="**/target/**/*.html"/>
+											</fileset>
+											<flattenmapper/>
+										</copy>
+									</tasks>
+								</configuration>
+								<goals>
+									<goal>run</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/334d9cc4/assembly/src/main/resources/assemblies/assembly-generic.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-generic.xml b/assembly/src/main/resources/assemblies/assembly-generic.xml
index 0bdf157..8ecc109 100644
--- a/assembly/src/main/resources/assemblies/assembly-generic.xml
+++ b/assembly/src/main/resources/assemblies/assembly-generic.xml
@@ -50,62 +50,49 @@
 			<directory>../cayenne-cgen/src/main/resources/templates/v4_1</directory>
 			<outputDirectory>templates</outputDirectory>
 		</fileSet>
-	</fileSets>
-
-	<files>
-		<file>
-			<source>../docs/asciidoc/getting-started-guide/target/generated-docs/getting-started-guide.pdf</source>
-			<outputDirectory>doc</outputDirectory>
-			<destName>getting-started.pdf</destName>
-		</file>
-		<file>
-			<source>../docs/asciidoc/getting-started-db-first/target/generated-docs/getting-started-db-first.pdf</source>
-			<outputDirectory>doc</outputDirectory>
-			<destName>getting-started-db-first.pdf</destName>
-		</file>
-		<file>
-			<source>../docs/asciidoc/getting-started-rop/target/generated-docs/getting-started-rop.pdf</source>
-			<outputDirectory>doc</outputDirectory>
-			<destName>getting-started-rop.pdf</destName>
-		</file>
-		<file>
-			<source>../docs/asciidoc/cayenne-guide/target/generated-docs/cayenne-guide.pdf</source>
-			<outputDirectory>doc</outputDirectory>
-			<destName>cayenne-guide.pdf</destName>
-		</file>
-		<file>
-			<source>../docs/asciidoc/upgrade-guide/target/generated-docs/upgrade-guide.pdf</source>
+		<fileSet>
+			<directory>target/doc-staging</directory>
 			<outputDirectory>doc</outputDirectory>
-			<destName>upgrade-guide.pdf</destName>
-		</file>
-	</files>
+		</fileSet>
+		<fileSet>
+			<directory>../</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>RELEASE-NOTES.txt</include>
+				<include>UPGRADE.txt</include>
+				<include>KEYS</include>
+			</includes>
+		</fileSet>
+	</fileSets>
 	
 	<dependencySets>
 		<dependencySet>
 			<outputDirectory>lib</outputDirectory>
 			<includes>
+				<include>org.apache.cayenne:cayenne-ant</include>
+				<include>org.apache.cayenne:cayenne-cache-invalidation</include>
+				<include>org.apache.cayenne:cayenne-cgen</include>
 				<include>org.apache.cayenne:cayenne-client</include>
+				<include>org.apache.cayenne:cayenne-client-jetty</include>
+				<include>org.apache.cayenne:cayenne-commitlog</include>
 				<include>org.apache.cayenne:cayenne-crypto</include>
+				<include>org.apache.cayenne:cayenne-dbcp2</include>
+				<include>org.apache.cayenne:cayenne-dbsync</include>
 				<include>org.apache.cayenne:cayenne-di</include>
+				<include>org.apache.cayenne:cayenne-jcache</include>
 				<include>org.apache.cayenne:cayenne-joda</include>
 				<include>org.apache.cayenne:cayenne-lifecycle</include>
-				<include>org.apache.cayenne:cayenne-commitlog</include>
+				<include>org.apache.cayenne:cayenne-osgi</include>
 				<include>org.apache.cayenne:cayenne-project</include>
+				<include>org.apache.cayenne:cayenne-project-compatibility</include>
+				<include>org.apache.cayenne:cayenne-protostuff</include>
+				<include>org.apache.cayenne:cayenne-rop-server</include>
 				<include>org.apache.cayenne:cayenne-server</include>
-				<include>org.apache.cayenne:cayenne-dbsync</include>
-				<include>org.apache.cayenne:cayenne-cgen</include>
-				<include>org.apache.cayenne:cayenne-ant</include>
-				<include>org.apache.cayenne:cayenne-dbcp2</include>
-				<include>org.apache.cayenne:cayenne-jcache</include>
-				<include>org.apache.cayenne:cayenne-cache-invalidation</include>
+				<include>org.apache.cayenne:cayenne-velocity</include>
+				<include>org.apache.cayenne:cayenne-web</include>
 				<include>org.apache.cayenne:cayenne-jgroups</include>
 				<include>org.apache.cayenne:cayenne-jms</include>
 				<include>org.apache.cayenne:cayenne-xmpp</include>
-				<include>org.apache.cayenne:cayenne-velocity</include>
-				<include>org.apache.cayenne:cayenne-project-compatibility</include>
-				<include>org.apache.cayenne:cayenne-web</include>
-				<include>org.apache.cayenne:cayenne-osgi</include>
-				<include>org.apache.cayenne:cayenne-rop-server</include>
 			</includes>
 		</dependencySet>
 		<dependencySet>


[12/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap22.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap22.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap22.html
deleted file mode 100644
index 0c085fb..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap22.html
+++ /dev/null
@@ -1,715 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:property</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id2', 
-				'properties_id3', 
-				'properties_id4');
-
-        
-        var usedByBoxes= new Array('usedBy_id2', 
-				'usedBy_id3', 
-				'usedBy_id4');
-
-        var sourceBoxes= new Array('source_id2', 
-				'source_id3', 
-				'source_id4');
-
-        
-        var diagramBoxes= new Array('diagram_id2');
-
-        var annotationBoxes= new Array('annotations_id2');
-
-        var attributesBoxes= new Array('attributes_id2');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, annotationBoxes);"
-                                     class="control" /></span><span class="globalControlName">Annotations</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id2"></a><div class="componentTitle">Element <span class="qname">cay:property</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id2" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('annotations_id2');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="annotations_id2" style="display:block">
-                              <div class="annotation">
-                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                        class="preWrapContainer">
-                                    <tr>
-                                       <td width="100%"><pre><span class="tokenText">A generic property used by other elements.</span></pre></td>
-                                    </tr>
-                                 </table>
-                              </div>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id2" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id2');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id2" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html15.jpeg"
-                                   usemap="#modelMap_46_html15" /><map name="modelMap_46_html15" id="modelMap_46_html15">
-                                 <area alt="modelMap22.tmp#id3" href="modelMap22.html#id3" coords="120,43,233,85" />
-                                 <area alt="modelMap22.tmp#id4" href="modelMap22.html#id4" coords="120,95,233,137" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id2" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('properties_id2');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id2" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id2" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id2');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id2" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Elements </td>
-                                    <td><b><a href="modelMap27.html#id1" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:data-map')">cay:data-map</a></b>, <b><a href="modelMap24.html#id97" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:query')">cay:query</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id2" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('attributes_id2');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id2" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap22.html#id3" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component name')">name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap22.html#id4" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component value')">value</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id2" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id2');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id2" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"property"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:annotation</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:documentation</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">A generic property used by other elements.</span><span class="tokenElement">&lt;/xs:documentation&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:annotation&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"value"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id3"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap22.html#id2" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:property')">cay:property</a></b>/@name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id3" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('properties_id3');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id3" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id3" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id3');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id3" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap22.html#id2" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:property')">cay:property</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id3" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id3');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id3" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id4"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap22.html#id2" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:property')">cay:property</a></b>/@value</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id4" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('properties_id4');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id4" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id4" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id4');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id4" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap22.html#id2" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:property')">cay:property</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id4" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id4');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id4" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"value"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file


[20/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap13.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap13.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap13.html
deleted file mode 100644
index 6d448ec..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap13.html
+++ /dev/null
@@ -1,578 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:post-load</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id64', 
-				'properties_id65');
-
-        
-        var usedByBoxes= new Array('usedBy_id64', 
-				'usedBy_id65');
-
-        var sourceBoxes= new Array('source_id64', 
-				'source_id65');
-
-        
-        var diagramBoxes= new Array('diagram_id64');
-
-        
-        var attributesBoxes= new Array('attributes_id64');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id64"></a><div class="componentTitle">Element <span class="qname">cay:post-load</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id64" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id64');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id64" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html16.jpeg"
-                                   usemap="#modelMap_46_html16" /><map name="modelMap_46_html16" id="modelMap_46_html16">
-                                 <area alt="modelMap13.tmp#id65" href="modelMap13.html#id65" coords="126,43,250,85" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id64" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id64');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id64" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id64" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id64');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id64" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Elements </td>
-                                    <td><b><a href="modelMap6.html#id51" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:entity-listener')">cay:entity-listener</a></b>, <b><a href="modelMap1.html#id33" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:obj-entity')">cay:obj-entity</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id64" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id64');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id64" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap13.html#id65" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component method-name')">method-name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id64" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id64');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id64" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"post-load"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"method-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id65"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap13.html#id64" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:post-load')">cay:post-load</a></b>/@method-name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id65" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id65');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id65" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id65" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id65');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id65" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap13.html#id64" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:post-load')">cay:post-load</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id65" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id65');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id65" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"method-name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file


[17/24] cayenne git commit: Update docs included into assembly

Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fcb490c2/docs/doc/src/main/resources/doc/schema/3.0/modelMap17.html
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/doc/schema/3.0/modelMap17.html b/docs/doc/src/main/resources/doc/schema/3.0/modelMap17.html
deleted file mode 100644
index 21a38c3..0000000
--- a/docs/doc/src/main/resources/doc/schema/3.0/modelMap17.html
+++ /dev/null
@@ -1,1204 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Schema documentation for component cay:procedure</title>
-      <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
-         <!--
-        var propertiesBoxes= new Array('properties_id11', 
-				'properties_id12', 
-				'properties_id13', 
-				'properties_id14', 
-				'properties_id15', 
-				'properties_id16', 
-				'properties_id17');
-
-        
-        var usedByBoxes= new Array('usedBy_id11', 
-				'usedBy_id13', 
-				'usedBy_id14', 
-				'usedBy_id15', 
-				'usedBy_id16', 
-				'usedBy_id17');
-
-        var sourceBoxes= new Array('source_id11', 
-				'source_id12', 
-				'source_id13', 
-				'source_id14', 
-				'source_id15', 
-				'source_id16', 
-				'source_id17');
-
-        var instanceBoxes= new Array('instance_id11');
-
-        var diagramBoxes= new Array('diagram_id11', 
-				'diagram_id12');
-
-        
-        var attributesBoxes= new Array('attributes_id11', 
-				'attributes_id12');
-
-        
-        var button_prefix = 'button_';
-        
-        /**
-        * Returns an element in the current HTML document.
-        *
-        * @param elementID Identifier of HTML element
-        * @return               HTML element object
-        */
-        function getElementObject(elementID) {
-            var elemObj = null;
-            if (document.getElementById) {
-                elemObj = document.getElementById(elementID);
-            }
-            return elemObj;
-        }
-        
-        /**
-        * Switches the state of a collapseable box, e.g.
-        * if it's opened, it'll be closed, and vice versa.
-        *
-        * @param boxID Identifier of box
-        */
-        function switchState(boxID) {
-            var boxObj = getElementObject(boxID);
-            var buttonObj = getElementObject(button_prefix + boxID);
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else if (boxObj.style.display == "none") {
-                // Box is closed, so open it
-                openBox(boxObj, buttonObj);
-            } else if (boxObj.style.display == "block") {
-                // Box is opened, so close it
-                closeBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-        * Opens a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function openBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "block";
-                
-                // Change text of button
-                if (boxObj.style.display == "block") {
-                    buttonObj.src = "images/button_minus.gif";
-                }
-            }
-        }
-        
-        /**
-        * Closes a collapseable box.
-        *
-        * @param boxObj       Collapseable box
-        * @param buttonObj Button controlling box
-        */
-        function closeBox(boxObj, buttonObj) {
-            if (boxObj == null || buttonObj == null) {
-                // Box or button not found
-            } else {
-                // Change 'display' CSS property of box
-                boxObj.style.display = "none";
-                
-                // Change text of button
-                if (boxObj.style.display == "none") {
-                    buttonObj.src = "images/button_plus.gif";
-                }
-            }
-        }
-    
-       function switchStateForAll(buttonObj, boxList) {
-            if (buttonObj == null) {
-                // button not found
-            } else if (buttonObj.value == "+") {
-                // Expand all
-                expandAll(boxList);
-                buttonObj.value = "-";
-            } else if (buttonObj.value == "-") {
-                // Collapse all
-                collapseAll(boxList);
-                buttonObj.value = "+";
-            }
-        }
-        
-        /**
-        * Closes all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function collapseAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                closeBox(boxObj, buttonObj);
-            }
-        }
-            
-        /**
-        * Open all boxes in a given list.
-        *
-        * @param boxList Array of box IDs
-        */
-        function expandAll(boxList) {
-            var idx;
-            for (idx = 0; idx < boxList.length; idx++) {
-                var boxObj = getElementObject(boxList[idx]);
-                var buttonObj = getElementObject(button_prefix + boxList[idx]);
-                openBox(boxObj, buttonObj);
-            }
-        }
-        
-        /**
-         * Update the message presented in the title of the html page.
-         * - If the documentation was splited by namespace we present something like: "Documentation for namespace 'ns'"
-         * - If the documentation was splited by location we present somehing like: "Documentation for 'Schema.xsd'"
-         * - If no split we always present: "Documentation for 'MainSchema.xsd'"
-         */
-        function updatePageTitle(message) {
-            top.document.title = message;
-        }
-        
-          
-                    
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function findAndFloat(id, x_displacement, y_displacement){
-
-            var element = getElementObject(id);            
-            
-            window[id + "_obj"] = element;
-            
-            if(document.layers) {
-               element.style = element;
-            }
-            
-            element.current_y = y_displacement;      
-            element.first_time = true;
-         
-            element.floatElement = function(){
-               // It may be closed by an user action.
-                
-               // Target X and Y coordinates.
-               var x, y;
-               
-               var myWidth = 0, myHeight = 0;
-               if( typeof( window.innerWidth ) == 'number' ) {
-                  //Non-IE
-                  myWidth = window.innerWidth;
-                  myHeight = window.innerHeight;
-               } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
-                  //IE 6+ in 'standards compliant mode'
-                  myWidth = document.documentElement.clientWidth;
-                  myHeight = document.documentElement.clientHeight;
-               } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-                  //IE 4 compatible
-                  myWidth = document.body.clientWidth;
-                  myHeight = document.body.clientHeight;
-               }
-               
-               
-               x = myWidth - x_displacement;
-               
-               var ns = (navigator.appName.indexOf("Netscape") != -1);               
-               y = ns ? pageYOffset : document.documentElement && document.documentElement.scrollTop ? 
-                  document.documentElement.scrollTop : document.body.scrollTop;               
-               y = y + y_displacement;               
-               
-               // The current y is the current coordinate of the floating element.
-               // This should be at the limit the y target coordinate.
-               this.current_y += (y - this.current_y)/1.25;
-               
-               // Add the pixels constant after the values
-               // and move the element.
-               var px = document.layers ? "" : "px";
-               this.style.left =  x + px;
-               this.style.top =  this.current_y + px;
-                              
-               setTimeout(this.id + "_obj.floatElement()", 100);
-            }
-            
-            element.floatElement();
-            return element;
-          }
-
-         /**
-          * Finds an HTML element by its ID and makes it floatable over the normal content.
-          *
-          * @param x_displacement The difference in pixels to the right side of the window from 
-          *           the left side of the element.
-          * @param y_displacement The difference in pixels to the right side of the window from 
-          *           the top of the element.          
-          */
-         function selectTOCGroupBy(id){
-            var selectIds = new Array('toc_group_by_namespace', 'toc_group_by_location', 'toc_group_by_component_type');
-            // Make all the tabs invisible.
-            for (i = 0; i < 3; i++){
-               var tab = getElementObject(selectIds[i]);
-               tab.style.display = 'none';
-            }
-            var selTab = getElementObject(id);
-            selTab.style.display = 'block';            
-         }
-          
-
-    --></script></head>
-   <body>
-      <div id="global_controls" class="globalControls" style="position:absolute;right:0;">
-         <table class="rt">
-            <tr>
-               <td class="rt_cornerTopLeft"></td>
-               <td class="rt_lineTop"></td>
-               <td class="rt_cornerTopRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_lineLeft"></td>
-               <td class="rt_content">
-                  <h3>Showing:</h3>
-                  <table>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, attributesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Attributes </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, diagramBoxes);"
-                                     class="control" /></span><span class="globalControlName">Diagrams</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, instanceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Instances</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, propertiesBoxes);"
-                                     class="control" /></span><span class="globalControlName">Properties </span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, sourceBoxes);"
-                                     class="control" /></span><span class="globalControlName">Source</span></td>
-                     </tr>
-                     <tr>
-                        <td><span><input type="checkbox" value="-" checked="checked"
-                                     onclick="switchStateForAll(this, usedByBoxes);"
-                                     class="control" /></span><span class="globalControlName">Used by </span></td>
-                     </tr>
-                  </table>
-                  <div align="right"><span><input type="button"
-                               onclick="getElementObject('global_controls').style.display = 'none';"
-                               value="Close" /></span></div>
-               </td>
-               <td class="rt_lineRight"></td>
-            </tr>
-            <tr>
-               <td class="rt_cornerBottomLeft"></td>
-               <td class="rt_lineBottom"></td>
-               <td class="rt_cornerBottomRight"></td>
-            </tr>
-         </table>
-      </div><a id="id11"></a><div class="componentTitle">Element <span class="qname">cay:procedure</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id11" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id11');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id11" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html27.jpeg"
-                                   usemap="#modelMap_46_html27" /><map name="modelMap_46_html27" id="modelMap_46_html27">
-                                 <area alt="modelMap17.tmp#id17" href="modelMap17.html#id17" coords="129,43,242,85" />
-                                 <area alt="modelMap17.tmp#id12" href="modelMap17.html#id12" coords="195,109,343,133" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id11" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id11');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id11" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id11" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id11');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id11" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap27.html#id1" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:data-map')">cay:data-map</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="modelMap17.html#id12" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:procedure-parameter*')">cay:procedure-parameter*</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="modelMap17.html#id12" target="mainFrame"
-                                 title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                 onclick="updatePageTitle('Schema documentation for component cay:procedure-parameter')">cay:procedure-parameter</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id11" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id11');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="instance_id11" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;cay:procedure</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;cay:procedure-parameter</span><span class="tokenText"> </span><span class="tokenAttrName">direction=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">length=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">type=</span><span class="tokenAttrValue">""</span><span class="tokenElement">&gt;</span><span class="tokenText" style="white-space:normal">{0,unbounded}</span><span class="tokenElement">&lt;/cay:procedure-parameter&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/cay:procedure&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id11" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id11');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id11" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap17.html#id17" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component name')">name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id11" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id11');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id11" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"procedure"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:sequence</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"procedure-parameter"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-          </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-          </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"type"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-          </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"length"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:integer"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-          </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"direction"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-        </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-      </span><span class="tokenElement">&lt;/xs:element&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;/xs:sequence&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id12"></a><div class="componentTitle">Element <span class="qname"><b><a href="modelMap17.html#id11" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:procedure')">cay:procedure</a></b>/cay:procedure-parameter</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>http://cayenne.apache.org/schema/3.0/modelMap</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id12" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id12');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id12" style="display:block"><img alt="Diagram" border="0" src="images/modelMap.html7.jpeg"
-                                   usemap="#modelMap_46_html7" /><map name="modelMap_46_html7" id="modelMap_46_html7">
-                                 <area alt="modelMap17.tmp#id13" href="modelMap17.html#id13" coords="190,43,303,85" />
-                                 <area alt="modelMap17.tmp#id14" href="modelMap17.html#id14" coords="190,95,303,137" />
-                                 <area alt="modelMap17.tmp#id15" href="modelMap17.html#id15" coords="190,147,309,189" />
-                                 <area alt="modelMap17.tmp#id16" href="modelMap17.html#id16" coords="190,199,303,241" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id12" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id12');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id12" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">minOccurs:
-                                       
-                                    </td>
-                                    <td><b>0</b></td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">maxOccurs:
-                                       
-                                    </td>
-                                    <td><b>unbounded</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id12" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id12');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id12" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap17.html#id16" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component direction')">direction</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap17.html#id15" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component length')">length</a></b></td>
-                                    <td><b>xs:integer</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap17.html#id13" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component name')">name</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="modelMap17.html#id14" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for component type')">type</a></b></td>
-                                    <td><b>xs:string</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id12" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id12');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id12" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:element</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"procedure-parameter"</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;xs:complexType</span><span class="tokenElement">&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"type"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"length"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:integer"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-    </span><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"direction"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span><span class="tokenIndent">
-  </span><span class="tokenElement">&lt;/xs:complexType&gt;</span><span class="tokenIndent">
-</span><span class="tokenElement">&lt;/xs:element&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id13"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap17.html#id12" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:procedure-parameter')">cay:procedure-parameter</a></b>/<b><a href="modelMap17.html#id11" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:procedure')">cay:procedure</a></b>/@name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id13" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id13');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id13" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id13" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id13');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id13" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap17.html#id12" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:procedure/cay:procedure-parameter')">cay:procedure/cay:procedure-parameter</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id13" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id13');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id13" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id14"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap17.html#id12" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:procedure-parameter')">cay:procedure-parameter</a></b>/<b><a href="modelMap17.html#id11" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:procedure')">cay:procedure</a></b>/@type</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id14" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id14');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id14" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id14" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id14');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id14" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap17.html#id12" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:procedure/cay:procedure-parameter')">cay:procedure/cay:procedure-parameter</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id14" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id14');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id14" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"type"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id15"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap17.html#id12" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:procedure-parameter')">cay:procedure-parameter</a></b>/<b><a href="modelMap17.html#id11" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:procedure')">cay:procedure</a></b>/@length</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:integer</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id15" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id15');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id15" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>optional</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id15" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id15');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id15" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap17.html#id12" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:procedure/cay:procedure-parameter')">cay:procedure/cay:procedure-parameter</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id15" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id15');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id15" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"length"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"optional"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:integer"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id16"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap17.html#id12" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:procedure-parameter')">cay:procedure-parameter</a></b>/<b><a href="modelMap17.html#id11" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:procedure')">cay:procedure</a></b>/@direction</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id16" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id16');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id16" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id16" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id16');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id16" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap17.html#id12" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:procedure/cay:procedure-parameter')">cay:procedure/cay:procedure-parameter</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id16" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id16');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id16" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"direction"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id17"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="modelMap17.html#id11" target="mainFrame"
-                  title="http://cayenne.apache.org/schema/3.0/modelMap"
-                  onclick="updatePageTitle('Schema documentation for component cay:procedure')">cay:procedure</a></b>/@name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:string</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id17" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id17');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id17" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id17" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id17');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id17" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="modelMap17.html#id11" target="mainFrame"
-                                             title="http://cayenne.apache.org/schema/3.0/modelMap"
-                                             onclick="updatePageTitle('Schema documentation for component cay:procedure')">cay:procedure</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id17" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id17');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id17" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement">&lt;xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:string"</span><span class="tokenElement">/&gt;</span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Schema location</b></td>
-                        <td>file:/Users/ari/svn/cayenne/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd</td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table>
-      <div class="footer">
-         <hr />
-         <div align="center">XML Schema documentation generated by <a href="http://www.oxygenxml.com" target="_parent"><span class="oXygenLogo"><span class="redX">&lt;</span>o<span class="redX">X</span>ygen<span class="redX">/&gt;</span></span></a><sup>®</sup> XML Editor.
-         </div>
-      </div><script type="text/javascript">
-         <!--                     
-                     // The namespace is the selected option in the TOC combo.
-                     
-                     // The corresponding div is already visible conf. to its style attr.                     
-                    
-                            var selectToc = getElementObject('selectTOC');
-                            if(selectToc != null){
-                                // It can be null when having chunking, the combo of the TOC is in another frame.
-                                selectToc.selectedIndex = 2;
-                            }
-                        
-                    
-                     // Floats the toolbar.
-                     var globalControls = getElementObject("global_controls"); 
-                     
-                     if(globalControls != null){
-	                     var browser=navigator.appName;
-						 var version = parseFloat(navigator.appVersion.split('MSIE')[1]);
-						 
-						 var IE6 = false;
-						 if ((browser=="Microsoft Internet Explorer") && (version < 7)){
-						 	IE6 = true;
-						 }
-	
-	                     //alert (IE6 + " |V| " + version);
-	                     
-	                     if(IE6){
-	                     	// On IE 6 the 'fixed' property is not supported. We must use javascript. 
-	                         globalControls.style.position='absolute';                         
-	                         // The global controls will do not exist in the TOC frame, when chunking.
-	                         findAndFloat("global_controls", 225, 30);    
-	                     } else {
-	                      	  globalControls.style.position='fixed';                     	
-	                     }
-	                     
-	                     globalControls.style.right='0';                       
-                     }
-                --></script></body>
-</html>
\ No newline at end of file