Author: jrbauer
Date: Fri Feb 6 03:32:35 2009
New Revision: 741386
URL: http://svn.apache.org/viewvc?rev=741386&view=rev
Log:
OPENJPA-849 Committing code for Dianne Richards that reverts driver property
name back to openjpa property.
Modified:
openjpa/trunk/openjpa-persistence-jdbc/pom.xml
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
Modified: openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?rev=741386&r1=741385&r2=741386&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/pom.xml Fri Feb 6 03:32:35 2009
@@ -552,7 +552,7 @@
<value>DefaultLevel=${openjpa.loglevel}</value>
</property>
<property>
- <name>javax.persistence.jdbc.driver</name>
+ <name>openjpa.ConnectionDriverName</name>
<value>org.apache.commons.dbcp.BasicDataSource</value>
</property>
<property>
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java?rev=741386&r1=741385&r2=741386&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java
Fri Feb 6 03:32:35 2009
@@ -59,7 +59,7 @@
*/
public void testBadUrlProtocolValueWithValidDriverClass() {
Properties p = new Properties();
- p.put("javax.persistence.jdbc.driver", GOOD_DRIVER);
+ p.put("openjpa.ConnectionDriverName", GOOD_DRIVER);
p.put("openjpa.ConnectionURL", BAD_URL_PROTOCOL);
verifyConnectException(p, PersistenceException.class,
UserException.class, GOOD_DRIVER,
BAD_URL_PROTOCOL);
@@ -70,7 +70,7 @@
*/
public void testBadUrlProtocolValueWithValidDataSource() {
Properties p = new Properties();
- p.put("javax.persistence.jdbc.driver", GOOD_DATASOURCE);
+ p.put("openjpa.ConnectionDriverName", GOOD_DATASOURCE);
p.put("openjpa.ConnectionURL", BAD_URL_PROTOCOL);
p.put("openjpa.ConnectionProperties", BAD_CONN_PROPS);
verifyConnectException(p, PersistenceException.class,
@@ -82,7 +82,7 @@
*/
public void testBadUrlSubprotocolValueWithValidDriverClass() {
Properties p = new Properties();
- p.put("javax.persistence.jdbc.driver", GOOD_DRIVER);
+ p.put("openjpa.ConnectionDriverName", GOOD_DRIVER);
p.put("openjpa.ConnectionURL", BAD_URL_SUBPROTOCOL);
verifyConnectException(p, PersistenceException.class,
UserException.class, GOOD_DRIVER,
BAD_URL_SUBPROTOCOL);
@@ -93,7 +93,7 @@
*/
public void testBadUrlSubprotocolValueWithValidDataSource() {
Properties p = new Properties();
- p.put("javax.persistence.jdbc.driver", GOOD_DRIVER);
+ p.put("openjpa.ConnectionDriverName", GOOD_DRIVER);
p.put("openjpa.ConnectionURL", BAD_URL_SUBPROTOCOL);
verifyConnectException(p, PersistenceException.class,
UserException.class, GOOD_DRIVER,
BAD_URL_SUBPROTOCOL);
@@ -104,7 +104,7 @@
*/
public void testValidUrlWithInvalidDriver() {
Properties p = new Properties();
- p.put("javax.persistence.jdbc.driver", BAD_DRIVER);
+ p.put("openjpa.ConnectionDriverName", BAD_DRIVER);
p.put("openjpa.ConnectionURL", GOOD_URL);
verifyConnectException(p, PersistenceException.class,
UserException.class, GOOD_URL, BAD_DRIVER);
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java?rev=741386&r1=741385&r2=741386&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java
Fri Feb 6 03:32:35 2009
@@ -64,7 +64,7 @@
// openjpa.ConnectionProperties. If either one of these are changed,
// this test case may fail.
String javaxConnectionDriver =
- (String) emProperties.get("javax.persistence.jdbc.driver");
+ (String) emProperties.get("openjpa.ConnectionDriverName");
assertNotNull(javaxConnectionDriver);
String openjpaConnectionURL =
(String) emProperties.get("openjpa.ConnectionURL");
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml?rev=741386&r1=741385&r2=741386&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
Fri Feb 6 03:32:35 2009
@@ -71,7 +71,7 @@
<persistence-unit name="invalid">
<properties>
- <property name="javax.persistence.jdbc.driver"
+ <property name="openjpa.ConnectionDriverName"
value="org.apache.commons.dbcp.BasicDataSource" />
<property name="openjpa.ConnectionProperties"
value="DriverClassName=not.a.real.Driver,Url=jdbc:notreal://"/>
