summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-07-03 06:02:56 (EDT)
committerEike Stepper2006-07-03 06:02:56 (EDT)
commite4b19414d78f09d39b43db6c11abf3ca738e348e (patch)
tree79386058ba6687a04ab58041b877f2b135559e31
parentaef28a7755a68f5cffb85684bc51f0c1072c1a16 (diff)
downloadcdo-e4b19414d78f09d39b43db6c11abf3ca738e348e.zip
cdo-e4b19414d78f09d39b43db6c11abf3ca738e348e.tar.gz
cdo-e4b19414d78f09d39b43db6c11abf3ca738e348e.tar.bz2
Fixed backend
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF5
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/META-INF/auth.users1
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/META-INF/common.properties7
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/META-INF/common.xml85
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.properties8
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.xml34
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/launches/CDO Server.launch98
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/plugin.xml13
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/CDOServerBackendInitializer.java29
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/CDOServerPlugin.java (renamed from plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerPlugin.java)37
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerApplication.java70
11 files changed, 99 insertions, 288 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF
index 447e382..a73bf62 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@ Bundle-Vendor: %providerName
Bundle-Localization: plugin
Eclipse-LazyStart: true
Require-Bundle: org.eclipse.emf.cdo.server,
- org.eclipse.net4j.socket
+ org.eclipse.net4j.socket,
+ org.eclipse.net4j.examples.server
Export-Package: org.eclipse.emf.cdo.examples.server.internal
-Bundle-Activator: org.eclipse.emf.cdo.examples.server.internal.ExampleServerPlugin
+Bundle-Activator: org.eclipse.emf.cdo.examples.server.internal.CDOServerPlugin
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/auth.users b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/auth.users
deleted file mode 100644
index 38fac2f..0000000
--- a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/auth.users
+++ /dev/null
@@ -1 +0,0 @@
-test=test
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/common.properties b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/common.properties
deleted file mode 100644
index 6c47d2d..0000000
--- a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/common.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-randomizer.algorithm=SHA1PRNG
-
-bufferPool.bufferSize=4096
-
-channel.responseTimeoutMillis=250000
-
-connectionManager.maxConnections=50
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/common.xml b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/common.xml
deleted file mode 100644
index d5cbd9f..0000000
--- a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/common.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
- "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
- <!-- ######################################################## -->
- <bean id="propertyConfigurer"
- class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="locations">
- <list>
- <value>plugin:/META-INF/common.properties</value>
- </list>
- </property>
- </bean>
-
- <!--
- Net4j Common Part
- -->
-
- <!-- ######################################################## -->
- <bean id="randomizer" class="org.eclipse.net4j.core.impl.RandomizerImpl">
- <property name="algorithmName">
- <value>${randomizer.algorithm}</value>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="bufferPool" class="org.eclipse.net4j.core.impl.BufferPoolImpl">
- <property name="bufferSize">
- <value>${bufferPool.bufferSize}</value>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="protocolManager" class="org.eclipse.net4j.core.impl.ProtocolManagerImpl"/>
-
- <!-- ######################################################## -->
- <bean id="serverControlProtocol" class="org.eclipse.net4j.core.protocol.ServerControlProtocol">
- <property name="protocolManager">
- <ref local="protocolManager"/>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="clientControlProtocol" class="org.eclipse.net4j.core.protocol.ClientControlProtocol">
- <property name="protocolManager">
- <ref local="protocolManager"/>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="multiplexer" class="org.eclipse.net4j.core.impl.MultiplexerImpl"/>
-
- <!-- ######################################################## -->
- <bean id="channel" singleton="false" class="org.eclipse.net4j.core.impl.ChannelImpl">
- <property name="multiplexer">
- <ref local="multiplexer"/>
- </property>
- <property name="responseTimeoutMillis">
- <value>${channel.responseTimeoutMillis}</value>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="connectionManager" class="org.eclipse.net4j.core.impl.ConnectionManagerImpl">
- <property name="maxConnections">
- <value>${connectionManager.maxConnections}</value>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="selectorManager" class="org.eclipse.net4j.socket.impl.SelectorManagerImpl"/>
-
- <!--
- CDO Common Part
- -->
-
- <!-- ######################################################## -->
- <bean id="oidEncoder" class="org.eclipse.emf.cdo.core.impl.OIDEncoderImpl">
- <property name="fragmentBits">
- <value>48</value>
- </property>
- </bean>
-
-</beans>
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.properties b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.properties
index c197fd9..0904fd8 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.properties
+++ b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.properties
@@ -1,11 +1,3 @@
-acceptor.listenAddr=0.0.0.0
-acceptor.listenPort=2036
-
-passiveNegotiator.algorithmName=PBEWithMD5AndDES
-passiveNegotiator.tokenLength=128
-
-auth.users.file=plugin:/META-INF/auth.users
-
###################
# JDBC PROPERTIES #
###################
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.xml b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.xml
index 79ac97d..ccd0910 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.xml
@@ -13,38 +13,18 @@
</property>
</bean>
- <!-- ######################################################## -->
- <bean id="acceptor" class="org.eclipse.net4j.socket.impl.SocketAcceptorImpl">
- <property name="listenAddr">
- <value>${acceptor.listenAddr}</value>
- </property>
- <property name="listenPort">
- <value>${acceptor.listenPort}</value>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="slave" singleton="false"
- class="org.eclipse.net4j.socket.impl.PassiveSocketConnectorImpl">
- <property name="bufferPool">
- <ref bean="bufferPool"/>
- </property>
- <property name="connectionManager">
- <ref bean="connectionManager"/>
- </property>
- <property name="protocolManager">
- <ref bean="protocolManager"/>
- </property>
- <property name="selectorManager">
- <ref bean="selectorManager"/>
- </property>
- </bean>
-
<!--
CDO Server Part
-->
<!-- ######################################################## -->
+ <bean id="oidEncoder" class="org.eclipse.emf.cdo.core.impl.OIDEncoderImpl">
+ <property name="fragmentBits">
+ <value>48</value>
+ </property>
+ </bean>
+
+ <!-- ######################################################## -->
<bean id="packageManager" class="org.eclipse.emf.cdo.server.impl.PackageManagerImpl"/>
<!-- ######################################################## -->
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 b9b99e6..9df4356 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
@@ -11,7 +11,7 @@
<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.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,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">
<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
@@ -19,13 +19,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"/>
@@ -50,17 +50,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"/>
@@ -69,11 +69,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"/>
@@ -82,30 +82,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"/>
@@ -131,8 +131,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"/>
@@ -141,8 +141,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"/>
@@ -153,8 +153,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="*"/>
@@ -162,25 +162,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"/>
@@ -194,8 +194,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"/>
@@ -205,26 +205,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"/>
@@ -233,37 +233,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"/>
@@ -272,10 +272,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"/>
@@ -287,38 +287,38 @@
<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.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.emf.cdo.examples.server.application"/>
+<stringAttribute key="application" value="org.eclipse.net4j.examples.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"/>
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/plugin.xml b/plugins/org.eclipse.emf.cdo.examples.server/plugin.xml
index 0a09824..cf01976 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.server/plugin.xml
@@ -2,15 +2,12 @@
<?eclipse version="3.0"?>
<plugin>
+
<extension
- id="application"
- name="CDO Example Server Application"
- point="org.eclipse.core.runtime.applications">
- <application>
- <run class="org.eclipse.emf.cdo.examples.server.internal.ExampleServerApplication"/>
- </application>
+ point="org.eclipse.net4j.examples.server.backends">
+ <backend
+ className="org.eclipse.emf.cdo.examples.server.internal.CDOServerBackendInitializer"
+ name="cdo"/>
</extension>
-
-
</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/CDOServerBackendInitializer.java b/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/CDOServerBackendInitializer.java
new file mode 100644
index 0000000..a72e1f4
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/CDOServerBackendInitializer.java
@@ -0,0 +1,29 @@
+/***************************************************************************
+ * Copyright (c) 2004-2006 Eike Stepper, Fuggerstr. 39, 10777 Berlin, 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.examples.server.internal;
+
+
+import org.eclipse.net4j.examples.server.internal.AbstractBackendInitializer;
+import org.eclipse.net4j.spring.Container;
+
+
+public class CDOServerBackendInitializer extends AbstractBackendInitializer
+{
+ public CDOServerBackendInitializer()
+ {
+ }
+
+ @Override
+ protected Container initialize()
+ {
+ return CDOServerPlugin.getServerContainer();
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerPlugin.java b/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/CDOServerPlugin.java
index 0815934..a64d11c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/CDOServerPlugin.java
@@ -11,6 +11,7 @@
package org.eclipse.emf.cdo.examples.server.internal;
+import org.eclipse.net4j.examples.server.internal.ExampleServerPlugin;
import org.eclipse.net4j.spring.Container;
import org.eclipse.net4j.spring.ContainerCreationException;
import org.eclipse.net4j.spring.impl.ContainerImpl;
@@ -22,12 +23,12 @@ import java.io.IOException;
/**
* The main plugin class to be used in the desktop.
*/
-public class ExampleServerPlugin extends AbstractPlugin
+public class CDOServerPlugin extends AbstractPlugin
{
public static final String CONTEXT_PATH = "META-INF/";
//The shared instance.
- private static ExampleServerPlugin plugin;
+ private static CDOServerPlugin plugin;
private static Container container;
@@ -36,7 +37,7 @@ public class ExampleServerPlugin extends AbstractPlugin
/**
* The constructor.
*/
- public ExampleServerPlugin()
+ public CDOServerPlugin()
{
if (plugin == null) plugin = this;
}
@@ -44,7 +45,7 @@ public class ExampleServerPlugin extends AbstractPlugin
/**
* Returns the shared instance.
*/
- public static ExampleServerPlugin getDefault()
+ public static CDOServerPlugin getDefault()
{
return plugin;
}
@@ -71,32 +72,6 @@ public class ExampleServerPlugin extends AbstractPlugin
plugin = null;
}
- public static Container getContainer()
- {
- if (container == null)
- {
- String baseResourcePath;
-
- try
- {
- baseResourcePath = getBundleLocation(getDefault().getBundle());
- }
- catch (IOException ex)
- {
- throw new ContainerCreationException("Error while computing location of bundle "
- + getDefault().getBundle(), ex);
- }
-
- String location = CONTEXT_PATH + "common.xml";
- String name = "common";
- Container parent = null;
- ClassLoader classLoader = getDefault().getClassLoader();
- container = new ContainerImpl(baseResourcePath, location, name, parent, classLoader);
- }
-
- return container;
- }
-
public static Container getServerContainer()
{
if (serverContainer == null)
@@ -115,7 +90,7 @@ public class ExampleServerPlugin extends AbstractPlugin
String location = CONTEXT_PATH + "server.xml";
String name = "server";
- Container parent = getContainer();
+ Container parent = ExampleServerPlugin.getNet4jContainer();
ClassLoader classLoader = getDefault().getClassLoader();
serverContainer = new ContainerImpl(baseResourcePath, location, name, parent, classLoader);
}
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
deleted file mode 100644
index 4487dbc..0000000
--- a/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerApplication.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Fuggerstr. 39, 10777 Berlin, 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.examples.server.internal;
-
-
-import org.eclipse.net4j.spring.Container;
-import org.eclipse.net4j.spring.ValidationException;
-import org.eclipse.net4j.util.thread.DeadlockDetector;
-
-import org.eclipse.emf.cdo.server.Mapper;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-
-
-public class ExampleServerApplication implements IPlatformRunnable
-{
- private static final String ACTIVE_MSG = "Mapper is not active";
-
- public ExampleServerApplication()
- {
- }
-
- public Object run(Object args) throws Exception
- {
- validateContainer();
- System.out.println("HIT ENTER FOR SHUTDOWN!!!");
-
- while (System.in.available() == 0)
- {
- DeadlockDetector.sleep(100);
- }
-
- return null;
- }
-
- private void validateContainer()
- {
- Mapper mapper = getMapper();
- assertTrue(mapper.isActive(), ACTIVE_MSG);
- }
-
- private Mapper getMapper()
- {
- try
- {
- Container container = ExampleServerPlugin.getServerContainer();
- return (Mapper) container.getBean("mapper", Mapper.class);
- }
- catch (Exception ex)
- {
- throw new ValidationException(ACTIVE_MSG, ex);
- }
- }
-
- private void assertTrue(boolean condition, String msg)
- {
- if (!condition)
- {
- throw new ValidationException(msg);
- }
- }
-}