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
parenta9bbe022dff89e1ff5ad5c65420a4bf88b37f40b (diff)
downloadcdo-826d5219f0b8b678f843c0c364017bfd48983036.tar.gz
cdo-826d5219f0b8b678f843c0c364017bfd48983036.tar.xz
cdo-826d5219f0b8b678f843c0c364017bfd48983036.zip
Adjust SSL config
-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
-rw-r--r--plugins/org.eclipse.emf.cdo.server/CDOServer_SSL.launch4
3 files changed, 17 insertions, 14 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">
diff --git a/plugins/org.eclipse.emf.cdo.server/CDOServer_SSL.launch b/plugins/org.eclipse.emf.cdo.server/CDOServer_SSL.launch
index e0babb764f..cf4e4ca306 100644
--- a/plugins/org.eclipse.emf.cdo.server/CDOServer_SSL.launch
+++ b/plugins/org.eclipse.emf.cdo.server/CDOServer_SSL.launch
@@ -25,11 +25,11 @@
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}&#13;&#10;-debug&#13;&#10;-console"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m&#13;&#10;-Xmx1024m&#13;&#10;-Ddebug=true&#13;&#10;-Dnet4j.config=&quot;${project_loc:/org.eclipse.emf.cdo.server.product}/config-ssl&quot;&#13;&#10;-Dorg.eclipse.net4j.tcp.ssl.passphrase=ab987c&#10;-Dorg.eclipse.net4j.tcp.ssl.trust=file:///${workspace_loc:org.eclipse.emf.cdo.examples}/sslKey/testTrust&#10;-Dorg.eclipse.net4j.tcp.ssl.key=file:///${workspace_loc:org.eclipse.emf.cdo.examples}/sslKey/testKeys&#10;-Dorg.eclipse.emf.cdo.server.browser.port=7777&#13;&#10;-Dorg.osgi.service.http.port=8080&#10;-Dosgi.console.enable.builtin=true"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m&#13;&#10;-Xmx1024m&#13;&#10;-Ddebug=true&#13;&#10;-Dnet4j.config=&quot;${project_loc:/org.eclipse.emf.cdo.server.product}/config-ssl&quot;&#13;&#10;-Dorg.eclipse.net4j.tcp.ssl.passphrase=ab987c&#10;&#13;&#10;-Dorg.eclipse.net4j.tcp.ssl.trust=file:///${workspace_loc:org.eclipse.emf.cdo.examples}/sslKey/testTrust&#13;&#10;&#10;-Dorg.eclipse.net4j.tcp.ssl.key=file:///${workspace_loc:org.eclipse.emf.cdo.examples}/sslKey/testKeys&#10;&#13;&#10;-Dorg.eclipse.emf.cdo.server.browser.port=7777&#13;&#10;-Dorg.osgi.service.http.port=8080&#10;&#13;&#10;-Dosgi.console.enable.builtin=true"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<stringAttribute key="selectedPlugin" value="org.eclipse.emf.cdo"/>
-<stringAttribute key="selected_target_plugins" value="com.mysql.jdbc@default:default,javax.servlet@default:default,org.apache.derby@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.h2@default:default,org.hsqldb@default:default,org.postgresql.jdbc3@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.mysql.jdbc*5.1.11.201205200850@default:default,com.mysql.jdbc*5.1.11.201205201951@default:default,javax.servlet@default:default,org.apache.derby@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.emf.common*2.8.0.v20120504-0433@default:default,org.eclipse.emf.common*2.8.0.v20120516-0416@default:default,org.eclipse.emf.ecore*2.8.0.v20120504-0433@default:default,org.eclipse.emf.ecore*2.8.0.v20120516-0416@default:default,org.eclipse.emf.ecore.change*2.8.0.v20120504-0433@default:default,org.eclipse.emf.ecore.change*2.8.0.v20120516-0416@default:default,org.eclipse.emf.ecore.xmi*2.8.0.v20120504-0433@default:default,org.eclipse.emf.ecore.xmi*2.8.0.v20120516-0416@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.h2@default:default,org.hsqldb@default:default,org.postgresql.jdbc3@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.db.derby@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.net4j.db.hsqldb@default:default,org.eclipse.net4j.db.mysql@default:default,org.eclipse.net4j.db.postgresql@default:default,org.eclipse.net4j.db@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j@default:default"/>
<booleanAttribute key="show_selected_only" value="true"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>

Back to the top