From 876d07a4dcbeb544097447560615aed8eee2da2a Mon Sep 17 00:00:00 2001
From: Sanne Grinovero <sanne@hibernate.org>
Date: Mon, 11 May 2015 21:09:44 +0100
Subject: [PATCH] OGM-803 Change usage of modules as included within WildFly 9

---
 documentation/manual/pom.xml                                | 2 ++
 .../src/main/asciidoc/en-US/modules/configuration.asciidoc  | 4 ++--
 modules/wildfly/pom.xml                                     | 2 +-
 pom.xml                                                     | 6 +++++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/documentation/manual/pom.xml b/documentation/manual/pom.xml
index e65a7035d1..194d59ae6d 100644
--- a/documentation/manual/pom.xml
+++ b/documentation/manual/pom.xml
@@ -91,6 +91,8 @@
                         <hibernate-orm-version>${hibernateVersion}</hibernate-orm-version>
                         <hibernate-search-version>${hibernateSearchVersion}</hibernate-search-version>
                         <hibernate-search-module-slot>${hibernate-search.module.slot}</hibernate-search-module-slot>
+                        <hibernate-search-major-minor-version>${hibernate-search-major-minor-version}</hibernate-search-major-minor-version>
+                        <hibernate-search-full-module-id>${hibernate-search-full-module-id}</hibernate-search-full-module-id>
                         <infinispan-version>${infinispanVersion}</infinispan-version>
                         <jboss-jta-version>${jbossjtaVersion}</jboss-jta-version>
                         <mongodb-version>${mongodbVersion}</mongodb-version>
diff --git a/documentation/manual/src/main/asciidoc/en-US/modules/configuration.asciidoc b/documentation/manual/src/main/asciidoc/en-US/modules/configuration.asciidoc
index f63196cc63..f54131ea84 100644
--- a/documentation/manual/src/main/asciidoc/en-US/modules/configuration.asciidoc
+++ b/documentation/manual/src/main/asciidoc/en-US/modules/configuration.asciidoc
@@ -384,7 +384,7 @@ https://docs.jboss.org/author/display/WFLY8/Class+Loading+in+WildFly[WildFly doc
 
 The Hibernate OGM module does not include the Hibernate Search module, so this will need to be downloaded separately.
 
-The Hibernate Search documentation has a similar section describing the details: http://docs.jboss.org/hibernate/search/{hibernate-search-module-slot}/reference/en-US/html/search-configuration.html#_update_and_activate_latest_hibernate_search_version_in_wildfly[Update and activate latest Hibernate Search version in WildFly].
+The Hibernate Search documentation has a similar section describing the details: http://docs.jboss.org/hibernate/search/{hibernate-search-major-minor-version}/reference/en-US/html/search-configuration.html#_update_and_activate_latest_hibernate_search_version_in_wildfly[Update and activate latest Hibernate Search version in WildFly].
 
 If your application needs to use both Hibernate OGM and Hibernate Search, your MANIFEST.MF will look like:
 
@@ -393,6 +393,6 @@ If your application needs to use both Hibernate OGM and Hibernate Search, your M
 [source]
 [subs="verbatim,attributes"]
 ----
-org.hibernate:ogm services, org.hibernate.ogm.couchdb services, org.hibernate.search.orm:{hibernate-search-module-slot} services
+org.hibernate:ogm services, org.hibernate.ogm.couchdb services, {hibernate-search-full-module-id} services
 ----
 ====
diff --git a/modules/wildfly/pom.xml b/modules/wildfly/pom.xml
index 7072d54187..6d1db65d5d 100644
--- a/modules/wildfly/pom.xml
+++ b/modules/wildfly/pom.xml
@@ -21,7 +21,7 @@
 
     <properties>
         <hibernate.hql.module.slot>${hibernateParserVersion}</hibernate.hql.module.slot>
-        <infinispan.module.slot>ispn-7.2</infinispan.module.slot>
+        <infinispan.module.slot>main</infinispan.module.slot>
     </properties>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 6ff79a5c6c..af3aaf7f5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,11 @@
         <!-- Since we require users to import a specific Hibernate Search module explicitly,
          all integration tests need to know which version that shall be.
          So the property needs to be defined in the global parent pom -->
-        <hibernate-search.module.slot>5.2</hibernate-search.module.slot>
+        <hibernate-search.module.slot>main</hibernate-search.module.slot>
+        <!-- Following might not match the slot, for example when 'main' is being used. Needed in docs URL rendering. -->
+        <hibernate-search-major-minor-version>5.2</hibernate-search-major-minor-version>
+        <!-- For documentation, to omit the slot when not needed: -->
+        <hibernate-search-full-module-id>org.hibernate.search.orm</hibernate-search-full-module-id>
     </properties>
 
     <!-- Only for management of test-scoped dependencies; All other dependencies (which are exposed to users) are