Author: norman
Date: Mon May 10 08:03:12 2010
New Revision: 942679
URL: http://svn.apache.org/viewvc?rev=942679&view=rev
Log:
Upgrade to OpenJPA 2.0.0 (JAMES-1000) and spring 3.0.2 (JAMES-1001)
Modified:
james/server/trunk/jpa-store/pom.xml
james/server/trunk/pom.xml
james/server/trunk/spring-deployment/src/main/config/james/META-INF/persistence.xml
Modified: james/server/trunk/jpa-store/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/jpa-store/pom.xml?rev=942679&r1=942678&r2=942679&view=diff
==============================================================================
--- james/server/trunk/jpa-store/pom.xml (original)
+++ james/server/trunk/jpa-store/pom.xml Mon May 10 08:03:12 2010
@@ -77,11 +77,6 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <scope>compile</scope>
- </dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -95,6 +90,12 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-api</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-library</artifactId>
@@ -114,7 +115,6 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>1.2.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=942679&r1=942678&r2=942679&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Mon May 10 08:03:12 2010
@@ -94,13 +94,6 @@
<url>http://download.java.net/maven/2/</url>
<layout>default</layout>
</repository>
- <!-- needed for persistence-api -->
- <repository>
- <id>maven1-repository.dev.java.net</id>
- <name>Java.net Repository for Maven (v1)</name>
- <url>http://download.java.net/maven/1/</url>
- <layout>legacy</layout>
- </repository>
<!-- netty -->
<repository>
@@ -471,12 +464,7 @@
<artifactId>james-server-jpa-store</artifactId>
<version>3.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0.2</version>
- <scope>runtime</scope>
- </dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-torque</artifactId>
@@ -897,38 +885,39 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
</dependency>
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -956,13 +945,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -977,6 +966,20 @@
<version>1.5.8</version>
<scope>runtime</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>2.0.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
Modified:
james/server/trunk/spring-deployment/src/main/config/james/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/META-INF/persistence.xml?rev=942679&r1=942678&r2=942679&view=diff
==============================================================================
---
james/server/trunk/spring-deployment/src/main/config/james/META-INF/persistence.xml
(original)
+++
james/server/trunk/spring-deployment/src/main/config/james/META-INF/persistence.xml
Mon May 10 08:03:12 2010
@@ -28,12 +28,6 @@
<class>org.apache.james.server.jpa.JPAUser</class>
<properties>
- <!-- workaround for MYSQL till openjpa 1.3 or 2.0.0 was released
-->
- <!-- see https://issues.apache.org/jira/browse/OPENJPA-740 -->
- <!-- IF YOU USE MYSQL UNCOMMENT THIS -->
- <!--
- <property name="openjpa.jdbc.DBDictionary"
value="blobTypeName=LONGBLOB"/>
- -->
<!-- create tables on startup -->
<property name="openjpa.jdbc.SynchronizeMappings"
value="buildSchema(ForeignKeys=true)"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
