diff options
12 files changed, 136 insertions, 107 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/CDO UI.launch b/plugins/org.eclipse.emf.cdo.ui/CDO UI.launch index 16b68891ae..291cce8777 100644 --- a/plugins/org.eclipse.emf.cdo.ui/CDO UI.launch +++ b/plugins/org.eclipse.emf.cdo.ui/CDO UI.launch @@ -38,22 +38,22 @@ <mapEntry key="org.eclipse.ui/trace/contexts" value="false"/> <mapEntry key="org.eclipse.wst.common.environment/trace/error" value="true"/> <mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/> -<mapEntry key="org.eclipse.wst.common.environment/trace/warning" value="true"/> <mapEntry key="org.eclipse.emf.validation/debug/exceptions/throwing" value="false"/> +<mapEntry key="org.eclipse.wst.common.environment/trace/warning" value="true"/> <mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/> <mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug" value="true"/> -<mapEntry key="org.eclipse.wst.sse.ui/actioncontributor/debugstatusfields" value="true"/> <mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/actioncontributor/debugstatusfields" value="true"/> +<mapEntry key="org.eclipse.jdt.core/debug" value="true"/> <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/> <mapEntry key="org.eclipse.net4j.tcp/debug" value="true"/> <mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/> <mapEntry key="org.eclipse.emf.cdo.server/debug.repository" value="true"/> <mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/> -<mapEntry key="org.eclipse.wst.sse.ui/contentOutline" value="false"/> <mapEntry key="org.eclipse.emf.ocl/debug/exceptions/throwing" value="false"/> -<mapEntry key="org.eclipse.wst.sse.ui/preferences-properties" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/contentOutline" value="false"/> <mapEntry key="org.eclipse.wtp.common/debug/logtrace" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/preferences-properties" value="false"/> <mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/> <mapEntry key="org.eclipse.emf.query.ocl/debug" value="true"/> <mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/> @@ -61,38 +61,38 @@ <mapEntry key="org.eclipse.net4j.util/debug.lifecycle.dump" value="true"/> <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/> <mapEntry key="org.eclipse.emf.cdo/debug.util" value="true"/> -<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/> <mapEntry key="org.eclipse.wst.sse.ui/propertySheet" value="false"/> +<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/> <mapEntry key="org.eclipse.team.core/refreshjob" value="false"/> -<mapEntry key="org.eclipse.ui/debug" value="false"/> <mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/> +<mapEntry key="org.eclipse.ui/debug" value="false"/> <mapEntry key="org.eclipse.wtp.common/debug/loglevel" value="WARNING"/> <mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/> <mapEntry key="org.eclipse.pde.core/classpath" value="false"/> <mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/> <mapEntry key="org.eclipse.equinox.preferences/general" value="false"/> <mapEntry key="org.eclipse.net4j.jms.server/debug.store" value="true"/> -<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/> <mapEntry key="org.eclipse.wst.sse.core/format" value="false"/> +<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/> <mapEntry key="org.eclipse.ocl/debug/evaluation" value="false"/> <mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/> <mapEntry key="org.eclipse.emf.validation/debug/constraints" value="false"/> <mapEntry key="org.eclipse.osgi/trace/activation" value="false"/> <mapEntry key="org.eclipse.ocl/debug/exceptions/catching" value="false"/> <mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/> -<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/> <mapEntry key="org.eclipse.team.core/threading" value="false"/> +<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/> <mapEntry key="org.eclipse.wst.sse.core/structureddocument" value="false"/> <mapEntry key="org.eclipse.emf.transaction/debug/methods/exiting" value="false"/> <mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/> -<mapEntry key="org.eclipse.emf.cdo.protocol/debug.protocol" value="true"/> <mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/> +<mapEntry key="org.eclipse.emf.cdo.protocol/debug.protocol" value="true"/> <mapEntry key="org.eclipse.ocl/debug" value="true"/> <mapEntry key="org.eclipse.ui/trace/graphics" value="false"/> <mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/> <mapEntry key="org.eclipse.net4j.db/debug" value="true"/> -<mapEntry key="org.eclipse.emf.query/debug/exceptions/throwing" value="false"/> <mapEntry key="org.eclipse.wst.common.environment/trace/ws_dt_cmd_engine" value="true"/> +<mapEntry key="org.eclipse.emf.query/debug/exceptions/throwing" value="false"/> <mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/> <mapEntry key="org.eclipse.net4j.jms/debug.protocol" value="true"/> <mapEntry key="org.eclipse.wst.sse.ui/gotoNextAnnotation" value="false"/> @@ -100,8 +100,8 @@ <mapEntry key="org.eclipse.debug.ui/debug" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/> <mapEntry key="org.eclipse.help.base/debug/search" value="false"/> -<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/> <mapEntry key="org.eclipse.pde.build/debug" value="false"/> +<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/> <mapEntry key="org.eclipse.wst.common.environment/trace/ws_ant" value="true"/> <mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/> <mapEntry key="org.eclipse.emf.validation/debug/parsers" value="false"/> @@ -110,13 +110,13 @@ <mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/> <mapEntry key="org.eclipse.update.core/debug/type" value="false"/> <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/> -<mapEntry key="org.eclipse.emf.workspace/debug/methods/exiting" value="false"/> -<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/> +<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/> +<mapEntry key="org.eclipse.emf.workspace/debug/methods/exiting" value="false"/> <mapEntry key="org.eclipse.wst.common.project.facet.core/actionSorting" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/> -<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/throwing" value="false"/> <mapEntry key="org.eclipse.core.resources/refresh" value="false"/> +<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/throwing" value="false"/> <mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/> <mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/> <mapEntry key="org.eclipse.jet/debug/builder" value="false"/> @@ -128,18 +128,18 @@ <mapEntry key="org.eclipse.ui/trace/handlers" value="false"/> <mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/> <mapEntry key="org.eclipse.jem.util/debug/logtrace" value="false"/> -<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/> <mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/> +<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/> <mapEntry key="org.eclipse.osgi/profile/startup" value="false"/> <mapEntry key="org.eclipse.core.jobs/jobs" value="false"/> <mapEntry key="org.eclipse.wst.sse.ui/debug" value="true"/> -<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/> -<mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/throwing" value="false"/> <mapEntry key="org.eclipse.wst.common.environment/trace/info" value="true"/> +<mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/throwing" value="false"/> +<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/> <mapEntry key="org.eclipse.net4j/perf" value="false"/> <mapEntry key="org.eclipse.help.base/debug" value="true"/> -<mapEntry key="org.eclipse.jet/debug/projectBundleLoading" value="false"/> <mapEntry key="org.eclipse.net4j/debug" value="true"/> +<mapEntry key="org.eclipse.jet/debug/projectBundleLoading" value="false"/> <mapEntry key="org.eclipse.net4j/debug.signal" value="true"/> <mapEntry key="org.eclipse.emf.query/debug/methods/entering" value="false"/> <mapEntry key="org.eclipse.wst.sse.core/structuredmodel/modelmanager" value="false"/> @@ -154,11 +154,11 @@ <mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/> <mapEntry key="org.eclipse.emf.cdo/debug.repository" value="true"/> <mapEntry key="org.eclipse.wst.sse.ui/extendedconfigurationbuilder" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/> <mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/> <mapEntry key="org.eclipse.wst.xml.core/debug/cmdocumentmanager" value="false"/> -<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/> <mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/> +<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/> <mapEntry key="org.eclipse.ui.ide/debug" value="false"/> <mapEntry key="org.eclipse.osgi/profile/debug" value="false"/> <mapEntry key="org.eclipse.pde.core/debug" value="true"/> @@ -168,17 +168,17 @@ <mapEntry key="org.eclipse.net4j.util/debug.registry" value="true"/> <mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/> <mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/> -<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/> -<mapEntry key="org.eclipse.emf.cdo/debug.object" value="false"/> <mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/> +<mapEntry key="org.eclipse.emf.cdo/debug.object" value="false"/> +<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/> <mapEntry key="org.eclipse.emf.cdo.server/debug.revision" value="false"/> <mapEntry key="org.eclipse.core.resources/strings" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/> <mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/> <mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/> -<mapEntry key="org.eclipse.core.resources/preferences" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/> <mapEntry key="org.eclipse.ui/perf/showHeapStatus" 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.jdt.core/debug/selection" value="false"/> <mapEntry key="org.eclipse.emf.workspace/debug" value="true"/> <mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/> @@ -192,33 +192,33 @@ <mapEntry key="org.eclipse.emf.transaction/debug/transactions" value="false"/> <mapEntry key="org.eclipse.ocl/debug/parsing" value="false"/> <mapEntry key="org.eclipse.update.core/debug" value="true"/> -<mapEntry key="org.eclipse.osgi/debug/security" value="false"/> <mapEntry key="org.eclipse.wst.sse.core/tasks/preferences" value="false"/> -<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/security" value="false"/> <mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/> <mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/> -<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/> <mapEntry key="org.eclipse.net4j.jms.admin/debug.protocol" value="true"/> +<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/> <mapEntry key="org.eclipse.ui/debug/showAllJobs" value="false"/> -<mapEntry key="org.eclipse.core.resources/history" value="false"/> <mapEntry key="org.eclipse.emf.cdo.server/debug.store" value="true"/> +<mapEntry key="org.eclipse.core.resources/history" value="false"/> <mapEntry key="org.eclipse.wst.sse.ui/propertyChangeUpdateActionContributionItem" value="false"/> <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/> -<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/> <mapEntry key="org.eclipse.pde.core/validation" value="false"/> +<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/> <mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/readtime" value="false"/> <mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/> <mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/> -<mapEntry key="org.eclipse.wst.sse.core/tasks" value="false"/> <mapEntry key="org.eclipse.core.runtime/debug" value="false"/> +<mapEntry key="org.eclipse.wst.sse.core/tasks" value="false"/> <mapEntry key="org.eclipse.equinox.preferences/set" value="false"/> <mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/> <mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/> <mapEntry key="org.eclipse.jet/debug/pluginBundleLoading" value="false"/> <mapEntry key="org.eclipse.wst.xml.core/debug/tracefilter" value=""/> -<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/> <mapEntry key="org.eclipse.emf.cdo/debug.protocol" value="true"/> +<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/> <mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/> <mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/> <mapEntry key="org.eclipse.emf.validation/debug/listeners" value="false"/> @@ -226,8 +226,8 @@ <mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/> <mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/> <mapEntry key="org.eclipse.net4j/debug.connector" value="true"/> -<mapEntry key="org.eclipse.wst.dtd.ui/projectionperf" value="false"/> <mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/> +<mapEntry key="org.eclipse.wst.dtd.ui/projectionperf" value="false"/> <mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/> <mapEntry key="org.eclipse.ocl/debug/methods/entering" value="false"/> <mapEntry key="org.eclipse.core.resources/restore" value="false"/> @@ -235,8 +235,8 @@ <mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/> <mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/> <mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/> -<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/> <mapEntry key="org.eclipse.osgi/debug/loader" value="false"/> +<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/> <mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerjob" value="false"/> <mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/> @@ -252,11 +252,11 @@ <mapEntry key="org.eclipse.emf.validation/debug/cache" value="false"/> <mapEntry key="org.eclipse.update.core/debug/install" value="false"/> <mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/> -<mapEntry key="org.eclipse.help/debug/protocols" value="false"/> <mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/> +<mapEntry key="org.eclipse.help/debug/protocols" value="false"/> <mapEntry key="org.eclipse.net4j.util/debug.lifecycle" value="true"/> -<mapEntry key="org.eclipse.emf.validation/debug/methods/entering" value="false"/> <mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/> +<mapEntry key="org.eclipse.emf.validation/debug/methods/entering" value="false"/> <mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/> <mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/> <mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/> @@ -270,10 +270,10 @@ <mapEntry key="org.eclipse.help/debug/context" value="false"/> <mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerValidators" value="false"/> <mapEntry key="org.eclipse.emf.validation/debug/xml" value="false"/> -<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/> <mapEntry key="org.eclipse.jet/debug/bundleLoading" value="false"/> -<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/> <mapEntry key="org.eclipse.emf.cdo/debug" value="true"/> +<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/> <mapEntry key="org.eclipse.emf.cdo.ui/debug" value="true"/> <mapEntry key="org.eclipse.emf.workspace/debug/exceptions/catching" value="false"/> <mapEntry key="org.eclipse.core.resources/build/needbuildstack" value="false"/> @@ -284,29 +284,29 @@ <mapEntry key="org.eclipse.emf.ocl/debug/methods/exiting" value="false"/> <mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/> <mapEntry key="org.eclipse.core.resources/build/failure" value="false"/> -<mapEntry key="org.eclipse.team.core/debug" value="false"/> <mapEntry key="org.eclipse.jet/debug" value="false"/> +<mapEntry key="org.eclipse.team.core/debug" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/> <mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/> <mapEntry key="org.eclipse.net4j.jms.server.jdbc/debug" value="true"/> <mapEntry key="org.eclipse.wst.xml.ui/projectionperf" value="false"/> -<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/> <mapEntry key="org.eclipse.core.resources/save" value="false"/> +<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/> <mapEntry key="org.eclipse.emf.transaction/debug/exceptions/throwing" value="false"/> <mapEntry key="org.eclipse.core.resources/contenttype" value="false"/> -<mapEntry key="org.eclipse.jem.util/debug/loglevel" value="WARNING"/> <mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/> +<mapEntry key="org.eclipse.jem.util/debug/loglevel" value="WARNING"/> <mapEntry key="org.eclipse.emf.validation/debug/exceptions/catching" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/> <mapEntry key="org.eclipse.emf.cdo.server/debug" value="true"/> +<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/> <mapEntry key="org.eclipse.osgi/debug/events" value="false"/> <mapEntry key="org.eclipse.ui/trace/commands" value="false"/> <mapEntry key="org.eclipse.equinox.preferences/get" value="false"/> <mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/operations" value="false"/> <mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/> <mapEntry key="org.eclipse.debug.ui/debug/launchhistory" value="false"/> -<mapEntry key="org.eclipse.net4j.util/debug.om" value="true"/> <mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/contributetime" value="false"/> +<mapEntry key="org.eclipse.net4j.util/debug.om" value="true"/> <mapEntry key="org.eclipse.net4j.jms.server/debug" value="true"/> <mapEntry key="org.eclipse.emf.workspace/debug/methods/entering" value="false"/> <mapEntry key="org.eclipse.emf.query.ocl/debug/methods/entering" value="false"/> @@ -318,8 +318,8 @@ <mapEntry key="org.eclipse.ui.intro/debug" value="true"/> <mapEntry key="org.eclipse.emf.transaction/debug/locking" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/cpresolution/advanced" value="false"/> -<mapEntry key="org.eclipse.net4j.jms/debug" value="true"/> <mapEntry key="org.eclipse.emf.validation/debug/providers" value="false"/> +<mapEntry key="org.eclipse.net4j.jms/debug" value="true"/> <mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/> <mapEntry key="org.eclipse.emf.cdo.server/debug.resource" value="true"/> <mapEntry key="org.eclipse.pde.core/cache" value="false"/> @@ -327,18 +327,18 @@ <mapEntry key="org.eclipse.wst.sse.ui/extendedconfigurationbuilder/time" value="false"/> <mapEntry key="org.eclipse.wst.sse.core/tasks/time" value="false"/> <mapEntry key="org.eclipse.emf.cdo/debug.transaction" value="true"/> -<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/lifecyclelistener" value="false"/> <mapEntry key="org.eclipse.emf.query/debug/methods/exiting" value="false"/> -<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/lifecyclelistener" value="false"/> <mapEntry key="org.eclipse.net4j/debug.selector" value="true"/> +<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/> <mapEntry key="org.eclipse.jdt.ui/debug" value="true"/> -<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/> -<mapEntry key="org.eclipse.wst.sse.core/filebuffers/modelmanagement" value="false"/> <mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/> -<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/> +<mapEntry key="org.eclipse.wst.sse.core/filebuffers/modelmanagement" value="false"/> +<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/> <mapEntry key="org.eclipse.wst.sse.ui/debug/tracefilter" value=""/> -<mapEntry key="org.eclipse.wtp.common/debug/logtracefile" value="false"/> +<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/> <mapEntry key="org.eclipse.jet/debug/ext/xpathFunctions" value="false"/> +<mapEntry key="org.eclipse.wtp.common/debug/logtracefile" value="false"/> <mapEntry key="org.eclipse.emf.query/debug" value="true"/> <mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/> <mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/> @@ -354,11 +354,11 @@ <mapEntry key="org.eclipse.net4j.jms.admin/debug" value="true"/> <mapEntry key="org.eclipse.emf.cdo/debug.model" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/> -<mapEntry key="org.eclipse.wst.common.project.facet.core/activation" value="false"/> <mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/> +<mapEntry key="org.eclipse.wst.common.project.facet.core/activation" value="false"/> <mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/> -<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/> <mapEntry key="org.eclipse.ui/perf/part.create" value="800"/> +<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/> <mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/> <mapEntry key="org.eclipse.team.core/streams" value="false"/> <mapEntry key="org.eclipse.ui.ide/debug/undomonitor" value="false"/> @@ -366,11 +366,11 @@ <mapEntry key="org.eclipse.ui/experimental/menus" value="false"/> <mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/> <mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/> -<mapEntry key="org.eclipse.net4j.container.ui/debug" value="true"/> <mapEntry key="org.eclipse.emf.cdo/debug.session" value="true"/> +<mapEntry key="org.eclipse.net4j.container.ui/debug" value="true"/> <mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/> -<mapEntry key="org.eclipse.emf.cdo/debug.adapter" value="true"/> <mapEntry key="org.eclipse.wst.sse.ui/storagemodelprovider/operations" value="false"/> +<mapEntry key="org.eclipse.emf.cdo/debug.adapter" value="true"/> <mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/> <mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/> <mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/> @@ -380,38 +380,38 @@ <mapEntry key="org.eclipse.net4j.db.mysql/debug.sql" value="true"/> <mapEntry key="org.eclipse.ui.workbench/debug" value="false"/> <mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/> -<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/> <mapEntry key="org.eclipse.emf.cdo.protocol/debug.model" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/> <mapEntry key="org.eclipse.debug.core/debug" value="false"/> -<mapEntry key="org.eclipse.core.resources/debug" value="false"/> <mapEntry key="org.eclipse.emf.cdo.server.jdbc/debug" value="true"/> +<mapEntry key="org.eclipse.core.resources/debug" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/> <mapEntry key="org.eclipse.jem.util/debug/logtracefile" value="false"/> -<mapEntry key="org.eclipse.ui.browser/debug" value="false"/> <mapEntry key="org.eclipse.emf.cdo.server/debug.protocol" value="false"/> +<mapEntry key="org.eclipse.ui.browser/debug" value="false"/> <mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/> -<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/> <mapEntry key="org.eclipse.update.core/debug/web" value="false"/> +<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/> <mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/> <mapEntry key="org.eclipse.help/debug" value="true"/> <mapEntry key="org.eclipse.core.runtime/perf" value="false"/> <mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/> -<mapEntry key="org.eclipse.emf.ocl/debug/methods/entering" value="false"/> <mapEntry key="org.eclipse.wst.sse.core/dom/adapter/notification/time" value="false"/> +<mapEntry key="org.eclipse.emf.ocl/debug/methods/entering" value="false"/> <mapEntry key="org.eclipse.net4j/debug.channel" value="true"/> <mapEntry key="org.eclipse.emf.cdo/debug.revision" value="true"/> <mapEntry key="org.eclipse.emf.cdo/debug.view" value="true"/> <mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/> <mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/> -<mapEntry key="org.eclipse.wst.sse.core/dom/adapter/notification/time/criteria" value="10"/> <mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/> +<mapEntry key="org.eclipse.wst.sse.core/dom/adapter/notification/time/criteria" value="10"/> <mapEntry key="org.eclipse.wst.common.environment/trace/data" value="true"/> -<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/> <mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/> -<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/> +<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/> <mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/> -<mapEntry key="org.eclipse.ocl/debug/exceptions/throwing" value="false"/> +<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/> <mapEntry key="org.eclipse.emf.cdo.protocol/debug" value="true"/> +<mapEntry key="org.eclipse.ocl/debug/exceptions/throwing" value="false"/> <mapEntry key="org.eclipse.emf.cdo/debug.resource" value="true"/> <mapEntry key="org.eclipse.jet/debug/modelLoaderExtensions" value="false"/> <mapEntry key="org.eclipse.wst.sse.core/debug" value="true"/> @@ -427,23 +427,23 @@ <mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/> <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/> <mapEntry key="org.eclipse.core.resources/build/delta" value="false"/> -<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/> <mapEntry key="org.eclipse.jet/debug/pluginProjectMonitor" value="false"/> +<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/> <mapEntry key="org.eclipse.emf.validation/debug/methods/exiting" value="false"/> <mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/> <mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/> <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/> -<mapEntry key="org.eclipse.wst.sse.core/filebuffers/lifecycle" value="false"/> <mapEntry key="org.eclipse.wst.sse.core/structuredmodel/locks" value="true"/> +<mapEntry key="org.eclipse.wst.sse.core/filebuffers/lifecycle" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/> <mapEntry key="org.eclipse.wst.common.environment/debug" value="true"/> <mapEntry key="org.eclipse.update.configurator/debug" value="false"/> -<mapEntry key="org.eclipse.help.ui/debug" value="true"/> <mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/> +<mapEntry key="org.eclipse.help.ui/debug" value="true"/> <mapEntry key="org.eclipse.emf.query.ocl/debug/methods/exiting" value="false"/> -<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/> <mapEntry key="org.eclipse.ocl/debug/methods/exiting" value="false"/> +<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/> <mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerSpelling" value="false"/> <mapEntry key="org.eclipse.emf.transaction/debug/methods/entering" value="false"/> <mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/> diff --git a/plugins/org.eclipse.net4j.tests/Net4j TCPTransportTest.launch b/plugins/org.eclipse.net4j.tests/Net4j TCPTransportTest.launch index 239859ad5f..7d0ee890f0 100644 --- a/plugins/org.eclipse.net4j.tests/Net4j TCPTransportTest.launch +++ b/plugins/org.eclipse.net4j.tests/Net4j TCPTransportTest.launch @@ -1,16 +1,16 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.jdt.junit.launchconfig"> -<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.net4j.tests.TCPTransportTest"/> -<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.net4j.tests"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="4"/> -</listAttribute> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.net4j.tests"/> +<listEntry value="/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> </listAttribute> -<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> <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.net4j.tests.TCPTransportTest"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.net4j.tests"/> </launchConfiguration> diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ClientTestProtocolFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ClientTestProtocolFactory.java index fcaf01e4fc..b3dca22170 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ClientTestProtocolFactory.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ClientTestProtocolFactory.java @@ -10,7 +10,6 @@ **************************************************************************/ package org.eclipse.net4j.tests; -import org.eclipse.net4j.IProtocol; import org.eclipse.net4j.util.factory.ProductCreationException; import org.eclipse.internal.net4j.ClientProtocolFactory; @@ -27,8 +26,8 @@ public class ClientTestProtocolFactory extends ClientProtocolFactory super(TYPE); } - public IProtocol create(String description) throws ProductCreationException + public TestProtocol create(String description) throws ProductCreationException { - return null; + return new TestProtocol(null); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java index f633ecc1d7..28daa7a60a 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java @@ -80,14 +80,14 @@ public class TCPTransportTest extends AbstractTransportTest container.registerFactory(new ClientTestProtocolFactory()); startTransport(); - IChannel channel = getConnector().openChannel(ServerTestProtocolFactory.TYPE); + IChannel channel = getConnector().openChannel(ClientTestProtocolFactory.TYPE); for (int i = 0; i < COUNT; i++) { IBuffer buffer = provideBuffer(); ByteBuffer byteBuffer = buffer.startPutting(channel.getChannelIndex()); byteBuffer.putInt(1970); channel.sendBuffer(buffer); - Thread.sleep(500000); + Thread.sleep(50); } assertTrue(counter.await(2, TimeUnit.SECONDS)); diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java index 44a957bbf9..af34af4136 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java @@ -27,6 +27,9 @@ public final class TestProtocol extends Protocol { System.out.println("BUFFER ARRIVED"); buffer.release(); - counter.countDown(); + if (counter != null) + { + counter.countDown(); + } } }
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java index bb19214e41..94c57b08b7 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java @@ -191,7 +191,7 @@ public class Channel extends Lifecycle implements IChannel, IBufferProvider @Override public String toString() { - return MessageFormat.format("Channel[{0}, {1}]", channelIndex, receiveHandler); //$NON-NLS-1$ + return MessageFormat.format("Channel[{0}]", channelIndex); //$NON-NLS-1$ } @Override diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java index ca6cf3af67..b8266b54b9 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java @@ -39,7 +39,7 @@ public abstract class Indication extends SignalReactor TRACER.trace("================ Indicating " + ReflectUtil.getSimpleClassName(this)); //$NON-NLS-1$ } - indicating(new ExtendedDataInputStream(in)); + indicating(wrapInputStream(in)); } protected abstract void indicating(ExtendedDataInputStream in) throws IOException; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java index a3e98a6daf..6777feea26 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java @@ -40,13 +40,13 @@ public abstract class IndicationWithResponse extends SignalReactor TRACER.trace("================ Indicating " + ReflectUtil.getSimpleClassName(this)); //$NON-NLS-1$ } - indicating(new ExtendedDataInputStream(in)); + indicating(wrapInputStream(in)); if (TRACER.isEnabled()) { TRACER.trace("================ Responding " + ReflectUtil.getSimpleClassName(this)); //$NON-NLS-1$ } - responding(new ExtendedDataOutputStream(out)); + responding(wrapOutputStream(out)); out.flush(); } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java index 6d4dd27f14..50c888478a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java @@ -41,7 +41,7 @@ public abstract class Request extends SignalActor TRACER.trace("================ Requesting " + ReflectUtil.getSimpleClassName(this)); //$NON-NLS-1$ } - requesting(new ExtendedDataOutputStream(out)); + requesting(wrapOutputStream(out)); out.flush(); } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java index ad9634c55a..e96c95a034 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java @@ -42,14 +42,14 @@ public abstract class RequestWithConfirmation<RESULT> extends SignalActor<RESULT TRACER.trace("================ Requesting " + ReflectUtil.getSimpleClassName(this)); //$NON-NLS-1$ } - requesting(new ExtendedDataOutputStream(out)); + requesting(wrapOutputStream(out)); out.flush(); if (TRACER.isEnabled()) { TRACER.trace("================ Confirming " + ReflectUtil.getSimpleClassName(this)); //$NON-NLS-1$ } - setResult(confirming(new ExtendedDataInputStream(in))); + setResult(confirming(wrapInputStream(in))); } protected abstract void requesting(ExtendedDataOutputStream out) throws IOException; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java index 56ed2bf0c3..f6483a45cb 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java @@ -13,10 +13,14 @@ package org.eclipse.net4j.signal; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.stream.BufferInputStream; import org.eclipse.net4j.stream.BufferOutputStream; +import org.eclipse.net4j.util.io.ExtendedDataInputStream; +import org.eclipse.net4j.util.io.ExtendedDataOutputStream; import org.eclipse.internal.net4j.bundle.OM; import java.io.EOFException; +import java.io.InputStream; +import java.io.OutputStream; import java.util.concurrent.TimeoutException; /** @@ -31,9 +35,9 @@ public abstract class Signal implements Runnable private int correlationID; - private BufferInputStream inputStream; + private BufferInputStream bufferInputStream; - private BufferOutputStream outputStream; + private BufferOutputStream bufferOutputStream; protected Signal() { @@ -49,14 +53,26 @@ public abstract class Signal implements Runnable return correlationID; } - protected final BufferInputStream getInputStream() + protected final BufferInputStream getBufferInputStream() { - return inputStream; + return bufferInputStream; } - protected final BufferOutputStream getOutputStream() + protected final BufferOutputStream getBufferOutputStream() { - return outputStream; + return bufferOutputStream; + } + + protected ExtendedDataInputStream wrapInputStream(InputStream in) + { + in = protocol.wrapInputStream(in); + return ExtendedDataInputStream.wrap(in); + } + + protected ExtendedDataOutputStream wrapOutputStream(OutputStream out) + { + out = protocol.wrapOutputStream(out); + return ExtendedDataOutputStream.wrap(out); } public final void run() @@ -75,7 +91,7 @@ public abstract class Signal implements Runnable { try { - execute(inputStream, outputStream); + execute(bufferInputStream, bufferOutputStream); } catch (EOFException ex) { @@ -105,13 +121,13 @@ public abstract class Signal implements Runnable this.correlationID = correlationID; } - void setInputStream(BufferInputStream inputStream) + void setBufferInputStream(BufferInputStream inputStream) { - this.inputStream = inputStream; + this.bufferInputStream = inputStream; } - void setOutputStream(BufferOutputStream outputStream) + void setBufferOutputStream(BufferOutputStream outputStream) { - this.outputStream = outputStream; + this.bufferOutputStream = outputStream; } } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java index ee874677ee..07d423504d 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java @@ -19,6 +19,8 @@ import org.eclipse.net4j.stream.ChannelOutputStream; import org.eclipse.internal.net4j.Protocol; import org.eclipse.internal.net4j.bundle.OM; +import java.io.InputStream; +import java.io.OutputStream; import java.nio.ByteBuffer; import java.text.MessageFormat; import java.util.Map; @@ -98,8 +100,8 @@ public abstract class SignalProtocol extends Protocol signal = createSignalReactor(signalID); signal.setProtocol(this); signal.setCorrelationID(-correlationID); - signal.setInputStream(new SignalInputStream(getInputStreamTimeout())); - signal.setOutputStream(new SignalOutputStream(-correlationID, signalID, false)); + signal.setBufferInputStream(new SignalInputStream(getInputStreamTimeout())); + signal.setBufferOutputStream(new SignalOutputStream(-correlationID, signalID, false)); signals.put(-correlationID, signal); getExecutorService().execute(signal); } @@ -121,7 +123,7 @@ public abstract class SignalProtocol extends Protocol if (signal != null) // Can be null after timeout { - BufferInputStream inputStream = signal.getInputStream(); + BufferInputStream inputStream = signal.getBufferInputStream(); inputStream.handleBuffer(buffer); } } @@ -160,13 +162,22 @@ public abstract class SignalProtocol extends Protocol short signalID = signalActor.getSignalID(); int correlationID = signalActor.getCorrelationID(); - signalActor.setInputStream(new SignalInputStream(timeout)); - signalActor.setOutputStream(new SignalOutputStream(correlationID, signalID, true)); + signalActor.setBufferInputStream(new SignalInputStream(timeout)); + signalActor.setBufferOutputStream(new SignalOutputStream(correlationID, signalID, true)); signals.put(correlationID, signalActor); - signalActor.runSync(); } + protected InputStream wrapInputStream(InputStream in) + { + return in; + } + + protected OutputStream wrapOutputStream(OutputStream out) + { + return out; + } + void stopSignal(Signal signal) { int correlationID = signal.getCorrelationID(); |