From e99bcec7b3979a2eb3348bc7e4278ee6a0603e35 Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Wed, 15 May 2013 07:42:37 +0200
Subject: [407256] Change the server configuration file (cdo-server.xml) for
 Oracle DB https://bugs.eclipse.org/bugs/show_bug.cgi?id=407256

---
 .../config/cdo-server.xml                                   | 13 ++++++++-----
 .../config/cdo-server.xml                                   | 13 ++++++++-----
 .../config/cdo-server.xml                                   | 13 ++++++++-----
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml
index 5b7b7fd307..b6fe0f4158 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml
@@ -60,7 +60,7 @@
         -->
 
         <!-- Optional:
-        <property name="objectTypeCacheSize" value="100000" />
+        <property name="objectTypeCacheSize" value="100000"/>
         -->
 
       </mappingStrategy>
@@ -102,10 +102,13 @@
 
       <!-- Example:
 			<dbAdapter name="oracle"/>
-      <dataSource class="oracle.jdbc.pool.OracleDataSource"
-        url="jdbc:oracle:thin:@localhost:1521:xe"
-        user="username"
-        password="password"/>
+			<dataSource class="oracle.jdbc.pool.OracleDataSource"
+				driverType="thin"
+				serverName="serverURL"
+				portNumber="1521"
+				databaseName="SID"
+				user="user"
+				password="passwd"/>
 			-->
 
     </store>
diff --git a/plugins/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml b/plugins/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml
index 5b7b7fd307..b6fe0f4158 100644
--- a/plugins/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml
@@ -60,7 +60,7 @@
         -->
 
         <!-- Optional:
-        <property name="objectTypeCacheSize" value="100000" />
+        <property name="objectTypeCacheSize" value="100000"/>
         -->
 
       </mappingStrategy>
@@ -102,10 +102,13 @@
 
       <!-- Example:
 			<dbAdapter name="oracle"/>
-      <dataSource class="oracle.jdbc.pool.OracleDataSource"
-        url="jdbc:oracle:thin:@localhost:1521:xe"
-        user="username"
-        password="password"/>
+			<dataSource class="oracle.jdbc.pool.OracleDataSource"
+				driverType="thin"
+				serverName="serverURL"
+				portNumber="1521"
+				databaseName="SID"
+				user="user"
+				password="passwd"/>
 			-->
 
     </store>
diff --git a/plugins/org.eclipse.emf.cdo.server.product/config/cdo-server.xml b/plugins/org.eclipse.emf.cdo.server.product/config/cdo-server.xml
index fb03664ee6..86d5885b1c 100644
--- a/plugins/org.eclipse.emf.cdo.server.product/config/cdo-server.xml
+++ b/plugins/org.eclipse.emf.cdo.server.product/config/cdo-server.xml
@@ -60,7 +60,7 @@
         -->
 
         <!-- Optional:
-        <property name="objectTypeCacheSize" value="100000" />
+        <property name="objectTypeCacheSize" value="100000"/>
         -->
 
       </mappingStrategy>
@@ -102,10 +102,13 @@
 
       <!-- Example:
 			<dbAdapter name="oracle"/>
-      <dataSource class="oracle.jdbc.pool.OracleDataSource"
-        url="jdbc:oracle:thin:@localhost:1521:xe"
-        user="username"
-        password="password"/>
+			<dataSource class="oracle.jdbc.pool.OracleDataSource"
+				driverType="thin"
+				serverName="serverURL"
+				portNumber="1521"
+				databaseName="SID"
+				user="user"
+				password="passwd"/>
 			-->
 
     </store>
-- 
cgit v1.2.3