From b7e1e2fcde88d433e52e6e6a7df69e28ccbdfaf9 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@vmware.com>
Date: Tue, 27 Nov 2012 16:17:51 +0100
Subject: [PATCH] DATAJPA-272 - Polished logging setup to reduce noise in test
 cases.

---
 .../support/MergingPersistenceUnitManagerUnitTests.java   | 2 --
 src/test/resources/META-INF/orm.xml                       | 2 +-
 src/test/resources/META-INF/persistence.xml               | 2 +-
 src/test/resources/META-INF/persistence2.xml              | 4 ++--
 src/test/resources/eclipselink.xml                        | 1 +
 src/test/resources/logback.xml                            | 4 ++--
 src/test/resources/openjpa.xml                            | 8 +++++++-
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/test/java/org/springframework/data/jpa/support/MergingPersistenceUnitManagerUnitTests.java b/src/test/java/org/springframework/data/jpa/support/MergingPersistenceUnitManagerUnitTests.java
index 6ac893ef8..fc881bf1f 100644
--- a/src/test/java/org/springframework/data/jpa/support/MergingPersistenceUnitManagerUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/support/MergingPersistenceUnitManagerUnitTests.java
@@ -72,8 +72,6 @@ public class MergingPersistenceUnitManagerUnitTests {
 
 		assertThat(info.getMappingFileNames().size(), is(2));
 		assertThat(info.getMappingFileNames(), hasItems("foo.xml", "bar.xml"));
-
-		System.out.println(info.getPersistenceUnitRootUrl());
 	}
 
 	@Test
diff --git a/src/test/resources/META-INF/orm.xml b/src/test/resources/META-INF/orm.xml
index a6f3f5b59..8bb0b959c 100644
--- a/src/test/resources/META-INF/orm.xml
+++ b/src/test/resources/META-INF/orm.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" version="1.0">
+<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd" version="2.0">
 
     <persistence-unit-metadata>
         <persistence-unit-defaults>
diff --git a/src/test/resources/META-INF/persistence.xml b/src/test/resources/META-INF/persistence.xml
index 9f45d06a5..e2c1924a4 100644
--- a/src/test/resources/META-INF/persistence.xml
+++ b/src/test/resources/META-INF/persistence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
+<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
 	<persistence-unit name="default">
 		<class>org.springframework.data.jpa.domain.AbstractPersistable</class>
 		<class>org.springframework.data.jpa.domain.sample.User</class>
diff --git a/src/test/resources/META-INF/persistence2.xml b/src/test/resources/META-INF/persistence2.xml
index 59635e5ea..05b0db857 100644
--- a/src/test/resources/META-INF/persistence2.xml
+++ b/src/test/resources/META-INF/persistence2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence version="1.0"
+<persistence version="2.0"
 	xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
+	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
 	<persistence-unit name="first">
 		<class>org.springframework.data.jpa.domain.sample.User</class>
 		<class>org.springframework.data.jpa.domain.sample.SpecialUser</class>
diff --git a/src/test/resources/eclipselink.xml b/src/test/resources/eclipselink.xml
index fd81dc968..715112c93 100644
--- a/src/test/resources/eclipselink.xml
+++ b/src/test/resources/eclipselink.xml
@@ -15,6 +15,7 @@
 		<prop key="javax.persistence.jdbc.password"></prop>
 		<prop key="javax.persistence.ddl-generation">create-tables</prop>
 		<prop key="eclipselink.weaving.internal">false</prop>
+		<prop key="eclipselink.logging.level">SEVERE</prop>
 	</util:properties>
 
 </beans>
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
index 4d17e2658..ad5cbef50 100644
--- a/src/test/resources/logback.xml
+++ b/src/test/resources/logback.xml
@@ -7,9 +7,9 @@
 		</encoder>
 	</appender>
 
-	<logger name="org.springframework.data" level="info" />
+	<logger name="org.springframework.data" level="error" />
 
-	<root level="warn">
+	<root level="error">
 		<appender-ref ref="console" />
 	</root>
 
diff --git a/src/test/resources/openjpa.xml b/src/test/resources/openjpa.xml
index ab8e8f17b..a9f1abb78 100644
--- a/src/test/resources/openjpa.xml
+++ b/src/test/resources/openjpa.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
 	<!-- EclipseLink vendor adaptor with workaround platform class for HSQL usage -->
 	<bean id="vendorAdaptor" class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter" parent="abstractVendorAdaptor">
 		<property name="database" value="HSQL" />
 	</bean>
+	
+	<util:properties id="jpaProperties">
+		<prop key="openjpa.Log">none</prop>
+	</util:properties>
 
 </beans>