summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-04-02 03:58:19 (EDT)
committerEike Stepper2006-04-02 03:58:19 (EDT)
commitd9d4f88a0aea4c307940262524cb3bb08c576839 (patch)
tree16c1501a6bf4a100dec4aa354eb5f5d5330be986
parenta5611933c3172bba3476c036c95f517ca51c3bed (diff)
downloadcdo-d9d4f88a0aea4c307940262524cb3bb08c576839.zip
cdo-d9d4f88a0aea4c307940262524cb3bb08c576839.tar.gz
cdo-d9d4f88a0aea4c307940262524cb3bb08c576839.tar.bz2
Fixed case of various acronyms.
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/.project2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/META-INF/common.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/launches/CDO Server.launch92
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/plugin.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerApplication.java (renamed from plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/CdoTestServerApplication.java)6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerPlugin.java (renamed from plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/CdoTestServerPlugin.java)10
-rw-r--r--plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CdoServerException.java56
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/DatabaseInconsistencyException.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/Mapper.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ResourceNotFoundException.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ServerCDOProtocol.java (renamed from plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CdoServerProtocol.java)6
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ServerCDOResProtocol.java (renamed from plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CdoResServerProtocol.java)4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/MapperImpl.java42
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/SQLConstants.java (renamed from plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/SqlConstants.java)2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/internal/ServerPlugin.java (renamed from plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CdoServerPlugin.java)10
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/AnnouncePackageIndication.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/CommitTransactionIndication.java74
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/DescribePackageIndication.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/InvalidateObjectRequest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/LoadObjectIndication.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/LoadResourceIndication.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/QueryAllResourcesIndication.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourcePathIndication.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourceRIDIndication.java (renamed from plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourceRidIndication.java)10
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourcesChangedRequest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ServerCDOProtocolImpl.java (renamed from plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/CdoServerProtocolImpl.java)26
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ServerCDOResProtocolImpl.java (renamed from plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/CdoResServerProtocolImpl.java)10
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/BeanHelper.java6
32 files changed, 199 insertions, 248 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/.project b/plugins/org.eclipse.emf.cdo.examples.server/.project
index 7a7489a..5eac849 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/.project
+++ b/plugins/org.eclipse.emf.cdo.examples.server/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.emf.cdo.example.server</name>
+ <name>org.eclipse.emf.cdo.example.server.internal</name>
<comment></comment>
<projects>
</projects>
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 321b987..7c2ca13 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
@@ -9,5 +9,5 @@ Bundle-Localization: plugin
Eclipse-LazyStart: true
Require-Bundle: org.eclipse.emf.cdo.server,
org.eclipse.net4j.socket
-Export-Package: org.eclipse.emf.cdo.example.server
-Bundle-Activator: org.eclipse.emf.cdo.example.server.CdoTestServerPlugin
+Export-Package: org.eclipse.emf.cdo.example.server.internal
+Bundle-Activator: org.eclipse.emf.cdo.example.server.internal.ExampleServerPlugin
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
index c580268..d5cbd9f 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/common.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/common.xml
@@ -76,7 +76,7 @@
-->
<!-- ######################################################## -->
- <bean id="oidEncoder" class="org.eclipse.emf.cdo.core.impl.OidEncoderImpl">
+ <bean id="oidEncoder" class="org.eclipse.emf.cdo.core.impl.OIDEncoderImpl">
<property name="fragmentBits">
<value>48</value>
</property>
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 2808d76..37fe0ca 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
@@ -54,7 +54,7 @@
<bean id="columnConverter" class="org.eclipse.emf.cdo.server.impl.ColumnConverterImpl"/>
<!-- ######################################################## -->
- <bean id="cdoServerProtocol" class="org.eclipse.emf.cdo.server.protocol.CdoServerProtocolImpl">
+ <bean id="cdoServerProtocol" class="org.eclipse.emf.cdo.server.protocol.ServerCDOProtocolImpl">
<property name="protocolManager">
<ref bean="protocolManager"/>
</property>
@@ -71,7 +71,7 @@
<!-- ######################################################## -->
<bean id="cdoResServerProtocol"
- class="org.eclipse.emf.cdo.server.protocol.CdoResServerProtocolImpl">
+ class="org.eclipse.emf.cdo.server.protocol.ServerCDOResProtocolImpl">
<property name="protocolManager">
<ref bean="protocolManager"/>
</property>
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 5842112..e789c6d 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
@@ -18,13 +18,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.wst.css.core/debug/tracefilter" value=""/>
<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
+<mapEntry key="org.eclipse.wst.css.core/debug/tracefilter" value=""/>
<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
<mapEntry key="org.eclipse.osgi/monitor/activation" 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.jst.jsp.core/debug/jspsearch" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/loader/debug" value="true"/>
<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 +49,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="org.eclipse.osgi/debug" value="false"/>
<mapEntry key="com.omondo.uml.core/trace/level" value="error"/>
+<mapEntry key="org.eclipse.osgi/debug" value="false"/>
<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/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.help.ui/debug/infopop" value="false"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
<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 +68,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.update.core/debug/install" 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.core.runtime/jobs/errorondeadlock" 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.help.ui/debug/embeddedBrowser/inprocess" 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 +81,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.jdt.core/debug/builder" 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.osgi/resolver/requires" value="false"/>
<mapEntry key="org.eclipse.wst.sse.ui/extendedconfigurationbuilder" value="true"/>
-<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.core.runtime/loader/debug/activateplugin" value="true"/>
<mapEntry key="org.eclipse.wst.javascript.core/debug/tracefilter" value=""/>
<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/startlevel" 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/restore/tree" 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.ui/trace/part.create" value="false"/>
<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
-<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/filter/native" value="*"/>
+<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.osgi/resolver/cycles" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/native" value="*"/>
+<mapEntry key="org.eclipse.jem/debug/loglevel" value="default"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/create" value="true"/>
+<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
<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 +130,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.jem.proxy/debug/logtracefile" value="default"/>
<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.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 +140,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.wtp.common/debug/logtrace" 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.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 +152,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.ui/trace/part.listeners" 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.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 +161,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.help.webapp/debug/workingsets" value="false"/>
<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
+<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
<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.core.runtime/url/debug/connect" value="false"/>
<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.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="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.jst.jsp.core/taglib/indexcreation" value="false"/>
+<mapEntry key="com.omondo.database/debug/trace" value="true"/>
<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="500"/>
-<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.core.runtime/registry/debug" value="true"/>
<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 +193,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.jdt.ui/debug/TypeConstraints" 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.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 +204,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.update.core/debug/configuration" value="false"/>
<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/logtracefile" value="default"/>
<mapEntry key="org.eclipse.jem.ui/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
<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.help.webapp/debug" value="true"/>
<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.core/filebuffers/lifecycle" 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.update.core/debug/warning" value="false"/>
<mapEntry key="org.eclipse.jem.beaninfo/debug/loglevel" value="default"/>
+<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
<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="org.eclipse.update.core/debug/parsing" 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.update.core/debug/parsing" value="false"/>
<mapEntry key="org.eclipse.core.runtime/preferences/general" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/syncinfo" 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 +232,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.osgi/profile/startup" 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.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.osgi/monitor/resources" value="false"/>
<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.osgi/monitor/resources" value="false"/>
<mapEntry key="org.eclipse.jem.ui/debug/loglevel" value="default"/>
+<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugpopup" value="false"/>
<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/url/debug/cachecopy" value="false"/>
<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.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.wst.sse.ui/extendededitoractionbuilder/debugtoolbar" 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.core/debug" value="false"/>
<mapEntry key="org.eclipse.wst.sse.ui/storagemodelprovider/elementstatelistener" 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.sse.ui/extendededitoractionbuilder/contributetime" value="false"/>
<mapEntry key="org.eclipse.wst.xml.core/debug" value="true"/>
-<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/loader/debug/prefixes/success" value="true"/>
<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 +271,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.core.runtime/loader/debug/failure" value="true"/>
<mapEntry key="org.eclipse.ui/debug/uijob.longwarning" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
+<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.core.resources/perf/builders" value="10000"/>
<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,30 +286,30 @@
<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.core.resources/save/tree" 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.core.runtime/config/debug" value="true"/>
<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
-<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/restore/metainfo" 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.wst.server.core/debug" value="true"/>
<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
+<mapEntry key="org.eclipse.wst.server.core/debug" value="true"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/success" value="true"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
+<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
</mapAttribute>
<stringAttribute key="location3" value="runtime-embedded"/>
<booleanAttribute key="automaticAdd" value="false"/>
<stringAttribute key="checked" value="org.eclipse.core.runtime"/>
<booleanAttribute key="includeFragments" value="true"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.jdbc,org.eclipse.net4j.spring,org.eclipse.net4j.socket,org.eclipse.net4j.core,org.eclipse.net4j.spring.db,org.eclipse.emf.cdo.core,org.eclipse.net4j.util,org.eclipse.emf.cdo.example.server,org.eclipse.emf.cdo.dbgen,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.dbgen.oracle,org.eclipse.emf.cdo.jdbc.hsqldb,org.eclipse.emf.cdo.jdbc.mysql,org.eclipse.emf.cdo.dbgen.ansi92,org.eclipse.emf.cdo.dbgen.mysql,org.eclipse.emf.cdo.dbgen.hsqldb"/>
<stringAttribute key="location" value="/ws.rt/cdo.server"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.net4j.spring,org.eclipse.net4j.socket,org.eclipse.net4j.core,org.eclipse.net4j.spring.db,org.eclipse.emf.cdo.core,org.eclipse.emf.cdo.dbgen,org.eclipse.net4j.util,org.eclipse.emf.cdo.example.server,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.jdbc,org.eclipse.emf.cdo.dbgen.oracle,org.eclipse.emf.cdo.jdbc.mysql,org.eclipse.emf.cdo.dbgen.mysql,org.eclipse.emf.cdo.dbgen.hsqldb,org.eclipse.emf.cdo.dbgen.ansi92"/>
<stringAttribute key="location4" value="C:\workspaces\runtime-workspace"/>
<stringAttribute key="application" value="org.eclipse.emf.cdo.example.server.application"/>
<stringAttribute key="configLocation" value=""/>
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/plugin.properties b/plugins/org.eclipse.emf.cdo.examples.server/plugin.properties
index ad0d011..d2e5b31 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.examples.server/plugin.properties
@@ -1,2 +1,2 @@
-pluginName = Net4j CDO Test
+pluginName = CDO Example Server
providerName = Eclipse.org
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/plugin.xml b/plugins/org.eclipse.emf.cdo.examples.server/plugin.xml
index cc2b5f5..8877eca 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.server/plugin.xml
@@ -4,10 +4,10 @@
<plugin>
<extension
id="application"
- name="CDO Test Server Application"
+ name="CDO Example Server Application"
point="org.eclipse.core.runtime.applications">
<application>
- <run class="org.eclipse.emf.cdo.example.server.CdoTestServerApplication"/>
+ <run class="org.eclipse.emf.cdo.example.server.internal.ExampleServerApplication"/>
</application>
</extension>
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/CdoTestServerApplication.java b/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerApplication.java
index f033b7e..21f07e7 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/CdoTestServerApplication.java
+++ b/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerApplication.java
@@ -1,12 +1,12 @@
-package org.eclipse.emf.cdo.example.server;
+package org.eclipse.emf.cdo.example.server.internal;
import org.eclipse.core.runtime.IPlatformRunnable;
-public class CdoTestServerApplication implements IPlatformRunnable
+public class ExampleServerApplication implements IPlatformRunnable
{
- public CdoTestServerApplication()
+ public ExampleServerApplication()
{
}
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/CdoTestServerPlugin.java b/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerPlugin.java
index e0ed3a8..dd12038 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/CdoTestServerPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerPlugin.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.cdo.example.server;
+package org.eclipse.emf.cdo.example.server.internal;
import org.eclipse.net4j.spring.Container;
@@ -22,12 +22,12 @@ import java.io.IOException;
/**
* The main plugin class to be used in the desktop.
*/
-public class CdoTestServerPlugin extends AbstractPlugin
+public class ExampleServerPlugin extends AbstractPlugin
{
public static final String CONTEXT_PATH = "META-INF/";
//The shared instance.
- private static CdoTestServerPlugin plugin;
+ private static ExampleServerPlugin plugin;
private static Container container;
@@ -36,7 +36,7 @@ public class CdoTestServerPlugin extends AbstractPlugin
/**
* The constructor.
*/
- public CdoTestServerPlugin()
+ public ExampleServerPlugin()
{
if (plugin == null) plugin = this;
}
@@ -44,7 +44,7 @@ public class CdoTestServerPlugin extends AbstractPlugin
/**
* Returns the shared instance.
*/
- public static CdoTestServerPlugin getDefault()
+ public static ExampleServerPlugin getDefault()
{
return plugin;
}
diff --git a/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
index 9d61bf3..182cdf7 100644
--- a/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.server
Bundle-Version: 1.0.0
Bundle-ClassPath: net4j.cdo.server.jar
-Bundle-Activator: org.eclipse.emf.cdo.server.CdoServerPlugin
+Bundle-Activator: org.eclipse.emf.cdo.server.internal.ServerPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.emf.cdo.core;visibility:=reexport,
@@ -13,4 +13,5 @@ Require-Bundle: org.eclipse.emf.cdo.core;visibility:=reexport,
Eclipse-LazyStart: true
Export-Package: org.eclipse.emf.cdo.server,
org.eclipse.emf.cdo.server.impl,
+ org.eclipse.emf.cdo.server.internal,
org.eclipse.emf.cdo.server.protocol
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CdoServerException.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CdoServerException.java
deleted file mode 100644
index 978061a..0000000
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CdoServerException.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Sympedia Methods and Tools.
- * 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.server;
-
-
-import org.eclipse.emf.cdo.core.CdoException;
-
-
-public class CdoServerException extends CdoException
-{
- /**
- *
- */
- private static final long serialVersionUID = 4120854356464777268L;
-
- /**
- *
- */
- public CdoServerException()
- {
- super();
- }
-
- /**
- * @param message
- */
- public CdoServerException(String message)
- {
- super(message);
- }
-
- /**
- * @param cause
- */
- public CdoServerException(Throwable cause)
- {
- super(cause);
- }
-
- /**
- * @param message
- * @param cause
- */
- public CdoServerException(String message, Throwable cause)
- {
- super(message, cause);
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/DatabaseInconsistencyException.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/DatabaseInconsistencyException.java
index 1df76e7..fc6457a 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/DatabaseInconsistencyException.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/DatabaseInconsistencyException.java
@@ -11,7 +11,10 @@
package org.eclipse.emf.cdo.server;
-public class DatabaseInconsistencyException extends CdoServerException
+import org.eclipse.emf.cdo.core.CDOException;
+
+
+public class DatabaseInconsistencyException extends CDOException
{
/**
*
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/Mapper.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/Mapper.java
index 7f8e01a..5248352 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/Mapper.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/Mapper.java
@@ -14,7 +14,7 @@ package org.eclipse.emf.cdo.server;
import org.eclipse.net4j.core.Channel;
import org.eclipse.net4j.spring.Service;
-import org.eclipse.emf.cdo.core.OidEncoder;
+import org.eclipse.emf.cdo.core.OIDEncoder;
public interface Mapper extends Service
@@ -77,7 +77,7 @@ public interface Mapper extends Service
public void insertResource(int rid, String path);
- public OidEncoder getOidEncoder();
+ public OIDEncoder getOidEncoder();
public PackageManager getPackageManager();
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ResourceNotFoundException.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ResourceNotFoundException.java
index 4b9e8c2..492596f 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ResourceNotFoundException.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ResourceNotFoundException.java
@@ -11,7 +11,10 @@
package org.eclipse.emf.cdo.server;
-public class ResourceNotFoundException extends CdoServerException
+import org.eclipse.emf.cdo.core.CDOException;
+
+
+public class ResourceNotFoundException extends CDOException
{
/**
*
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CdoServerProtocol.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ServerCDOProtocol.java
index 75ccdf4..da7fbc7 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CdoServerProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ServerCDOProtocol.java
@@ -11,16 +11,16 @@
package org.eclipse.emf.cdo.server;
-import org.eclipse.emf.cdo.core.CdoProtocol;
+import org.eclipse.emf.cdo.core.CDOProtocol;
import org.springframework.transaction.support.TransactionTemplate;
-public interface CdoServerProtocol extends CdoProtocol
+public interface ServerCDOProtocol extends CDOProtocol
{
public Mapper getMapper();
public TransactionTemplate getTransactionTemplate();
- public CdoResServerProtocol getCdoResServerProtocol();
+ public ServerCDOResProtocol getCdoResServerProtocol();
} \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CdoResServerProtocol.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ServerCDOResProtocol.java
index 344837b..9361845 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CdoResServerProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ServerCDOResProtocol.java
@@ -11,12 +11,12 @@
package org.eclipse.emf.cdo.server;
-import org.eclipse.emf.cdo.core.CdoResProtocol;
+import org.eclipse.emf.cdo.core.CDOResProtocol;
import org.springframework.transaction.support.TransactionTemplate;
-public interface CdoResServerProtocol extends CdoResProtocol
+public interface ServerCDOResProtocol extends CDOResProtocol
{
public Mapper getMapper();
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/MapperImpl.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/MapperImpl.java
index 1d633f6..49c7a32 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/MapperImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/MapperImpl.java
@@ -17,11 +17,11 @@ import org.eclipse.net4j.spring.impl.ServiceImpl;
import org.eclipse.net4j.util.ImplementationError;
import org.eclipse.net4j.util.StringHelper;
-import org.eclipse.emf.cdo.core.CdoResProtocol;
-import org.eclipse.emf.cdo.core.OidEncoder;
+import org.eclipse.emf.cdo.core.CDOResProtocol;
+import org.eclipse.emf.cdo.core.OIDEncoder;
import org.eclipse.emf.cdo.dbgen.ColumnType;
-import org.eclipse.emf.cdo.dbgen.Database;
import org.eclipse.emf.cdo.dbgen.DBGenFactory;
+import org.eclipse.emf.cdo.dbgen.Database;
import org.eclipse.emf.cdo.dbgen.IndexType;
import org.eclipse.emf.cdo.dbgen.SQLDialect;
import org.eclipse.emf.cdo.dbgen.Table;
@@ -51,7 +51,7 @@ import java.sql.SQLException;
import javax.sql.DataSource;
-public class MapperImpl extends ServiceImpl implements Mapper, SqlConstants
+public class MapperImpl extends ServiceImpl implements Mapper, SQLConstants
{
protected static final int OBJECT_NOT_FOUND_IN_DB = 0;
@@ -69,7 +69,7 @@ public class MapperImpl extends ServiceImpl implements Mapper, SqlConstants
protected String sqlDialectName;
- protected OidEncoder oidEncoder;
+ protected OIDEncoder oIDEncoder;
private int nextPid;
@@ -163,19 +163,19 @@ public class MapperImpl extends ServiceImpl implements Mapper, SqlConstants
}
/**
- * @return Returns the oidEncoder.
+ * @return Returns the oIDEncoder.
*/
- public OidEncoder getOidEncoder()
+ public OIDEncoder getOidEncoder()
{
- return oidEncoder;
+ return oIDEncoder;
}
/**
- * @param oidEncoder The oidEncoder to set.
+ * @param oIDEncoder The oIDEncoder to set.
*/
- public void setOidEncoder(OidEncoder oidEncoder)
+ public void setOidEncoder(OIDEncoder oIDEncoder)
{
- doSet("oidEncoder", oidEncoder);
+ doSet("oIDEncoder", oIDEncoder);
}
/**
@@ -215,7 +215,7 @@ public class MapperImpl extends ServiceImpl implements Mapper, SqlConstants
if (resourceInfo == null) throw new ResourceNotFoundException("Unknown RID: " + rid);
long nextOidFragment = resourceInfo.getNextOIDFragment();
- return oidEncoder.getOID(rid, nextOidFragment);
+ return oIDEncoder.getOID(rid, nextOidFragment);
}
protected void validate() throws ValidationException
@@ -225,7 +225,7 @@ public class MapperImpl extends ServiceImpl implements Mapper, SqlConstants
assertNotNull("packageManager");
assertNotNull("resourceManager");
assertNotNull("dataSource");
- assertNotNull("oidEncoder");
+ assertNotNull("oIDEncoder");
assertNotNull("jdbcTemplate");
initTables();
@@ -469,13 +469,13 @@ public class MapperImpl extends ServiceImpl implements Mapper, SqlConstants
Object[] args = ridBounds(rid);
if (isDebugEnabled()) debug(StringHelper.replaceWildcards(SELECT_MAX_OID_FRAGMENT, "?", args));
long oid = jdbcTemplate.queryForLong(SELECT_MAX_OID_FRAGMENT, args);
- return (int) (oid & 0xFFFFFFFFL); // TODO Without OidEncoder???
+ return (int) (oid & 0xFFFFFFFFL); // TODO Without OIDEncoder???
}
private Object[] ridBounds(int rid)
{
- long lowerBound = oidEncoder.getOID(rid, 1);
- long upperBound = oidEncoder.getOID(rid + 1, 1) - 1;
+ long lowerBound = oIDEncoder.getOID(rid, 1);
+ long upperBound = oIDEncoder.getOID(rid + 1, 1) - 1;
return new Object[] { new Long(lowerBound), new Long(upperBound)};
}
@@ -660,7 +660,7 @@ public class MapperImpl extends ServiceImpl implements Mapper, SqlConstants
int cid = resultSet.getInt(3);
if (isDebugEnabled())
- debug("Object: oid=" + oidEncoder.toString(oid) + ", oca=" + oca + ", cid=" + cid);
+ debug("Object: oid=" + oIDEncoder.toString(oid) + ", oca=" + oca + ", cid=" + cid);
channel.transmitLong(oid);
channel.transmitInt(oca);
@@ -691,7 +691,7 @@ public class MapperImpl extends ServiceImpl implements Mapper, SqlConstants
int cid = resultSet.getInt(2);
if (isDebugEnabled())
- debug("Object: oid=" + oidEncoder.toString(oid) + ", oca=" + oca + ", cid=" + cid);
+ debug("Object: oid=" + oIDEncoder.toString(oid) + ", oca=" + oca + ", cid=" + cid);
channel.transmitLong(oid);
channel.transmitInt(oca);
@@ -753,7 +753,7 @@ public class MapperImpl extends ServiceImpl implements Mapper, SqlConstants
{
Container container = (Container) it.next();
if (isDebugEnabled())
- debug("Container: oid=" + oidEncoder.toString(container.oid) + ", cid=" + container.cid);
+ debug("Container: oid=" + oIDEncoder.toString(container.oid) + ", cid=" + container.cid);
channel.transmitLong(container.oid);
channel.transmitInt(container.cid);
@@ -773,7 +773,7 @@ public class MapperImpl extends ServiceImpl implements Mapper, SqlConstants
int cid = resultSet.getInt(3);
if (isDebugEnabled())
- debug("Reference: feature=" + feature + ", target=" + oidEncoder.toString(target)
+ debug("Reference: feature=" + feature + ", target=" + oIDEncoder.toString(target)
+ ", cid=" + cid);
channel.transmitInt(feature);
@@ -837,7 +837,7 @@ public class MapperImpl extends ServiceImpl implements Mapper, SqlConstants
}
});
- channel.transmitInt(CdoResProtocol.NO_MORE_RESOURCES);
+ channel.transmitInt(CDOResProtocol.NO_MORE_RESOURCES);
}
public void createAttributeTables(PackageInfo packageInfo)
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/SqlConstants.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/SQLConstants.java
index 63365ef..fed227e 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/SqlConstants.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/SQLConstants.java
@@ -11,7 +11,7 @@
package org.eclipse.emf.cdo.server.impl;
-public interface SqlConstants
+public interface SQLConstants
{
//--------------------------------------------------------------------
public static final String SYSTEM_TABLE = "CDO_SYSTEM";
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CdoServerPlugin.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/internal/ServerPlugin.java
index 542bb6d..32ef3d5 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CdoServerPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/internal/ServerPlugin.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.cdo.server;
+package org.eclipse.emf.cdo.server.internal;
import org.eclipse.net4j.util.eclipse.AbstractPlugin;
@@ -21,15 +21,15 @@ import java.util.List;
/**
* The main plugin class to be used in the desktop.
*/
-public class CdoServerPlugin extends AbstractPlugin
+public class ServerPlugin extends AbstractPlugin
{
//The shared instance.
- private static CdoServerPlugin plugin;
+ private static ServerPlugin plugin;
/**
* The constructor.
*/
- public CdoServerPlugin()
+ public ServerPlugin()
{
if (plugin == null) plugin = this;
}
@@ -46,7 +46,7 @@ public class CdoServerPlugin extends AbstractPlugin
/**
* Returns the shared instance.
*/
- public static CdoServerPlugin getDefault()
+ public static ServerPlugin getDefault()
{
return plugin;
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/AnnouncePackageIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/AnnouncePackageIndication.java
index bdd4225..19c1cc7 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/AnnouncePackageIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/AnnouncePackageIndication.java
@@ -13,11 +13,11 @@ package org.eclipse.emf.cdo.server.protocol;
import org.eclipse.net4j.core.impl.AbstractIndicationWithResponse;
-import org.eclipse.emf.cdo.core.CdoProtocol;
-import org.eclipse.emf.cdo.server.CdoServerProtocol;
+import org.eclipse.emf.cdo.core.CDOProtocol;
import org.eclipse.emf.cdo.server.ClassInfo;
import org.eclipse.emf.cdo.server.Mapper;
import org.eclipse.emf.cdo.server.PackageInfo;
+import org.eclipse.emf.cdo.server.ServerCDOProtocol;
public class AnnouncePackageIndication extends AbstractIndicationWithResponse
@@ -26,7 +26,7 @@ public class AnnouncePackageIndication extends AbstractIndicationWithResponse
public short getSignalId()
{
- return CdoProtocol.ANNOUNCE_PACKAGE;
+ return CDOProtocol.ANNOUNCE_PACKAGE;
}
public void indicate()
@@ -37,7 +37,7 @@ public class AnnouncePackageIndication extends AbstractIndicationWithResponse
public void respond()
{
- Mapper mapper = ((CdoServerProtocol) getProtocol()).getMapper();
+ Mapper mapper = ((ServerCDOProtocol) getProtocol()).getMapper();
PackageInfo packageInfo = mapper.getPackageManager().getPackageInfo(packageName);
if (packageInfo == null)
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/CommitTransactionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/CommitTransactionIndication.java
index 9143972..818b78f 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/CommitTransactionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/CommitTransactionIndication.java
@@ -16,17 +16,17 @@ import org.eclipse.net4j.core.Protocol;
import org.eclipse.net4j.core.impl.AbstractIndicationWithResponse;
import org.eclipse.net4j.util.ImplementationError;
-import org.eclipse.emf.cdo.core.CdoProtocol;
-import org.eclipse.emf.cdo.core.OidEncoder;
+import org.eclipse.emf.cdo.core.CDOProtocol;
+import org.eclipse.emf.cdo.core.OIDEncoder;
import org.eclipse.emf.cdo.core.protocol.ResourceChangeInfo;
import org.eclipse.emf.cdo.server.AttributeInfo;
-import org.eclipse.emf.cdo.server.CdoResServerProtocol;
-import org.eclipse.emf.cdo.server.CdoServerProtocol;
import org.eclipse.emf.cdo.server.ClassInfo;
import org.eclipse.emf.cdo.server.ColumnConverter;
import org.eclipse.emf.cdo.server.Mapper;
import org.eclipse.emf.cdo.server.ResourceInfo;
-import org.eclipse.emf.cdo.server.impl.SqlConstants;
+import org.eclipse.emf.cdo.server.ServerCDOProtocol;
+import org.eclipse.emf.cdo.server.ServerCDOResProtocol;
+import org.eclipse.emf.cdo.server.impl.SQLConstants;
import org.springframework.transaction.TransactionException;
import org.springframework.transaction.TransactionStatus;
@@ -60,14 +60,14 @@ public class CommitTransactionIndication extends AbstractIndicationWithResponse
public short getSignalId()
{
- return CdoProtocol.COMMIT_TRANSACTION;
+ return CDOProtocol.COMMIT_TRANSACTION;
}
public void indicate()
{
try
{
- TransactionTemplate transactionTemplate = ((CdoServerProtocol) getProtocol())
+ TransactionTemplate transactionTemplate = ((ServerCDOProtocol) getProtocol())
.getTransactionTemplate();
transactionTemplate.execute(new TransactionCallbackWithoutResult()
{
@@ -224,20 +224,20 @@ public class CommitTransactionIndication extends AbstractIndicationWithResponse
*/
private long registerTempOID(long tempOID)
{
- OidEncoder oidEncoder = getMapper().getOidEncoder();
- int rid = oidEncoder.getRID(-tempOID);
+ OIDEncoder oIDEncoder = getMapper().getOidEncoder();
+ int rid = oIDEncoder.getRID(-tempOID);
ResourceInfo resourceInfo = getMapper().getResourceManager().getResourceInfo(rid, getMapper());
long oidFragment = resourceInfo.getNextOIDFragment();
Long key = new Long(tempOID);
- long oid = oidEncoder.getOID(rid, oidFragment);
+ long oid = oIDEncoder.getOID(rid, oidFragment);
Long val = new Long(oid);
tempOIDs.put(key, val);
oidList.add(val);
if (isDebugEnabled())
- debug("Mapping oid " + oidEncoder.toString(key) + " --> " + oidEncoder.toString(val));
+ debug("Mapping oid " + oIDEncoder.toString(key) + " --> " + oIDEncoder.toString(val));
return oid;
}
@@ -251,8 +251,8 @@ public class CommitTransactionIndication extends AbstractIndicationWithResponse
if (sourceVal == null)
{
- OidEncoder oidEncoder = getMapper().getOidEncoder();
- throw new ImplementationError("no mapping for temporary oid " + oidEncoder.toString(tempOID));
+ OIDEncoder oIDEncoder = getMapper().getOidEncoder();
+ throw new ImplementationError("no mapping for temporary oid " + oIDEncoder.toString(tempOID));
}
return sourceVal.longValue();
@@ -265,7 +265,7 @@ public class CommitTransactionIndication extends AbstractIndicationWithResponse
for (;;)
{
long oid = receiveLong();
- if (oid == CdoProtocol.NO_MORE_OBJECT_CHANGES)
+ if (oid == CDOProtocol.NO_MORE_OBJECT_CHANGES)
{
break;
}
@@ -284,30 +284,30 @@ public class CommitTransactionIndication extends AbstractIndicationWithResponse
for (;;)
{
byte changeKind = receiveByte();
- if (changeKind == CdoProtocol.NO_MORE_REFERENCE_CHANGES)
+ if (changeKind == CDOProtocol.NO_MORE_REFERENCE_CHANGES)
{
break;
}
switch (changeKind)
{
- case CdoProtocol.FEATURE_SET:
+ case CDOProtocol.FEATURE_SET:
receiveReferenceSet();
break;
- case CdoProtocol.FEATURE_UNSET:
+ case CDOProtocol.FEATURE_UNSET:
receiveReferenceUnset();
break;
- case CdoProtocol.LIST_ADD:
+ case CDOProtocol.LIST_ADD:
receiveReferenceAdd();
break;
- case CdoProtocol.LIST_REMOVE:
+ case CDOProtocol.LIST_REMOVE:
receiveReferenceRemove();
break;
- case CdoProtocol.LIST_MOVE:
+ case CDOProtocol.LIST_MOVE:
receiveReferenceMove();
break;
@@ -336,9 +336,9 @@ public class CommitTransactionIndication extends AbstractIndicationWithResponse
if (isDebugEnabled())
{
- OidEncoder oidEncoder = getMapper().getOidEncoder();
- debug("received reference set: oid=" + oidEncoder.toString(oid) + ", feature=" + feature
- + ", target=" + oidEncoder.toString(target) + ", content=" + content);
+ OIDEncoder oIDEncoder = getMapper().getOidEncoder();
+ debug("received reference set: oid=" + oIDEncoder.toString(oid) + ", feature=" + feature
+ + ", target=" + oIDEncoder.toString(target) + ", content=" + content);
}
getMapper().insertReference(oid, feature, 0, target, content);
@@ -355,8 +355,8 @@ public class CommitTransactionIndication extends AbstractIndicationWithResponse
if (isDebugEnabled())
{
- OidEncoder oidEncoder = getMapper().getOidEncoder();
- debug("received reference unset: oid=" + oidEncoder.toString(oid) + ", feature=" + feature);
+ OIDEncoder oIDEncoder = getMapper().getOidEncoder();
+ debug("received reference unset: oid=" + oIDEncoder.toString(oid) + ", feature=" + feature);
}
getMapper().removeReference(oid, feature, 0);
@@ -381,9 +381,9 @@ public class CommitTransactionIndication extends AbstractIndicationWithResponse
if (isDebugEnabled())
{
- OidEncoder oidEncoder = getMapper().getOidEncoder();
- debug("received reference add: oid=" + oidEncoder.toString(oid) + ", feature=" + feature
- + ", ordinal=" + ordinal + ", target=" + oidEncoder.toString(target) + ", content="
+ OIDEncoder oIDEncoder = getMapper().getOidEncoder();
+ debug("received reference add: oid=" + oIDEncoder.toString(oid) + ", feature=" + feature
+ + ", ordinal=" + ordinal + ", target=" + oIDEncoder.toString(target) + ", content="
+ content);
}
@@ -408,8 +408,8 @@ public class CommitTransactionIndication extends AbstractIndicationWithResponse
if (isDebugEnabled())
{
- OidEncoder oidEncoder = getMapper().getOidEncoder();
- debug("receiveObjectChangesReferences(REMOVE, sourceId=" + oidEncoder.toString(oid)
+ OIDEncoder oIDEncoder = getMapper().getOidEncoder();
+ debug("receiveObjectChangesReferences(REMOVE, sourceId=" + oIDEncoder.toString(oid)
+ ", featureId=" + feature + ", sourceOrdinal=" + ordinal + ")");
}
@@ -430,8 +430,8 @@ public class CommitTransactionIndication extends AbstractIndicationWithResponse
if (isDebugEnabled())
{
- OidEncoder oidEncoder = getMapper().getOidEncoder();
- debug("received reference move: oid=" + oidEncoder.toString(oid) + ", feature=" + feature
+ OIDEncoder oIDEncoder = getMapper().getOidEncoder();
+ debug("received reference move: oid=" + oIDEncoder.toString(oid) + ", feature=" + feature
+ ", ordinal=" + ordinal + ", moveToIndex=" + moveToIndex);
}
@@ -502,7 +502,7 @@ public class CommitTransactionIndication extends AbstractIndicationWithResponse
for (;;)
{
int cid = receiveInt();
- if (cid == CdoProtocol.NO_MORE_SEGMENTS)
+ if (cid == CDOProtocol.NO_MORE_SEGMENTS)
{
break;
}
@@ -538,7 +538,7 @@ public class CommitTransactionIndication extends AbstractIndicationWithResponse
}
sql.append(" WHERE ");
- sql.append(SqlConstants.OBJECT_OID_COLUMN);
+ sql.append(SQLConstants.OBJECT_OID_COLUMN);
sql.append("=?");
getMapper().sql(sql.toString(), args);
@@ -617,8 +617,8 @@ public class CommitTransactionIndication extends AbstractIndicationWithResponse
{
Channel me = getChannel();
int myType = me.getConnector().getType();
- CdoServerProtocol cdo = (CdoServerProtocol) me.getProtocol();
- CdoResServerProtocol cdores = cdo.getCdoResServerProtocol();
+ ServerCDOProtocol cdo = (ServerCDOProtocol) me.getProtocol();
+ ServerCDOResProtocol cdores = cdo.getCdoResServerProtocol();
Channel[] channels = cdores.getChannels();
for (int i = 0; i < channels.length; i++)
@@ -646,7 +646,7 @@ public class CommitTransactionIndication extends AbstractIndicationWithResponse
{
if (mapper == null)
{
- mapper = ((CdoServerProtocol) getProtocol()).getMapper();
+ mapper = ((ServerCDOProtocol) getProtocol()).getMapper();
}
return mapper;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/DescribePackageIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/DescribePackageIndication.java
index 7764255..ac18f48 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/DescribePackageIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/DescribePackageIndication.java
@@ -13,12 +13,12 @@ package org.eclipse.emf.cdo.server.protocol;
import org.eclipse.net4j.core.impl.AbstractIndicationWithResponse;
-import org.eclipse.emf.cdo.core.CdoProtocol;
+import org.eclipse.emf.cdo.core.CDOProtocol;
import org.eclipse.emf.cdo.server.AttributeInfo;
-import org.eclipse.emf.cdo.server.CdoServerProtocol;
import org.eclipse.emf.cdo.server.ClassInfo;
import org.eclipse.emf.cdo.server.Mapper;
import org.eclipse.emf.cdo.server.PackageInfo;
+import org.eclipse.emf.cdo.server.ServerCDOProtocol;
import java.util.ArrayList;
import java.util.Iterator;
@@ -31,7 +31,7 @@ public class DescribePackageIndication extends AbstractIndicationWithResponse
public short getSignalId()
{
- return CdoProtocol.DESCRIBE_PACKAGE;
+ return CDOProtocol.DESCRIBE_PACKAGE;
}
public void indicate()
@@ -105,6 +105,6 @@ public class DescribePackageIndication extends AbstractIndicationWithResponse
private Mapper getMapper()
{
- return ((CdoServerProtocol) getProtocol()).getMapper();
+ return ((ServerCDOProtocol) getProtocol()).getMapper();
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/InvalidateObjectRequest.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/InvalidateObjectRequest.java
index 77da725..8206b6d 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/InvalidateObjectRequest.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/InvalidateObjectRequest.java
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.server.protocol;
import org.eclipse.net4j.core.impl.AbstractRequest;
-import org.eclipse.emf.cdo.core.CdoProtocol;
+import org.eclipse.emf.cdo.core.CDOProtocol;
import java.util.Iterator;
import java.util.List;
@@ -30,7 +30,7 @@ public class InvalidateObjectRequest extends AbstractRequest
public short getSignalId()
{
- return CdoProtocol.INVALIDATE_OBJECT;
+ return CDOProtocol.INVALIDATE_OBJECT;
}
public void request()
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 e9e8a21..7f0d822 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
@@ -13,9 +13,9 @@ package org.eclipse.emf.cdo.server.protocol;
import org.eclipse.net4j.core.impl.AbstractIndicationWithResponse;
-import org.eclipse.emf.cdo.core.CdoProtocol;
-import org.eclipse.emf.cdo.server.CdoServerProtocol;
+import org.eclipse.emf.cdo.core.CDOProtocol;
import org.eclipse.emf.cdo.server.Mapper;
+import org.eclipse.emf.cdo.server.ServerCDOProtocol;
public class LoadObjectIndication extends AbstractIndicationWithResponse
@@ -24,7 +24,7 @@ public class LoadObjectIndication extends AbstractIndicationWithResponse
public short getSignalId()
{
- return CdoProtocol.LOAD_OBJECT;
+ return CDOProtocol.LOAD_OBJECT;
}
public void indicate()
@@ -34,7 +34,7 @@ public class LoadObjectIndication extends AbstractIndicationWithResponse
public void respond()
{
- Mapper mapper = ((CdoServerProtocol) getProtocol()).getMapper();
+ Mapper mapper = ((ServerCDOProtocol) getProtocol()).getMapper();
mapper.transmitObject(getChannel(), oid);
}
}
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 9bb7e54..ec3e22a 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
@@ -14,11 +14,11 @@ package org.eclipse.emf.cdo.server.protocol;
import org.eclipse.net4j.core.Channel;
import org.eclipse.net4j.core.impl.AbstractIndicationWithResponse;
-import org.eclipse.emf.cdo.core.CdoProtocol;
-import org.eclipse.emf.cdo.server.CdoServerProtocol;
+import org.eclipse.emf.cdo.core.CDOProtocol;
import org.eclipse.emf.cdo.server.Mapper;
import org.eclipse.emf.cdo.server.ResourceInfo;
import org.eclipse.emf.cdo.server.ResourceManager;
+import org.eclipse.emf.cdo.server.ServerCDOProtocol;
public class LoadResourceIndication extends AbstractIndicationWithResponse
@@ -27,7 +27,7 @@ public class LoadResourceIndication extends AbstractIndicationWithResponse
public short getSignalId()
{
- return CdoProtocol.LOAD_RESOURCE;
+ return CDOProtocol.LOAD_RESOURCE;
}
public void indicate()
@@ -37,12 +37,12 @@ public class LoadResourceIndication extends AbstractIndicationWithResponse
public void respond()
{
- Mapper mapper = ((CdoServerProtocol) getProtocol()).getMapper();
+ Mapper mapper = ((ServerCDOProtocol) getProtocol()).getMapper();
ResourceManager resourceManager = mapper.getResourceManager();
ResourceInfo resourceInfo = resourceManager.getResourceInfo(rid, mapper);
Channel channel = getChannel();
- // CdoServerProtocolImpl.setResourceInfo(channel, resourceInfo);
+ // ServerCDOProtocolImpl.setResourceInfo(channel, resourceInfo);
mapper.transmitContent(channel, resourceInfo);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/QueryAllResourcesIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/QueryAllResourcesIndication.java
index 28f7cac..54e72d3 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/QueryAllResourcesIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/QueryAllResourcesIndication.java
@@ -4,13 +4,13 @@ package org.eclipse.emf.cdo.server.protocol;
import org.eclipse.net4j.core.Protocol;
import org.eclipse.net4j.core.impl.AbstractIndicationWithResponse;
-import org.eclipse.emf.cdo.core.CdoResSignals;
-import org.eclipse.emf.cdo.server.CdoResServerProtocol;
+import org.eclipse.emf.cdo.core.CDOResSignals;
import org.eclipse.emf.cdo.server.Mapper;
+import org.eclipse.emf.cdo.server.ServerCDOResProtocol;
public class QueryAllResourcesIndication extends AbstractIndicationWithResponse implements
- CdoResSignals
+ CDOResSignals
{
public QueryAllResourcesIndication()
{
@@ -28,7 +28,7 @@ public class QueryAllResourcesIndication extends AbstractIndicationWithResponse
public void respond()
{
Protocol protocol = getProtocol();
- Mapper mapper = ((CdoResServerProtocol) protocol).getMapper();
+ Mapper mapper = ((ServerCDOResProtocol) protocol).getMapper();
mapper.transmitAllResources(channel);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourcePathIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourcePathIndication.java
index 3c99c98..28260b7 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourcePathIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourcePathIndication.java
@@ -13,11 +13,11 @@ package org.eclipse.emf.cdo.server.protocol;
import org.eclipse.net4j.core.impl.AbstractIndicationWithResponse;
-import org.eclipse.emf.cdo.core.CdoProtocol;
-import org.eclipse.emf.cdo.server.CdoServerProtocol;
+import org.eclipse.emf.cdo.core.CDOProtocol;
import org.eclipse.emf.cdo.server.Mapper;
import org.eclipse.emf.cdo.server.ResourceInfo;
import org.eclipse.emf.cdo.server.ResourceManager;
+import org.eclipse.emf.cdo.server.ServerCDOProtocol;
public class ResourcePathIndication extends AbstractIndicationWithResponse
@@ -26,7 +26,7 @@ public class ResourcePathIndication extends AbstractIndicationWithResponse
public short getSignalId()
{
- return CdoProtocol.RESOURCE_PATH;
+ return CDOProtocol.RESOURCE_PATH;
}
public void indicate()
@@ -37,7 +37,7 @@ public class ResourcePathIndication extends AbstractIndicationWithResponse
public void respond()
{
- Mapper mapper = ((CdoServerProtocol) getProtocol()).getMapper();
+ Mapper mapper = ((ServerCDOProtocol) getProtocol()).getMapper();
ResourceManager resourceManager = mapper.getResourceManager();
ResourceInfo info = resourceManager.getResourceInfo(path, mapper);
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourceRidIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourceRIDIndication.java
index 70de2f9..281ff52 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourceRidIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourceRIDIndication.java
@@ -13,20 +13,20 @@ package org.eclipse.emf.cdo.server.protocol;
import org.eclipse.net4j.core.impl.AbstractIndicationWithResponse;
-import org.eclipse.emf.cdo.core.CdoProtocol;
-import org.eclipse.emf.cdo.server.CdoServerProtocol;
+import org.eclipse.emf.cdo.core.CDOProtocol;
import org.eclipse.emf.cdo.server.Mapper;
import org.eclipse.emf.cdo.server.ResourceInfo;
import org.eclipse.emf.cdo.server.ResourceManager;
+import org.eclipse.emf.cdo.server.ServerCDOProtocol;
-public class ResourceRidIndication extends AbstractIndicationWithResponse
+public class ResourceRIDIndication extends AbstractIndicationWithResponse
{
private int rid;
public short getSignalId()
{
- return CdoProtocol.RESOURCE_RID;
+ return CDOProtocol.RESOURCE_RID;
}
public void indicate()
@@ -37,7 +37,7 @@ public class ResourceRidIndication extends AbstractIndicationWithResponse
public void respond()
{
- Mapper mapper = ((CdoServerProtocol) getProtocol()).getMapper();
+ Mapper mapper = ((ServerCDOProtocol) getProtocol()).getMapper();
ResourceManager resourceManager = mapper.getResourceManager();
ResourceInfo info = resourceManager.getResourceInfo(rid, mapper);
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourcesChangedRequest.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourcesChangedRequest.java
index a5e1317..5fc7484 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourcesChangedRequest.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourcesChangedRequest.java
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.server.protocol;
import org.eclipse.net4j.core.impl.AbstractRequest;
-import org.eclipse.emf.cdo.core.CdoResSignals;
+import org.eclipse.emf.cdo.core.CDOResSignals;
import org.eclipse.emf.cdo.core.protocol.ResourceChangeInfo;
import java.util.List;
@@ -30,7 +30,7 @@ public class ResourcesChangedRequest extends AbstractRequest
public short getSignalId()
{
- return CdoResSignals.RESOURCES_CHANGED;
+ return CDOResSignals.RESOURCES_CHANGED;
}
public void request()
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/CdoServerProtocolImpl.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ServerCDOProtocolImpl.java
index dd91f63..71e358d 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/CdoServerProtocolImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ServerCDOProtocolImpl.java
@@ -15,24 +15,24 @@ import org.eclipse.net4j.core.Indication;
import org.eclipse.net4j.spring.ValidationException;
import org.eclipse.net4j.util.ImplementationError;
-import org.eclipse.emf.cdo.core.CdoProtocol;
-import org.eclipse.emf.cdo.core.protocol.AbstractCdoProtocol;
-import org.eclipse.emf.cdo.server.CdoResServerProtocol;
-import org.eclipse.emf.cdo.server.CdoServerProtocol;
+import org.eclipse.emf.cdo.core.CDOProtocol;
+import org.eclipse.emf.cdo.core.protocol.AbstractCDOProtocol;
import org.eclipse.emf.cdo.server.Mapper;
+import org.eclipse.emf.cdo.server.ServerCDOProtocol;
+import org.eclipse.emf.cdo.server.ServerCDOResProtocol;
import org.springframework.transaction.support.TransactionTemplate;
-public class CdoServerProtocolImpl extends AbstractCdoProtocol implements CdoServerProtocol
+public class ServerCDOProtocolImpl extends AbstractCDOProtocol implements ServerCDOProtocol
{
protected Mapper mapper;
protected TransactionTemplate transactionTemplate;
- protected CdoResServerProtocol cdoResServerProtocol;
+ protected ServerCDOResProtocol serverCDOResProtocol;
- public CdoServerProtocolImpl()
+ public ServerCDOProtocolImpl()
{
}
@@ -52,7 +52,7 @@ public class CdoServerProtocolImpl extends AbstractCdoProtocol implements CdoSer
return new DescribePackageIndication();
case RESOURCE_RID:
- return new ResourceRidIndication();
+ return new ResourceRIDIndication();
case RESOURCE_PATH:
return new ResourcePathIndication();
@@ -67,7 +67,7 @@ public class CdoServerProtocolImpl extends AbstractCdoProtocol implements CdoSer
return new CommitTransactionIndication();
default:
- throw new ImplementationError("Invalid " + CdoProtocol.PROTOCOL_NAME + " signalId: "
+ throw new ImplementationError("Invalid " + CDOProtocol.PROTOCOL_NAME + " signalId: "
+ signalId);
}
}
@@ -92,14 +92,14 @@ public class CdoServerProtocolImpl extends AbstractCdoProtocol implements CdoSer
doSet("transactionTemplate", transactionTemplate);
}
- public CdoResServerProtocol getCdoResServerProtocol()
+ public ServerCDOResProtocol getCdoResServerProtocol()
{
- return cdoResServerProtocol;
+ return serverCDOResProtocol;
}
- public void setCdoResServerProtocol(CdoResServerProtocol cdoResServerProtocol)
+ public void setCdoResServerProtocol(ServerCDOResProtocol serverCDOResProtocol)
{
- doSet("cdoResServerProtocol", cdoResServerProtocol);
+ doSet("serverCDOResProtocol", serverCDOResProtocol);
}
protected void validate() throws ValidationException
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/CdoResServerProtocolImpl.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ServerCDOResProtocolImpl.java
index 25431f8..cbc5fc0 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/CdoResServerProtocolImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ServerCDOResProtocolImpl.java
@@ -15,21 +15,21 @@ import org.eclipse.net4j.core.Indication;
import org.eclipse.net4j.spring.ValidationException;
import org.eclipse.net4j.util.ImplementationError;
-import org.eclipse.emf.cdo.core.protocol.AbstractCdoResProtocol;
-import org.eclipse.emf.cdo.server.CdoResServerProtocol;
+import org.eclipse.emf.cdo.core.protocol.AbstractCDOResProtocol;
import org.eclipse.emf.cdo.server.Mapper;
+import org.eclipse.emf.cdo.server.ServerCDOResProtocol;
import org.springframework.transaction.support.TransactionTemplate;
-public class CdoResServerProtocolImpl extends AbstractCdoResProtocol implements
- CdoResServerProtocol
+public class ServerCDOResProtocolImpl extends AbstractCDOResProtocol implements
+ ServerCDOResProtocol
{
protected Mapper mapper;
protected TransactionTemplate transactionTemplate;
- public CdoResServerProtocolImpl()
+ public ServerCDOResProtocolImpl()
{
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/BeanHelper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/BeanHelper.java
index 8a75e38..606f59d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/BeanHelper.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/BeanHelper.java
@@ -80,7 +80,7 @@ public class BeanHelper
try
{
- return (Object[]) getter.invoke(object, (Object[])null);
+ return (Object[]) getter.invoke(object, (Object[]) null);
}
catch (Throwable t)
{
@@ -138,7 +138,7 @@ public class BeanHelper
try
{
- Object returnValue = getter.invoke(object, (Object[])null);
+ Object returnValue = getter.invoke(object, (Object[]) null);
if (returnValue == null) return null;
if (returnValue instanceof String) return (String) returnValue;
@@ -161,7 +161,7 @@ public class BeanHelper
try
{
- return (Boolean) getter.invoke(object, (Object[])null);
+ return (Boolean) getter.invoke(object, (Object[]) null);
}
catch (Throwable t)
{