diff options
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} -debug -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 -Xmx1024m -Ddebug=true -Dnet4j.config="${project_loc:/org.eclipse.emf.cdo.server.product}/config-ssl" -Dorg.eclipse.net4j.tcp.ssl.passphrase=ab987c -Dorg.eclipse.net4j.tcp.ssl.trust=file:///${workspace_loc:org.eclipse.emf.cdo.examples}/sslKey/testTrust -Dorg.eclipse.net4j.tcp.ssl.key=file:///${workspace_loc:org.eclipse.emf.cdo.examples}/sslKey/testKeys -Dorg.eclipse.emf.cdo.server.browser.port=7777 -Dorg.osgi.service.http.port=8080 -Dosgi.console.enable.builtin=true"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m -Ddebug=true -Dnet4j.config="${project_loc:/org.eclipse.emf.cdo.server.product}/config-ssl" -Dorg.eclipse.net4j.tcp.ssl.passphrase=ab987c -Dorg.eclipse.net4j.tcp.ssl.trust=file:///${workspace_loc:org.eclipse.emf.cdo.examples}/sslKey/testTrust -Dorg.eclipse.net4j.tcp.ssl.key=file:///${workspace_loc:org.eclipse.emf.cdo.examples}/sslKey/testKeys -Dorg.eclipse.emf.cdo.server.browser.port=7777 -Dorg.osgi.service.http.port=8080 -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"/> |