diff options
| author | Eike Stepper | 2011-12-15 14:49:31 +0000 |
|---|---|---|
| committer | Eike Stepper | 2011-12-15 14:49:31 +0000 |
| commit | 6bbf40ec119b3b175407ddf4d0be159369edc93f (patch) | |
| tree | a99d7d0f7b04a0526f069020ef5516175aed94d1 | |
| parent | 353fb8114d7b40fce5e110df928ce8feb1d4f942 (diff) | |
| download | cdo-6bbf40ec119b3b175407ddf4d0be159369edc93f.tar.gz cdo-6bbf40ec119b3b175407ddf4d0be159369edc93f.tar.xz cdo-6bbf40ec119b3b175407ddf4d0be159369edc93f.zip | |
Disable server browser in AutomatedTests
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.tests.all/CDO AutomatedTests.launch | 2 | ||||
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.all/CDO AutomatedTests.launch b/plugins/org.eclipse.emf.cdo.tests.all/CDO AutomatedTests.launch index 6ce653e45e..b14e24439b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.all/CDO AutomatedTests.launch +++ b/plugins/org.eclipse.emf.cdo.tests.all/CDO AutomatedTests.launch @@ -16,5 +16,5 @@ <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.all.AutomatedTests"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.tests.all"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m -Dorg.eclipse.net4j.util.om.trace.disable=true"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m -Dorg.eclipse.net4j.util.om.trace.disable=true -Dorg.eclipse.emf.cdo.tests.config.impl.RepositoryConfig.disableServerBrowser=true"/>
</launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java index 17dbb468fb..ba105ebb4c 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java @@ -93,6 +93,9 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf private static final boolean LOG_MULTI_VIEW_COMMIT = false; + private static final Boolean disableServerBrowser = Boolean.valueOf(System.getProperty( + "org.eclipse.emf.cdo.tests.config.impl.RepositoryConfig.disableServerBrowser", "false")); + private static final long serialVersionUID = 1L; private boolean supportingAudits; @@ -344,8 +347,11 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf // Start default repository getRepository(REPOSITORY_NAME); - serverBrowser = new CDOServerBrowser(repositories); - serverBrowser.activate(); + if (!disableServerBrowser) + { + serverBrowser = new CDOServerBrowser(repositories); + serverBrowser.activate(); + } } @Override |