Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-06-14 05:44:25 +0000
committerEike Stepper2012-06-14 05:44:25 +0000
commit826d5219f0b8b678f843c0c364017bfd48983036 (patch)
treefa99a3a04054d02d6f514a118aa7c5120f3d7a50 /plugins/org.eclipse.emf.cdo.server.product
parenta9bbe022dff89e1ff5ad5c65420a4bf88b37f40b (diff)
downloadcdo-826d5219f0b8b678f843c0c364017bfd48983036.tar.gz
cdo-826d5219f0b8b678f843c0c364017bfd48983036.tar.xz
cdo-826d5219f0b8b678f843c0c364017bfd48983036.zip
Adjust SSL config
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.product')
-rw-r--r--plugins/org.eclipse.emf.cdo.server.product/config-ssl/cdo-server.xml23
-rw-r--r--plugins/org.eclipse.emf.cdo.server.product/config/cdo-server.xml4
2 files changed, 15 insertions, 12 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.product/config-ssl/cdo-server.xml b/plugins/org.eclipse.emf.cdo.server.product/config-ssl/cdo-server.xml
index 37e24110ee..cc264b9f29 100644
--- a/plugins/org.eclipse.emf.cdo.server.product/config-ssl/cdo-server.xml
+++ b/plugins/org.eclipse.emf.cdo.server.product/config-ssl/cdo-server.xml
@@ -17,16 +17,21 @@
<property name="allowInterruptRunningQueries" value="true"/>
<property name="idGenerationLocation" value="STORE"/> <!-- Possible values: STORE | CLIENT -->
- <!-- Example (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=302775):
- <userManager type="file" description="_database/repo1.users"/>
+ <!-- Example http://bugs.eclipse.org/380629
+ <securityManager type="default" realmPath="/security"/>
+ <securityManager type="annotation" realmPath="/security"/>
-->
- <!-- Example (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=345835):
- <userManager type="TestRepository" description="repo1"/>
+ <!-- Example http://bugs.eclipse.org/302775
+ <userManager type="file" description="_database/repo1.users"/>
-->
- <!-- Example (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=345431):
- <initialPackage nsURI="http://www.eclipse.org/emf/CDO/examples/company/1.0.0"/>
+ <!-- Example http://bugs.eclipse.org/34583
+ <userManager type="TestRepository" description="repo1"/>
+ -->
+
+ <!-- Example http://bugs.eclipse.org/345431
+ <initialPackage nsURI="http://www.eclipse.org/emf/CDO/examples/company/1.0.0"/>
-->
<store type="db">
@@ -36,8 +41,6 @@
<mappingStrategy type="horizontal"> <!-- callout -->
<property name="qualifiedNames" value="true"/>
- <property name="toManyReferences" value="ONE_TABLE_PER_REFERENCE"/>
- <property name="toOneReferences" value="LIKE_ATTRIBUTES"/>
<!--
Per default, the objectTypeCache is in-memory and contains
@@ -46,7 +49,7 @@
The cache can be disabled by setting a size of 0.
-->
- <!-- Optional:
+ <!-- Optional:
<property name="objectTypeCacheSize" value="100000" />
-->
@@ -109,6 +112,6 @@
<property name="port" value="50032"/>
</store>
</repository>
- -->
+ -->
</cdoServer>
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 a04f2c0338..72c7f7d230 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
@@ -8,8 +8,8 @@
<acceptor type="tcp" listenAddr="0.0.0.0" port="2036"/>
<!-- Examples:
- <acceptor type="ssl" listenAddr="0.0.0.0" port="2036"/>
- <acceptor type="http"/>
+ <acceptor type="ssl" listenAddr="0.0.0.0" port="2036"/>
+ <acceptor type="http"/>
-->
<repository name="repo1">

Back to the top