diff options
| author | Eike Stepper | 2010-05-26 11:44:23 +0000 |
|---|---|---|
| committer | Eike Stepper | 2010-05-26 11:44:23 +0000 |
| commit | 790e188045e6ff60b837131b5f96b6d240619a20 (patch) | |
| tree | d3ff283714cd0e6a7607ded52bb38ba3b8ff7bfa /features | |
| parent | 6bcb678b3e00180f611cf1ab34cc11cb63f8a4bb (diff) | |
| download | cdo-790e188045e6ff60b837131b5f96b6d240619a20.tar.gz cdo-790e188045e6ff60b837131b5f96b6d240619a20.tar.xz cdo-790e188045e6ff60b837131b5f96b6d240619a20.zip | |
[302775] Allow configuration of authentication in cdo-server.xml
https://bugs.eclipse.org/bugs/show_bug.cgi?id=302775
Diffstat (limited to 'features')
| -rw-r--r-- | features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml | 18 |
1 files changed, 11 insertions, 7 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 70719b37b2..56272de624 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 @@ -7,7 +7,7 @@ <acceptor type="tcp" listenAddr="0.0.0.0" port="2036"> <!-- - <negotiator type="challenge" description="/temp/users.db"/> + <negotiator type="challenge" description="_database/repo1.users"/> --> </acceptor> @@ -18,6 +18,10 @@ <property name="supportingAudits" value="true"/> <property name="supportingBranches" value="true"/> + <!-- + <userManager type="file" description="_database/repo1.users"/> + --> + <store type="db"> <mappingStrategy type="horizontalBranching"> <property name="qualifiedNames" value="false"/> @@ -27,34 +31,34 @@ <dbAdapter name="h2"/> <dataSource class="org.h2.jdbcx.JdbcDataSource" - uRL="jdbc:h2:_database/cdodb3"/> + uRL="jdbc:h2:_database/repo1"/> <!-- <dbAdapter name="derby-embedded"/> <dataSource class="org.apache.derby.jdbc.EmbeddedDataSource" - databaseName="/temp/cdodb1" + databaseName="/temp/repo1" createDatabase="create"/> --> <!-- <dbAdapter name="hsqldb"/> <dataSource class="org.eclipse.net4j.db.hsqldb.HSQLDBDataSource" - database="jdbc:hsqldb:mem:cdodb1" + database="jdbc:hsqldb:mem:repo1" user="sa"/> --> <!-- <dbAdapter name="mysql"/> <dataSource class="com.mysql.jdbc.jdbc2.optional.MysqlDataSource" - url="jdbc:mysql://localhost/cdodb1" + url="jdbc:mysql://localhost/repo1" user="sa"/> --> <!-- <dbAdapter name="postgresql"/> <dataSource class="org.postgresql.ds.PGSimpleDataSource" - url="jdbc:postgresql://localhost:5432/cdo" - databaseName="cdo" + url="jdbc:postgresql://localhost:5432/repo1" + databaseName="repo1" user="cdo" password="cdo"/> --> |