summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-09-30 12:31:35 (EDT)
committerEike Stepper2007-09-30 12:31:35 (EDT)
commit6541cd0302b31b8f3fbba9cc061845de58925a28 (patch)
treea9871423b0638db889c9e9f40fd057b1a4523c3f
parente55c1727083a6f457f9db29ba3a3391564c456d6 (diff)
downloadcdo-6541cd0302b31b8f3fbba9cc061845de58925a28.zip
cdo-6541cd0302b31b8f3fbba9cc061845de58925a28.tar.gz
cdo-6541cd0302b31b8f3fbba9cc061845de58925a28.tar.bz2
[203538] Limit memory consumption in CDORevisionResolverImpl
https://bugs.eclipse.org/bugs/show_bug.cgi?id=203538
-rw-r--r--features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java2
-rw-r--r--plugins/org.eclipse.net4j.jms.tests/JMSSeparatedTest.launch4
-rw-r--r--plugins/org.eclipse.net4j.jms.tests/JMSTest.launch4
4 files changed, 3 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 416886b..0ae97f5 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
@@ -8,6 +8,8 @@
<property name="supportingAudits" value="true"/>
<property name="verifyingRevisions" value="false"/>
<property name="rememberingKnownTypes" value="false"/>
+ <property name="currentLRUCapacity" value="20"/>
+ <property name="revisedLRUCapacity" value="1000"/>
<store type="db">
<!-- mode: OFF | EXPRESS | NORMAL | GUARANTEED -->
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java
index 8975a51..57b064f 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java
@@ -133,7 +133,7 @@ public class SelectPackageDialog extends BaseDialog<CheckboxTableViewer>
*/
private class PackageLabelProvider extends LabelProvider implements ITableLabelProvider, ITableColorProvider
{
- private final Color red = Display.getCurrent().getSystemColor(SWT.COLOR_RED);
+ private final Color red = Display.getCurrent().getSystemColor(SWT.COLOR_DARK_MAGENTA);
public PackageLabelProvider()
{
diff --git a/plugins/org.eclipse.net4j.jms.tests/JMSSeparatedTest.launch b/plugins/org.eclipse.net4j.jms.tests/JMSSeparatedTest.launch
index d233d63..b1506d8 100644
--- a/plugins/org.eclipse.net4j.jms.tests/JMSSeparatedTest.launch
+++ b/plugins/org.eclipse.net4j.jms.tests/JMSSeparatedTest.launch
@@ -7,10 +7,6 @@
<listEntry value="1"/>
</listAttribute>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.net4j.jms.tests.JMSSeparatedTest"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.net4j.jms.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djava.naming.factory.initial=com.sun.jndi.rmi.registry.RegistryContextFactory&#13;&#10;-Djava.naming.provider.url=rmi://localhost:1199&#13;&#10;-Dnet4j.config=config"/>
diff --git a/plugins/org.eclipse.net4j.jms.tests/JMSTest.launch b/plugins/org.eclipse.net4j.jms.tests/JMSTest.launch
index c726c34..202d555 100644
--- a/plugins/org.eclipse.net4j.jms.tests/JMSTest.launch
+++ b/plugins/org.eclipse.net4j.jms.tests/JMSTest.launch
@@ -7,10 +7,6 @@
<listEntry value="1"/>
</listAttribute>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.net4j.jms.tests.JMSTest"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.net4j.jms.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djava.naming.factory.initial=com.sun.jndi.rmi.registry.RegistryContextFactory&#13;&#10;-Djava.naming.provider.url=rmi://localhost:1199&#13;&#10;-Dnet4j.config=config"/>