diff options
author | Eike Stepper | 2006-09-01 09:01:58 +0000 |
---|---|---|
committer | Eike Stepper | 2006-09-01 09:01:58 +0000 |
commit | 8332ed884a4cdd292a24fe191f99fcf92c6be8c5 (patch) | |
tree | de882c92a9463d2bd9399be452c4f8f71be4e149 | |
parent | 89b6d77d8645642ff3e0c733b4d56722c3138d62 (diff) | |
download | cdo-8332ed884a4cdd292a24fe191f99fcf92c6be8c5.tar.gz cdo-8332ed884a4cdd292a24fe191f99fcf92c6be8c5.tar.xz cdo-8332ed884a4cdd292a24fe191f99fcf92c6be8c5.zip |
[155899] Bidirectional XRefs are doubled at target side
6 files changed, 278 insertions, 54 deletions
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 87fa5c0610..9fd637c595 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 @@ -7,9 +7,6 @@ <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.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"/> <booleanAttribute key="automaticValidate" value="true"/> <mapAttribute key="tracingOptions"> @@ -18,13 +15,13 @@ <mapEntry key="org.eclipse.jst.jsp.core/debug/jspindexmanager" value="false"/> <mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/> <mapEntry key="org.eclipse.wst.server.core/resources" value="false"/> -<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/> <mapEntry key="org.eclipse.wst.css.core/debug/tracefilter" value=""/> +<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/> <mapEntry key="org.eclipse.update.configurator/debug" value="false"/> <mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/> -<mapEntry key="org.eclipse.ui/debug/showSystemJobs" value="false"/> -<mapEntry key="org.eclipse.jst.jsp.core/debug/jspsearch" value="false"/> <mapEntry key="org.eclipse.core.runtime/loader/debug" value="true"/> +<mapEntry key="org.eclipse.jst.jsp.core/debug/jspsearch" value="false"/> +<mapEntry key="org.eclipse.ui/debug/showSystemJobs" value="false"/> <mapEntry key="org.eclipse.wst.sse.core/structuredmodel/state" value="false"/> <mapEntry key="org.eclipse.jem.proxy/remote/debug/vmtraceout" value="false"/> <mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/> @@ -49,17 +46,17 @@ <mapEntry key="org.eclipse.update.core/debug/web" value="false"/> <mapEntry key="com.ibm.wtp.common.util/debug/loglevel" value="WARNING"/> <mapEntry key="org.eclipse.core.runtime/registry/debug/resolve" value="true"/> -<mapEntry key="com.omondo.uml.core/trace/level" value="error"/> <mapEntry key="org.eclipse.osgi/debug" value="false"/> +<mapEntry key="com.omondo.uml.core/trace/level" value="error"/> <mapEntry key="org.eclipse.osgi/trace/activation" value="false"/> <mapEntry key="com.omondo.database/debug/debug" value="true"/> <mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/> <mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugmenu" value="false"/> <mapEntry key="org.eclipse.ui/trace/part.activate" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/> -<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/> -<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/> <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/> +<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/> +<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/> <mapEntry key="org.eclipse.wst.sse.ui/debug" value="true"/> <mapEntry key="org.eclipse.wst.html.core/debug" value="true"/> <mapEntry key="org.eclipse.core.runtime/registry/debug/events/extension" value="true"/> @@ -68,11 +65,11 @@ <mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/> <mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/> -<mapEntry key="org.eclipse.ui/debug/internalerror/openDialog" value="false"/> <mapEntry key="org.eclipse.update.core/debug/install" value="false"/> +<mapEntry key="org.eclipse.ui/debug/internalerror/openDialog" value="false"/> <mapEntry key="org.eclipse.core.runtime/jobs/errorondeadlock" value="false"/> -<mapEntry key="org.eclipse.core.resources/debug" value="false"/> <mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/> +<mapEntry key="org.eclipse.core.resources/debug" value="false"/> <mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.profile.DefaultProfileLogger"/> <mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/> <mapEntry key="org.eclipse.wst.internet.webbrowser/url" value="false"/> @@ -81,30 +78,30 @@ <mapEntry key="org.eclipse.ui/trace/perspective.listeners" value="false"/> <mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/> <mapEntry key="org.eclipse.help/debug/context" value="false"/> -<mapEntry key="org.eclipse.wst.sse.ui/actioncontributor/debugstatusfields" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/actioncontributor/debugstatusfields" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/> <mapEntry key="org.eclipse.wst.sse.ui/extendedconfigurationbuilder" value="true"/> -<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/> <mapEntry key="org.eclipse.core.runtime/loader/debug/activateplugin" value="true"/> +<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/> <mapEntry key="org.eclipse.wst.javascript.core/debug/tracefilter" value=""/> <mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/> <mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/> <mapEntry key="com.omondo.database/debug/explorer" value="true"/> <mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/> -<mapEntry key="org.eclipse.core.resources/preferences" value="false"/> <mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/> +<mapEntry key="org.eclipse.core.resources/preferences" value="false"/> <mapEntry key="org.eclipse.ui/trace/part.create" value="false"/> <mapEntry key="org.eclipse.help/debug/protocols" value="false"/> -<mapEntry key="org.eclipse.core.resources/natures" value="false"/> -<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/modelstatelistener" value="false"/> <mapEntry key="org.eclipse.help.base/debug/search" value="false"/> -<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/native" value="*"/> +<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/modelstatelistener" value="false"/> +<mapEntry key="org.eclipse.core.resources/natures" value="false"/> <mapEntry key="org.eclipse.jem/debug/loglevel" value="default"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/create" value="true"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/native" value="*"/> +<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/> <mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/create" value="true"/> <mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/> <mapEntry key="org.eclipse.core.runtime/preferences/get" value="false"/> <mapEntry key="org.eclipse.wst.sse.core/filebuffers/modelmanagement" value="false"/> @@ -130,8 +127,8 @@ <mapEntry key="org.eclipse.ui/trace/page.listeners" value="false"/> <mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/> <mapEntry key="org.eclipse.jdt.ui/debug/allTypesCache" value="false"/> -<mapEntry key="org.eclipse.jst.jsp.core/debug/jsptranslation" value="false"/> <mapEntry key="org.eclipse.jem.proxy/debug/logtracefile" value="default"/> +<mapEntry key="org.eclipse.jst.jsp.core/debug/jsptranslation" value="false"/> <mapEntry key="org.eclipse.wst.sse.core/builder/modelprovider" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/> <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/> @@ -140,8 +137,8 @@ <mapEntry key="org.eclipse.wst.internet.monitor.core/debug" value="true"/> <mapEntry key="org.eclipse.wst.sse.ui/storagemodelprovider/operations" value="false"/> <mapEntry key="org.eclipse.osgi/debug/loader" value="false"/> -<mapEntry key="org.eclipse.wst.html.core/debug/tracefilter" value=""/> <mapEntry key="org.eclipse.wtp.common/debug/logtrace" value="false"/> +<mapEntry key="org.eclipse.wst.html.core/debug/tracefilter" value=""/> <mapEntry key="org.eclipse.jst.jsp.core/debug" value="true"/> <mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/> <mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/> @@ -152,8 +149,8 @@ <mapEntry key="org.eclipse.osgi/debug/filter" value="false"/> <mapEntry key="com.omondo.database/debug/warning" value="true"/> <mapEntry key="org.eclipse.wst.sse.core/structuredmodel/lifecycle" value="false"/> -<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/> <mapEntry key="org.eclipse.ui/trace/part.listeners" value="false"/> +<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/> <mapEntry key="org.eclipse.jst.jsp.core/taglib/resolve" value="false"/> <mapEntry key="com.omondo.uml.core/trace/module/viewEvent" value="false"/> <mapEntry key="org.eclipse.core.runtime/loader/debug/filter/class" value="*"/> @@ -161,25 +158,25 @@ <mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/operations" value="false"/> <mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/failure" value="true"/> <mapEntry key="org.eclipse.wtp.common/debug/loglevel" value="WARNING"/> -<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/> <mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/> +<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/> <mapEntry key="org.eclipse.core.runtime/loader/debug/filter/loader" value="*"/> <mapEntry key="org.eclipse.jem/debug/logtrace" value="default"/> <mapEntry key="org.eclipse.core.runtime/loader/debug/actions" value="true"/> <mapEntry key="org.eclipse.wst.sse.core/debug/tracefilter" value=""/> -<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/> <mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/> +<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/> <mapEntry key="org.eclipse.wst.sse.core/builder/participant/tasktag" value="false"/> <mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/> <mapEntry key="com.omondo.uml.std/trace/module/modelMapper" value="false"/> <mapEntry key="org.eclipse.ui/trace/graphics" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/> -<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/> -<mapEntry key="org.eclipse.jst.jsp.core/taglib/indexcreation" value="false"/> <mapEntry key="com.omondo.database/debug/trace" value="true"/> +<mapEntry key="org.eclipse.jst.jsp.core/taglib/indexcreation" value="false"/> +<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/> <mapEntry key="org.eclipse.core.resources/perf/snapshot" value="500"/> -<mapEntry key="com.omondo.uml.core/trace/module/UMLPlugin" value="false"/> <mapEntry key="org.eclipse.core.runtime/registry/debug" value="true"/> +<mapEntry key="com.omondo.uml.core/trace/module/UMLPlugin" value="false"/> <mapEntry key="org.eclipse.osgi/debug/packages" value="false"/> <mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes" value="true"/> <mapEntry key="org.eclipse.wst.sse.core/participantregistry" value="false"/> @@ -193,8 +190,8 @@ <mapEntry key="org.eclipse.team.core/streams" value="false"/> <mapEntry key="org.eclipse.core.runtime/jobs/locks" value="false"/> <mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/> -<mapEntry key="org.eclipse.core.runtime/registry/debug/dump" value=""/> <mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/> +<mapEntry key="org.eclipse.core.runtime/registry/debug/dump" value=""/> <mapEntry key="org.eclipse.jst.jsp.core/taglib/indextime" value="false"/> <mapEntry key="org.eclipse.core.resources/build/delta" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/> @@ -204,26 +201,26 @@ <mapEntry key="org.eclipse.jdt.ui/debug" value="true"/> <mapEntry key="org.eclipse.core.runtime/registry/debug/events/plugin" value="true"/> <mapEntry key="org.eclipse.wst.sse.core/dom/adapter/notification/time/criteria" value="10"/> -<mapEntry key="org.eclipse.jem.beaninfo/debug/logtrace" value="default"/> <mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/> +<mapEntry key="org.eclipse.jem.beaninfo/debug/logtrace" value="default"/> <mapEntry key="org.eclipse.jem.beaninfo/debug/logtracefile" value="default"/> <mapEntry key="org.eclipse.jem.ui/debug/logtrace" value="default"/> -<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/> <mapEntry key="org.eclipse.help.webapp/debug" value="true"/> -<mapEntry key="org.eclipse.core.resources/refresh" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/> <mapEntry key="org.eclipse.wst.sse.core/filebuffers/lifecycle" value="false"/> +<mapEntry key="org.eclipse.core.resources/refresh" value="false"/> <mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/> <mapEntry key="org.eclipse.jem.proxy/debug/loglevel" value="default"/> -<mapEntry key="org.eclipse.jem.beaninfo/debug/loglevel" value="default"/> <mapEntry key="org.eclipse.update.core/debug/warning" value="false"/> +<mapEntry key="org.eclipse.jem.beaninfo/debug/loglevel" value="default"/> <mapEntry key="org.eclipse.core.resources/save" value="false"/> <mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/lifecyclelistener" value="false"/> <mapEntry key="org.eclipse.jem/debug/logtracefile" value="default"/> -<mapEntry key="com.omondo.database/debug/info" value="true"/> <mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/> -<mapEntry key="org.eclipse.core.runtime/preferences/general" value="false"/> +<mapEntry key="com.omondo.database/debug/info" value="true"/> <mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/> +<mapEntry key="org.eclipse.core.runtime/preferences/general" value="false"/> <mapEntry key="org.eclipse.team.core/threading" value="false"/> <mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/> <mapEntry key="org.eclipse.osgi/debug/packageadmin/timing" value="false"/> @@ -232,37 +229,37 @@ <mapEntry key="org.eclipse.jem.proxy/remote/debug/debugvm" value="false"/> <mapEntry key="org.eclipse.jst.jsp.core/debug/tracefilter" value=""/> <mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/resource" value="*"/> <mapEntry key="org.eclipse.osgi/profile/startup" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/resource" value="*"/> <mapEntry key="org.eclipse.osgi/debug/services" value="false"/> <mapEntry key="com.omondo.database/debug/fatal" value="true"/> <mapEntry key="com.omondo.uml.std/trace/module/modelJavaEvent" value="false"/> <mapEntry key="org.eclipse.core.resources/save/markers" value="false"/> -<mapEntry key="org.eclipse.jem.proxy/remote/debug/ioconsole" value="false"/> <mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/> -<mapEntry key="org.eclipse.jem.ui/debug/loglevel" value="default"/> +<mapEntry key="org.eclipse.jem.proxy/remote/debug/ioconsole" value="false"/> <mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugpopup" value="false"/> +<mapEntry key="org.eclipse.jem.ui/debug/loglevel" value="default"/> <mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/> <mapEntry key="org.eclipse.ui/trace/workbench.restore" value="false"/> <mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/> <mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/> <mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder" value="true"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/properties" value="true"/> <mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/properties" value="true"/> <mapEntry key="org.eclipse.wst.css.core/debug" value="true"/> <mapEntry key="org.eclipse.ui/trace/include.timings" value="true"/> <mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/> <mapEntry key="org.eclipse.core.runtime/jobs/beginend" value="false"/> -<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/> <mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugtoolbar" value="false"/> +<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/> <mapEntry key="org.eclipse.team.core/debug" value="false"/> <mapEntry key="org.eclipse.wst.sse.ui/storagemodelprovider/elementstatelistener" value="false"/> -<mapEntry key="org.eclipse.osgi/debug/events" value="false"/> <mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/contributetime" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/events" value="false"/> <mapEntry key="org.eclipse.wst.xml.core/debug" value="true"/> -<mapEntry key="org.eclipse.osgi/debug/monitorbundles" value="false"/> <mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/success" value="true"/> +<mapEntry key="org.eclipse.osgi/debug/monitorbundles" value="false"/> <mapEntry key="org.eclipse.core.runtime/debug/pluginstopper" value="true"/> <mapEntry key="org.eclipse.ui/trace/workbench.start" value="false"/> <mapEntry key="org.eclipse.jst.jsp.core/partitioner/prefixlistener" value="false"/> @@ -271,10 +268,10 @@ <mapEntry key="org.eclipse.osgi/profile/debug" value="false"/> <mapEntry key="org.eclipse.ui/trace/contexts" value="false"/> <mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/> -<mapEntry key="org.eclipse.ui/debug/uijob.longwarning" value="false"/> <mapEntry key="org.eclipse.core.runtime/loader/debug/failure" value="true"/> -<mapEntry key="org.eclipse.update.core/debug/type" value="false"/> +<mapEntry key="org.eclipse.ui/debug/uijob.longwarning" value="false"/> <mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/> +<mapEntry key="org.eclipse.update.core/debug/type" value="false"/> <mapEntry key="org.eclipse.core.resources/history" value="false"/> <mapEntry key="org.eclipse.team.core/refreshjob" value="false"/> <mapEntry key="org.eclipse.ui.intro/debug" value="true"/> @@ -286,35 +283,35 @@ <mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/> <mapEntry key="org.eclipse.core.resources/build/failure" value="false"/> <mapEntry key="org.eclipse.ui/trace/handlers" value="false"/> -<mapEntry key="org.eclipse.wst.sse.ui/debug/tracefilter" value=""/> <mapEntry key="org.eclipse.core.resources/save/tree" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/debug/tracefilter" value=""/> <mapEntry key="org.eclipse.core.runtime/config/debug" value="true"/> <mapEntry key="org.eclipse.help.ui/debug" value="true"/> -<mapEntry key="org.eclipse.wst.sse.core/builder/time" value="false"/> <mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/> +<mapEntry key="org.eclipse.wst.sse.core/builder/time" value="false"/> <mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/> <mapEntry key="com.ibm.wtp.common.util/debug/logtracefile" value="false"/> <mapEntry key="org.eclipse.core.runtime/perf/failure" value="false"/> <mapEntry key="org.eclipse.wst.sse.ui/extendedconfigurationbuilder/time" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/> <mapEntry key="org.eclipse.wst.internet.monitor.core/parsing" value="false"/> -<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/> <mapEntry key="org.eclipse.wst.server.core/debug" value="true"/> +<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/> <mapEntry key="org.eclipse.core.runtime/loader/debug/success" value="true"/> -<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/> <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"/> -<booleanAttribute key="org.eclipse.hyades.trace.ui.ATTR_SHOW_EXEC_CPU_TIME" value="true"/> <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="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.net4j.examples.server,org.eclipse.emf.cdo.examples.server,org.eclipse.emf.cdo.core,org.eclipse.net4j.util,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="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.dbgen,org.eclipse.net4j.examples.server,org.eclipse.emf.cdo.examples.server,org.eclipse.emf.cdo.core,org.eclipse.net4j.util,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="location4" value="C:\workspaces\runtime-workspace"/> <booleanAttribute key="org.eclipse.hyades.trace.ui.ATTR_SHOW_EXEC_INSTANCES" value="false"/> <stringAttribute key="application" value="org.eclipse.net4j.examples.server.application"/> diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/LoadObjectIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/LoadObjectIndication.java index a16bedf782..599767a813 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/LoadObjectIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/LoadObjectIndication.java @@ -30,6 +30,11 @@ public class LoadObjectIndication extends AbstractIndicationWithResponse public void indicate() { oid = receiveLong(); + if (isDebugEnabled()) + { + Mapper mapper = ((ServerCDOProtocol) getProtocol()).getMapper(); + debug("Loading object " + mapper.getOidEncoder().toString(oid)); + } } public void respond() diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/LoadResourceIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/LoadResourceIndication.java index efdf46af5b..eb141fbdd6 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/LoadResourceIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/LoadResourceIndication.java @@ -33,6 +33,10 @@ public class LoadResourceIndication extends AbstractIndicationWithResponse public void indicate() { rid = receiveInt(); + if (isDebugEnabled()) + { + debug("Loading rid " + rid); + } } public void respond() diff --git a/plugins/org.eclipse.emf.cdo.tests/launches/CDO All Tests.launch b/plugins/org.eclipse.emf.cdo.tests/launches/CDO All Tests.launch new file mode 100644 index 0000000000..5214bdc68b --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests/launches/CDO All Tests.launch @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<stringAttribute key="product" value="org.eclipse.platform.ide"/> +<stringAttribute key="bootstrap" value=""/> +<booleanAttribute key="useProduct" value="false"/> +<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.net4j.examples.mvc.swt,org.eclipse.net4j.examples.prov.client.ui,org.eclipse.net4j.examples.mvc,org.eclipse.net4j.examples.prov.server,org.eclipse.emf.cdo.dbgen.edit,org.eclipse.emf.cdo.examples.library,org.eclipse.emf.cdo.examples.library.ui,org.eclipse.emf.cdo.analysis.gmf,org.eclipse.emf.cdo.mapping.editor,org.eclipse.net4j.examples.server,org.eclipse.net4j.tests,org.eclipse.emf.cdo.doc,org.eclipse.datatools.enablement.mysql,org.eclipse.net4j.spring.tests,org.eclipse.emf.cdo,org.eclipse.emf.cdo.dbgen.editor,org.eclipse.net4j.examples.prov.edit,org.eclipse.emf.cdo.utilities.migrator,org.eclipse.emf.cdo.analysis,org.eclipse.emf.cdo.examples.server,org.eclipse.datatools.enablement.mysql.dbdefinition,org.eclipse.net4j.examples.prov,org.eclipse.emf.cdo.examples.client,org.eclipse.emf.cdo.examples.ui,org.eclipse.net4j.examples.client.ui,org.eclipse.net4j.examples.client,org.eclipse.net4j.doc,org.eclipse.net4j.examples.prov.client,org.eclipse.net4j.examples.prov.editor,org.eclipse.net4j"/> +<booleanAttribute key="tracing" value="false"/> +<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,org.apache.ant,org.apache.xerces,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=""/> +<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="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> +<booleanAttribute key="clearws" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.model1.AllTests"/> +<stringAttribute key="pde.version" value="3.2a"/> +<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/> +<booleanAttribute key="default" value="false"/> +<booleanAttribute key="clearConfig" value="true"/> +<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="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.tests"/> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/> +</launchConfiguration> diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/Bugzilla155899Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/Bugzilla155899Test.java new file mode 100644 index 0000000000..81922f210e --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/Bugzilla155899Test.java @@ -0,0 +1,173 @@ +/*************************************************************************** + * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + **************************************************************************/ +package org.eclipse.emf.cdo.tests.model1; + + +import org.eclipse.emf.cdo.client.CDOResource; +import org.eclipse.emf.cdo.client.ResourceManager; + +import org.eclipse.emf.ecore.resource.Resource; + +import testmodel1.ExtendedNode; +import testmodel1.TreeNode; + + +/** + * Bidirectional XRefs are doubled at target side + * + * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=155899 + */ +public class Bugzilla155899Test extends AbstractModel1Test +{ + public void testTwoResourcesUniDi() throws Exception + { + final String SOURCE_RESOURCE = "/test/source"; + final String TARGET_RESOURCE = "/test/target"; + final String SOURCE = "sourceRoot"; + final String TARGET = "targetRoot"; + + { // Execution + TreeNode target = createNode(TARGET); + CDOResource targetResource = saveRoot(target, TARGET_RESOURCE); + ResourceManager resourceManager = targetResource.getResourceManager(); + Resource sourceResource = createResource(SOURCE_RESOURCE, resourceManager); + + TreeNode source = createNode(SOURCE); + source.getReferences().add(target); + sourceResource.getContents().add(source); + resourceManager.commit(); + } + + { // Verification + TreeNode source = (TreeNode) loadRoot(SOURCE_RESOURCE); + assertEquals(1, source.getReferences().size()); + assertNode(TARGET, (TreeNode) source.getReferences().get(0)); + + TreeNode target = (TreeNode) loadRoot(TARGET_RESOURCE); + assertEquals(0, target.getReferences().size()); + } + } + + public void testTwoResourcesBiDi() throws Exception + { + final String SOURCE_RESOURCE = "/test/source"; + final String TARGET_RESOURCE = "/test/target"; + final String SOURCE = "sourceRoot"; + final String TARGET = "targetRoot"; + + { // Execution + ExtendedNode target = createExtended(TARGET); + CDOResource targetResource = saveRoot(target, TARGET_RESOURCE); + ResourceManager resourceManager = targetResource.getResourceManager(); + Resource sourceResource = createResource(SOURCE_RESOURCE, resourceManager); + + ExtendedNode source = createExtended(SOURCE); + source.getBidiSource().add(target); + sourceResource.getContents().add(source); + resourceManager.commit(); + } + + { // Verification + ExtendedNode source = (ExtendedNode) loadRoot(SOURCE_RESOURCE); + assertEquals(1, source.getBidiSource().size()); + assertEquals(0, source.getBidiTarget().size()); + assertNode(TARGET, (ExtendedNode) source.getBidiSource().get(0)); + + ExtendedNode target = (ExtendedNode) loadRoot(TARGET_RESOURCE); + assertEquals(0, target.getBidiSource().size()); + assertEquals(1, target.getBidiTarget().size()); + assertNode(SOURCE, (ExtendedNode) target.getBidiTarget().get(0)); + } + } + + public void testOneResourceTargetRoot() throws Exception + { + final String RESOURCE = "/test/res"; + final String SOURCE = "source"; + final String TARGET = "target"; + + { // Execution + ExtendedNode target = createExtended(TARGET); + ExtendedNode source = createExtended(SOURCE, target); + source.getBidiSource().add(target); + saveRoot(target, RESOURCE); + } + + { // Verification + ExtendedNode target = (ExtendedNode) loadRoot(RESOURCE); + assertEquals(0, target.getBidiSource().size()); + assertEquals(1, target.getBidiTarget().size()); + + ExtendedNode source = (ExtendedNode) findChild(SOURCE, target); + assertEquals(1, source.getBidiSource().size()); + assertEquals(0, source.getBidiTarget().size()); + } + } + + public void testOneResourceSourceRoot() throws Exception + { + final String RESOURCE = "/test/res"; + final String SOURCE = "source"; + final String TARGET = "target"; + + { // Execution + ExtendedNode source = createExtended(SOURCE); + ExtendedNode target = createExtended(TARGET, source); + source.getBidiSource().add(target); + saveRoot(source, RESOURCE); + } + + { // Verification + ExtendedNode source = (ExtendedNode) loadRoot(RESOURCE); + assertEquals(1, source.getBidiSource().size()); + assertEquals(0, source.getBidiTarget().size()); + + ExtendedNode target = (ExtendedNode) findChild(TARGET, source); + assertEquals(0, target.getBidiSource().size()); + assertEquals(1, target.getBidiTarget().size()); + } + } + + public void testTwoResourcesTwoResMans() throws Exception + { + final String SOURCE_RESOURCE = "/test/source"; + final String TARGET_RESOURCE = "/test/target"; + final String SOURCE = "sourceRoot"; + final String TARGET = "targetRoot"; + + { // Execution + ExtendedNode target = createExtended(TARGET); + saveRoot(target, TARGET_RESOURCE); + + ExtendedNode source = createExtended(SOURCE); + CDOResource sourceResource = saveRoot(source, SOURCE_RESOURCE); + + ResourceManager resourceManager = sourceResource.getResourceManager(); + Resource targetResource = getResource(TARGET_RESOURCE, resourceManager); + target = (ExtendedNode) targetResource.getContents().get(0); + + source.getBidiTarget().add(target); + resourceManager.commit(); + } + + { // Verification + ExtendedNode source = (ExtendedNode) loadRoot(SOURCE_RESOURCE); + assertEquals(0, source.getBidiSource().size()); + assertEquals(1, source.getBidiTarget().size()); + assertNode(TARGET, (ExtendedNode) source.getBidiTarget().get(0)); + + ExtendedNode target = (ExtendedNode) loadRoot(TARGET_RESOURCE); + assertEquals(1, target.getBidiSource().size()); + assertEquals(0, target.getBidiTarget().size()); + assertNode(SOURCE, (ExtendedNode) target.getBidiSource().get(0)); + } + } +} diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/AbstractTopologyTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/AbstractTopologyTest.java index ad80e7cee4..ab505cb1f0 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/AbstractTopologyTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/AbstractTopologyTest.java @@ -129,20 +129,28 @@ public abstract class AbstractTopologyTest extends TestCase implements ITopology return topology.createResourceManager(resourceSet); } - protected CDOResource createResource(String path) + protected CDOResource createResource(String path, ResourceManager resourceManager) { - ResourceManager resourceManager = createResourceManager(); URI uri = CDOResourceFactoryImpl.formatURI(path); return (CDOResource) resourceManager.createResource(uri); } - protected CDOResource getResource(String path) + protected CDOResource createResource(String path) + { + return createResource(path, createResourceManager()); + } + + protected CDOResource getResource(String path, ResourceManager resourceManager) { - ResourceManager resourceManager = createResourceManager(); URI uri = CDOResourceFactoryImpl.formatURI(path); return (CDOResource) resourceManager.getResource(uri, true); } + protected CDOResource getResource(String path) + { + return getResource(path, createResourceManager()); + } + protected EObject loadRoot(String path) throws IOException { CDOResource resource = getResource(path); |