From aa4303d5c5063f0367aca245d9b96436f7e86f95 Mon Sep 17 00:00:00 2001
From: Sanne Grinovero <sanne@hibernate.org>
Date: Thu, 22 Feb 2018 00:23:47 +0000
Subject: [PATCH] HHH-12317 Move module path of the new Feature packs to
 org.hibernate.orm

---
 .../module-templates/hibernate-core-alias.xml |  4 ++--
 .../hibernate-core-old-deprecated.xml         | 19 +++++++++++++++++++
 .../module-templates/hibernate-core.xml       |  4 ++--
 .../module-templates/jipijapa-alias.xml       |  4 ++--
 .../module-templates/jipijapa.xml             |  4 ++--
 5 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 hibernate-orm-modules/module-templates/hibernate-core-old-deprecated.xml

diff --git a/hibernate-orm-modules/module-templates/hibernate-core-alias.xml b/hibernate-orm-modules/module-templates/hibernate-core-alias.xml
index 3c2b9eff0e..76629f5cda 100644
--- a/hibernate-orm-modules/module-templates/hibernate-core-alias.xml
+++ b/hibernate-orm-modules/module-templates/hibernate-core-alias.xml
@@ -6,6 +6,6 @@
   ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
   -->
 <module-alias xmlns="urn:jboss:module:1.3"
-    name="org.hibernate" slot="${minorSlot}"
-    target-name="org.hibernate" target-slot="${slot}"
+    name="org.hibernate.orm" slot="${minorSlot}"
+    target-name="org.hibernate.orm" target-slot="${slot}"
 />
diff --git a/hibernate-orm-modules/module-templates/hibernate-core-old-deprecated.xml b/hibernate-orm-modules/module-templates/hibernate-core-old-deprecated.xml
new file mode 100644
index 0000000000..99104f3cfc
--- /dev/null
+++ b/hibernate-orm-modules/module-templates/hibernate-core-old-deprecated.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Hibernate, Relational Persistence for Idiomatic Java
+  ~
+  ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+  ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+  -->
+<module xmlns="urn:jboss:module:1.3" name="org.hibernate" slot="${minorSlot}">
+
+    <properties>
+        <property name="jboss.api" value="deprecated"/>
+        <!-- This module is using the old name. Please use "org.hibernate.orm" in the future.-->
+    </properties>
+
+    <dependencies>
+        <module name="org.hibernate.orm" services="import" export="true" slot="${minorSlot}"/>
+    </dependencies>
+
+</module>
diff --git a/hibernate-orm-modules/module-templates/hibernate-core.xml b/hibernate-orm-modules/module-templates/hibernate-core.xml
index 4d59a18b4f..2953e4f156 100644
--- a/hibernate-orm-modules/module-templates/hibernate-core.xml
+++ b/hibernate-orm-modules/module-templates/hibernate-core.xml
@@ -5,7 +5,7 @@
   ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later.
   ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.hibernate" slot="${slot}">
+<module xmlns="urn:jboss:module:1.3" name="org.hibernate.orm" slot="${slot}">
     <resources>
         <artifact name="${org.hibernate:hibernate-core}"/>
         <artifact name="${org.hibernate:hibernate-envers}"/>
@@ -29,6 +29,6 @@
         <module name="org.jboss.vfs"/>
         <module name="org.javassist" export="true"/>
         <module name="org.hibernate.commons-annotations"/>
-        <module name="org.hibernate.jipijapa-hibernate5" services="import" slot="${slot}"/>
+        <module name="org.hibernate.orm.jipijapa-hibernate5" services="import" slot="${slot}"/>
     </dependencies>
 </module>
diff --git a/hibernate-orm-modules/module-templates/jipijapa-alias.xml b/hibernate-orm-modules/module-templates/jipijapa-alias.xml
index 25b9f93a83..464929e667 100644
--- a/hibernate-orm-modules/module-templates/jipijapa-alias.xml
+++ b/hibernate-orm-modules/module-templates/jipijapa-alias.xml
@@ -6,6 +6,6 @@
   ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
   -->
 <module-alias xmlns="urn:jboss:module:1.3"
-    name="org.hibernate.jipijapa-hibernate5" slot="${minorSlot}"
-    target-name="org.hibernate.jipijapa-hibernate5" target-slot="${slot}"
+    name="org.hibernate.orm.jipijapa-hibernate5" slot="${minorSlot}"
+    target-name="org.hibernate.orm.jipijapa-hibernate5" target-slot="${slot}"
 />
diff --git a/hibernate-orm-modules/module-templates/jipijapa.xml b/hibernate-orm-modules/module-templates/jipijapa.xml
index eca05c60d9..d5ad2ff583 100644
--- a/hibernate-orm-modules/module-templates/jipijapa.xml
+++ b/hibernate-orm-modules/module-templates/jipijapa.xml
@@ -5,7 +5,7 @@
   ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later.
   ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.hibernate.jipijapa-hibernate5" slot="${slot}">
+<module xmlns="urn:jboss:module:1.3" name="org.hibernate.orm.jipijapa-hibernate5" slot="${slot}">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
@@ -15,7 +15,7 @@
     </resources>
 
     <dependencies>
-        <module name="org.hibernate" slot="${slot}"/>
+        <module name="org.hibernate.orm" slot="${slot}"/>
         <module name="javax.api"/>
         <module name="javax.annotation.api"/>
         <module name="javax.enterprise.api"/>