svn commit: r439228 - in /incubator/cayenne/main/trunk/core/cayenne-jpa/src: main/java/org/apache/cayenne/jpa/cspi/CjpaDataSourceFactory.java test/java/org/apache/cayenne/jpa/cspi/CjpaDataSourceFactoryTest.java

[aadamchik]

Author: aadamchik
Date: Fri Sep  1 01:13:22 2006
New Revision: 439228

URL: http://svn.apache.org/viewvc?rev=439228&view=rev
Log:
changing property prefix for the app-managed datasource

Modified:
    
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaDataSourceFactory.java
    
incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/cspi/CjpaDataSourceFactoryTest.java

Modified: 
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaDataSourceFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaDataSourceFactory.java?rev=439228&r1=439227&r2=439228&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaDataSourceFactory.java
 (original)
+++ 
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaDataSourceFactory.java
 Fri Sep  1 01:13:22 2006
@@ -46,13 +46,13 @@
  * supported:
  * </p>
  * <ul>
- * <li>CayenneDataSource.[datasource name].jdbc.driver - (required) JDBC 
driver class</li>
- * <li>CayenneDataSource.[datasource name].jdbc.url - (required) Database 
URL</li>
- * <li>CayenneDataSource.[datasource name].jdbc.username - Database login 
id</li>
- * <li>CayenneDataSource.[datasource name].jdbc.password - Database 
password</li>
- * <li>CayenneDataSource.[datasource name].jdbc.minConnections - (optional) 
Minimal pool
+ * <li>cayenne.ds.[datasource name].jdbc.driver - (required) JDBC driver 
class</li>
+ * <li>cayenne.ds.[datasource name].jdbc.url - (required) Database URL</li>
+ * <li>cayenne.ds.[datasource name].jdbc.username - Database login id</li>
+ * <li>cayenne.ds.[datasource name].jdbc.password - Database password</li>
+ * <li>cayenne.ds.[datasource name].jdbc.minConnections - (optional) Minimal 
pool
  * size</li>
- * <li>CayenneDataSource.[datasource name].jdbc.maxConnections - (optional) 
Maximum pool
+ * <li>cayenne.ds.[datasource name].jdbc.maxConnections - (optional) Maximum 
pool
  * size</li>
  * </ul>
  * <p>
@@ -66,7 +66,7 @@
  */
 public class CjpaDataSourceFactory extends JndiJpaDataSourceFactory {
 
-    public static final String DATA_SOURCE_PREFIX = "CayenneDataSource.";
+    public static final String DATA_SOURCE_PREFIX = "cayenne.ds.";
     public static final String MIN_CONNECTIONS_SUFFIX = "jdbc.minConnections";
     public static final String MAX_CONNECTIONS_SUFFIX = "jdbc.maxConnections";
 

Modified: 
incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/cspi/CjpaDataSourceFactoryTest.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/cspi/CjpaDataSourceFactoryTest.java?rev=439228&r1=439227&r2=439228&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/cspi/CjpaDataSourceFactoryTest.java
 (original)
+++ 
incubator/cayenne/main/trunk/core/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/cspi/CjpaDataSourceFactoryTest.java
 Fri Sep  1 01:13:22 2006
@@ -26,6 +26,6 @@
 
     public void testGetDriverKey() {
         CjpaDataSourceFactory factory = new CjpaDataSourceFactory();
-        assertEquals("CayenneDataSource.xyz.jdbc.driver", 
factory.getDriverKey("xyz"));
+        assertEquals("cayenne.ds.xyz.jdbc.driver", 
factory.getDriverKey("xyz"));
     }
 }