Author: gmazza
Date: Sun Jun 30 13:29:01 2013
New Revision: 1498118
URL: http://svn.apache.org/r1498118
Log:
Removed a line break in an orm.xml file that EclipseLink JPA didn't like, added
instructions on how to do JUnit tests with EclipseLink.
Modified:
roller/trunk/app/pom.xml
roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1498118&r1=1498117&r2=1498118&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Sun Jun 30 13:29:01 2013
@@ -103,15 +103,25 @@
</exclusions>
</dependency>
- <!-- EclipseLink deps (for sometimes testing purposes)
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>eclipselink</artifactId>
- <version>2.5.0</version>
- <scope>test</scope>
- </dependency>
- -->
-
+ <!-- To run JUnit tests using EclipseLink JPA instead of OpenJPA:
+ 1.) Uncomment this dependency and comment-out the adjacent hibernate
+ and OpenJPA ones
+ 2.) Comment-out the OpenJPA "-javaagent" line in the Surefire plugin
+ below and comment-out the OpenJPA profile in order to prevent
+ the OpenJPA bytecode enhancement
+ 3.) In src/main/resources/META-INF/persistence.xml, comment-out the
+ <non-jta-data-source> element, as EclipseLink tries to do a
+ JNDI connection instead of relying on the jdbc properties if
+ the former is available.
+ As of 6/30/2013, running mvn clean install with EclipseLink JPA
+ returns 30 failures and 14 errors.
+
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>eclipselink</artifactId>
+ <version>2.5.0</version>
+ </dependency>
+-->
<!-- Hibernate deps (for sometimes testing purposes)
<dependency>
<groupId>org.hibernate</groupId>
Modified:
roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml?rev=1498118&r1=1498117&r2=1498118&view=diff
==============================================================================
---
roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml
(original)
+++
roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml
Sun Jun 30 13:29:01 2013
@@ -22,8 +22,7 @@
<query>SELECT p FROM Subscription p ORDER BY p.inboundblogs
DESC</query>
</named-query>
<named-query name="Subscription.getByGroupOrderByInboundBlogsDesc">
- <query>SELECT p FROM Subscription p JOIN p.groups g WHERE g.handle
= ?1 ORDER
- BY p.inboundblogs DESC
+ <query>SELECT p FROM Subscription p JOIN p.groups g WHERE g.handle
= ?1 ORDER BY p.inboundblogs DESC
</query>
</named-query>
<named-query name="Subscription.getByFeedURL">
