Merge pull request #7309 from tryncatch/BAEL-2804

BAEL-2804 JPA Query Parameters Usage

persistence-modules/java-jpa-2/README.md

@@ -1 +1,6 @@
 # Relevant Articles
+<<<<<<< HEAD
+
+- [JPA Query Parameters Usage](http://www.baeldung.com/jpa-query-parameters-usage)
+=======
+>>>>>>> refs/heads/master

persistence-modules/java-jpa-2/pom.xml

@@ -1,18 +1,15 @@
-<?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>
     <artifactId>java-jpa-2</artifactId>
     <name>java-jpa-2</name>
-
     <parent>
-        <artifactId>parent-modules</artifactId>
         <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-
     <dependencies>
         <dependency>
             <groupId>org.hibernate</groupId>
@@ -104,7 +101,6 @@
             </plugin>
         </plugins>
     </build>
-
     <properties>
         <hibernate.version>5.4.0.Final</hibernate.version>
         <eclipselink.version>2.7.4-RC1</eclipselink.version>

persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml

@@ -0,0 +1,35 @@
+<?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_2.xsd"
+    version="2.2">
+
+    <persistence-unit name="jpa-h2-queryparams"
+        transaction-type="RESOURCE_LOCAL">
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+        <class>com.baeldung.jpa.queryparams.Employee</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <properties>
+            <property name="javax.persistence.jdbc.driver"
+                value="org.h2.Driver" />
+            <property name="javax.persistence.jdbc.url"
+                value="jdbc:h2:mem:test" />
+            <property name="javax.persistence.jdbc.user"
+                value="sa" />
+            <property name="javax.persistence.jdbc.password"
+                value="" />
+            <property name="hibernate.dialect"
+                value="org.hibernate.dialect.H2Dialect" />
+            <property name="hibernate.hbm2ddl.auto"
+                value="create-drop" />
+            <property name="show_sql" value="true" />
+            <property
+                name="hibernate.temp.use_jdbc_metadata_defaults"
+                value="false" />
+            <property
+                name="javax.persistence.sql-load-script-source"
+                value="queryparams.sql" />
+        </properties>
+    </persistence-unit>
+</persistence>

persistence-modules/java-jpa-2/src/main/resources/logback.xml

@@ -0,0 +1,15 @@
+<?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>

persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml

@@ -224,26 +224,4 @@
 				value="products_jpa.sql" />
 		</properties>
 	</persistence-unit>
-	
-	<persistence-unit name="jpa-h2-queryparams" transaction-type="RESOURCE_LOCAL">
-		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-		<class>com.baeldung.jpa.queryparams.Employee</class>
-		<exclude-unlisted-classes>true</exclude-unlisted-classes>
-		<properties>
-			<property name="javax.persistence.jdbc.driver"
-				value="org.h2.Driver" />
-			<property name="javax.persistence.jdbc.url"
-				value="jdbc:h2:mem:test" />
-			<property name="javax.persistence.jdbc.user" value="sa" />
-			<property name="javax.persistence.jdbc.password" value="" />
-			<property name="hibernate.dialect"
-				value="org.hibernate.dialect.H2Dialect" />
-			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
-			<property name="show_sql" value="true" />
-			<property name="hibernate.temp.use_jdbc_metadata_defaults"
-				value="false" />
-			<property name="javax.persistence.sql-load-script-source"
-				value="employees2.sql" />
-		</properties>
-	</persistence-unit>
 </persistence>

persistence-modules/pom.xml

@@ -18,7 +18,6 @@
         <module>apache-cayenne</module>
         <module>core-java-persistence</module>
         <module>deltaspike</module>
-        <module>elasticsearch</module>
         <module>flyway</module>
         <module>hbase</module>
         <module>hibernate5</module>