You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/03/02 13:33:04 UTC
svn commit: r513732 - in /incubator/roller/branches/roller_4.0/apps/planet:
testdata/ testdata/META-INF/ web/META-INF/ web/WEB-INF/classes/META-INF/
Author: snoopdave
Date: Fri Mar 2 04:33:03 2007
New Revision: 513732
URL: http://svn.apache.org/viewvc?view=rev&rev=513732
Log:
- persistence.xml in the right place
- default to derby in tests, as usual
Added:
incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/classes/META-INF/
incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/classes/META-INF/persistence.xml
- copied, changed from r512470, incubator/roller/branches/roller_4.0/apps/planet/web/META-INF/persistence.xml
Removed:
incubator/roller/branches/roller_4.0/apps/planet/web/META-INF/persistence.xml
Modified:
incubator/roller/branches/roller_4.0/apps/planet/testdata/JPAEMF.properties
incubator/roller/branches/roller_4.0/apps/planet/testdata/META-INF/persistence.xml
incubator/roller/branches/roller_4.0/apps/planet/testdata/planet-custom.properties
Modified: incubator/roller/branches/roller_4.0/apps/planet/testdata/JPAEMF.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/testdata/JPAEMF.properties?view=diff&rev=513732&r1=513731&r2=513732
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/testdata/JPAEMF.properties (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/testdata/JPAEMF.properties Fri Mar 2 04:33:03 2007
@@ -11,13 +11,18 @@
#toplink.jdbc.user=roller
#toplink.jdbc.password=roller
+# OpenJPA and MySQL
+#openjpa.ConnectionDriverName=com.mysql.jdbc.Driver
+#openjpa.ConnectionURL=jdbc:mysql://snoopdave:3306/rollertest
+#openjpa.ConnectionUserName=scott
+#openjpa.ConnectionPassword=tiger
# JPA/Hibernate and Derby
-hibernate.dialect=org.hibernate.dialect.DerbyDialect
-hibernate.connection.driver_class=org.apache.derby.jdbc.ClientDriver
-hibernate.connection.url=jdbc:derby://localhost:3219/planet
-hibernate.connection.username=app
-hibernate.connection.password=app
+#hibernate.dialect=org.hibernate.dialect.DerbyDialect
+#hibernate.connection.driver_class=org.apache.derby.jdbc.ClientDriver
+#hibernate.connection.url=jdbc:derby://localhost:3219/planet
+#hibernate.connection.username=app
+#hibernate.connection.password=app
# JPA/Hibernate and MySQL
#hibernate.dialect=org.hibernate.dialect.MySQLDialect
Modified: incubator/roller/branches/roller_4.0/apps/planet/testdata/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/testdata/META-INF/persistence.xml?view=diff&rev=513732&r1=513731&r2=513732
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/testdata/META-INF/persistence.xml (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/testdata/META-INF/persistence.xml Fri Mar 2 04:33:03 2007
@@ -1,12 +1,11 @@
<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
- <persistence-unit name="PlanetPU" transaction-type="RESOURCE_LOCAL">
+ <persistence-unit name ="PlanetPU" transaction-type = "RESOURCE_LOCAL">
+ <provider>oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider</provider>
<!--
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
<provider>org.hibernate.ejb.HibernatePersistence</provider>
-->
- <provider>oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider</provider>
-
<mapping-file>org/apache/roller/planet/pojos/PropertyData.orm.xml</mapping-file>
<mapping-file>org/apache/roller/planet/pojos/PlanetData.orm.xml</mapping-file>
<mapping-file>org/apache/roller/planet/pojos/PlanetGroupData.orm.xml</mapping-file>
Modified: incubator/roller/branches/roller_4.0/apps/planet/testdata/planet-custom.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/testdata/planet-custom.properties?view=diff&rev=513732&r1=513731&r2=513732
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/testdata/planet-custom.properties (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/testdata/planet-custom.properties Fri Mar 2 04:33:03 2007
@@ -6,7 +6,7 @@
hibernate.dialect=org.hibernate.dialect.DerbyDialect
#jdbc.driverClass=com.mysql.jdbc.Driver
-#jdbc.connectionURL=jdbc:mysql://localhost:3306/test_planet
-#jdbc.username=roller
-#jdbc.password=roller
+#jdbc.connectionURL=jdbc:mysql://localhost:3306/rollertest
+#jdbc.username=scott
+#jdbc.password=tiger
#hibernate.dialect=org.hibernate.dialect.MySQLDialect
Copied: incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/classes/META-INF/persistence.xml (from r512470, incubator/roller/branches/roller_4.0/apps/planet/web/META-INF/persistence.xml)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/classes/META-INF/persistence.xml?view=diff&rev=513732&p1=incubator/roller/branches/roller_4.0/apps/planet/web/META-INF/persistence.xml&r1=512470&p2=incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/classes/META-INF/persistence.xml&r2=513732
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/web/META-INF/persistence.xml (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/classes/META-INF/persistence.xml Fri Mar 2 04:33:03 2007
@@ -2,6 +2,10 @@
<persistence-unit name ="PlanetPU" transaction-type = "RESOURCE_LOCAL">
<provider>oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider</provider>
+ <!--
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ -->
<jta-data-source>jdbc/planetdb</jta-data-source>
<mapping-file>org/apache/roller/planet/pojos/PlanetData.orm.xml</mapping-file>
<mapping-file>org/apache/roller/planet/pojos/PlanetGroupData.orm.xml</mapping-file>