From a50afec871787ca2d21297e022aeafa9708c021e Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sat, 1 Sep 2018 21:36:49 +0530
Subject: [PATCH 1/2] [BAEL-8855] - Moved all code from module
 jpa-storedprocedure into module persistence-modules/java-jpa

---
 jpa-storedprocedure/README.md                      |  1 -
 persistence-modules/java-jpa/README.md             |  3 ++-
 .../src/main/java/com/baeldung/jpa/model/Car.java  |  0
 .../com/baeldung/jpa/model/QueryParameter.java     |  0
 .../src/main/resources/META-INF/persistence.xml    | 14 ++++++++++++++
 .../database/FindCarByYearProcedureMySQL.sql       |  0
 .../config/database/create_table_mysql.sql         |  0
 .../main/resources/config/database/insert_cars.sql |  0
 .../storedprocedure/StoredProcedureLiveTest.java   |  0
 .../java-jpa}/src/test/resources/persistence.xml   |  0
 10 files changed, 16 insertions(+), 2 deletions(-)
 rename {jpa-storedprocedure => persistence-modules/java-jpa}/src/main/java/com/baeldung/jpa/model/Car.java (100%)
 rename {jpa-storedprocedure => persistence-modules/java-jpa}/src/main/java/com/baeldung/jpa/model/QueryParameter.java (100%)
 rename {jpa-storedprocedure => persistence-modules/java-jpa}/src/main/resources/config/database/FindCarByYearProcedureMySQL.sql (100%)
 rename {jpa-storedprocedure => persistence-modules/java-jpa}/src/main/resources/config/database/create_table_mysql.sql (100%)
 rename {jpa-storedprocedure => persistence-modules/java-jpa}/src/main/resources/config/database/insert_cars.sql (100%)
 rename {jpa-storedprocedure => persistence-modules/java-jpa}/src/test/java/com/baeldung/jpa/storedprocedure/StoredProcedureLiveTest.java (100%)
 rename {jpa-storedprocedure => persistence-modules/java-jpa}/src/test/resources/persistence.xml (100%)

diff --git a/jpa-storedprocedure/README.md b/jpa-storedprocedure/README.md
index 39d6784d8b..7d843af9ea 100644
--- a/jpa-storedprocedure/README.md
+++ b/jpa-storedprocedure/README.md
@@ -1,2 +1 @@
 ### Relevant Articles:
