summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-10-04 13:48:52 (EDT)
committerEike Stepper2006-10-04 13:48:52 (EDT)
commit2132da316e485e1e79d57141c891eb3fbbc85c8f (patch)
treeb2b2e891e428067f7eef494e6703fd3f1708dc3c
parenta643b0221498a52fb726c2b2ec3f6ad3a9b83122 (diff)
downloadcdo-2132da316e485e1e79d57141c891eb3fbbc85c8f.zip
cdo-2132da316e485e1e79d57141c891eb3fbbc85c8f.tar.gz
cdo-2132da316e485e1e79d57141c891eb3fbbc85c8f.tar.bz2
[159765] ConcurrentModificationException during ResourceManager.commit() https://bugs.eclipse.org/bugs/show_bug.cgi?id=159765
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.properties20
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/launches/CDO All Suites.launch6
2 files changed, 14 insertions, 12 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.properties b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.properties
index 5ba75a6..08a63f3 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.properties
+++ b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.properties
@@ -7,21 +7,21 @@
# DERBY #
#########
-jdbc.dialect=DERBY
-jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
-jdbc.url=jdbc:derby:cdoTest;create=true
-jdbc.username=test
-jdbc.password=test
+#jdbc.dialect=DERBY
+#jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
+#jdbc.url=jdbc:derby:cdoTest;create=true
+#jdbc.username=test
+#jdbc.password=test
##########
# HSQLDB #
##########
-#jdbc.dialect=HSQLDB
-#jdbc.driver=org.hsqldb.jdbcDriver
-#jdbc.url=jdbc:hsqldb:.
-#jdbc.username=sa
-#jdbc.password=
+jdbc.dialect=HSQLDB
+jdbc.driver=org.hsqldb.jdbcDriver
+jdbc.url=jdbc:hsqldb:.
+jdbc.username=sa
+jdbc.password=
#########
# MYSQL #
diff --git a/plugins/org.eclipse.emf.cdo.tests/launches/CDO All Suites.launch b/plugins/org.eclipse.emf.cdo.tests/launches/CDO All Suites.launch
index 8fa11fb..825f088 100644
--- a/plugins/org.eclipse.emf.cdo.tests/launches/CDO All Suites.launch
+++ b/plugins/org.eclipse.emf.cdo.tests/launches/CDO All Suites.launch
@@ -14,16 +14,18 @@
</listAttribute>
<stringAttribute key="selected_target_plugins" value="com.ibm.icu,org.apache.ant,org.eclipse.ant.core,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.resources.win32,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.emf.common,org.eclipse.emf.ecore,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore.edit,org.eclipse.emf.ecore.xmi,org.eclipse.emf.edit,org.eclipse.emf.ocl,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.osgi,org.eclipse.update.configurator,org.junit"/>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="C:\AllTests.txt"/>
<booleanAttribute key="automaticValidate" value="true"/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<booleanAttribute key="automaticAdd" value="false"/>
<stringAttribute key="checked" value="[NONE]"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.jdbc,org.eclipse.net4j.spring,org.eclipse.net4j.socket,org.eclipse.net4j.core,org.eclipse.net4j.spring.db,org.eclipse.emf.cdo.dbgen,org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.mapping,org.eclipse.emf.cdo.core,org.eclipse.emf.cdo.client,org.eclipse.net4j.util,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.client.ocl,org.eclipse.net4j.embedded,org.eclipse.emf.cdo.jdbc.derby,org.eclipse.emf.cdo.dbgen.derby,org.eclipse.emf.cdo.dbgen.oracle,org.eclipse.emf.cdo.jdbc.hsqldb,org.eclipse.emf.cdo.jdbc.mysql,org.eclipse.emf.cdo.dbgen.ansi92,org.eclipse.emf.cdo.dbgen.mysql,org.eclipse.emf.cdo.dbgen.hsqldb"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.jdbc,org.eclipse.net4j.spring,org.eclipse.net4j.socket,org.eclipse.net4j.core,org.eclipse.net4j.spring.db,org.eclipse.emf.cdo.dbgen,org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.mapping,org.eclipse.emf.cdo.core,org.eclipse.emf.cdo.client,org.eclipse.net4j.util,org.eclipse.emf.cdo.client.ocl,org.eclipse.emf.cdo.server,org.eclipse.net4j.embedded,org.eclipse.emf.cdo.jdbc.derby,org.eclipse.emf.cdo.dbgen.derby,org.eclipse.emf.cdo.dbgen.oracle,org.eclipse.emf.cdo.jdbc.hsqldb,org.eclipse.emf.cdo.jdbc.mysql,org.eclipse.emf.cdo.dbgen.ansi92,org.eclipse.emf.cdo.dbgen.mysql,org.eclipse.emf.cdo.dbgen.hsqldb"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
<booleanAttribute key="clearws" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.AllSuites"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/>
<stringAttribute key="pde.version" value="3.2a"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="default" value="false"/>