From b0cf427c218723ff3905b1dddd3fc5751d4c8e50 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Tue, 4 Aug 2015 23:03:21 -0500 Subject: [PATCH] HHH-9998 - Continue documentation TLC --- documentation/documentation.gradle | 14 +- .../en-US/Hibernate_Integrations_Guide.ent} | 0 .../en-US/Hibernate_Integrations_Guide.xml} | 2 +- .../en-US/Preface.xml | 0 .../en-US/chapters/services/Services.xml | 0 ...otstrapServiceRegistryBuilder-example.java | 0 .../DisabledEventPublishingServiceImpl.java | 0 .../extras/extend/EventPublishingService.java | 0 .../EventPublishingServiceContributor.java | 0 .../extend/EventPublishingServiceImpl.java | 0 .../EventPublishingServiceInitiator.java | 0 ...testAndGreatestConnectionProviderImpl.java | 0 .../services/extras/override/ex1-direct.java | 0 .../extras/override/ex2-contributor.java | 0 .../services/extras/override/ex2-meta-inf | 0 .../services/extras/override/ex3-app.java | 0 .../extras/override/ex3-contributor.java | 0 .../services/extras/override/ex3-meta-inf | 0 .../register-event-listeners-example.java | 0 .../en-US/extras/batch_insert.java | 0 .../en-US/extras/bmt-idiom.java | 0 .../en-US/extras/browsing_cache.java | 0 .../en-US/extras/cache_providers.xml | 0 .../en-US/extras/cache_providers_mapping.java | 0 .../en-US/extras/check.xml | 0 .../en-US/extras/child-column-elements.xml | 0 .../en-US/extras/cmt-idiom.java | 0 .../en-US/extras/comments.xml | 0 .../en-US/extras/default-attribute.xml | 0 .../en-US/extras/embedding_SchemaExport.java | 0 .../evicting_from_second_level_cache.java | 0 .../en-US/extras/evicting_item.java | 0 .../en-US/extras/executeUpdate.java | 0 .../en-US/extras/flush_and_clear_session.java | 0 .../en-US/extras/foreign-key.xml | 0 .../en-US/extras/hibernate.cfg.xml | 0 .../en-US/extras/hibernate.properties | 0 .../en-US/extras/hql-insert.java | 0 .../en-US/extras/hql_delete.java | 0 .../en-US/extras/length-precision-scale.xml | 0 .../letting_hibernate_find_mapping_files.java | 0 .../en-US/extras/notnull-unique.xml | 0 .../en-US/extras/opening_a_session.java | 0 .../en-US/extras/setCacheRegion.java | 0 .../specify_mapping_files_directly.java | 0 ...iguration_properties_programmatically.java | 0 .../en-US/extras/sql-type.xml | 0 .../en-US/extras/timestamp_version.java | 0 .../en-US/extras/timestamp_version.xml | 0 .../extras/transaction-bound-Session.java | 0 .../en-US/extras/updating_version.java | 0 .../extras/using_a_StatelessSession.java | 0 .../en-US/extras/using_scroll.java | 0 .../en-US/extras/version_annotation.java | 0 .../en-US/extras/version_property.xml | 0 .../en-US/images/hibernate_logo_a.png | Bin .../en-US/images/icon.svg | 0 .../en-US/Hibernate_Mapping_Guide.ent} | 0 .../en-US/Hibernate_Mapping_Guide.xml} | 2 +- .../en-US/Preface.xml | 0 .../en-US/chapters/basic/Basic_Types.xml | 0 .../en-US/chapters/basic/extras/Blob.sql | 0 .../chapters/basic/extras/BlobLocator.java | 0 .../basic/extras/BlobMaterialized.java | 0 .../en-US/chapters/basic/extras/Clob.sql | 0 .../chapters/basic/extras/ClobLocator.java | 0 .../basic/extras/ClobMaterialized.java | 0 .../extras/ClobMaterializedCharArray.java | 0 .../basic/extras/EnumAttributeConverter.java | 0 .../chapters/basic/extras/EnumCustomType.java | 0 .../basic/extras/EnumeratedOrdinal.java | 0 .../basic/extras/EnumeratedString.java | 0 .../basic/extras/ExplicitColumnNaming.java | 0 .../chapters/basic/extras/FizzywigType1.java | 0 .../basic/extras/FizzywigType1_reg.java | 0 .../chapters/basic/extras/FizzywigType2.java | 0 .../basic/extras/FizzywigType2_reg.java | 0 .../chapters/basic/extras/NCLOB_locator.java | 0 .../basic/extras/NCLOB_materialized.java | 0 .../en-US/chapters/basic/extras/NVARCHAR.java | 0 .../en-US/chapters/basic/extras/ex1.java | 0 .../en-US/chapters/basic/extras/ex2.java | 0 .../chapters/basic/extras/explicitType.java | 0 .../categoizations/Data_Categorizations.xml | 0 .../categoizations/extras/Contact.java | 0 .../categoizations/extras/Contact.sql | 0 .../en-US/chapters/collection/Collection.xml | 0 .../extras/DelimitedStringTagsExample.java | 0 .../chapters/composition/Composition.xml | 0 .../chapters/composition/extras/Address.java | 0 .../extras/Contact-AttributeOverride.java | 0 .../extras/Contact-ImplicitNamingStrategy.sql | 0 .../chapters/composition/extras/Contact.java | 0 .../chapters/composition/extras/Name.java | 0 .../chapters/composition/extras/Person.java | 0 .../chapters/composition/extras/Person1.sql | 0 .../composition/extras/Person_alt.java | 0 .../component-safe-implicit-naming.java | 0 .../en-US/chapters/entity/Entity.xml | 0 .../en-US/chapters/id/Identifiers.xml | 0 .../id/extras/ConfiguredSequence.java | 0 .../chapters/id/extras/NamedSequence.java | 0 .../chapters/id/extras/SimpleAssigned.java | 0 .../chapters/id/extras/SimpleGenerated.java | 0 .../chapters/id/extras/TableGenerator.sql | 0 .../extras/UUIDCustomVersionOneStrategy.java | 0 .../en-US/chapters/id/extras/UUIDRandom.java | 0 .../chapters/id/extras/UnnamedSequence.java | 0 .../chapters/id/extras/UnnamedTable.java | 0 .../en-US/chapters/natural_id/Natural_Id.xml | 0 .../en-US/Bibliography.xml | 0 .../en-US/Hibernate_User_Guide.ent} | 0 .../en-US/Hibernate_User_Guide.xml} | 2 +- .../{manual => userGuide}/en-US/Preface.xml | 0 .../appendices/Appendix_LegacyBootstrap.xml | 0 .../chapters/architecture/Architecture.xml | 0 .../en-US/chapters/batch/Batching.xml | 0 .../en-US/chapters/bootstrap/Bootstrap.xml | 0 .../en-US/chapters/bootstrap/extras/jpa1.java | 0 .../en-US/chapters/bootstrap/extras/jpa2.java | 0 .../chapters/bootstrap/extras/native1.java | 0 .../chapters/bootstrap/extras/native2.java | 0 .../chapters/bootstrap/extras/native3.java | 0 .../chapters/bootstrap/extras/native4.java | 0 .../chapters/bootstrap/extras/native5.java | 0 .../chapters/bootstrap/extras/native6.java | 0 .../chapters/bootstrap/extras/native7.java | 0 .../chapters/bootstrap/extras/native8.java | 0 .../chapters/bootstrap/extras/native9.java | 0 .../en-US/chapters/caching/Caching.xml | 0 .../en-US/chapters/domain/DomainModel.xml | 0 .../chapters/domain/extras/listing1.java | 0 .../chapters/domain/extras/listing10.java | 0 .../chapters/domain/extras/listing2.java | 0 .../chapters/domain/extras/listing3.java | 0 .../chapters/domain/extras/listing4.java | 0 .../chapters/domain/extras/listing5.java | 0 .../chapters/domain/extras/listing6.java | 0 .../chapters/domain/extras/listing7.java | 0 .../chapters/domain/extras/listing8.java | 0 .../chapters/domain/extras/listing9.java | 0 .../en-US/chapters/envers/Envers.xml | 0 .../en-US/chapters/events/Events.xml | 0 .../events/extras/AuditInterceptor.java | 0 .../events/extras/JpaCallbacksExample.java | 0 .../events/extras/LoadListenerExample.java | 0 .../extras/SessionFactoryScopedExample.java | 0 .../events/extras/SessionScopedExample.java | 0 .../events/extras/jacc-event-reg-example.java | 0 .../en-US/chapters/fetching/Fetching.xml | 0 .../chapters/fetching/extras/Department.java | 0 .../chapters/fetching/extras/Employee.java | 0 .../fetching/extras/FetchOverrides.java | 0 .../en-US/chapters/fetching/extras/Login.java | 0 .../chapters/fetching/extras/LoginScalar.java | 0 .../chapters/fetching/extras/Project.java | 0 .../extras/ProjectsForAnEmployeeCriteria.java | 0 .../ProjectsForAnEmployeeFetchProfile.java | 0 .../extras/ProjectsForAnEmployeeHql.java | 0 .../en-US/chapters/jdbc/Database_Access.xml | 0 .../en-US/chapters/jndi/JNDI.xml | 0 .../en-US/chapters/locking/Locking.xml | 0 .../locking/extras/timestamp_version.java | 0 .../locking/extras/timestamp_version.xml | 0 .../locking/extras/updating_version.java | 0 .../locking/extras/version_annotation.java | 0 .../locking/extras/version_property.xml | 0 .../chapters/multitenancy/Multi_Tenancy.xml | 0 ...TenantConnectionProviderImpl-multi-cp.java | 0 ...enantConnectionProviderImpl-single-cp.java | 0 ...tenant-identifier-from-SessionFactory.java | 0 .../images/multitenacy_database.png | Bin .../images/multitenacy_database.svg | 0 .../images/multitenacy_discriminator.png | Bin .../images/multitenacy_discriminator.svg | 0 .../images/multitenacy_schema.png | Bin .../images/multitenacy_schema.svg | 0 .../en-US/chapters/osgi/OSGi.xml | 0 .../osgi/extras/extension_point_blueprint.xml | 0 .../en-US/chapters/pc/PersistenceContext.xml | 0 .../extras/CheckingLazinessWithHibernate.java | 0 .../pc/extras/CheckingLazinessWithJPA.java | 0 .../pc/extras/CheckingLazinessWithJPA2.java | 0 .../chapters/pc/extras/ContainsWithEM.java | 0 .../pc/extras/ContainsWithSession.java | 0 .../chapters/pc/extras/DeletingWithEM.java | 0 .../pc/extras/DeletingWithSession.java | 0 .../pc/extras/GetReferenceWithEM.java | 0 .../pc/extras/GetReferenceWithSession.java | 0 .../en-US/chapters/pc/extras/LoadWithEM.java | 0 .../chapters/pc/extras/LoadWithSession.java | 0 .../pc/extras/MakingPersistentWithEM.java | 0 .../extras/MakingPersistentWithSession.java | 0 .../pc/extras/ManagedUpdateWithEM.java | 0 .../pc/extras/ManagedUpdateWithSession.java | 0 .../en-US/chapters/pc/extras/MergeWithEM.java | 0 .../chapters/pc/extras/MergeWithSession.java | 0 .../chapters/pc/extras/NaturalIdLoading.java | 0 .../pc/extras/ReattachingWithSession1.java | 0 .../pc/extras/ReattachingWithSession2.java | 0 .../chapters/pc/extras/RefreshWithEM.java | 0 .../pc/extras/RefreshWithSession.java | 0 .../pc/extras/SimpleNaturalIdLoading.java | 0 .../chapters/pc/extras/UnwrapWithEM.java | 0 .../chapters/pc/extras/VisualizingMerge.java | 0 .../chapters/portability/Portability.xml | 0 .../chapters/transactions/Transactions.xml | 0 .../chapters/transactions/extras/bmt.java | 0 .../chapters/transactions/extras/cmt.java | 0 .../chapters/transactions/extras/jdbc.java | 0 .../en-US/images/AuthorWork.png | Bin .../en-US/images/AuthorWork.zargo | Bin .../en-US/images/CustomerOrderProduct.png | Bin .../en-US/images/CustomerOrderProduct.zargo | Bin .../en-US/images/EmployerEmployee.png | Bin .../en-US/images/EmployerEmployee.zargo | Bin .../en-US/images/hibernate_logo_a.png | Bin .../en-US/images/overview.png | Bin .../en-US/images/overview.svg | 500 +++++++++--------- documentation/status.md | 67 +++ 220 files changed, 327 insertions(+), 260 deletions(-) rename documentation/src/main/docbook/{integration/en-US/Hibernate_Integrations.ent => integrationsGuide/en-US/Hibernate_Integrations_Guide.ent} (100%) rename documentation/src/main/docbook/{integration/en-US/Hibernate_Integrations.xml => integrationsGuide/en-US/Hibernate_Integrations_Guide.xml} (96%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/Preface.xml (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/chapters/services/Services.xml (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/chapters/services/extras/BootstrapServiceRegistryBuilder-example.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/chapters/services/extras/extend/DisabledEventPublishingServiceImpl.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/chapters/services/extras/extend/EventPublishingService.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/chapters/services/extras/extend/EventPublishingServiceContributor.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/chapters/services/extras/extend/EventPublishingServiceImpl.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/chapters/services/extras/extend/EventPublishingServiceInitiator.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/chapters/services/extras/override/LatestAndGreatestConnectionProviderImpl.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/chapters/services/extras/override/ex1-direct.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/chapters/services/extras/override/ex2-contributor.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/chapters/services/extras/override/ex2-meta-inf (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/chapters/services/extras/override/ex3-app.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/chapters/services/extras/override/ex3-contributor.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/chapters/services/extras/override/ex3-meta-inf (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/chapters/services/extras/register-event-listeners-example.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/batch_insert.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/bmt-idiom.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/browsing_cache.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/cache_providers.xml (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/cache_providers_mapping.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/check.xml (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/child-column-elements.xml (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/cmt-idiom.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/comments.xml (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/default-attribute.xml (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/embedding_SchemaExport.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/evicting_from_second_level_cache.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/evicting_item.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/executeUpdate.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/flush_and_clear_session.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/foreign-key.xml (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/hibernate.cfg.xml (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/hibernate.properties (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/hql-insert.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/hql_delete.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/length-precision-scale.xml (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/letting_hibernate_find_mapping_files.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/notnull-unique.xml (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/opening_a_session.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/setCacheRegion.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/specify_mapping_files_directly.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/specifying_configuration_properties_programmatically.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/sql-type.xml (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/timestamp_version.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/timestamp_version.xml (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/transaction-bound-Session.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/updating_version.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/using_a_StatelessSession.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/using_scroll.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/version_annotation.java (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/extras/version_property.xml (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/images/hibernate_logo_a.png (100%) rename documentation/src/main/docbook/{integration => integrationsGuide}/en-US/images/icon.svg (100%) rename documentation/src/main/docbook/{manual/en-US/Hibernate_Manual.ent => mappingGuide/en-US/Hibernate_Mapping_Guide.ent} (100%) rename documentation/src/main/docbook/{mapping/en-US/Hibernate_Mapping.xml => mappingGuide/en-US/Hibernate_Mapping_Guide.xml} (97%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/Preface.xml (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/Basic_Types.xml (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/Blob.sql (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/BlobLocator.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/BlobMaterialized.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/Clob.sql (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/ClobLocator.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/ClobMaterialized.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/ClobMaterializedCharArray.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/EnumAttributeConverter.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/EnumCustomType.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/EnumeratedOrdinal.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/EnumeratedString.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/ExplicitColumnNaming.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/FizzywigType1.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/FizzywigType1_reg.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/FizzywigType2.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/FizzywigType2_reg.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/NCLOB_locator.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/NCLOB_materialized.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/NVARCHAR.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/ex1.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/ex2.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/basic/extras/explicitType.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/categoizations/Data_Categorizations.xml (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/categoizations/extras/Contact.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/categoizations/extras/Contact.sql (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/collection/Collection.xml (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/collection/extras/DelimitedStringTagsExample.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/composition/Composition.xml (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/composition/extras/Address.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/composition/extras/Contact-AttributeOverride.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/composition/extras/Contact-ImplicitNamingStrategy.sql (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/composition/extras/Contact.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/composition/extras/Name.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/composition/extras/Person.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/composition/extras/Person1.sql (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/composition/extras/Person_alt.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/composition/extras/component-safe-implicit-naming.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/entity/Entity.xml (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/id/Identifiers.xml (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/id/extras/ConfiguredSequence.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/id/extras/NamedSequence.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/id/extras/SimpleAssigned.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/id/extras/SimpleGenerated.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/id/extras/TableGenerator.sql (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/id/extras/UUIDCustomVersionOneStrategy.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/id/extras/UUIDRandom.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/id/extras/UnnamedSequence.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/id/extras/UnnamedTable.java (100%) rename documentation/src/main/docbook/{mapping => mappingGuide}/en-US/chapters/natural_id/Natural_Id.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/Bibliography.xml (100%) rename documentation/src/main/docbook/{mapping/en-US/Hibernate_Mapping.ent => userGuide/en-US/Hibernate_User_Guide.ent} (100%) rename documentation/src/main/docbook/{manual/en-US/Hibernate_Manual.xml => userGuide/en-US/Hibernate_User_Guide.xml} (97%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/Preface.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/appendices/Appendix_LegacyBootstrap.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/architecture/Architecture.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/batch/Batching.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/bootstrap/Bootstrap.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/bootstrap/extras/jpa1.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/bootstrap/extras/jpa2.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/bootstrap/extras/native1.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/bootstrap/extras/native2.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/bootstrap/extras/native3.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/bootstrap/extras/native4.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/bootstrap/extras/native5.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/bootstrap/extras/native6.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/bootstrap/extras/native7.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/bootstrap/extras/native8.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/bootstrap/extras/native9.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/caching/Caching.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/domain/DomainModel.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/domain/extras/listing1.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/domain/extras/listing10.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/domain/extras/listing2.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/domain/extras/listing3.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/domain/extras/listing4.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/domain/extras/listing5.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/domain/extras/listing6.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/domain/extras/listing7.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/domain/extras/listing8.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/domain/extras/listing9.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/envers/Envers.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/events/Events.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/events/extras/AuditInterceptor.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/events/extras/JpaCallbacksExample.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/events/extras/LoadListenerExample.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/events/extras/SessionFactoryScopedExample.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/events/extras/SessionScopedExample.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/events/extras/jacc-event-reg-example.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/fetching/Fetching.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/fetching/extras/Department.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/fetching/extras/Employee.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/fetching/extras/FetchOverrides.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/fetching/extras/Login.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/fetching/extras/LoginScalar.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/fetching/extras/Project.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/fetching/extras/ProjectsForAnEmployeeCriteria.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/fetching/extras/ProjectsForAnEmployeeFetchProfile.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/fetching/extras/ProjectsForAnEmployeeHql.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/jdbc/Database_Access.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/jndi/JNDI.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/locking/Locking.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/locking/extras/timestamp_version.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/locking/extras/timestamp_version.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/locking/extras/updating_version.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/locking/extras/version_annotation.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/locking/extras/version_property.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/multitenancy/Multi_Tenancy.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/multitenancy/extras/MultiTenantConnectionProviderImpl-multi-cp.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/multitenancy/extras/MultiTenantConnectionProviderImpl-single-cp.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/multitenancy/extras/tenant-identifier-from-SessionFactory.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/multitenancy/images/multitenacy_database.png (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/multitenancy/images/multitenacy_database.svg (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/multitenancy/images/multitenacy_discriminator.png (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/multitenancy/images/multitenacy_discriminator.svg (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/multitenancy/images/multitenacy_schema.png (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/multitenancy/images/multitenacy_schema.svg (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/osgi/OSGi.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/osgi/extras/extension_point_blueprint.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/PersistenceContext.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/CheckingLazinessWithHibernate.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/CheckingLazinessWithJPA.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/CheckingLazinessWithJPA2.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/ContainsWithEM.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/ContainsWithSession.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/DeletingWithEM.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/DeletingWithSession.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/GetReferenceWithEM.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/GetReferenceWithSession.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/LoadWithEM.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/LoadWithSession.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/MakingPersistentWithEM.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/MakingPersistentWithSession.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/ManagedUpdateWithEM.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/ManagedUpdateWithSession.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/MergeWithEM.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/MergeWithSession.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/NaturalIdLoading.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/ReattachingWithSession1.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/ReattachingWithSession2.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/RefreshWithEM.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/RefreshWithSession.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/SimpleNaturalIdLoading.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/UnwrapWithEM.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/pc/extras/VisualizingMerge.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/portability/Portability.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/transactions/Transactions.xml (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/transactions/extras/bmt.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/transactions/extras/cmt.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/chapters/transactions/extras/jdbc.java (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/images/AuthorWork.png (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/images/AuthorWork.zargo (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/images/CustomerOrderProduct.png (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/images/CustomerOrderProduct.zargo (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/images/EmployerEmployee.png (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/images/EmployerEmployee.zargo (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/images/hibernate_logo_a.png (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/images/overview.png (100%) rename documentation/src/main/docbook/{manual => userGuide}/en-US/images/overview.svg (96%) create mode 100644 documentation/status.md diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle index a8f8b80616..261fcb2b4d 100644 --- a/documentation/documentation.gradle +++ b/documentation/documentation.gradle @@ -165,18 +165,18 @@ jdocbook { } // book-specific config - manual { - masterSourceDocumentName = 'Hibernate_Manual.xml' + userGuide { + masterSourceDocumentName = 'Hibernate_User_Guide.xml' } - integration { - masterSourceDocumentName = 'Hibernate_Integrations.xml' + integrationsGuide { + masterSourceDocumentName = 'Hibernate_Integrations_Guide.xml' } - mapping { - masterSourceDocumentName = 'Hibernate_Mapping.xml' + mappingGuide { + masterSourceDocumentName = 'Hibernate_Mapping_Guide.xml' } } -[ 'integration', 'manual', 'mapping'].each { bookName -> +[ 'integrationsGuide', 'userGuide', 'mappingGuide'].each { bookName -> task "stageLocalStyles_$bookName"(type: Copy) { into project.file( "target/docbook/stage/$bookName" ) from project.file( 'src/main/style' ) diff --git a/documentation/src/main/docbook/integration/en-US/Hibernate_Integrations.ent b/documentation/src/main/docbook/integrationsGuide/en-US/Hibernate_Integrations_Guide.ent similarity index 100% rename from documentation/src/main/docbook/integration/en-US/Hibernate_Integrations.ent rename to documentation/src/main/docbook/integrationsGuide/en-US/Hibernate_Integrations_Guide.ent diff --git a/documentation/src/main/docbook/integration/en-US/Hibernate_Integrations.xml b/documentation/src/main/docbook/integrationsGuide/en-US/Hibernate_Integrations_Guide.xml similarity index 96% rename from documentation/src/main/docbook/integration/en-US/Hibernate_Integrations.xml rename to documentation/src/main/docbook/integrationsGuide/en-US/Hibernate_Integrations_Guide.xml index 80857da6cd..b7558e683c 100644 --- a/documentation/src/main/docbook/integration/en-US/Hibernate_Integrations.xml +++ b/documentation/src/main/docbook/integrationsGuide/en-US/Hibernate_Integrations_Guide.xml @@ -6,7 +6,7 @@ ~ See the lgpl.txt file in the root directory or . --> + %BOOK_ENTITIES; ]> diff --git a/documentation/src/main/docbook/integration/en-US/Preface.xml b/documentation/src/main/docbook/integrationsGuide/en-US/Preface.xml similarity index 100% rename from documentation/src/main/docbook/integration/en-US/Preface.xml rename to documentation/src/main/docbook/integrationsGuide/en-US/Preface.xml diff --git a/documentation/src/main/docbook/integration/en-US/chapters/services/Services.xml b/documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/Services.xml similarity index 100% rename from documentation/src/main/docbook/integration/en-US/chapters/services/Services.xml rename to documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/Services.xml diff --git a/documentation/src/main/docbook/integration/en-US/chapters/services/extras/BootstrapServiceRegistryBuilder-example.java b/documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/BootstrapServiceRegistryBuilder-example.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/chapters/services/extras/BootstrapServiceRegistryBuilder-example.java rename to documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/BootstrapServiceRegistryBuilder-example.java diff --git a/documentation/src/main/docbook/integration/en-US/chapters/services/extras/extend/DisabledEventPublishingServiceImpl.java b/documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/extend/DisabledEventPublishingServiceImpl.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/chapters/services/extras/extend/DisabledEventPublishingServiceImpl.java rename to documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/extend/DisabledEventPublishingServiceImpl.java diff --git a/documentation/src/main/docbook/integration/en-US/chapters/services/extras/extend/EventPublishingService.java b/documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/extend/EventPublishingService.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/chapters/services/extras/extend/EventPublishingService.java rename to documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/extend/EventPublishingService.java diff --git a/documentation/src/main/docbook/integration/en-US/chapters/services/extras/extend/EventPublishingServiceContributor.java b/documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/extend/EventPublishingServiceContributor.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/chapters/services/extras/extend/EventPublishingServiceContributor.java rename to documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/extend/EventPublishingServiceContributor.java diff --git a/documentation/src/main/docbook/integration/en-US/chapters/services/extras/extend/EventPublishingServiceImpl.java b/documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/extend/EventPublishingServiceImpl.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/chapters/services/extras/extend/EventPublishingServiceImpl.java rename to documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/extend/EventPublishingServiceImpl.java diff --git a/documentation/src/main/docbook/integration/en-US/chapters/services/extras/extend/EventPublishingServiceInitiator.java b/documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/extend/EventPublishingServiceInitiator.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/chapters/services/extras/extend/EventPublishingServiceInitiator.java rename to documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/extend/EventPublishingServiceInitiator.java diff --git a/documentation/src/main/docbook/integration/en-US/chapters/services/extras/override/LatestAndGreatestConnectionProviderImpl.java b/documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/override/LatestAndGreatestConnectionProviderImpl.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/chapters/services/extras/override/LatestAndGreatestConnectionProviderImpl.java rename to documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/override/LatestAndGreatestConnectionProviderImpl.java diff --git a/documentation/src/main/docbook/integration/en-US/chapters/services/extras/override/ex1-direct.java b/documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/override/ex1-direct.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/chapters/services/extras/override/ex1-direct.java rename to documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/override/ex1-direct.java diff --git a/documentation/src/main/docbook/integration/en-US/chapters/services/extras/override/ex2-contributor.java b/documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/override/ex2-contributor.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/chapters/services/extras/override/ex2-contributor.java rename to documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/override/ex2-contributor.java diff --git a/documentation/src/main/docbook/integration/en-US/chapters/services/extras/override/ex2-meta-inf b/documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/override/ex2-meta-inf similarity index 100% rename from documentation/src/main/docbook/integration/en-US/chapters/services/extras/override/ex2-meta-inf rename to documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/override/ex2-meta-inf diff --git a/documentation/src/main/docbook/integration/en-US/chapters/services/extras/override/ex3-app.java b/documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/override/ex3-app.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/chapters/services/extras/override/ex3-app.java rename to documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/override/ex3-app.java diff --git a/documentation/src/main/docbook/integration/en-US/chapters/services/extras/override/ex3-contributor.java b/documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/override/ex3-contributor.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/chapters/services/extras/override/ex3-contributor.java rename to documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/override/ex3-contributor.java diff --git a/documentation/src/main/docbook/integration/en-US/chapters/services/extras/override/ex3-meta-inf b/documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/override/ex3-meta-inf similarity index 100% rename from documentation/src/main/docbook/integration/en-US/chapters/services/extras/override/ex3-meta-inf rename to documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/override/ex3-meta-inf diff --git a/documentation/src/main/docbook/integration/en-US/chapters/services/extras/register-event-listeners-example.java b/documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/register-event-listeners-example.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/chapters/services/extras/register-event-listeners-example.java rename to documentation/src/main/docbook/integrationsGuide/en-US/chapters/services/extras/register-event-listeners-example.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/batch_insert.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/batch_insert.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/batch_insert.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/batch_insert.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/bmt-idiom.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/bmt-idiom.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/bmt-idiom.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/bmt-idiom.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/browsing_cache.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/browsing_cache.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/browsing_cache.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/browsing_cache.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/cache_providers.xml b/documentation/src/main/docbook/integrationsGuide/en-US/extras/cache_providers.xml similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/cache_providers.xml rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/cache_providers.xml diff --git a/documentation/src/main/docbook/integration/en-US/extras/cache_providers_mapping.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/cache_providers_mapping.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/cache_providers_mapping.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/cache_providers_mapping.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/check.xml b/documentation/src/main/docbook/integrationsGuide/en-US/extras/check.xml similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/check.xml rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/check.xml diff --git a/documentation/src/main/docbook/integration/en-US/extras/child-column-elements.xml b/documentation/src/main/docbook/integrationsGuide/en-US/extras/child-column-elements.xml similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/child-column-elements.xml rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/child-column-elements.xml diff --git a/documentation/src/main/docbook/integration/en-US/extras/cmt-idiom.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/cmt-idiom.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/cmt-idiom.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/cmt-idiom.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/comments.xml b/documentation/src/main/docbook/integrationsGuide/en-US/extras/comments.xml similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/comments.xml rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/comments.xml diff --git a/documentation/src/main/docbook/integration/en-US/extras/default-attribute.xml b/documentation/src/main/docbook/integrationsGuide/en-US/extras/default-attribute.xml similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/default-attribute.xml rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/default-attribute.xml diff --git a/documentation/src/main/docbook/integration/en-US/extras/embedding_SchemaExport.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/embedding_SchemaExport.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/embedding_SchemaExport.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/embedding_SchemaExport.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/evicting_from_second_level_cache.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/evicting_from_second_level_cache.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/evicting_from_second_level_cache.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/evicting_from_second_level_cache.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/evicting_item.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/evicting_item.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/evicting_item.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/evicting_item.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/executeUpdate.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/executeUpdate.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/executeUpdate.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/executeUpdate.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/flush_and_clear_session.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/flush_and_clear_session.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/flush_and_clear_session.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/flush_and_clear_session.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/foreign-key.xml b/documentation/src/main/docbook/integrationsGuide/en-US/extras/foreign-key.xml similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/foreign-key.xml rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/foreign-key.xml diff --git a/documentation/src/main/docbook/integration/en-US/extras/hibernate.cfg.xml b/documentation/src/main/docbook/integrationsGuide/en-US/extras/hibernate.cfg.xml similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/hibernate.cfg.xml rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/hibernate.cfg.xml diff --git a/documentation/src/main/docbook/integration/en-US/extras/hibernate.properties b/documentation/src/main/docbook/integrationsGuide/en-US/extras/hibernate.properties similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/hibernate.properties rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/hibernate.properties diff --git a/documentation/src/main/docbook/integration/en-US/extras/hql-insert.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/hql-insert.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/hql-insert.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/hql-insert.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/hql_delete.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/hql_delete.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/hql_delete.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/hql_delete.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/length-precision-scale.xml b/documentation/src/main/docbook/integrationsGuide/en-US/extras/length-precision-scale.xml similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/length-precision-scale.xml rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/length-precision-scale.xml diff --git a/documentation/src/main/docbook/integration/en-US/extras/letting_hibernate_find_mapping_files.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/letting_hibernate_find_mapping_files.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/letting_hibernate_find_mapping_files.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/letting_hibernate_find_mapping_files.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/notnull-unique.xml b/documentation/src/main/docbook/integrationsGuide/en-US/extras/notnull-unique.xml similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/notnull-unique.xml rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/notnull-unique.xml diff --git a/documentation/src/main/docbook/integration/en-US/extras/opening_a_session.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/opening_a_session.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/opening_a_session.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/opening_a_session.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/setCacheRegion.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/setCacheRegion.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/setCacheRegion.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/setCacheRegion.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/specify_mapping_files_directly.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/specify_mapping_files_directly.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/specify_mapping_files_directly.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/specify_mapping_files_directly.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/specifying_configuration_properties_programmatically.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/specifying_configuration_properties_programmatically.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/specifying_configuration_properties_programmatically.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/specifying_configuration_properties_programmatically.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/sql-type.xml b/documentation/src/main/docbook/integrationsGuide/en-US/extras/sql-type.xml similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/sql-type.xml rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/sql-type.xml diff --git a/documentation/src/main/docbook/integration/en-US/extras/timestamp_version.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/timestamp_version.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/timestamp_version.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/timestamp_version.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/timestamp_version.xml b/documentation/src/main/docbook/integrationsGuide/en-US/extras/timestamp_version.xml similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/timestamp_version.xml rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/timestamp_version.xml diff --git a/documentation/src/main/docbook/integration/en-US/extras/transaction-bound-Session.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/transaction-bound-Session.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/transaction-bound-Session.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/transaction-bound-Session.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/updating_version.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/updating_version.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/updating_version.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/updating_version.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/using_a_StatelessSession.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/using_a_StatelessSession.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/using_a_StatelessSession.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/using_a_StatelessSession.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/using_scroll.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/using_scroll.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/using_scroll.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/using_scroll.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/version_annotation.java b/documentation/src/main/docbook/integrationsGuide/en-US/extras/version_annotation.java similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/version_annotation.java rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/version_annotation.java diff --git a/documentation/src/main/docbook/integration/en-US/extras/version_property.xml b/documentation/src/main/docbook/integrationsGuide/en-US/extras/version_property.xml similarity index 100% rename from documentation/src/main/docbook/integration/en-US/extras/version_property.xml rename to documentation/src/main/docbook/integrationsGuide/en-US/extras/version_property.xml diff --git a/documentation/src/main/docbook/integration/en-US/images/hibernate_logo_a.png b/documentation/src/main/docbook/integrationsGuide/en-US/images/hibernate_logo_a.png similarity index 100% rename from documentation/src/main/docbook/integration/en-US/images/hibernate_logo_a.png rename to documentation/src/main/docbook/integrationsGuide/en-US/images/hibernate_logo_a.png diff --git a/documentation/src/main/docbook/integration/en-US/images/icon.svg b/documentation/src/main/docbook/integrationsGuide/en-US/images/icon.svg similarity index 100% rename from documentation/src/main/docbook/integration/en-US/images/icon.svg rename to documentation/src/main/docbook/integrationsGuide/en-US/images/icon.svg diff --git a/documentation/src/main/docbook/manual/en-US/Hibernate_Manual.ent b/documentation/src/main/docbook/mappingGuide/en-US/Hibernate_Mapping_Guide.ent similarity index 100% rename from documentation/src/main/docbook/manual/en-US/Hibernate_Manual.ent rename to documentation/src/main/docbook/mappingGuide/en-US/Hibernate_Mapping_Guide.ent diff --git a/documentation/src/main/docbook/mapping/en-US/Hibernate_Mapping.xml b/documentation/src/main/docbook/mappingGuide/en-US/Hibernate_Mapping_Guide.xml similarity index 97% rename from documentation/src/main/docbook/mapping/en-US/Hibernate_Mapping.xml rename to documentation/src/main/docbook/mappingGuide/en-US/Hibernate_Mapping_Guide.xml index a793493954..d37f7d4a89 100644 --- a/documentation/src/main/docbook/mapping/en-US/Hibernate_Mapping.xml +++ b/documentation/src/main/docbook/mappingGuide/en-US/Hibernate_Mapping_Guide.xml @@ -6,7 +6,7 @@ ~ See the lgpl.txt file in the root directory or . --> + %BOOK_ENTITIES; ]> diff --git a/documentation/src/main/docbook/mapping/en-US/Preface.xml b/documentation/src/main/docbook/mappingGuide/en-US/Preface.xml similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/Preface.xml rename to documentation/src/main/docbook/mappingGuide/en-US/Preface.xml diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/Basic_Types.xml b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/Basic_Types.xml similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/Basic_Types.xml rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/Basic_Types.xml diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/Blob.sql b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/Blob.sql similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/Blob.sql rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/Blob.sql diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/BlobLocator.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/BlobLocator.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/BlobLocator.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/BlobLocator.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/BlobMaterialized.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/BlobMaterialized.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/BlobMaterialized.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/BlobMaterialized.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/Clob.sql b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/Clob.sql similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/Clob.sql rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/Clob.sql diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/ClobLocator.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/ClobLocator.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/ClobLocator.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/ClobLocator.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/ClobMaterialized.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/ClobMaterialized.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/ClobMaterialized.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/ClobMaterialized.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/ClobMaterializedCharArray.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/ClobMaterializedCharArray.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/ClobMaterializedCharArray.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/ClobMaterializedCharArray.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/EnumAttributeConverter.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/EnumAttributeConverter.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/EnumAttributeConverter.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/EnumAttributeConverter.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/EnumCustomType.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/EnumCustomType.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/EnumCustomType.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/EnumCustomType.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/EnumeratedOrdinal.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/EnumeratedOrdinal.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/EnumeratedOrdinal.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/EnumeratedOrdinal.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/EnumeratedString.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/EnumeratedString.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/EnumeratedString.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/EnumeratedString.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/ExplicitColumnNaming.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/ExplicitColumnNaming.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/ExplicitColumnNaming.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/ExplicitColumnNaming.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/FizzywigType1.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/FizzywigType1.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/FizzywigType1.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/FizzywigType1.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/FizzywigType1_reg.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/FizzywigType1_reg.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/FizzywigType1_reg.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/FizzywigType1_reg.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/FizzywigType2.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/FizzywigType2.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/FizzywigType2.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/FizzywigType2.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/FizzywigType2_reg.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/FizzywigType2_reg.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/FizzywigType2_reg.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/FizzywigType2_reg.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/NCLOB_locator.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/NCLOB_locator.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/NCLOB_locator.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/NCLOB_locator.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/NCLOB_materialized.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/NCLOB_materialized.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/NCLOB_materialized.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/NCLOB_materialized.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/NVARCHAR.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/NVARCHAR.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/NVARCHAR.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/NVARCHAR.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/ex1.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/ex1.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/ex1.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/ex1.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/ex2.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/ex2.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/ex2.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/ex2.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/explicitType.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/explicitType.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/basic/extras/explicitType.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/basic/extras/explicitType.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/categoizations/Data_Categorizations.xml b/documentation/src/main/docbook/mappingGuide/en-US/chapters/categoizations/Data_Categorizations.xml similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/categoizations/Data_Categorizations.xml rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/categoizations/Data_Categorizations.xml diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/categoizations/extras/Contact.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/categoizations/extras/Contact.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/categoizations/extras/Contact.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/categoizations/extras/Contact.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/categoizations/extras/Contact.sql b/documentation/src/main/docbook/mappingGuide/en-US/chapters/categoizations/extras/Contact.sql similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/categoizations/extras/Contact.sql rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/categoizations/extras/Contact.sql diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/collection/Collection.xml b/documentation/src/main/docbook/mappingGuide/en-US/chapters/collection/Collection.xml similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/collection/Collection.xml rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/collection/Collection.xml diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/collection/extras/DelimitedStringTagsExample.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/collection/extras/DelimitedStringTagsExample.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/collection/extras/DelimitedStringTagsExample.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/collection/extras/DelimitedStringTagsExample.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/composition/Composition.xml b/documentation/src/main/docbook/mappingGuide/en-US/chapters/composition/Composition.xml similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/composition/Composition.xml rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/composition/Composition.xml diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/composition/extras/Address.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/composition/extras/Address.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/composition/extras/Address.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/composition/extras/Address.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/composition/extras/Contact-AttributeOverride.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/composition/extras/Contact-AttributeOverride.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/composition/extras/Contact-AttributeOverride.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/composition/extras/Contact-AttributeOverride.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/composition/extras/Contact-ImplicitNamingStrategy.sql b/documentation/src/main/docbook/mappingGuide/en-US/chapters/composition/extras/Contact-ImplicitNamingStrategy.sql similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/composition/extras/Contact-ImplicitNamingStrategy.sql rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/composition/extras/Contact-ImplicitNamingStrategy.sql diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/composition/extras/Contact.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/composition/extras/Contact.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/composition/extras/Contact.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/composition/extras/Contact.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/composition/extras/Name.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/composition/extras/Name.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/composition/extras/Name.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/composition/extras/Name.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/composition/extras/Person.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/composition/extras/Person.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/composition/extras/Person.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/composition/extras/Person.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/composition/extras/Person1.sql b/documentation/src/main/docbook/mappingGuide/en-US/chapters/composition/extras/Person1.sql similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/composition/extras/Person1.sql rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/composition/extras/Person1.sql diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/composition/extras/Person_alt.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/composition/extras/Person_alt.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/composition/extras/Person_alt.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/composition/extras/Person_alt.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/composition/extras/component-safe-implicit-naming.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/composition/extras/component-safe-implicit-naming.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/composition/extras/component-safe-implicit-naming.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/composition/extras/component-safe-implicit-naming.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/entity/Entity.xml b/documentation/src/main/docbook/mappingGuide/en-US/chapters/entity/Entity.xml similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/entity/Entity.xml rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/entity/Entity.xml diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/id/Identifiers.xml b/documentation/src/main/docbook/mappingGuide/en-US/chapters/id/Identifiers.xml similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/id/Identifiers.xml rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/id/Identifiers.xml diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/id/extras/ConfiguredSequence.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/id/extras/ConfiguredSequence.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/id/extras/ConfiguredSequence.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/id/extras/ConfiguredSequence.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/id/extras/NamedSequence.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/id/extras/NamedSequence.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/id/extras/NamedSequence.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/id/extras/NamedSequence.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/id/extras/SimpleAssigned.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/id/extras/SimpleAssigned.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/id/extras/SimpleAssigned.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/id/extras/SimpleAssigned.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/id/extras/SimpleGenerated.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/id/extras/SimpleGenerated.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/id/extras/SimpleGenerated.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/id/extras/SimpleGenerated.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/id/extras/TableGenerator.sql b/documentation/src/main/docbook/mappingGuide/en-US/chapters/id/extras/TableGenerator.sql similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/id/extras/TableGenerator.sql rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/id/extras/TableGenerator.sql diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/id/extras/UUIDCustomVersionOneStrategy.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/id/extras/UUIDCustomVersionOneStrategy.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/id/extras/UUIDCustomVersionOneStrategy.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/id/extras/UUIDCustomVersionOneStrategy.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/id/extras/UUIDRandom.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/id/extras/UUIDRandom.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/id/extras/UUIDRandom.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/id/extras/UUIDRandom.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/id/extras/UnnamedSequence.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/id/extras/UnnamedSequence.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/id/extras/UnnamedSequence.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/id/extras/UnnamedSequence.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/id/extras/UnnamedTable.java b/documentation/src/main/docbook/mappingGuide/en-US/chapters/id/extras/UnnamedTable.java similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/id/extras/UnnamedTable.java rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/id/extras/UnnamedTable.java diff --git a/documentation/src/main/docbook/mapping/en-US/chapters/natural_id/Natural_Id.xml b/documentation/src/main/docbook/mappingGuide/en-US/chapters/natural_id/Natural_Id.xml similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/chapters/natural_id/Natural_Id.xml rename to documentation/src/main/docbook/mappingGuide/en-US/chapters/natural_id/Natural_Id.xml diff --git a/documentation/src/main/docbook/manual/en-US/Bibliography.xml b/documentation/src/main/docbook/userGuide/en-US/Bibliography.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/Bibliography.xml rename to documentation/src/main/docbook/userGuide/en-US/Bibliography.xml diff --git a/documentation/src/main/docbook/mapping/en-US/Hibernate_Mapping.ent b/documentation/src/main/docbook/userGuide/en-US/Hibernate_User_Guide.ent similarity index 100% rename from documentation/src/main/docbook/mapping/en-US/Hibernate_Mapping.ent rename to documentation/src/main/docbook/userGuide/en-US/Hibernate_User_Guide.ent diff --git a/documentation/src/main/docbook/manual/en-US/Hibernate_Manual.xml b/documentation/src/main/docbook/userGuide/en-US/Hibernate_User_Guide.xml similarity index 97% rename from documentation/src/main/docbook/manual/en-US/Hibernate_Manual.xml rename to documentation/src/main/docbook/userGuide/en-US/Hibernate_User_Guide.xml index fd7f6115d1..9fd4841518 100644 --- a/documentation/src/main/docbook/manual/en-US/Hibernate_Manual.xml +++ b/documentation/src/main/docbook/userGuide/en-US/Hibernate_User_Guide.xml @@ -6,7 +6,7 @@ ~ See the lgpl.txt file in the root directory or . --> + %BOOK_ENTITIES; ]> diff --git a/documentation/src/main/docbook/manual/en-US/Preface.xml b/documentation/src/main/docbook/userGuide/en-US/Preface.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/Preface.xml rename to documentation/src/main/docbook/userGuide/en-US/Preface.xml diff --git a/documentation/src/main/docbook/manual/en-US/appendices/Appendix_LegacyBootstrap.xml b/documentation/src/main/docbook/userGuide/en-US/appendices/Appendix_LegacyBootstrap.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/appendices/Appendix_LegacyBootstrap.xml rename to documentation/src/main/docbook/userGuide/en-US/appendices/Appendix_LegacyBootstrap.xml diff --git a/documentation/src/main/docbook/manual/en-US/chapters/architecture/Architecture.xml b/documentation/src/main/docbook/userGuide/en-US/chapters/architecture/Architecture.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/architecture/Architecture.xml rename to documentation/src/main/docbook/userGuide/en-US/chapters/architecture/Architecture.xml diff --git a/documentation/src/main/docbook/manual/en-US/chapters/batch/Batching.xml b/documentation/src/main/docbook/userGuide/en-US/chapters/batch/Batching.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/batch/Batching.xml rename to documentation/src/main/docbook/userGuide/en-US/chapters/batch/Batching.xml diff --git a/documentation/src/main/docbook/manual/en-US/chapters/bootstrap/Bootstrap.xml b/documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/Bootstrap.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/bootstrap/Bootstrap.xml rename to documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/Bootstrap.xml diff --git a/documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/jpa1.java b/documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/jpa1.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/jpa1.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/jpa1.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/jpa2.java b/documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/jpa2.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/jpa2.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/jpa2.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/native1.java b/documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/native1.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/native1.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/native1.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/native2.java b/documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/native2.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/native2.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/native2.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/native3.java b/documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/native3.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/native3.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/native3.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/native4.java b/documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/native4.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/native4.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/native4.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/native5.java b/documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/native5.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/native5.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/native5.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/native6.java b/documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/native6.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/native6.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/native6.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/native7.java b/documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/native7.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/native7.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/native7.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/native8.java b/documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/native8.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/native8.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/native8.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/native9.java b/documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/native9.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/bootstrap/extras/native9.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/bootstrap/extras/native9.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/caching/Caching.xml b/documentation/src/main/docbook/userGuide/en-US/chapters/caching/Caching.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/caching/Caching.xml rename to documentation/src/main/docbook/userGuide/en-US/chapters/caching/Caching.xml diff --git a/documentation/src/main/docbook/manual/en-US/chapters/domain/DomainModel.xml b/documentation/src/main/docbook/userGuide/en-US/chapters/domain/DomainModel.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/domain/DomainModel.xml rename to documentation/src/main/docbook/userGuide/en-US/chapters/domain/DomainModel.xml diff --git a/documentation/src/main/docbook/manual/en-US/chapters/domain/extras/listing1.java b/documentation/src/main/docbook/userGuide/en-US/chapters/domain/extras/listing1.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/domain/extras/listing1.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/domain/extras/listing1.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/domain/extras/listing10.java b/documentation/src/main/docbook/userGuide/en-US/chapters/domain/extras/listing10.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/domain/extras/listing10.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/domain/extras/listing10.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/domain/extras/listing2.java b/documentation/src/main/docbook/userGuide/en-US/chapters/domain/extras/listing2.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/domain/extras/listing2.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/domain/extras/listing2.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/domain/extras/listing3.java b/documentation/src/main/docbook/userGuide/en-US/chapters/domain/extras/listing3.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/domain/extras/listing3.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/domain/extras/listing3.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/domain/extras/listing4.java b/documentation/src/main/docbook/userGuide/en-US/chapters/domain/extras/listing4.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/domain/extras/listing4.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/domain/extras/listing4.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/domain/extras/listing5.java b/documentation/src/main/docbook/userGuide/en-US/chapters/domain/extras/listing5.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/domain/extras/listing5.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/domain/extras/listing5.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/domain/extras/listing6.java b/documentation/src/main/docbook/userGuide/en-US/chapters/domain/extras/listing6.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/domain/extras/listing6.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/domain/extras/listing6.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/domain/extras/listing7.java b/documentation/src/main/docbook/userGuide/en-US/chapters/domain/extras/listing7.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/domain/extras/listing7.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/domain/extras/listing7.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/domain/extras/listing8.java b/documentation/src/main/docbook/userGuide/en-US/chapters/domain/extras/listing8.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/domain/extras/listing8.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/domain/extras/listing8.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/domain/extras/listing9.java b/documentation/src/main/docbook/userGuide/en-US/chapters/domain/extras/listing9.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/domain/extras/listing9.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/domain/extras/listing9.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/envers/Envers.xml b/documentation/src/main/docbook/userGuide/en-US/chapters/envers/Envers.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/envers/Envers.xml rename to documentation/src/main/docbook/userGuide/en-US/chapters/envers/Envers.xml diff --git a/documentation/src/main/docbook/manual/en-US/chapters/events/Events.xml b/documentation/src/main/docbook/userGuide/en-US/chapters/events/Events.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/events/Events.xml rename to documentation/src/main/docbook/userGuide/en-US/chapters/events/Events.xml diff --git a/documentation/src/main/docbook/manual/en-US/chapters/events/extras/AuditInterceptor.java b/documentation/src/main/docbook/userGuide/en-US/chapters/events/extras/AuditInterceptor.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/events/extras/AuditInterceptor.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/events/extras/AuditInterceptor.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/events/extras/JpaCallbacksExample.java b/documentation/src/main/docbook/userGuide/en-US/chapters/events/extras/JpaCallbacksExample.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/events/extras/JpaCallbacksExample.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/events/extras/JpaCallbacksExample.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/events/extras/LoadListenerExample.java b/documentation/src/main/docbook/userGuide/en-US/chapters/events/extras/LoadListenerExample.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/events/extras/LoadListenerExample.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/events/extras/LoadListenerExample.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/events/extras/SessionFactoryScopedExample.java b/documentation/src/main/docbook/userGuide/en-US/chapters/events/extras/SessionFactoryScopedExample.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/events/extras/SessionFactoryScopedExample.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/events/extras/SessionFactoryScopedExample.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/events/extras/SessionScopedExample.java b/documentation/src/main/docbook/userGuide/en-US/chapters/events/extras/SessionScopedExample.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/events/extras/SessionScopedExample.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/events/extras/SessionScopedExample.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/events/extras/jacc-event-reg-example.java b/documentation/src/main/docbook/userGuide/en-US/chapters/events/extras/jacc-event-reg-example.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/events/extras/jacc-event-reg-example.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/events/extras/jacc-event-reg-example.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/fetching/Fetching.xml b/documentation/src/main/docbook/userGuide/en-US/chapters/fetching/Fetching.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/fetching/Fetching.xml rename to documentation/src/main/docbook/userGuide/en-US/chapters/fetching/Fetching.xml diff --git a/documentation/src/main/docbook/manual/en-US/chapters/fetching/extras/Department.java b/documentation/src/main/docbook/userGuide/en-US/chapters/fetching/extras/Department.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/fetching/extras/Department.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/fetching/extras/Department.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/fetching/extras/Employee.java b/documentation/src/main/docbook/userGuide/en-US/chapters/fetching/extras/Employee.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/fetching/extras/Employee.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/fetching/extras/Employee.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/fetching/extras/FetchOverrides.java b/documentation/src/main/docbook/userGuide/en-US/chapters/fetching/extras/FetchOverrides.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/fetching/extras/FetchOverrides.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/fetching/extras/FetchOverrides.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/fetching/extras/Login.java b/documentation/src/main/docbook/userGuide/en-US/chapters/fetching/extras/Login.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/fetching/extras/Login.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/fetching/extras/Login.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/fetching/extras/LoginScalar.java b/documentation/src/main/docbook/userGuide/en-US/chapters/fetching/extras/LoginScalar.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/fetching/extras/LoginScalar.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/fetching/extras/LoginScalar.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/fetching/extras/Project.java b/documentation/src/main/docbook/userGuide/en-US/chapters/fetching/extras/Project.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/fetching/extras/Project.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/fetching/extras/Project.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/fetching/extras/ProjectsForAnEmployeeCriteria.java b/documentation/src/main/docbook/userGuide/en-US/chapters/fetching/extras/ProjectsForAnEmployeeCriteria.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/fetching/extras/ProjectsForAnEmployeeCriteria.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/fetching/extras/ProjectsForAnEmployeeCriteria.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/fetching/extras/ProjectsForAnEmployeeFetchProfile.java b/documentation/src/main/docbook/userGuide/en-US/chapters/fetching/extras/ProjectsForAnEmployeeFetchProfile.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/fetching/extras/ProjectsForAnEmployeeFetchProfile.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/fetching/extras/ProjectsForAnEmployeeFetchProfile.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/fetching/extras/ProjectsForAnEmployeeHql.java b/documentation/src/main/docbook/userGuide/en-US/chapters/fetching/extras/ProjectsForAnEmployeeHql.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/fetching/extras/ProjectsForAnEmployeeHql.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/fetching/extras/ProjectsForAnEmployeeHql.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/jdbc/Database_Access.xml b/documentation/src/main/docbook/userGuide/en-US/chapters/jdbc/Database_Access.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/jdbc/Database_Access.xml rename to documentation/src/main/docbook/userGuide/en-US/chapters/jdbc/Database_Access.xml diff --git a/documentation/src/main/docbook/manual/en-US/chapters/jndi/JNDI.xml b/documentation/src/main/docbook/userGuide/en-US/chapters/jndi/JNDI.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/jndi/JNDI.xml rename to documentation/src/main/docbook/userGuide/en-US/chapters/jndi/JNDI.xml diff --git a/documentation/src/main/docbook/manual/en-US/chapters/locking/Locking.xml b/documentation/src/main/docbook/userGuide/en-US/chapters/locking/Locking.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/locking/Locking.xml rename to documentation/src/main/docbook/userGuide/en-US/chapters/locking/Locking.xml diff --git a/documentation/src/main/docbook/manual/en-US/chapters/locking/extras/timestamp_version.java b/documentation/src/main/docbook/userGuide/en-US/chapters/locking/extras/timestamp_version.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/locking/extras/timestamp_version.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/locking/extras/timestamp_version.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/locking/extras/timestamp_version.xml b/documentation/src/main/docbook/userGuide/en-US/chapters/locking/extras/timestamp_version.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/locking/extras/timestamp_version.xml rename to documentation/src/main/docbook/userGuide/en-US/chapters/locking/extras/timestamp_version.xml diff --git a/documentation/src/main/docbook/manual/en-US/chapters/locking/extras/updating_version.java b/documentation/src/main/docbook/userGuide/en-US/chapters/locking/extras/updating_version.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/locking/extras/updating_version.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/locking/extras/updating_version.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/locking/extras/version_annotation.java b/documentation/src/main/docbook/userGuide/en-US/chapters/locking/extras/version_annotation.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/locking/extras/version_annotation.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/locking/extras/version_annotation.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/locking/extras/version_property.xml b/documentation/src/main/docbook/userGuide/en-US/chapters/locking/extras/version_property.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/locking/extras/version_property.xml rename to documentation/src/main/docbook/userGuide/en-US/chapters/locking/extras/version_property.xml diff --git a/documentation/src/main/docbook/manual/en-US/chapters/multitenancy/Multi_Tenancy.xml b/documentation/src/main/docbook/userGuide/en-US/chapters/multitenancy/Multi_Tenancy.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/multitenancy/Multi_Tenancy.xml rename to documentation/src/main/docbook/userGuide/en-US/chapters/multitenancy/Multi_Tenancy.xml diff --git a/documentation/src/main/docbook/manual/en-US/chapters/multitenancy/extras/MultiTenantConnectionProviderImpl-multi-cp.java b/documentation/src/main/docbook/userGuide/en-US/chapters/multitenancy/extras/MultiTenantConnectionProviderImpl-multi-cp.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/multitenancy/extras/MultiTenantConnectionProviderImpl-multi-cp.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/multitenancy/extras/MultiTenantConnectionProviderImpl-multi-cp.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/multitenancy/extras/MultiTenantConnectionProviderImpl-single-cp.java b/documentation/src/main/docbook/userGuide/en-US/chapters/multitenancy/extras/MultiTenantConnectionProviderImpl-single-cp.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/multitenancy/extras/MultiTenantConnectionProviderImpl-single-cp.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/multitenancy/extras/MultiTenantConnectionProviderImpl-single-cp.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/multitenancy/extras/tenant-identifier-from-SessionFactory.java b/documentation/src/main/docbook/userGuide/en-US/chapters/multitenancy/extras/tenant-identifier-from-SessionFactory.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/multitenancy/extras/tenant-identifier-from-SessionFactory.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/multitenancy/extras/tenant-identifier-from-SessionFactory.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/multitenancy/images/multitenacy_database.png b/documentation/src/main/docbook/userGuide/en-US/chapters/multitenancy/images/multitenacy_database.png similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/multitenancy/images/multitenacy_database.png rename to documentation/src/main/docbook/userGuide/en-US/chapters/multitenancy/images/multitenacy_database.png diff --git a/documentation/src/main/docbook/manual/en-US/chapters/multitenancy/images/multitenacy_database.svg b/documentation/src/main/docbook/userGuide/en-US/chapters/multitenancy/images/multitenacy_database.svg similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/multitenancy/images/multitenacy_database.svg rename to documentation/src/main/docbook/userGuide/en-US/chapters/multitenancy/images/multitenacy_database.svg diff --git a/documentation/src/main/docbook/manual/en-US/chapters/multitenancy/images/multitenacy_discriminator.png b/documentation/src/main/docbook/userGuide/en-US/chapters/multitenancy/images/multitenacy_discriminator.png similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/multitenancy/images/multitenacy_discriminator.png rename to documentation/src/main/docbook/userGuide/en-US/chapters/multitenancy/images/multitenacy_discriminator.png diff --git a/documentation/src/main/docbook/manual/en-US/chapters/multitenancy/images/multitenacy_discriminator.svg b/documentation/src/main/docbook/userGuide/en-US/chapters/multitenancy/images/multitenacy_discriminator.svg similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/multitenancy/images/multitenacy_discriminator.svg rename to documentation/src/main/docbook/userGuide/en-US/chapters/multitenancy/images/multitenacy_discriminator.svg diff --git a/documentation/src/main/docbook/manual/en-US/chapters/multitenancy/images/multitenacy_schema.png b/documentation/src/main/docbook/userGuide/en-US/chapters/multitenancy/images/multitenacy_schema.png similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/multitenancy/images/multitenacy_schema.png rename to documentation/src/main/docbook/userGuide/en-US/chapters/multitenancy/images/multitenacy_schema.png diff --git a/documentation/src/main/docbook/manual/en-US/chapters/multitenancy/images/multitenacy_schema.svg b/documentation/src/main/docbook/userGuide/en-US/chapters/multitenancy/images/multitenacy_schema.svg similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/multitenancy/images/multitenacy_schema.svg rename to documentation/src/main/docbook/userGuide/en-US/chapters/multitenancy/images/multitenacy_schema.svg diff --git a/documentation/src/main/docbook/manual/en-US/chapters/osgi/OSGi.xml b/documentation/src/main/docbook/userGuide/en-US/chapters/osgi/OSGi.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/osgi/OSGi.xml rename to documentation/src/main/docbook/userGuide/en-US/chapters/osgi/OSGi.xml diff --git a/documentation/src/main/docbook/manual/en-US/chapters/osgi/extras/extension_point_blueprint.xml b/documentation/src/main/docbook/userGuide/en-US/chapters/osgi/extras/extension_point_blueprint.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/osgi/extras/extension_point_blueprint.xml rename to documentation/src/main/docbook/userGuide/en-US/chapters/osgi/extras/extension_point_blueprint.xml diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/PersistenceContext.xml b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/PersistenceContext.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/PersistenceContext.xml rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/PersistenceContext.xml diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/CheckingLazinessWithHibernate.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/CheckingLazinessWithHibernate.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/CheckingLazinessWithHibernate.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/CheckingLazinessWithHibernate.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/CheckingLazinessWithJPA.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/CheckingLazinessWithJPA.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/CheckingLazinessWithJPA.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/CheckingLazinessWithJPA.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/CheckingLazinessWithJPA2.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/CheckingLazinessWithJPA2.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/CheckingLazinessWithJPA2.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/CheckingLazinessWithJPA2.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/ContainsWithEM.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/ContainsWithEM.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/ContainsWithEM.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/ContainsWithEM.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/ContainsWithSession.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/ContainsWithSession.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/ContainsWithSession.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/ContainsWithSession.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/DeletingWithEM.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/DeletingWithEM.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/DeletingWithEM.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/DeletingWithEM.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/DeletingWithSession.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/DeletingWithSession.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/DeletingWithSession.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/DeletingWithSession.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/GetReferenceWithEM.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/GetReferenceWithEM.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/GetReferenceWithEM.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/GetReferenceWithEM.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/GetReferenceWithSession.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/GetReferenceWithSession.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/GetReferenceWithSession.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/GetReferenceWithSession.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/LoadWithEM.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/LoadWithEM.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/LoadWithEM.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/LoadWithEM.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/LoadWithSession.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/LoadWithSession.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/LoadWithSession.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/LoadWithSession.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/MakingPersistentWithEM.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/MakingPersistentWithEM.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/MakingPersistentWithEM.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/MakingPersistentWithEM.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/MakingPersistentWithSession.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/MakingPersistentWithSession.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/MakingPersistentWithSession.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/MakingPersistentWithSession.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/ManagedUpdateWithEM.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/ManagedUpdateWithEM.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/ManagedUpdateWithEM.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/ManagedUpdateWithEM.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/ManagedUpdateWithSession.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/ManagedUpdateWithSession.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/ManagedUpdateWithSession.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/ManagedUpdateWithSession.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/MergeWithEM.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/MergeWithEM.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/MergeWithEM.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/MergeWithEM.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/MergeWithSession.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/MergeWithSession.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/MergeWithSession.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/MergeWithSession.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/NaturalIdLoading.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/NaturalIdLoading.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/NaturalIdLoading.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/NaturalIdLoading.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/ReattachingWithSession1.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/ReattachingWithSession1.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/ReattachingWithSession1.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/ReattachingWithSession1.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/ReattachingWithSession2.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/ReattachingWithSession2.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/ReattachingWithSession2.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/ReattachingWithSession2.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/RefreshWithEM.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/RefreshWithEM.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/RefreshWithEM.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/RefreshWithEM.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/RefreshWithSession.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/RefreshWithSession.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/RefreshWithSession.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/RefreshWithSession.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/SimpleNaturalIdLoading.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/SimpleNaturalIdLoading.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/SimpleNaturalIdLoading.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/SimpleNaturalIdLoading.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/UnwrapWithEM.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/UnwrapWithEM.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/UnwrapWithEM.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/UnwrapWithEM.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/pc/extras/VisualizingMerge.java b/documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/VisualizingMerge.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/pc/extras/VisualizingMerge.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/pc/extras/VisualizingMerge.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/portability/Portability.xml b/documentation/src/main/docbook/userGuide/en-US/chapters/portability/Portability.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/portability/Portability.xml rename to documentation/src/main/docbook/userGuide/en-US/chapters/portability/Portability.xml diff --git a/documentation/src/main/docbook/manual/en-US/chapters/transactions/Transactions.xml b/documentation/src/main/docbook/userGuide/en-US/chapters/transactions/Transactions.xml similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/transactions/Transactions.xml rename to documentation/src/main/docbook/userGuide/en-US/chapters/transactions/Transactions.xml diff --git a/documentation/src/main/docbook/manual/en-US/chapters/transactions/extras/bmt.java b/documentation/src/main/docbook/userGuide/en-US/chapters/transactions/extras/bmt.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/transactions/extras/bmt.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/transactions/extras/bmt.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/transactions/extras/cmt.java b/documentation/src/main/docbook/userGuide/en-US/chapters/transactions/extras/cmt.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/transactions/extras/cmt.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/transactions/extras/cmt.java diff --git a/documentation/src/main/docbook/manual/en-US/chapters/transactions/extras/jdbc.java b/documentation/src/main/docbook/userGuide/en-US/chapters/transactions/extras/jdbc.java similarity index 100% rename from documentation/src/main/docbook/manual/en-US/chapters/transactions/extras/jdbc.java rename to documentation/src/main/docbook/userGuide/en-US/chapters/transactions/extras/jdbc.java diff --git a/documentation/src/main/docbook/manual/en-US/images/AuthorWork.png b/documentation/src/main/docbook/userGuide/en-US/images/AuthorWork.png similarity index 100% rename from documentation/src/main/docbook/manual/en-US/images/AuthorWork.png rename to documentation/src/main/docbook/userGuide/en-US/images/AuthorWork.png diff --git a/documentation/src/main/docbook/manual/en-US/images/AuthorWork.zargo b/documentation/src/main/docbook/userGuide/en-US/images/AuthorWork.zargo similarity index 100% rename from documentation/src/main/docbook/manual/en-US/images/AuthorWork.zargo rename to documentation/src/main/docbook/userGuide/en-US/images/AuthorWork.zargo diff --git a/documentation/src/main/docbook/manual/en-US/images/CustomerOrderProduct.png b/documentation/src/main/docbook/userGuide/en-US/images/CustomerOrderProduct.png similarity index 100% rename from documentation/src/main/docbook/manual/en-US/images/CustomerOrderProduct.png rename to documentation/src/main/docbook/userGuide/en-US/images/CustomerOrderProduct.png diff --git a/documentation/src/main/docbook/manual/en-US/images/CustomerOrderProduct.zargo b/documentation/src/main/docbook/userGuide/en-US/images/CustomerOrderProduct.zargo similarity index 100% rename from documentation/src/main/docbook/manual/en-US/images/CustomerOrderProduct.zargo rename to documentation/src/main/docbook/userGuide/en-US/images/CustomerOrderProduct.zargo diff --git a/documentation/src/main/docbook/manual/en-US/images/EmployerEmployee.png b/documentation/src/main/docbook/userGuide/en-US/images/EmployerEmployee.png similarity index 100% rename from documentation/src/main/docbook/manual/en-US/images/EmployerEmployee.png rename to documentation/src/main/docbook/userGuide/en-US/images/EmployerEmployee.png diff --git a/documentation/src/main/docbook/manual/en-US/images/EmployerEmployee.zargo b/documentation/src/main/docbook/userGuide/en-US/images/EmployerEmployee.zargo similarity index 100% rename from documentation/src/main/docbook/manual/en-US/images/EmployerEmployee.zargo rename to documentation/src/main/docbook/userGuide/en-US/images/EmployerEmployee.zargo diff --git a/documentation/src/main/docbook/manual/en-US/images/hibernate_logo_a.png b/documentation/src/main/docbook/userGuide/en-US/images/hibernate_logo_a.png similarity index 100% rename from documentation/src/main/docbook/manual/en-US/images/hibernate_logo_a.png rename to documentation/src/main/docbook/userGuide/en-US/images/hibernate_logo_a.png diff --git a/documentation/src/main/docbook/manual/en-US/images/overview.png b/documentation/src/main/docbook/userGuide/en-US/images/overview.png similarity index 100% rename from documentation/src/main/docbook/manual/en-US/images/overview.png rename to documentation/src/main/docbook/userGuide/en-US/images/overview.png diff --git a/documentation/src/main/docbook/manual/en-US/images/overview.svg b/documentation/src/main/docbook/userGuide/en-US/images/overview.svg similarity index 96% rename from documentation/src/main/docbook/manual/en-US/images/overview.svg rename to documentation/src/main/docbook/userGuide/en-US/images/overview.svg index 7ec1c26be7..1b58a483c4 100644 --- a/documentation/src/main/docbook/manual/en-US/images/overview.svg +++ b/documentation/src/main/docbook/userGuide/en-US/images/overview.svg @@ -1,250 +1,250 @@ - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Application - - - -Persistent Objects - - - -Database - - - -HIBERNATE - - - - - - - - - - - - - - -hibernate. - -properties - - - -XML Mapping - - - + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Application + + + +Persistent Objects + + + +Database + + + +HIBERNATE + + + + + + + + + + + + + + +hibernate. + +properties + + + +XML Mapping + + + diff --git a/documentation/status.md b/documentation/status.md new file mode 100644 index 0000000000..b5c95d59b2 --- /dev/null +++ b/documentation/status.md @@ -0,0 +1,67 @@ +Status of the documentation overhaul (5.0 version) +================================================== + +Overall the plan is to define 3 DocBook-based guides. The intention is for this document to serve +as an outline of the work and a status of what still needs done. + + +User Guide +========== + +Covers reference topics targeting users. + +* Prefix (done) +* Architecture (done) +* DomainModel (done) +* Bootstrap (done) +* PersistenceContext (done) +* Database_Access (done) +* Transactions (done) +* JNDI (done) +* Locking (needs some work) +* Fetching (needs some work) +* Batching (needs lot of work - not started - open questions) +* Caching (needs some work) +* Events (need some work) +* HQL_JPQL (needs lots of work) +* Criteria (needs lots of work) +* Native_Queries (needs lots of work) +* Multi_Tenancy (needs some work) +* OSGi (right place for this?) +* Envers +* Portability (needs some work) + + +Domain Model Mapping Guide +=========================== + +Covers mapping domain model to database. Note that a lot of the "not started" content exists elsewhere; its merely a +matter of pulling that content in and better organizing it. + + +* Prefix (done) +* Data_Categorizations (done) +* Basic_Types (done) +* Composition (done) +* Collection (needs some work) +* Entity (needs some work) +* Secondary_Tables (not started) +* Identifiers (mostly done - needs "derived id" stuff documented) +* Natural_Id (not started) +* Associations (not started) +* Attribute_Access (not started) +* Mapping_Overrides - AttributeOverrides/AssociationOverrides (not started) +* Generated_attributes (not started) +* "columns, formulas, read/write-fragments" (not started) +* Naming_Strategies - implicit, physical, quoting (not started) +* Database_Constraints - pk, fk, uk, check, etc (not started) +* Auxiliary_DB_Objects - does this belong here? or somewhere else (integrations guide) discussing schema tooling? + + +Integrations Guide +=================== + +* Services&Registries (pretty much done) +* IdGeneratorStrategyInterpreter (not started) +* custom Session/SessionFactory implementors (not started) +* ??? \ No newline at end of file