-- [A Guide to Stored Procedures with JPA](http://www.baeldung.com/jpa-stored-procedures)
diff --git a/persistence-modules/java-jpa/README.md b/persistence-modules/java-jpa/README.md
index e9aabaaa74..418e0a67e2 100644
--- a/persistence-modules/java-jpa/README.md
+++ b/persistence-modules/java-jpa/README.md
@@ -1,3 +1,4 @@
 # Relevant Articles
 
-* [A Guide to SqlResultSetMapping](http://www.baeldung.com/jpa-sql-resultset-mapping)
+- [A Guide to SqlResultSetMapping](http://www.baeldung.com/jpa-sql-resultset-mapping)
+- [A Guide to Stored Procedures with JPA](http://www.baeldung.com/jpa-stored-procedures)
\ No newline at end of file
diff --git a/jpa-storedprocedure/src/main/java/com/baeldung/jpa/model/Car.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/model/Car.java
similarity index 100%
rename from jpa-storedprocedure/src/main/java/com/baeldung/jpa/model/Car.java
rename to persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/model/Car.java
diff --git a/jpa-storedprocedure/src/main/java/com/baeldung/jpa/model/QueryParameter.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/model/QueryParameter.java
similarity index 100%
rename from jpa-storedprocedure/src/main/java/com/baeldung/jpa/model/QueryParameter.java
rename to persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/model/QueryParameter.java
diff --git a/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml b/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml
index e9230eb6cd..3d881673b2 100644
--- a/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml
+++ b/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml
@@ -20,4 +20,18 @@
             <property name="hibernate.temp.use_jdbc_metadata_defaults" value="false"/>
         </properties>
     </persistence-unit>
+    
+    <persistence-unit name="jpa-db">
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+        <class>com.baeldung.jpa.model.Car</class>
+        <properties>
+            <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver" />
+            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://127.0.0.1:3306/baeldung" />
+            <property name="javax.persistence.jdbc.user" value="baeldung" />
+            <property name="javax.persistence.jdbc.password" value="YourPassword" />
+            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect" />
+            <property name="hibernate.show_sql" value="true" />
+        </properties>
+    </persistence-unit>
+	
 </persistence>
\ No newline at end of file
diff --git a/jpa-storedprocedure/src/main/resources/config/database/FindCarByYearProcedureMySQL.sql b/persistence-modules/java-jpa/src/main/resources/config/database/FindCarByYearProcedureMySQL.sql
similarity index 100%
rename from jpa-storedprocedure/src/main/resources/config/database/FindCarByYearProcedureMySQL.sql
rename to persistence-modules/java-jpa/src/main/resources/config/database/FindCarByYearProcedureMySQL.sql
diff --git a/jpa-storedprocedure/src/main/resources/config/database/create_table_mysql.sql b/persistence-modules/java-jpa/src/main/resources/config/database/create_table_mysql.sql
similarity index 100%
rename from jpa-storedprocedure/src/main/resources/config/database/create_table_mysql.sql
rename to persistence-modules/java-jpa/src/main/resources/config/database/create_table_mysql.sql
diff --git a/jpa-storedprocedure/src/main/resources/config/database/insert_cars.sql b/persistence-modules/java-jpa/src/main/resources/config/database/insert_cars.sql
similarity index 100%
rename from jpa-storedprocedure/src/main/resources/config/database/insert_cars.sql
rename to persistence-modules/java-jpa/src/main/resources/config/database/insert_cars.sql
diff --git a/jpa-storedprocedure/src/test/java/com/baeldung/jpa/storedprocedure/StoredProcedureLiveTest.java b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/storedprocedure/StoredProcedureLiveTest.java
similarity index 100%
rename from jpa-storedprocedure/src/test/java/com/baeldung/jpa/storedprocedure/StoredProcedureLiveTest.java
rename to persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/storedprocedure/StoredProcedureLiveTest.java
diff --git a/jpa-storedprocedure/src/test/resources/persistence.xml b/persistence-modules/java-jpa/src/test/resources/persistence.xml
similarity index 100%
rename from jpa-storedprocedure/src/test/resources/persistence.xml
rename to persistence-modules/java-jpa/src/test/resources/persistence.xml

From d717277dcdef4bb331f788f4fe81861b6f09992f Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sat, 1 Sep 2018 22:57:19 +0530
Subject: [PATCH 2/2] [BAEL-8855] - Deleted module jpa-storedprocedure

---
 jpa-storedprocedure/README.md                 |  1 -
 jpa-storedprocedure/pom.xml                   | 65 -------------------
 .../main/resources/META-INF/persistence.xml   | 20 ------
 .../src/main/resources/logback.xml            | 13 ----
 pom.xml                                       |  2 -
 5 files changed, 101 deletions(-)
 delete mode 100644 jpa-storedprocedure/README.md
 delete mode 100644 jpa-storedprocedure/pom.xml
 delete mode 100644 jpa-storedprocedure/src/main/resources/META-INF/persistence.xml
 delete mode 100644 jpa-storedprocedure/src/main/resources/logback.xml

diff --git a/jpa-storedprocedure/README.md b/jpa-storedprocedure/README.md
deleted file mode 100644
index 7d843af9ea..0000000000
--- a/jpa-storedprocedure/README.md
+++ /dev/null
@@ -1 +0,0 @@
-### Relevant Articles:
diff --git a/jpa-storedprocedure/pom.xml b/jpa-storedprocedure/pom.xml
deleted file mode 100644
index 79fa637cb6..0000000000
--- a/jpa-storedprocedure/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
-    <artifactId>jpa-storedprocedure</artifactId>
-    <version>1.0</version>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <!-- core library -->
-        <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>${jee.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>${hibernate.version}</version>
-        </dependency>
-        <!-- MySql JDBC -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>JpaStoredProcedure</finalName>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <archiveBaseDirectory>${project.basedir}</archiveBaseDirectory>
-                    <!--archive> <manifest> <mainClass>fully.qualified.MainClass</mainClass> </manifest> </archive -->
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <properties>
-        <jee.version>7.0</jee.version>
-        <hibernate.version>5.2.5.Final</hibernate.version>
-        <mysql.version>6.0.5</mysql.version>
-        <commons-io.version>2.5</commons-io.version>
-    </properties>
-
-</project>
\ No newline at end of file
diff --git a/jpa-storedprocedure/src/main/resources/META-INF/persistence.xml b/jpa-storedprocedure/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index 4c443cb7cf..0000000000
--- a/jpa-storedprocedure/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"
-			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-			 xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
-             http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"
-			 version="2.1">
-
-	<persistence-unit name="jpa-db">
-		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-		<class>com.baeldung.jpa.model.Car</class>
-		<properties>
-			<property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver" />
-			<property name="javax.persistence.jdbc.url" value="jdbc:mysql://127.0.0.1:3306/baeldung" />
-			<property name="javax.persistence.jdbc.user" value="baeldung" />
-			<property name="javax.persistence.jdbc.password" value="YourPassword" />
-			<property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect" />
-			<property name="hibernate.show_sql" value="true" />
-		</properties>
-	</persistence-unit>
-</persistence>
\ No newline at end of file
diff --git a/jpa-storedprocedure/src/main/resources/logback.xml b/jpa-storedprocedure/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/jpa-storedprocedure/src/main/resources/logback.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-            </pattern>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-    </root>
-</configuration>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 92df840079..7bed9c5cc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -398,7 +398,6 @@
 				<module>jee-7</module>
 				<module>jhipster/jhipster-monolithic</module>
 				<module>jjwt</module>
-				<module>jpa-storedprocedure</module>
 				<module>jsf</module>
 				<module>json-path</module>
 				<module>json</module>
@@ -949,7 +948,6 @@
 				<module>jgroups</module>
 				<module>jee-7</module>
 				<module>jjwt</module>
-				<module>jpa-storedprocedure</module>
 				<module>jsf</module>
 				<module>json-path</module>
 				<module>json</module>