diff options
author | Eike Stepper | 2007-11-14 15:30:00 +0000 |
---|---|---|
committer | Eike Stepper | 2007-11-14 15:30:00 +0000 |
commit | 68c08fd69714fc2a7939615cb338d8080d888e33 (patch) | |
tree | 6b4456a72e03bd631253c9de77773ccb2bdbcb2a | |
parent | 430fb8b72455f82e9f0fbe70843cde3935882f2d (diff) | |
download | cdo-68c08fd69714fc2a7939615cb338d8080d888e33.tar.gz cdo-68c08fd69714fc2a7939615cb338d8080d888e33.tar.xz cdo-68c08fd69714fc2a7939615cb338d8080d888e33.zip |
*** empty log message ***
-rw-r--r-- | features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml | 12 | ||||
-rw-r--r-- | plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml b/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml index 0c5fbde0e9..9a1979a88c 100644 --- a/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml +++ b/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml @@ -29,26 +29,22 @@ </mappingStrategy> <!--<dbAdapter name="derby"/> - <dataSource - driverClass="org.apache.derby.jdbc.EmbeddedDataSource" + <dataSource class="org.apache.derby.jdbc.EmbeddedDataSource" databaseName="/temp/cdodb1" createDatabase="create"/> --> <!--<dbAdapter name="derby"/> - <dataSource - driverClass="org.apache.derby.jdbc.ClientDataSource" + <dataSource class="org.apache.derby.jdbc.ClientDataSource" databaseName="cdodb1" createDatabase="create"/>--> <dbAdapter name="hsqldb"/> - <dataSource - driverClass="org.eclipse.net4j.db.hsqldb.HSQLDBDataSource" + <dataSource class="org.eclipse.net4j.db.hsqldb.HSQLDBDataSource" database="jdbc:hsqldb:mem:cdodb1" user="sa"/> <!--<dbAdapter name="mysql"/> - <dataSource - driverClass="com.mysql.jdbc.jdbc2.optional.MysqlDataSource" + <dataSource class="com.mysql.jdbc.jdbc2.optional.MysqlDataSource" url="jdbc:mysql://localhost/cdodb1" user="sa"/>--> </store> diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java index 899ff991fe..6326ffe419 100644 --- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java +++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java @@ -49,7 +49,7 @@ public final class DBUtil public static DataSource createDataSource(Map<Object, Object> properties, String namespace) { - return createDataSource(properties, namespace, "driverClass"); + return createDataSource(properties, namespace, "class"); } public static DataSource createDataSource(Map<Object, Object> properties, String namespace, String driverClassKey) |