diff --git a/assembly/src/release/conf/activemq-nojournal.xml b/assembly/src/release/conf/activemq-nojournal.xml
index 25a6196685..6a3e6895a9 100755
--- a/assembly/src/release/conf/activemq-nojournal.xml
+++ b/assembly/src/release/conf/activemq-nojournal.xml
@@ -98,10 +98,12 @@
    
   <!-- Oracle DataSource Sample Setup -->
   <!--
-  <bean id="oracle-ds" class="oracle.jdbc.pool.OracleDataSource">
-    <property name="URL" value="jdbc:oracle:thin:@localhost:1521:AMQDB"/>
-    <property name="user" value="scott"/>
+  <bean id="oracle-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+    <property name="driverClassName" value="oracle.jdbc.driver.OracleDriver"/>
+    <property name="url" value="jdbc:oracle:thin:@localhost:1521:AMQDB"/>
+    <property name="username" value="scott"/>
     <property name="password" value="tiger"/>
+    <property name="poolPreparedStatements" value="true"/>
   </bean>
   -->
       
diff --git a/assembly/src/release/conf/activemq.xml b/assembly/src/release/conf/activemq.xml
index 514d7ff829..f634b006f9 100755
--- a/assembly/src/release/conf/activemq.xml
+++ b/assembly/src/release/conf/activemq.xml
@@ -100,15 +100,18 @@
     <property name="poolPreparedStatements" value="true"/>
   </bean>
   -->  
-      
-  <!-- Embedded Derby DataSource Sample Setup -->
-  <!-- 
-  <bean id="derby-ds" class="org.apache.derby.jdbc.EmbeddedDataSource">
-    <property name="databaseName" value="derbydb"/>
-    <property name="createDatabase" value="create"/>
+   
+  <!-- Oracle DataSource Sample Setup -->
+  <!--
+  <bean id="oracle-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+    <property name="driverClassName" value="oracle.jdbc.driver.OracleDriver"/>
+    <property name="url" value="jdbc:oracle:thin:@localhost:1521:AMQDB"/>
+    <property name="username" value="scott"/>
+    <property name="password" value="tiger"/>
+    <property name="poolPreparedStatements" value="true"/>
   </bean>
-  -->  
-  
+  -->
+        
   <!-- Embedded Derby DataSource Sample Setup -->
   <!-- 
   <bean id="derby-ds" class="org.apache.derby.jdbc.EmbeddedDataSource">