svn commit: r1606820 - in /jackrabbit/oak/trunk/oak-core: pom.xml src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java

[reschke]

Author: reschke
Date: Mon Jun 30 16:18:37 2014
New Revision: 1606820

URL: http://svn.apache.org/r1606820
Log:
OAK-1914 - hardwire driver class name for Oracle, add Ora JDBC as embedded for 
now

Modified:
    jackrabbit/oak/trunk/oak-core/pom.xml
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java

Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1606820&r1=1606819&r2=1606820&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Mon Jun 30 16:18:37 2014
@@ -42,7 +42,7 @@
               <!-- OAK-1708 TODO: temporary workaround for embedding code for 
DocumentNodeStoreService-->
               commons-dbcp,commons-pool,h2,json-simple,
               <!-- OAK-1708 TODO: note these below will only embedded when 
build with the respective profiles from oak-parent -->
-              postgresql,db2,db2-license,mysql-connector-java
+              postgresql,db2,db2-license,mysql-connector-java,ojdbc6
             </Embed-Dependency>
             <Embed-Transitive>true</Embed-Transitive>
             <Import-Package>

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java?rev=1606820&r1=1606819&r2=1606820&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java
 Mon Jun 30 16:18:37 2014
@@ -114,6 +114,8 @@ public class RDBDataSourceFactory {
             return "com.ibm.db2.jcc.DB2Driver";
         } else if ("mysql".equals(type)) {
             return "com.mysql.jdbc.Driver";
+        } else if ("oracle".equals(type)) {
+            return "oracle.jdbc.OracleDriver";
         } else {
             return "";
         }