Author: kwsutter
Date: Mon Apr 15 15:06:16 2013
New Revision: 1468108
URL: http://svn.apache.org/r1468108
Log:
OPENJPA-2172. Remove the dependency on the slf4j runtime bundle from
openjpa-all.jar. Also, modified the persistence.xml files for the OpenBooks
sample to set the Validation-Mode to None (since it's not being used). This
way, we can avoid the dependency altogether. This also required the update to
the persistence.xml files to point at the JPA 2.0 xsd files.
Modified:
openjpa/trunk/openjpa-all/pom.xml
openjpa/trunk/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.liberty.xml
openjpa/trunk/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.was.xml
openjpa/trunk/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml
Modified: openjpa/trunk/openjpa-all/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-all/pom.xml?rev=1468108&r1=1468107&r2=1468108&view=diff
==============================================================================
--- openjpa/trunk/openjpa-all/pom.xml (original)
+++ openjpa/trunk/openjpa-all/pom.xml Mon Apr 15 15:06:16 2013
@@ -150,10 +150,5 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4jVersion}</version>
- </dependency>
</dependencies>
</project>
Modified:
openjpa/trunk/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.liberty.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.liberty.xml?rev=1468108&r1=1468107&r2=1468108&view=diff
==============================================================================
---
openjpa/trunk/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.liberty.xml
(original)
+++
openjpa/trunk/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.liberty.xml
Mon Apr 15 15:06:16 2013
@@ -19,7 +19,9 @@
-->
<persistence xmlns="http://java.sun.com/xml/ns/persistence";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- version="1.0">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
+ http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd";
+ version="2.0">
<persistence-unit name="OpenBooks">
<jta-data-source>java:comp/env/jdbc/OpenBooks</jta-data-source>
<non-jta-data-source>java:comp/env/jdbc/NonTxOpenBooks</non-jta-data-source>
@@ -31,6 +33,8 @@
<class>openbook.domain.Customer</class>
<class>openbook.domain.Author</class>
+ <validation-mode>NONE</validation-mode>
+
<properties>
<property name="openjpa.DataCache" value="true"/>
<property name="openjpa.RemoteCommitProvider" value="sjvm"/>
Modified:
openjpa/trunk/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.was.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.was.xml?rev=1468108&r1=1468107&r2=1468108&view=diff
==============================================================================
---
openjpa/trunk/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.was.xml
(original)
+++
openjpa/trunk/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.was.xml
Mon Apr 15 15:06:16 2013
@@ -19,7 +19,9 @@
-->
<persistence xmlns="http://java.sun.com/xml/ns/persistence";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- version="1.0">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
+ http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd";
+ version="2.0">
<persistence-unit name="OpenBooks">
<jta-data-source>jdbc/OpenBooks</jta-data-source>
<non-jta-data-source>jdbc/NonTxOpenBooks</non-jta-data-source>
@@ -31,6 +33,8 @@
<class>openbook.domain.Customer</class>
<class>openbook.domain.Author</class>
+ <validation-mode>NONE</validation-mode>
+
<properties>
<property name="openjpa.DataCache"
value="true"/>
<property name="openjpa.RemoteCommitProvider" value="sjvm"/>
Modified:
openjpa/trunk/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml?rev=1468108&r1=1468107&r2=1468108&view=diff
==============================================================================
---
openjpa/trunk/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml
(original)
+++
openjpa/trunk/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml
Mon Apr 15 15:06:16 2013
@@ -19,6 +19,8 @@
-->
<persistence 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";
version="2.0">
<persistence-unit name="OpenBooks">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
@@ -30,6 +32,8 @@
<class>openbook.domain.Customer</class>
<class>openbook.domain.Author</class>
+ <validation-mode>NONE</validation-mode>
+
<properties>
<!-- Use these for MySQL
<property name="javax.persistence.jdbc.driver"
value="com.mysql.jdbc.Driver"/>
