Author: kwsutter
Date: Mon Apr 15 13:45:01 2013
New Revision: 1468067
URL: http://svn.apache.org/r1468067
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.
Modified:
openjpa/branches/2.2.x/openjpa-all/pom.xml
openjpa/branches/2.2.x/openjpa-examples/openbooks/build.properties
openjpa/branches/2.2.x/openjpa-examples/openbooks/run.properties
openjpa/branches/2.2.x/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.liberty.xml
openjpa/branches/2.2.x/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.was.xml
openjpa/branches/2.2.x/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml
Modified: openjpa/branches/2.2.x/openjpa-all/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-all/pom.xml?rev=1468067&r1=1468066&r2=1468067&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-all/pom.xml (original)
+++ openjpa/branches/2.2.x/openjpa-all/pom.xml Mon Apr 15 13:45:01 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/branches/2.2.x/openjpa-examples/openbooks/build.properties
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-examples/openbooks/build.properties?rev=1468067&r1=1468066&r2=1468067&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-examples/openbooks/build.properties
(original)
+++ openjpa/branches/2.2.x/openjpa-examples/openbooks/build.properties Mon Apr
15 13:45:01 2013
@@ -21,7 +21,7 @@
# Directory location of maven repository
maven.repos=${user.home}/.m2/repository
# OpenJPA runtime artifact
-openjpa.version=2.2.1-SNAPSHOT
+openjpa.version=2.2.2-SNAPSHOT
# This is the variable of interest.
# Notice that the variable points to a directory, not a *.jar file.
Modified: openjpa/branches/2.2.x/openjpa-examples/openbooks/run.properties
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-examples/openbooks/run.properties?rev=1468067&r1=1468066&r2=1468067&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-examples/openbooks/run.properties (original)
+++ openjpa/branches/2.2.x/openjpa-examples/openbooks/run.properties Mon Apr 15
13:45:01 2013
@@ -21,7 +21,7 @@
# Directory location of maven repository
maven.repos=${user.home}/.m2/repository
# OpenJPA runtime artifact
-openjpa.version=2.2.1-SNAPSHOT
+openjpa.version=2.2.2-SNAPSHOT
openjpa.lib=${maven.repos}/org/apache/openjpa/openjpa-all/${openjpa.version}
# Other depends
# MySQL
Modified:
openjpa/branches/2.2.x/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.liberty.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.liberty.xml?rev=1468067&r1=1468066&r2=1468067&view=diff
==============================================================================
---
openjpa/branches/2.2.x/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.liberty.xml
(original)
+++
openjpa/branches/2.2.x/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.liberty.xml
Mon Apr 15 13:45:01 2013
@@ -31,6 +31,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/branches/2.2.x/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.was.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.was.xml?rev=1468067&r1=1468066&r2=1468067&view=diff
==============================================================================
---
openjpa/branches/2.2.x/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.was.xml
(original)
+++
openjpa/branches/2.2.x/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.was.xml
Mon Apr 15 13:45:01 2013
@@ -21,26 +21,28 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
version="1.0">
<persistence-unit name="OpenBooks">
- <jta-data-source>jdbc/OpenBooks</jta-data-source>
- <non-jta-data-source>jdbc/NonTxOpenBooks</non-jta-data-source>
+ <jta-data-source>jdbc/OpenBooks</jta-data-source>
+ <non-jta-data-source>jdbc/NonTxOpenBooks</non-jta-data-source>
- <class>openbook.domain.Book</class>
- <class>openbook.domain.Inventory</class>
- <class>openbook.domain.PurchaseOrder</class>
- <class>openbook.domain.LineItem</class>
- <class>openbook.domain.Customer</class>
- <class>openbook.domain.Author</class>
-
- <properties>
- <property name="openjpa.DataCache"
value="true"/>
- <property name="openjpa.RemoteCommitProvider" value="sjvm"/>
- <property name="openjpa.DynamicEnhancementAgent"
value="false"/>
- <property name="openjpa.RuntimeUnenhancedClasses"
value="unsupported"/>
+ <class>openbook.domain.Book</class>
+ <class>openbook.domain.Inventory</class>
+ <class>openbook.domain.PurchaseOrder</class>
+ <class>openbook.domain.LineItem</class>
+ <class>openbook.domain.Customer</class>
+ <class>openbook.domain.Author</class>
- <property name="openjpa.jdbc.SynchronizeMappings"
value="buildSchema(ForeignKeys=true)"/>
- <property name="openjpa.jdbc.QuerySQLCache"
value="true(EnableStatistics=true)"/>
-
- </properties>
+ <validation-mode>NONE</validation-mode>
+
+ <properties>
+ <property name="openjpa.DataCache" value="true"/>
+ <property name="openjpa.RemoteCommitProvider" value="sjvm"/>
+ <property name="openjpa.DynamicEnhancementAgent" value="false"/>
+ <property name="openjpa.RuntimeUnenhancedClasses"
value="unsupported"/>
+
+ <property name="openjpa.jdbc.SynchronizeMappings"
value="buildSchema(ForeignKeys=true)"/>
+ <property name="openjpa.jdbc.QuerySQLCache"
value="true(EnableStatistics=true)"/>
+
+ </properties>
</persistence-unit>
</persistence>
Modified:
openjpa/branches/2.2.x/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml?rev=1468067&r1=1468066&r2=1468067&view=diff
==============================================================================
---
openjpa/branches/2.2.x/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml
(original)
+++
openjpa/branches/2.2.x/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml
Mon Apr 15 13:45:01 2013
@@ -30,6 +30,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"/>
