You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2013/05/31 03:30:23 UTC
svn commit: r1488075 - in /roller/trunk: ./ planet-business/
planet-business/src/main/resources/META-INF/
planet-business/src/test/resources/
planet-business/src/test/resources/META-INF/ weblogger-business/
weblogger-business/src/main/resources/org/apa...
Author: gmazza
Date: Fri May 31 01:30:23 2013
New Revision: 1488075
URL: http://svn.apache.org/r1488075
Log:
Updated & centralized Hibernate version info, turned off Hibernate transaction manager lookup attempts until we can find non-JNDI way of activating it, created non-JNDI persistence.xml in planet-business/src/test
Added:
roller/trunk/planet-business/src/test/resources/META-INF/
roller/trunk/planet-business/src/test/resources/META-INF/persistence.xml
Modified:
roller/trunk/planet-business/pom.xml
roller/trunk/planet-business/src/main/resources/META-INF/persistence.xml
roller/trunk/planet-business/src/test/resources/planet-custom.properties
roller/trunk/pom.xml
roller/trunk/weblogger-business/pom.xml
roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml
roller/trunk/weblogger-business/src/test/resources/META-INF/persistence.xml
roller/trunk/weblogger-business/src/test/resources/planet-custom.properties
roller/trunk/weblogger-business/src/test/resources/roller-custom.properties
Modified: roller/trunk/planet-business/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/pom.xml?rev=1488075&r1=1488074&r2=1488075&view=diff
==============================================================================
--- roller/trunk/planet-business/pom.xml (original)
+++ roller/trunk/planet-business/pom.xml Fri May 31 01:30:23 2013
@@ -73,16 +73,14 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>3.5.1-Final</version>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>1.5.6</version>
<scope>runtime</scope>
</dependency>
-->
-
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
Modified: roller/trunk/planet-business/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/src/main/resources/META-INF/persistence.xml?rev=1488075&r1=1488074&r2=1488075&view=diff
==============================================================================
--- roller/trunk/planet-business/src/main/resources/META-INF/persistence.xml (original)
+++ roller/trunk/planet-business/src/main/resources/META-INF/persistence.xml Fri May 31 01:30:23 2013
@@ -5,6 +5,6 @@
<mapping-file>org/apache/roller/planet/pojos/Planet.orm.xml</mapping-file>
<mapping-file>org/apache/roller/planet/pojos/PlanetGroup.orm.xml</mapping-file>
<mapping-file>org/apache/roller/planet/pojos/Subscription.orm.xml</mapping-file>
- <mapping-file>org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml</mapping-file>
+ <mapping-file>org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml</mapping-file>
</persistence-unit>
</persistence>
\ No newline at end of file
Added: roller/trunk/planet-business/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/src/test/resources/META-INF/persistence.xml?rev=1488075&view=auto
==============================================================================
--- roller/trunk/planet-business/src/test/resources/META-INF/persistence.xml (added)
+++ roller/trunk/planet-business/src/test/resources/META-INF/persistence.xml Fri May 31 01:30:23 2013
@@ -0,0 +1,17 @@
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0">
+ <persistence-unit name ="PlanetPU" transaction-type = "RESOURCE_LOCAL">
+ <mapping-file>org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml</mapping-file>
+ <mapping-file>org/apache/roller/planet/pojos/Planet.orm.xml</mapping-file>
+ <mapping-file>org/apache/roller/planet/pojos/PlanetGroup.orm.xml</mapping-file>
+ <mapping-file>org/apache/roller/planet/pojos/Subscription.orm.xml</mapping-file>
+ <mapping-file>org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml</mapping-file>
+ <properties>
+ <property name="javax.persistence.jdbc.driver" value="org.apache.derby.jdbc.ClientDriver" />
+ <property name="javax.persistence.jdbc.url"
+ value="jdbc:derby://localhost:3221/rollerdb" />
+ <property name="javax.persistence.jdbc.user" value="APP" />
+ <property name="javax.persistence.jdbc.password" value="APP" />
+ <property name="eclipselink.target-database" value="Derby"/>
+ </properties>
+ </persistence-unit>
+</persistence>
\ No newline at end of file
Modified: roller/trunk/planet-business/src/test/resources/planet-custom.properties
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/src/test/resources/planet-custom.properties?rev=1488075&r1=1488074&r2=1488075&view=diff
==============================================================================
--- roller/trunk/planet-business/src/test/resources/planet-custom.properties (original)
+++ roller/trunk/planet-business/src/test/resources/planet-custom.properties Fri May 31 01:30:23 2013
@@ -8,6 +8,7 @@ database.jdbc.driverClass=org.apache.der
database.jdbc.connectionURL=jdbc:derby://localhost:3221/rollerdb
database.jdbc.username=APP
database.jdbc.password=APP
+hibernate.dialect=org.hibernate.dialect.DerbyDialect
#jdbc.driverClass=com.mysql.jdbc.Driver
#jdbc.connectionURL=jdbc:mysql://localhost:3306/rollertest
Modified: roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1488075&r1=1488074&r2=1488075&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Fri May 31 01:30:23 2013
@@ -119,12 +119,6 @@
<url>http://oss.sonatype.org/content/groups/public</url>
</repository>
- <!-- JBoss Hibernate JPA repo
- <repository>
- <id>JBoss Repo</id>
- <url>http://repository.jboss.com/maven2</url>
- </repository> -->
-
<!-- for jstl-1.2 for now.. -->
<repository>
<id>java.net</id>
@@ -349,7 +343,7 @@
<scope>compile</scope>
</dependency>
- <!-- Next three EclipseLink usage only -->
+ <!-- Next three EclipseLink JPA usage only -->
<dependency>
<groupId>org.eclipse.persistence</groupId>
@@ -369,6 +363,20 @@
<version>1.1</version>
</dependency>
+ <!-- Next two Hibernate JPA usage only -->
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>4.2.1.Final</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
Modified: roller/trunk/weblogger-business/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/pom.xml?rev=1488075&r1=1488074&r2=1488075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/pom.xml (original)
+++ roller/trunk/weblogger-business/pom.xml Fri May 31 01:30:23 2013
@@ -58,19 +58,20 @@
</exclusions>
</dependency>
-<!-- EclipseLink deps (for sometimes testing purposes) -->
+<!-- EclipseLink deps (for sometimes testing purposes)
-<!--
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
@@ -78,17 +79,16 @@
</dependency>
-->
-<!-- Hibernate deps (for sometimes testing purposes) -->
-<!--
+<!-- Hibernate deps (for sometimes testing purposes)
+
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>3.5.1-Final</version>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>1.5.6</version>
<scope>runtime</scope>
</dependency>
-->
Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml?rev=1488075&r1=1488074&r2=1488075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml Fri May 31 01:30:23 2013
@@ -78,6 +78,8 @@
<transient name="thumbnailInputStream"/>
<transient name="thumbnailHeight"/>
<transient name="thumbnailWidth"/>
+ <transient name="addedTags"/>
+ <transient name="removedTags"/>
</attributes>
</entity>
</entity-mappings>
Modified: roller/trunk/weblogger-business/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/test/resources/META-INF/persistence.xml?rev=1488075&r1=1488074&r2=1488075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/test/resources/META-INF/persistence.xml (original)
+++ roller/trunk/weblogger-business/src/test/resources/META-INF/persistence.xml Fri May 31 01:30:23 2013
@@ -1,16 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence">
<persistence-unit name="RollerPU" transaction-type="RESOURCE_LOCAL">
- <!-- Activate below & comment out non-jta-data-source if using EclipseLink-->
- <!--properties>
- <property name="javax.persistence.jdbc.driver" value="org.apache.derby.jdbc.ClientDriver" />
- <property name="javax.persistence.jdbc.url"
- value="jdbc:derby://localhost:3221/rollerdb" />
- <property name="javax.persistence.jdbc.user" value="APP" />
- <property name="javax.persistence.jdbc.password" value="APP" />
- <property name="eclipselink.target-database" value="Derby"/>
- </properties-->
- <non-jta-data-source>${datasourceName}</non-jta-data-source>
<mapping-file>org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml </mapping-file>
<mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml </mapping-file>
<mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml </mapping-file>
@@ -40,5 +30,13 @@
<class>org.apache.roller.weblogger.pojos.AutoPing</class>
<class>org.apache.roller.weblogger.pojos.WeblogThemeAssoc</class>
<class>org.apache.roller.weblogger.pojos.WeblogThemeTemplateCode</class>
+ <properties>
+ <property name="javax.persistence.jdbc.driver" value="org.apache.derby.jdbc.ClientDriver" />
+ <property name="javax.persistence.jdbc.url"
+ value="jdbc:derby://localhost:3221/rollerdb" />
+ <property name="javax.persistence.jdbc.user" value="APP" />
+ <property name="javax.persistence.jdbc.password" value="APP" />
+ <property name="eclipselink.target-database" value="Derby"/>
+ </properties>
</persistence-unit>
</persistence>
Modified: roller/trunk/weblogger-business/src/test/resources/planet-custom.properties
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/test/resources/planet-custom.properties?rev=1488075&r1=1488074&r2=1488075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/test/resources/planet-custom.properties (original)
+++ roller/trunk/weblogger-business/src/test/resources/planet-custom.properties Fri May 31 01:30:23 2013
@@ -9,6 +9,8 @@ database.jdbc.connectionURL=jdbc:derby:/
database.jdbc.username=app
database.jdbc.password=app
+hibernate.dialect=org.hibernate.dialect.DerbyDialect
+
cache.dir=${planetCacheDir}
#database.jdbc.driverClass=com.mysql.jdbc.Driver
Modified: roller/trunk/weblogger-business/src/test/resources/roller-custom.properties
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/test/resources/roller-custom.properties?rev=1488075&r1=1488074&r2=1488075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/test/resources/roller-custom.properties (original)
+++ roller/trunk/weblogger-business/src/test/resources/roller-custom.properties Fri May 31 01:30:23 2013
@@ -10,6 +10,11 @@ openjpa.FlushBeforeQueries=true
openjpa.ConnectionRetainMode=always
openjpa.Log=commons
+hibernate.dialect=org.hibernate.dialect.DerbyDialect
+# turn off transaction manager during JUnit testing (TODO: find way to activate for JUnit tests)
+hibernate.transaction.factory_class=
+hibernate.transaction.manager_lookup_class=
+
# use CMA authentication to work around Spring init issues in UI tests
authentication.cma.enabled=true