summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-05-25 15:33:57 (EDT)
committerEike Stepper2006-05-25 15:33:57 (EDT)
commit3a9f7ffb57be5eb7ce3d4ae1902a69efd0bb1c59 (patch)
treef3148456403ffe9cb52d4b3ee35e1aded49f6003
parent46fd6fc900f0520beb69e04bfd8a254c3c69d874 (diff)
downloadcdo-3a9f7ffb57be5eb7ce3d4ae1902a69efd0bb1c59.zip
cdo-3a9f7ffb57be5eb7ce3d4ae1902a69efd0bb1c59.tar.gz
cdo-3a9f7ffb57be5eb7ce3d4ae1902a69efd0bb1c59.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/initMysql.bat16
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/launches/CDO Server.launch19
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerApplication.java10
3 files changed, 32 insertions, 13 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/initMysql.bat b/plugins/org.eclipse.emf.cdo.examples.server/initMysql.bat
index 3a2f8cd..9affd25 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/initMysql.bat
+++ b/plugins/org.eclipse.emf.cdo.examples.server/initMysql.bat
@@ -1,13 +1,13 @@
@echo off
-mysql -u test -ptest -e "drop database if exists cdoTest; create database cdoTest" mysql
+rem mysql -u test -ptest -e "drop database if exists cdoTest; create database cdoTest" mysql
-rem set ROOTPW=rIstec0o
-rem set USER=test@localhost
-rem set PASSWORD=test
-rem set DATABASE=cdoTest
+set ROOTPW=root
+set USER=test@localhost
+set PASSWORD=test
+set DATABASE=cdoTest
-rem mysql -u root -p%ROOTPW% -e "drop database if exists %DATABASE%" mysql
-rem mysql -u root -p%ROOTPW% -e "create database %DATABASE%" mysql
+mysql -u root -p%ROOTPW% -e "drop database if exists %DATABASE%" mysql
+mysql -u root -p%ROOTPW% -e "create database %DATABASE%" mysql
rem mysql -u root -p%ROOTPW% -e "create user %USER% identified by '%PASSWORD%'" mysql
-rem mysql -u root -p%ROOTPW% -e "grant all privileges on %DATABASE%.* to %USER%" mysql
+mysql -u root -p%ROOTPW% -e "grant all privileges on %DATABASE%.* to %USER% identified by '%PASSWORD%'" mysql
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/launches/CDO Server.launch b/plugins/org.eclipse.emf.cdo.examples.server/launches/CDO Server.launch
index 3b841ed..5a15182 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/launches/CDO Server.launch
+++ b/plugins/org.eclipse.emf.cdo.examples.server/launches/CDO Server.launch
@@ -5,12 +5,13 @@
<stringAttribute key="bootstrap" value=""/>
<booleanAttribute key="useProduct" value="false"/>
<booleanAttribute key="tracing" value="false"/>
+<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_PROFILING_SET" value="tptp-dummy-profiling-set-CDO Server"/>
<stringAttribute key="location2" value="_embedded"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
</listAttribute>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu,com.sympedia.tools.ant,com.sympedia.util,com.sympedia.util.eclipse,com.sympedia.util.eclipse.resources,org.apache.ant,org.apache.log4j,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.edit,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.osgi,org.eclipse.update.configurator"/>
+<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.edit,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.osgi,org.eclipse.update.configurator"/>
<booleanAttribute key="automaticValidate" value="true"/>
<mapAttribute key="tracingOptions">
<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
@@ -304,15 +305,23 @@
<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
</mapAttribute>
+<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_DESTINATION_FILE" value=""/>
+<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_DATA_COLLECTOR" value="org.eclipse.tptp.trace.ui.jvmpiMechanism:org.eclipse.tptp.analysisType.execution,org.eclipse.tptp.analysisType.methodCoverage"/>
+<intAttribute key="org.eclipse.hyades.trace.ui.ATTR_EXEC_POLLING_FREQ" value="60"/>
<stringAttribute key="location3" value="runtime-embedded"/>
<booleanAttribute key="automaticAdd" value="false"/>
<stringAttribute key="checked" value="org.eclipse.core.runtime"/>
+<booleanAttribute key="org.eclipse.hyades.trace.ui.ATTR_SHOW_EXEC_CPU_TIME" value="true"/>
<booleanAttribute key="includeFragments" value="true"/>
+<booleanAttribute key="org.eclipse.hyades.trace.ui.ATTR_PROFILE_TO_FILE" value="false"/>
<stringAttribute key="location" value="/ws.rt/cdo.server"/>
-<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.core,org.eclipse.net4j.util,org.eclipse.emf.cdo.example.server,org.eclipse.emf.cdo.dbgen,org.eclipse.emf.cdo.server,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="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.core,org.eclipse.net4j.util,org.eclipse.emf.cdo.example.server,org.eclipse.emf.cdo.dbgen,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.dbgen.oracle,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="location4" value="C:\workspaces\runtime-workspace"/>
-<stringAttribute key="configLocation" value=""/>
+<booleanAttribute key="org.eclipse.hyades.trace.ui.ATTR_SHOW_EXEC_INSTANCES" value="false"/>
<stringAttribute key="application" value="org.eclipse.emf.cdo.example.server.application"/>
+<stringAttribute key="configLocation" value=""/>
+<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_DESTINATION_MONITOR" value="DefaultMonitor"/>
+<booleanAttribute key="org.eclipse.hyades.trace.ui.ATTR_EXEC_POLLING_FREQ_MODE" value="true"/>
<booleanAttribute key="clearws" value="false"/>
<stringAttribute key="location1" value="../cdo.embedded"/>
<stringAttribute key="pde.version" value="3.2a"/>
@@ -322,7 +331,11 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="org.eclipse.hyades.trace.ui.ATTR_SHOW_EXEC_BOUNDARY_CLASS" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="askclear" value="false"/>
<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_DESTINATION_PROJECT" value="ProfileProject"/>
+<booleanAttribute key="org.eclipse.hyades.trace.ui.ATTR_SHOW_EXECUTION_FLOW" value="false"/>
+<intAttribute key="org.eclipse.hyades.trace.ui.ATTR_SHOW_EXEC_BOUNDARY_CLASS_DEPTH" value="1"/>
</launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerApplication.java b/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerApplication.java
index f5888e2..5ccf85f 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerApplication.java
+++ b/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerApplication.java
@@ -11,6 +11,8 @@
package org.eclipse.emf.cdo.example.server.internal;
+import org.eclipse.net4j.util.thread.DeadlockDetector;
+
import org.eclipse.core.runtime.IPlatformRunnable;
@@ -22,9 +24,13 @@ public class ExampleServerApplication implements IPlatformRunnable
public Object run(Object args) throws Exception
{
- for (;;)
+ System.out.println("HIT ANY KEY FOR SHUTDOWN!!!");
+
+ while (System.in.available() == 0)
{
- // Graceful shutdown?
+ DeadlockDetector.sleep(100);
}
+
+ return null;
}
}